--- a/Scanner.st Tue Aug 01 16:34:20 2006 +0200
+++ b/Scanner.st Tue Aug 01 16:34:40 2006 +0200
@@ -199,7 +199,7 @@
"kludge: action is nextColonOrAssign, but type is special"
TypeArray at:($: codePoint) put:#special.
- ActionArray at:($' codePoint) put:[:s :char | s nextString].
+ ActionArray at:($' codePoint) put:[:s :char | s nextString:char].
ActionArray at:($$ codePoint) put:[:s :char | s nextCharacter].
ActionArray at:($# codePoint) put:[:s :char | s nextHash].
ActionArray at:($!! codePoint) put:[:s :char | s nextExcla].
@@ -211,7 +211,7 @@
Scanner setupActions
"
- "Modified: 23.5.1997 / 12:07:55 / cg"
+ "Modified: / 01-08-2006 / 14:56:45 / cg"
! !
!Scanner class methodsFor:'instance creation'!
@@ -2056,7 +2056,7 @@
(nextChar == $' ) ifTrue:[
"ST-80 and ST/X support arbitrary symbols as #'...'"
- self nextString.
+ self nextString:nextChar.
self markSymbolFrom:tokenPosition to:(source position1Based-1).
tokenType == #EOF ifFalse:[
tokenValue bitsPerCharacter > 8 ifTrue:[
@@ -2095,7 +2095,7 @@
].
(nextChar == $') ifTrue:[
source next.
- self nextString.
+ self nextString:nextChar.
tokenType := #ESSymbol.
^ #ESSymbol
].
@@ -2132,7 +2132,7 @@
tokenType := #BinaryOperator.
^ tokenType
- "Modified: / 1.4.1998 / 13:02:45 / cg"
+ "Modified: / 01-08-2006 / 14:57:19 / cg"
!
nextId
@@ -2594,7 +2594,7 @@
"Modified: / 5.3.1998 / 02:54:54 / cg"
!
-nextString
+nextString:delimiter
"a single quote has been scanned; scan the string (caring for doubled quotes"
|nextChar string pos
@@ -2622,8 +2622,8 @@
(nextChar == Character cr) ifTrue:[
lineNr := lineNr + 1
] ifFalse:[
- (nextChar == Character quote) ifTrue:[
- (source peekOrNil == Character quote) ifTrue:[
+ (nextChar == delimiter) ifTrue:[
+ (source peekOrNil == delimiter) ifTrue:[
source next
] ifFalse:[
inString := false
@@ -2662,7 +2662,7 @@
tokenType := #String.
^ tokenType
- "Modified: / 31.3.1998 / 17:33:14 / cg"
+ "Created: / 01-08-2006 / 14:56:07 / cg"
!
nextSymbolAfterHash
@@ -3082,7 +3082,7 @@
!Scanner class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.220 2006-05-09 09:43:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.221 2006-08-01 14:34:40 cg Exp $'
! !
Scanner initialize!