checkin from browser
authorClaus Gittinger <cg@exept.de>
Mon, 14 Oct 1996 20:44:04 +0200
changeset 360 9b26a5a4da70
parent 359 5c3718455360
child 361 e23d954af088
checkin from browser
VarNode.st
VariableNode.st
--- a/VarNode.st	Mon Oct 14 20:11:35 1996 +0200
+++ b/VarNode.st	Mon Oct 14 20:44:04 1996 +0200
@@ -17,7 +17,7 @@
 	category:'System-Compiler-Support'
 !
 
-!VariableNode  class methodsFor:'documentation'!
+!VariableNode class methodsFor:'documentation'!
 
 copyright
 "
@@ -43,7 +43,7 @@
 "
 ! !
 
-!VariableNode  class methodsFor:'instance creation'!
+!VariableNode class methodsFor:'instance creation'!
 
 type:t class:class name:n
     ^ (self basicNew) type:t class:class name:n
@@ -266,8 +266,7 @@
         ].
         ^ self
     ].
-    ((type == #ClassVariable) 
-    or:[type == #PrivateClass]) ifTrue:[
+    (type == #ClassVariable) ifTrue:[
         litIndex := aCompiler addLiteral:(selfClass name , ':' , name) asSymbol.
         litIndex < 256 ifTrue:[
             aStream nextPut:#pushClassVarS; nextPut:litIndex
@@ -276,6 +275,15 @@
         ].
         ^ self
     ].
+    (type == #PrivateClass) ifTrue:[
+        litIndex := aCompiler addLiteral:(selfClass name , '::' , name) asSymbol.
+        litIndex < 256 ifTrue:[
+            aStream nextPut:#pushGlobalS; nextPut:litIndex
+        ] ifFalse:[
+            aStream nextPut:#pushGlobalL; nextPut:litIndex; nextPut:0
+        ].
+        ^ self
+    ].
     (type == #BlockVariable) ifTrue:[
         "find deltaLevel to block, where variable was defined"
         b := codeBlock.
@@ -310,7 +318,7 @@
     "not reached"
     self halt:'bad type'.
 
-    "Modified: 11.10.1996 / 19:17:06 / cg"
+    "Modified: 14.10.1996 / 19:43:18 / cg"
 !
 
 codeStoreOn:aStream inBlock:codeBlock valueNeeded:valueNeeded for:aCompiler
@@ -527,8 +535,8 @@
     "Created: 14.4.1996 / 00:46:32 / cg"
 ! !
 
-!VariableNode  class methodsFor:'documentation'!
+!VariableNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Attic/VarNode.st,v 1.21 1996-10-12 17:58:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Attic/VarNode.st,v 1.22 1996-10-14 18:44:04 cg Exp $'
 ! !
--- a/VariableNode.st	Mon Oct 14 20:11:35 1996 +0200
+++ b/VariableNode.st	Mon Oct 14 20:44:04 1996 +0200
@@ -17,7 +17,7 @@
 	category:'System-Compiler-Support'
 !
 
-!VariableNode  class methodsFor:'documentation'!
+!VariableNode class methodsFor:'documentation'!
 
 copyright
 "
@@ -43,7 +43,7 @@
 "
 ! !
 
-!VariableNode  class methodsFor:'instance creation'!
+!VariableNode class methodsFor:'instance creation'!
 
 type:t class:class name:n
     ^ (self basicNew) type:t class:class name:n
@@ -266,8 +266,7 @@
         ].
         ^ self
     ].
-    ((type == #ClassVariable) 
-    or:[type == #PrivateClass]) ifTrue:[
+    (type == #ClassVariable) ifTrue:[
         litIndex := aCompiler addLiteral:(selfClass name , ':' , name) asSymbol.
         litIndex < 256 ifTrue:[
             aStream nextPut:#pushClassVarS; nextPut:litIndex
@@ -276,6 +275,15 @@
         ].
         ^ self
     ].
+    (type == #PrivateClass) ifTrue:[
+        litIndex := aCompiler addLiteral:(selfClass name , '::' , name) asSymbol.
+        litIndex < 256 ifTrue:[
+            aStream nextPut:#pushGlobalS; nextPut:litIndex
+        ] ifFalse:[
+            aStream nextPut:#pushGlobalL; nextPut:litIndex; nextPut:0
+        ].
+        ^ self
+    ].
     (type == #BlockVariable) ifTrue:[
         "find deltaLevel to block, where variable was defined"
         b := codeBlock.
@@ -310,7 +318,7 @@
     "not reached"
     self halt:'bad type'.
 
-    "Modified: 11.10.1996 / 19:17:06 / cg"
+    "Modified: 14.10.1996 / 19:43:18 / cg"
 !
 
 codeStoreOn:aStream inBlock:codeBlock valueNeeded:valueNeeded for:aCompiler
@@ -527,8 +535,8 @@
     "Created: 14.4.1996 / 00:46:32 / cg"
 ! !
 
-!VariableNode  class methodsFor:'documentation'!
+!VariableNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/VariableNode.st,v 1.21 1996-10-12 17:58:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/VariableNode.st,v 1.22 1996-10-14 18:44:04 cg Exp $'
 ! !