--- a/CascadeNode.st Fri Aug 11 18:04:27 1995 +0200
+++ b/CascadeNode.st Fri Aug 11 22:28:40 1995 +0200
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -19,9 +19,9 @@
CascadeNode comment:'
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
-$Header: /cvs/stx/stx/libcomp/CascadeNode.st,v 1.9 1995-08-11 16:02:51 claus Exp $
+$Header: /cvs/stx/stx/libcomp/CascadeNode.st,v 1.10 1995-08-11 20:27:48 claus Exp $
'!
!CascadeNode class methodsFor:'documentation'!
@@ -29,7 +29,7 @@
copyright
"
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libcomp/CascadeNode.st,v 1.9 1995-08-11 16:02:51 claus Exp $
+$Header: /cvs/stx/stx/libcomp/CascadeNode.st,v 1.10 1995-08-11 20:27:48 claus Exp $
"
!
@@ -54,15 +54,15 @@
!CascadeNode methodsFor: 'code generation'!
-codeOn:aStream inBlock:b valueNeeded:valueNeeded
- receiver codeForCascadeOn:aStream inBlock:b.
- self codeSendOn:aStream inBlock:b valueNeeded:valueNeeded
+codeOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+ receiver codeForCascadeOn:aStream inBlock:b for:aCompiler.
+ self codeSendOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
!
-codeForCascadeOn:aStream inBlock:b
- receiver codeForCascadeOn:aStream inBlock:b.
+codeForCascadeOn:aStream inBlock:b for:aCompiler
+ receiver codeForCascadeOn:aStream inBlock:b for:aCompiler.
aStream nextPut:#dup.
- self codeSendOn:aStream inBlock:b valueNeeded:false
+ self codeSendOn:aStream inBlock:b valueNeeded:false for:aCompiler
! !
!CascadeNode methodsFor: 'printing'!
@@ -73,12 +73,12 @@
index := 1.
selectorParts := OrderedCollection new.
[index == 0] whileFalse:[
- index2 := selector indexOf:$: startingAt:index.
- index2 ~~ 0 ifTrue:[
- selectorParts add:(selector copyFrom:index to:index2).
- index2 := index2 + 1
- ].
- index := index2
+ index2 := selector indexOf:$: startingAt:index.
+ index2 ~~ 0 ifTrue:[
+ selectorParts add:(selector copyFrom:index to:index2).
+ index2 := index2 + 1
+ ].
+ index := index2
].
receiver printOn:aStream indent:i.
@@ -86,29 +86,29 @@
nargs := argArray size.
nargs == 0 ifTrue:[
- selector printOn:aStream
+ selector printOn:aStream
] ifFalse:[
- 1 to:nargs do:[:argIndex |
- aStream space.
- (selectorParts at:argIndex) printOn:aStream.
- aStream space.
- arg := argArray at:argIndex.
- needParen := false.
- arg isMessage ifTrue:[
- arg isBinaryMessage ifFalse:[
- arg isUnaryMessage ifFalse:[
- needParen := true
- ]
- ].
- ].
- needParen ifTrue:[
- aStream nextPutAll:'('
- ].
- arg printOn:aStream indent:i.
- needParen ifTrue:[
- aStream nextPutAll:') '
- ].
- ]
+ 1 to:nargs do:[:argIndex |
+ aStream space.
+ (selectorParts at:argIndex) printOn:aStream.
+ aStream space.
+ arg := argArray at:argIndex.
+ needParen := false.
+ arg isMessage ifTrue:[
+ arg isBinaryMessage ifFalse:[
+ arg isUnaryMessage ifFalse:[
+ needParen := true
+ ]
+ ].
+ ].
+ needParen ifTrue:[
+ aStream nextPutAll:'('
+ ].
+ arg printOn:aStream indent:i.
+ needParen ifTrue:[
+ aStream nextPutAll:') '
+ ].
+ ]
]
! !
@@ -118,13 +118,13 @@
|t argValueArray|
receiver isSuper ifTrue:[
- ^ super evaluate
+ ^ super evaluate
].
t := receiver evaluateForCascade.
argArray isNil ifTrue:[
- t perform:selector.
- ^ t
+ t perform:selector.
+ ^ t
].
argValueArray := argArray collect:[:arg | arg evaluate].
^ t perform:selector withArguments:argValueArray
@@ -134,13 +134,13 @@
|t argValueArray|
receiver isSuper ifTrue:[
- ^ super evaluateForCascade
+ ^ super evaluateForCascade
].
t := receiver evaluateForCascade.
argArray isNil ifTrue:[
- t perform:selector.
- ^ t
+ t perform:selector.
+ ^ t
].
argValueArray := argArray collect:[:arg | arg evaluate].
t perform:selector withArguments:argValueArray.