bug fix if source ends with underline(-identifier)
authorClaus Gittinger <cg@exept.de>
Tue, 02 Feb 1999 22:44:50 +0100
changeset 802 5c6e7db91d5f
parent 801 0ab2ba78b26e
child 803 4d31ec53f65d
bug fix if source ends with underline(-identifier)
Scanner.st
--- a/Scanner.st	Fri Jan 15 22:22:05 1999 +0100
+++ b/Scanner.st	Tue Feb 02 22:44:50 1999 +0100
@@ -1353,17 +1353,21 @@
             [ok] whileTrue:[
                 string := string copyWith:nextChar.
                 nextChar := source nextPeek.
-                (nextChar isAlphaNumeric) ifTrue:[
-                    string := string , source nextAlphaNumericWord.
-                    nextChar := source peekOrNil.
-                ].
-                (nextChar == $_) ifTrue:[
-                    ok := allowUnderscoreInIdentifier
+                nextChar isNil ifTrue:[
+                    ok := false
                 ] ifFalse:[
-                    (nextChar == $$) ifTrue:[
-                        ok := allowDollarInIdentifier
+                    (nextChar isAlphaNumeric) ifTrue:[
+                        string := string , source nextAlphaNumericWord.
+                        nextChar := source peekOrNil.
+                    ].
+                    (nextChar == $_) ifTrue:[
+                        ok := allowUnderscoreInIdentifier
                     ] ifFalse:[
-                        ok := false
+                        (nextChar == $$) ifTrue:[
+                            ok := allowDollarInIdentifier
+                        ] ifFalse:[
+                            ok := false
+                        ]
                     ]
                 ]
             ].
@@ -1400,7 +1404,7 @@
     ^ tokenType
 
     "Created: / 13.9.1995 / 12:56:42 / claus"
-    "Modified: / 17.10.1998 / 15:48:28 / cg"
+    "Modified: / 2.2.1999 / 22:29:57 / cg"
 !
 
 nextMantissa:radix
@@ -1891,6 +1895,6 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.89 1998-10-30 12:16:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.90 1999-02-02 21:44:50 cg Exp $'
 ! !
 Scanner initialize!