dont allow x# as selector
authorClaus Gittinger <cg@exept.de>
Fri, 13 Feb 2009 09:37:34 +0100
changeset 2155 163e7d5a0730
parent 2154 9cc9a982e2ca
child 2156 2cb69ec50829
dont allow x# as selector
Scanner.st
--- a/Scanner.st	Thu Feb 12 14:33:28 2009 +0100
+++ b/Scanner.st	Fri Feb 13 09:37:34 2009 +0100
@@ -2653,7 +2653,7 @@
     "a special character has been read, look for another one.
      also -number is handled here"
 
-    |secondChar thirdChar fourthChar string p charType|
+    |secondChar thirdChar fourthChar string p|
 
     secondChar := source peekOrNil.
     ((firstChar == $-) and:[secondChar notNil]) ifTrue:[
@@ -2665,8 +2665,11 @@
     ].
     string := firstChar asString.
 
+    "/ changed: do not allow second char to be a hash
+    "/ unless the first is also.
     secondChar == $# ifTrue:[
-        parserFlags allowHashAsBinarySelector ifFalse:[
+        (parserFlags allowHashAsBinarySelector 
+        and:[firstChar == $#]) ifFalse:[
             tokenName := token := string.
             tokenType := #BinaryOperator.
             ^ tokenType
@@ -3221,7 +3224,7 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.245 2009-01-19 13:46:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.246 2009-02-13 08:37:34 cg Exp $'
 ! !
 
 Scanner initialize!