Parser.st
changeset 1212 082618467e2c
parent 1207 8b07493663e4
child 1214 df80d1034ebe
--- a/Parser.st	Mon Nov 05 17:47:11 2001 +0100
+++ b/Parser.st	Mon Nov 05 17:48:36 2001 +0100
@@ -5315,9 +5315,7 @@
         "is it a private-class ?"
 
         aClass := self classToLookForClassVars.
-        aClass isMeta ifTrue:[
-            aClass := aClass soleInstance.
-        ].
+        aClass := aClass theNonMetaclass.
         (aClass privateClassesAt:varName) notNil ifTrue:[
             parseForCode ifFalse:[self rememberGlobalUsed:(aClass name , '::' , varName)].
             ^ VariableNode type:#PrivateClass class:aClass name:varName
@@ -5331,13 +5329,11 @@
             parseForCode ifFalse:[self rememberGlobalUsed:(space name , '::' , varName)].
             space isNameSpace ifTrue:[
                 ^ VariableNode type:#GlobalVariable name:(space name , '::' , varName) asSymbol
-            ] ifFalse:[
-                ^ VariableNode type:#PrivateClass class:space name:varName
-            ]
-        ] ifFalse:[
-            parseForCode ifFalse:[self rememberGlobalUsed:varName].
-            ^ VariableNode type:#GlobalVariable name:varName asSymbol
-        ]
+            ].
+            ^ VariableNode type:#PrivateClass class:space name:varName
+        ].
+        parseForCode ifFalse:[self rememberGlobalUsed:varName].
+        ^ VariableNode type:#GlobalVariable name:varName asSymbol
     ].
 
     "is it a global-variable ?"
@@ -5366,7 +5362,7 @@
 
     ^ #Error
 
-    "Modified: / 8.3.1999 / 01:35:56 / cg"
+    "Modified: / 5.11.2001 / 16:45:35 / cg"
 ! !
 
 !Parser methodsFor:'private'!
@@ -6014,6 +6010,6 @@
 !Parser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.311 2001-11-05 15:37:24 james Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.312 2001-11-05 16:48:36 cg Exp $'
 ! !
 Parser initialize!