--- a/Parser.st	Fri Jun 25 16:52:18 1999 +0200
+++ b/Parser.st	Fri Jun 25 16:55:15 1999 +0200
@@ -3591,6 +3591,7 @@
         self markSelfFrom:pos to:pos+3.
         ^ selfNode
     ].
+
     (tokenType == #Identifier) ifTrue:[
         "
          must check for variable first, to be backward compatible
@@ -3683,12 +3684,13 @@
                      type:#GlobalVariable
                      name:globlName asSymbol.
                 parseForCode ifFalse:[self rememberGlobalUsed:globlName].
-            ]
+            ].
+            self markVariable:var from:pos to:pos+var name size - 1.
         ].
 
-        var == #Error ifTrue:[^ #Error].
-
-        self markVariable:var from:pos to:pos+var name size - 1.
+        var == #Error ifTrue:[
+            ^ #Error
+        ].
 
         ((tokenType == $_) or:[tokenType == #':=']) ifFalse:[
             ^ var
@@ -3867,7 +3869,7 @@
         superNode isNil ifTrue:[
             superNode := SuperNode value:selfValue inClass:classToCompileFor
         ].
-        self markIdentifierFrom:pos to:pos+5.
+        self markSelfFrom:pos to:pos+5.
         ^ superNode
     ].
     (tokenType  == #Here) ifTrue:[
@@ -3879,7 +3881,7 @@
         classToCompileFor isNil ifTrue:[
             self warning:'in which class are you ?' position:pos to:(pos + 3).
         ].
-        self markIdentifierFrom:pos to:pos+3.
+        self markSelfFrom:pos to:pos+3.
         ^ SuperNode value:selfValue inClass:classToCompileFor here:true
     ].
     (tokenType == #ThisContext) ifTrue:[
@@ -4042,7 +4044,7 @@
         ]
     ].
 
-    self markGlobalIdentifierFrom:pos1 to:pos2.
+"/    self markGlobalIdentifierFrom:pos1 to:pos2.
     ^ VariableNode type:#GlobalVariable name:tokenName asSymbol
 
     "Modified: / 16.4.1998 / 18:46:45 / cg"
@@ -4759,6 +4761,6 @@
 !Parser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.201 1999-06-23 22:48:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.202 1999-06-25 14:54:45 cg Exp $'
 ! !
 Parser initialize!