oops #nextSymbolAfterHash
authorsr
Wed, 20 May 2009 16:15:51 +0200
changeset 2181 9498c1060445
parent 2180 891d45ffad68
child 2182 bce48a1e1367
oops #nextSymbolAfterHash
Scanner.st
--- a/Scanner.st	Mon May 18 16:28:02 2009 +0200
+++ b/Scanner.st	Wed May 20 16:15:51 2009 +0200
@@ -2853,7 +2853,7 @@
         nextChar == $_ ifTrue:[
             part := nil.
         ] ifFalse:[
-            nextChar == $. ifTrue:[
+            (allowPeriodInSymbol and:[nextChar == $.]) ifTrue:[
                 part := nil.
             ] ifFalse:[
                 part := source nextAlphaNumericWord.
@@ -2871,14 +2871,14 @@
             ] ifFalse:[
                 self warnPeriodAt:source position1Based.
             ].
-            [(nextChar == $_) or:[nextChar == $.]] whileTrue:[
+            [(nextChar == $_) or:[(allowPeriodInSymbol and:[nextChar == $.])]] whileTrue:[
                 string := string copyWith:nextChar.
                 nextChar := source nextPeek.
                 (nextChar notNil and:[nextChar isLetterOrDigit]) ifTrue:[
                     string := string , source nextAlphaNumericWord.
                     nextChar := source peek.
                 ] ifFalse:[
-                    string last == $. ifTrue:[
+                    (allowPeriodInSymbol and:[string last == $.]) ifTrue:[
                         peekChar := nextChar.
                         nextChar := $..
                         string := string copyWithoutLast:1.
@@ -3269,7 +3269,7 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.248 2009-05-18 14:28:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.249 2009-05-20 14:15:51 sr Exp $'
 ! !
 
 Scanner initialize!