evaluate -> evaluateIn:
authorClaus Gittinger <cg@exept.de>
Fri, 28 Mar 2003 15:39:23 +0100
changeset 1383 3d485eefbb36
parent 1382 10281d2f42d1
child 1384 0db9682870d9
evaluate -> evaluateIn:
ParseNode.st
PrimaryNode.st
PrimitiveNode.st
ReturnNode.st
--- a/ParseNode.st	Thu Mar 27 23:31:40 2003 +0100
+++ b/ParseNode.st	Fri Mar 28 15:39:23 2003 +0100
@@ -141,8 +141,20 @@
 
 !ParseNode methodsFor:'evaluation'!
 
+evaluate
+    ^ self evaluateIn:nil
+!
+
 evaluateForCascade
-    ^ self evaluate
+    ^ self evaluateForCascadeIn:nil
+!
+
+evaluateForCascadeIn:anEnvironment
+    ^ self evaluateIn:anEnvironment
+!
+
+evaluateIn:anEnvironment
+    self subclassResponsibility
 ! !
 
 !ParseNode methodsFor:'printing & storing'!
@@ -281,5 +293,5 @@
 !ParseNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ParseNode.st,v 1.34 2002-11-18 11:38:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ParseNode.st,v 1.35 2003-03-28 14:39:08 cg Exp $'
 ! !
--- a/PrimaryNode.st	Thu Mar 27 23:31:40 2003 +0100
+++ b/PrimaryNode.st	Fri Mar 28 15:39:23 2003 +0100
@@ -68,10 +68,6 @@
 
 !PrimaryNode methodsFor:'evaluation'!
 
-evaluate
-    ^ self subclassResponsibility
-!
-
 store:aValue
     ^ self subclassResponsibility
 ! !
@@ -108,5 +104,5 @@
 !PrimaryNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/PrimaryNode.st,v 1.21 2003-03-27 15:57:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/PrimaryNode.st,v 1.22 2003-03-28 14:39:13 cg Exp $'
 ! !
--- a/PrimitiveNode.st	Thu Mar 27 23:31:40 2003 +0100
+++ b/PrimitiveNode.st	Fri Mar 28 15:39:23 2003 +0100
@@ -116,14 +116,14 @@
 
 !PrimitiveNode methodsFor:'evaluation'!
 
-evaluate
+evaluateExpressionIn:anEnvironment
     "catch evaluation"
 
     optional ifTrue:[^ nil].
     self error:'cannot evaluate primitives' mayProceed:true
 !
 
-evaluateExpression
+evaluateIn:anEnvironment
     "catch evaluation"
 
     optional ifTrue:[^ nil].
@@ -143,5 +143,5 @@
 !PrimitiveNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/PrimitiveNode.st,v 1.19 2000-06-24 15:42:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/PrimitiveNode.st,v 1.20 2003-03-28 14:39:00 cg Exp $'
 ! !
--- a/ReturnNode.st	Thu Mar 27 23:31:40 2003 +0100
+++ b/ReturnNode.st	Fri Mar 28 15:39:23 2003 +0100
@@ -122,10 +122,10 @@
 
 !ReturnNode methodsFor:'evaluation'!
 
-evaluateExpression
+evaluateExpressionIn:anEnvironment
     |val|
 
-    val := expression evaluate.
+    val := expression evaluateIn:anEnvironment.
     myHome exitWith:val.
     "when we arrive here, the parser context is already gone
      - try block-return"
@@ -154,5 +154,5 @@
 !ReturnNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ReturnNode.st,v 1.27 2003-03-27 15:56:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ReturnNode.st,v 1.28 2003-03-28 14:39:23 cg Exp $'
 ! !