--- a/CascadeNode.st	Fri Mar 28 15:39:23 2003 +0100
+++ b/CascadeNode.st	Fri Mar 28 15:41:56 2003 +0100
@@ -94,40 +94,40 @@
 
 !CascadeNode methodsFor:'evaluation'!
 
-evaluate
+evaluateForCascadeIn:anEnvironment
+    |t argValueArray|
+
+    selector := selector asSymbol.
+    receiver isSuper ifTrue:[
+        ^ super evaluateForCascadeIn:anEnvironment
+    ].
+
+    t := receiver evaluateForCascadeIn:anEnvironment.
+    argArray isNil ifTrue:[
+        t perform:selector.
+        ^ t
+    ].
+    argValueArray := argArray collect:[:arg | arg evaluateIn:anEnvironment]. 
+    t perform:selector withArguments:argValueArray.
+    ^ t
+!
+
+evaluateIn:anEnvironment
     |t argValueArray|
 
     selector := selector asSymbol.
 
     receiver isSuper ifTrue:[
-        ^ super evaluate
+        ^ super evaluateIn:anEnvironment
     ].
 
-    t := receiver evaluateForCascade.
+    t := receiver evaluateForCascadeIn:anEnvironment.
     argArray isNil ifTrue:[
         ^ t perform:selector.
         "/ t perform:selector. ^ t
     ].
-    argValueArray := argArray collect:[:arg | arg evaluate].
+    argValueArray := argArray collect:[:arg | arg evaluateIn:anEnvironment].
     ^ t perform:selector withArguments:argValueArray
-!
-
-evaluateForCascade
-    |t argValueArray|
-
-    selector := selector asSymbol.
-    receiver isSuper ifTrue:[
-        ^ super evaluateForCascade
-    ].
-
-    t := receiver evaluateForCascade.
-    argArray isNil ifTrue:[
-        t perform:selector.
-        ^ t
-    ].
-    argValueArray := argArray collect:[:arg | arg evaluate]. 
-    t perform:selector withArguments:argValueArray.
-    ^ t
 ! !
 
 !CascadeNode methodsFor:'printing & storing'!
@@ -188,5 +188,5 @@
 !CascadeNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/CascadeNode.st,v 1.23 2002-11-26 09:08:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/CascadeNode.st,v 1.24 2003-03-28 14:41:47 cg Exp $'
 ! !