changed: #evaluate:in:receiver:notifying:logged:ifFail:compile:checkForEndOfInput:
authorClaus Gittinger <cg@exept.de>
Mon, 25 Jan 2010 12:30:37 +0100
changeset 2328 09ef8479a874
parent 2327 88c2ba0ae517
child 2329 50473c5384bb
changed: #evaluate:in:receiver:notifying:logged:ifFail:compile:checkForEndOfInput: fixed doIt eval of super-message; used receivers superclass, instead of method-home's superclass for super-eval.
Parser.st
--- a/Parser.st	Mon Jan 18 17:01:35 2010 +0100
+++ b/Parser.st	Mon Jan 25 12:30:37 2010 +0100
@@ -2644,7 +2644,7 @@
 
             choice == #InstanceVariable ifTrue:[
                 classToCompileFor theNonMetaclass addInstVarName:varName.
-                "/ ST/X special - classToCompileFor is obsoleted
+                "/ ST/X special - old classToCompileFor is obsoleted - refetch
                 classToCompileFor := Smalltalk classNamed:(classToCompileFor name).
                 RestartCompilationSignal raise.    
                 "/ not reached - restarted compile will not arrive here again
@@ -2653,7 +2653,7 @@
 
             choice == #ClassInstanceVariable ifTrue:[
                 classToCompileFor theMetaclass addInstVarName:varName.
-                "/ ST/X special - classToCompileFor is obsoleted
+                "/ ST/X special - old classToCompileFor is obsoleted - refetch
                 classToCompileFor := Smalltalk classNamed:(classToCompileFor name).
                 RestartCompilationSignal raise.    
                 "/ not reached - restarted compile will not arrive here again
@@ -4220,7 +4220,7 @@
      at the end of the expression."
 
     |tree mustBackup loggedString chgStream value s sReal spc
-     nameSpaceQuerySignal compiler|
+     nameSpaceQuerySignal compiler cls|
 
     aStringOrStream isNil ifTrue:[
         EmptySourceNotificationSignal raiseRequest.
@@ -4241,11 +4241,11 @@
     self setContext:aContext.
     aContext notNil ifTrue:[
         self setSelf:(aContext receiver).
-"/        aContext method notNil ifTrue:[
-"/            cls := aContext method mclass
-"/        ].
-"/        self setClassToCompileFor:(cls ? aContext receiver class).
-        self setClassToCompileFor:(aContext receiver class).
+        aContext method notNil ifTrue:[
+            cls := aContext method mclass
+        ].
+        self setClassToCompileFor:(cls ? aContext receiver class).
+        "/ self setClassToCompileFor:(aContext receiver class).
     ].
     self notifying:requestor.
     self nextToken.
@@ -9751,11 +9751,11 @@
 !Parser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.633 2009-12-10 13:24:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.634 2010-01-25 11:30:37 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.633 2009-12-10 13:24:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.634 2010-01-25 11:30:37 cg Exp $'
 ! !
 
 Parser initialize!