hg/stx-libcomp: comparison MessageNode.st

equal deleted inserted replaced

-:65eaf1a009f5
+:1ef1d1395146
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 ParseNode subclass:#MessageNode
-instanceVariableNames:'receiver selector argArray lineNr'
+	 instanceVariableNames:'receiver selector argArray lineNr'
-classVariableNames:''
+	 classVariableNames:''
-poolDictionaries:''
+	 poolDictionaries:''
-category:'System-Compiler-Support'
+	 category:'System-Compiler-Support'
 !
 !MessageNode class methodsFor:'documentation'!
 copyright
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 !
-version
-^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.31 1995-11-11 15:30:33 cg Exp $'
-!
 documentation
 "
 node for parse-trees, representing message sends
 "
+!
+version
+^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.32 1995-11-23 02:13:47 cg Exp $'
 ! !
 !MessageNode class methodsFor:'instance creation'!
 receiver:recNode selector:selectorString
 ^ (self basicNew) receiver:recNode selector:selectorString args:nil lineno:0
+!
+receiver:recNode selector:selectorString arg1:argNode1 arg2:argNode2 fold:folding
+|result recVal argVal selector|
+"
+This is just a demonstration - of how complex constants can be folded.
+This was inspired by some discussion in c.l.s about enhancing the language - I prefer
+enhancing the compiler ....
+The following optimization will convert '#(...) with:#(...) collect:[...]' into an array constant,
+allowing a constant arrays of complex objects.
+Notice: this method is normally disabled - its just a demo after all.
+"
+folding ifTrue:[
+	"do constant folding ..."
+	(recNode isConstant and:[argNode1 isConstant]) ifTrue:[
+	    "check if we can do it ..."
+	    selector := selectorString asSymbolIfInterned.
+	    selector notNil ifTrue:[
+		recVal := recNode evaluate.
+		(recVal respondsTo:selector) ifTrue:[
+		    "
+		     we could do much more here - but then, we need a dependency from
+		     the folded selectors method to the method we generate code for ...
+		     limit optimizations to those that will never change
+		     (or - if you change them - you will crash so bad ...)
+		    "
+		    argVal := argNode1 evaluate.
+		    ((recVal isMemberOf:Array) and:[argVal isMemberOf:Array]) ifTrue:[
+			(selector == #with:collect:) ifTrue:[
+			    (argNode2 isMemberOf:BlockNode) ifTrue:[
+				(SignalSet anySignal catch:[
+				    result := recVal perform:selector with:argVal with:(argNode2 evaluate).
+				]) ifTrue:[
+				    ^ 'error in constant expression'
+				].
+				^ ConstantNode type:(ConstantNode typeOfConstant:result) value:result
+			    ]
+			]
+		    ]
+		]
+	    ]
+	]
+].
+^ (self basicNew) receiver:recNode selector:selectorString args:(Array with:argNode1 with:argNode2) lineno:0
 !
 receiver:recNode selector:selectorString arg:argNode
 ^ self receiver:recNode selector:selectorString arg:argNode fold:true
 !
 "/      ]
 ].
 ^ (self basicNew) receiver:recNode selector:selectorString args:(Array with:argNode) lineno:0
 !
-receiver:recNode selector:selectorString arg1:argNode1 arg2:argNode2 fold:folding
-|result recVal argVal selector|
-"
-This is just a demonstration - of how complex constants can be folded.
-This was inspired by some discussion in c.l.s about enhancing the language - I prefer
-enhancing the compiler ....
-The following optimization will convert '#(...) with:#(...) collect:[...]' into an array constant,
-allowing a constant arrays of complex objects.
-Notice: this method is normally disabled - its just a demo after all.
-"
-folding ifTrue:[
-	"do constant folding ..."
-	(recNode isConstant and:[argNode1 isConstant]) ifTrue:[
-	    "check if we can do it ..."
-	    selector := selectorString asSymbolIfInterned.
-	    selector notNil ifTrue:[
-		recVal := recNode evaluate.
-		(recVal respondsTo:selector) ifTrue:[
-		    "
-		     we could do much more here - but then, we need a dependency from
-		     the folded selectors method to the method we generate code for ...
-		     limit optimizations to those that will never change
-		     (or - if you change them - you will crash so bad ...)
-		    "
-		    argVal := argNode1 evaluate.
-		    ((recVal isMemberOf:Array) and:[argVal isMemberOf:Array]) ifTrue:[
-			(selector == #with:collect:) ifTrue:[
-			    (argNode2 isMemberOf:BlockNode) ifTrue:[
-				(SignalSet anySignal catch:[
-				    result := recVal perform:selector with:argVal with:(argNode2 evaluate).
-				]) ifTrue:[
-				    ^ 'error in constant expression'
-				].
-				^ ConstantNode type:(ConstantNode typeOfConstant:result) value:result
-			    ]
-			]
-		    ]
-		]
-	    ]
-	]
-].
-^ (self basicNew) receiver:recNode selector:selectorString args:(Array with:argNode1 with:argNode2) lineno:0
-!
 receiver:recNode selector:selectorString args:anArray
 ^ self receiver:recNode selector:selectorString args:anArray fold:true
 !
 receiver:recNode selector:selectorString args:argArray fold:folding
 ^ (self basicNew) receiver:recNode selector:selectorString args:argArray lineno:0
 "Modified: 3.9.1995 / 16:41:39 / claus"
 ! !
-!MessageNode methodsFor:'accessing'!
-receiver:r selector:s args:a lineno:l
-receiver := r.
-selector := s asSymbol.
-argArray := a.
-lineNr := l
-!
-receiver
-^ receiver
-!
-selector
-^ selector
-!
-args
-^ argArray
-!
-arg1
-^ argArray at:1
-!
-lineNumber
-^ lineNr
-!
-lineNumber:num
-lineNr := num
-! !
-!MessageNode methodsFor:'queries'!
-isMessage
-^ true
-! !
 !MessageNode class methodsFor:'queries'!
 hasLineNumber:sel
 "return true, if special send code needs lineNr"
 (sel == #~~) ifTrue:[^ false].
 (sel == #class) ifTrue:[^ false].
 (sel == #isNil) ifTrue:[^ false].
 (sel == #notNil) ifTrue:[^ false].
 ^ true
+!
+isBuiltIn1ArgSelector:sel
+"return true, if selector sel is built-in.
+(i.e. there is a single bytecode for it)"
+(sel == #at:) ifTrue:[^ true].
+(sel == #value:) ifTrue:[^ true].
+(sel == #bitAnd:) ifTrue:[^ true].
+(sel == #bitOr:) ifTrue:[^ true].
+(sel == #new:) ifTrue:[^ true].
+(sel == #basicNew:) ifTrue:[^ true].
+^ false
+!
+isBuiltIn2ArgSelector:sel
+"return true, if selector sel is built-in.
+(i.e. there is a single bytecode for it)"
+(sel == #at:put:) ifTrue:[^ true].
+^ false
 !
 isBuiltInUnarySelector:sel
 "return true, if unary selector sel is built-in.
 (i.e. there is a single bytecode for it)"
 (sel == #notNil) ifTrue:[^ true].
 (sel == #not) ifTrue:[^ true].
 (sel == #new) ifTrue:[^ true].
 (sel == #basicNew) ifTrue:[^ true].
 ^ false
-!
-isBuiltIn1ArgSelector:sel
-"return true, if selector sel is built-in.
-(i.e. there is a single bytecode for it)"
-(sel == #at:) ifTrue:[^ true].
-(sel == #value:) ifTrue:[^ true].
-(sel == #bitAnd:) ifTrue:[^ true].
-(sel == #bitOr:) ifTrue:[^ true].
-(sel == #new:) ifTrue:[^ true].
-(sel == #basicNew:) ifTrue:[^ true].
-^ false
-!
-isBuiltIn2ArgSelector:sel
-"return true, if selector sel is built-in.
-(i.e. there is a single bytecode for it)"
-(sel == #at:put:) ifTrue:[^ true].
-^ false
 ! !
-!MessageNode methodsFor:'printing'!
+!MessageNode methodsFor:'accessing'!
-printOn:aStream indent:i
+arg1
-|needParen selectorParts index index2 arg|
+^ argArray at:1
+!
-(#(whileTrue: whileFalse:) includes:selector) ifTrue:[
-	receiver isBlock ifTrue:[
+args
-	    ^ self printWhileOn:aStream indent:i
+^ argArray
-	].
+!
-].
+lineNumber
-index := 1.
+^ lineNr
-selectorParts := OrderedCollection new.
+!
-[index == 0] whileFalse:[
-	index2 := selector indexOf:$: startingAt:index.
+lineNumber:num
-	index2 ~~ 0 ifTrue:[
+lineNr := num
-	    selectorParts add:(selector copyFrom:index to:index2).
+!
-	    index2 := index2 + 1
-	].
+receiver
-	index := index2
+^ receiver
-].
+!
-needParen := false.
+receiver:r selector:s args:a lineno:l
-receiver isMessage ifTrue:[
+receiver := r.
-	receiver isUnaryMessage ifFalse:[
+selector := s asSymbol.
-	    receiver isBinaryMessage ifFalse:[
+argArray := a.
-		needParen := true
+lineNr := l
-	    ].
+!
-	].
-].
+selector
-needParen ifTrue:[
+^ selector
-	aStream nextPutAll:'('
-].
-receiver printOn:aStream indent:i.
-needParen ifTrue:[
-	aStream nextPutAll:')'
-].
-1 to:(argArray size) 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:') '
-	].
-]
-!
-printWhileOn:aStream indent:i
-|needParen arg|
-"special handling of whileTrue/whileFalse"
-aStream nextPutAll:'['.
-receiver statements printOn:aStream indent:i.
-aStream nextPutAll:'] whileTrue: '.
-arg := argArray at:1.
-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:') '
-].
 ! !
 !MessageNode methodsFor:'checks'!
 plausibilityCheck
 	].
 ].
 ^ nil
 ! !
-!MessageNode methodsFor:'evaluating'!
+!MessageNode methodsFor:'code generation'!
-evaluate
+XXcodeWhileOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
-|r nargs argValueArray class|
+"generate code for [...] whilexxx:[ ... ]"
+|pos pos2 theReceiver theArg theByteCode optByteCode|
+(selector == #whileTrue:) ifTrue:[
+	theByteCode := #falseJump
+] ifFalse:[
+	theByteCode := #trueJump
+].
+theReceiver := receiver.
+optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
+optByteCode notNil ifTrue:[
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := receiver statements expression arg1
+	].
+	theReceiver := receiver statements expression receiver.
+	theByteCode := optByteCode
+].
+valueNeeded ifTrue:[aStream nextPut:#pushNil].
+pos := aStream position.
+optByteCode notNil ifTrue:[
+	theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	theArg notNil ifTrue:[
+	    theArg codeOn:aStream inBlock:b for:aCompiler
+	]
+] ifFalse:[
+	theReceiver codeInlineOn:aStream inBlock:b for:aCompiler
+].
+(lineNr between:1 and:255) ifTrue:[
+	aStream nextPut:#lineno; nextPut:lineNr.
+].
+aStream nextPut:theByteCode.
+pos2 := aStream position.
+aStream nextPut:0.
+valueNeeded ifTrue:[aStream nextPut:#drop].
+(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+aStream nextPut:#jump; nextPut:pos.
+(aStream contents) at:pos2 put:(aStream position).
+!
+codeAndIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for (x and:[y]) ifxxx:[ ... ]"
+|theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here jmp|
+theByteCode := #falseJump.
+theReceiver := receiver receiver.
+optByteCode := self optimizedConditionFor:theReceiver
+					 with:theByteCode.
+optByteCode notNil ifTrue:[
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := theReceiver arg1
+	].
+	theReceiver := theReceiver receiver.
+	theByteCode := optByteCode
+].
+theReceiver codeOn:aStream inBlock:b for:aCompiler.
+theArg notNil ifTrue:[
+	theArg codeOn:aStream inBlock:b for:aCompiler
+].
+aStream nextPut:theByteCode.
+pos1 := aStream position.
+aStream nextPut:0.
+theReceiver := receiver arg1.
+theReceiver codeInlineOn:aStream inBlock:b for:aCompiler.
+(selector == #ifTrue:) ifTrue:[
+	jmp := #falseJump
+] ifFalse:[
+	jmp := #trueJump
+].
+aStream nextPut:jmp.
+pos2 := aStream position.
+aStream nextPut:0.
+code := aStream contents.
+(selector == #ifFalse:) ifTrue:[
+	code at:pos1 put:(aStream position)
+].
+(argArray at: 1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+valueNeeded ifTrue:[
+	aStream nextPut:#jump.
+	pos3 := aStream position.
+	aStream nextPut:0.
+	here := aStream position.
+	(selector == #ifTrue:) ifTrue:[
+	    code at:pos1 put:here
+	].
+	code at:pos2 put:here.
+	aStream nextPut:#pushNil.
+	code at:pos3 put:(aStream position)
+] ifFalse:[
+	here := aStream position.
+	(selector == #ifTrue:) ifTrue:[
+	    code at:pos1 put:here
+	].
+	code at:pos2 put:here
+]
+!
+codeAndOrOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for x and/or:[y] - but not in an if"
+|pos theReceiver theByteCode|
+self halt.
+theReceiver := receiver.
+(selector == #and:) ifTrue:[
+	theByteCode := #falseJump
+] ifFalse:[
+	theByteCode := #trueJump
+].
+"
+(self canOptimizeConditionFor:receiver) ifTrue:[
+	theByteCode := self optimizedConditionFor:theReceiver
+					     with:theByteCode.
+	theReceiver := theReceiver receiver
+].
+"
+theReceiver codeOn:aStream inBlock:b for:aCompiler.
+aStream nextPut:theByteCode.
+pos := aStream position.
+aStream nextPut:0.
+(argArray at: 1) codeInlineOn:aStream inBlock:b for:aCompiler.
+(aStream contents) at:pos put:(aStream position).
+valueNeeded ifFalse:[aStream nextPut:#drop]
+!
+codeForCascadeOn:aStream inBlock:b for:aCompiler
+"like codeOn, but always leave the receiver instead of the result"
+|nargs isBuiltIn code litIndex|
+argArray isNil ifTrue:[
+	nargs := 0
+] ifFalse:[
+	nargs := argArray size
+].
+isBuiltIn := false.
+(nargs == 0) ifTrue:[
+	isBuiltIn := self class isBuiltInUnarySelector:selector
+].
+(nargs == 1) ifTrue:[
+	isBuiltIn := self class isBuiltIn1ArgSelector:selector
+].
+(nargs == 2) ifTrue:[
+	isBuiltIn := self class isBuiltIn2ArgSelector:selector
+].
+receiver codeOn:aStream inBlock:b for:aCompiler.
+aStream nextPut:#dup.
+"can we use a send-bytecode ?"
+isBuiltIn ifTrue:[
+	receiver isSuper ifFalse:[
+	    (nargs > 0) ifTrue:[
+		(argArray at:1) codeOn:aStream inBlock:b for:aCompiler.
+		(nargs > 1) ifTrue:[
+		    (argArray at:2) codeOn:aStream inBlock:b for:aCompiler
+		]
+	    ].
+	    aStream nextPut:selector.
+	    (self class hasLineNumber:selector) ifTrue:[
+		aStream nextPut:lineNr.
+	    ].
+	    aStream nextPut:#drop.
+	    ^ self
+	]
+].
+"no - generate a send"
+argArray notNil ifTrue:[
+	argArray do:[:arg |
+	    arg codeOn:aStream inBlock:b for:aCompiler
+	]
+].
+litIndex := aCompiler addLiteral:selector.
+litIndex <= 255 ifTrue:[
+	receiver isSuper ifTrue:[
+	    receiver isHere ifTrue:[
+		code := #hereSend
+	    ] ifFalse:[
+		code := #superSend.
+	    ].
+	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs; nextPut:nil; nextPut:#drop.
+	    ^ self
+	].
+	(nargs <= 3) ifTrue:[
+	    code := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1).
+	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex.
+	    ^ self
+	].
+	aStream nextPut:#sendDrop; nextPut:lineNr; nextPut:litIndex; nextPut:nargs.
+	^ self
+].
+"need 16bit litIndex"
 receiver isSuper ifTrue:[
-	r := receiver value.
 	receiver isHere ifTrue:[
-	    class := receiver definingClass.
+	    code := #hereSendL
 	] ifFalse:[
-	    class := receiver definingClass superclass.
+	    code := #superSendL.
 	].
-	argArray notNil ifTrue:[
+	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs; nextPut:nil; nextPut:#drop.
-	    argValueArray := argArray collect:[:arg | arg evaluate].
+	^ self
-	] ifFalse:[
+].
-	    argValueArray := #()
+aStream nextPut:#sendDropL; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs
-	].
+!
-	^ r perform:selector inClass:class withArguments:argValueArray
-].
-argArray isNil ifTrue:[
-	^ (receiver evaluate) perform:selector
-].
-nargs := argArray size.
-(nargs == 1) ifTrue:[
-	^ (receiver evaluate) perform:selector with:(argArray at:1) evaluate
-].
-(nargs == 2) ifTrue:[
-	^ (receiver evaluate) perform:selector
-				 with:(argArray at:1) evaluate
-				 with:(argArray at:2) evaluate
-].
-(nargs == 3) ifTrue:[
-	^ (receiver evaluate) perform:selector
-				 with:(argArray at:1) evaluate
-				 with:(argArray at:2) evaluate
-				 with:(argArray at:3) evaluate
-].
-r := receiver evaluate.
-argValueArray := argArray collect:[:arg | arg evaluate].
-^ r perform:selector withArguments:argValueArray
-!
-evaluateForCascade
-|r nargs argValueArray class|
-receiver isSuper ifTrue:[
-	r := receiver value.
-	class := receiver definingClass.
-	receiver isHere ifFalse:[
-	    class := class superclass.
-	].
-	argArray notNil ifTrue:[
-	    argValueArray := argArray collect:[:arg | arg evaluate].
-	] ifFalse:[
-	    argValueArray := #()
-	].
-	r perform:selector inClass:class withArguments:argValueArray.
-	^ r
-].
-r := receiver evaluate.
-argArray isNil ifTrue:[
-	r perform:selector.
-	^ r
-].
-nargs := argArray size.
-(nargs == 1) ifTrue:[
-	r perform:selector with:(argArray at:1) evaluate.
-	^ r
-].
-(nargs == 2) ifTrue:[
-	r perform:selector with:(argArray at:1) evaluate
-			   with:(argArray at:2) evaluate.
-	^ r
-].
-(nargs == 3) ifTrue:[
-	r perform:selector with:(argArray at:1) evaluate
-			   with:(argArray at:2) evaluate
-			   with:(argArray at:3) evaluate.
-	^ r
-].
-argValueArray := argArray collect:[:arg | arg evaluate].
-r perform:selector withArguments:argValueArray.
-^ r
-! !
-!MessageNode methodsFor:'code generation'!
 codeForSideEffectOn:aStream inBlock:b for:aCompiler
 self codeOn:aStream inBlock:b valueNeeded:false for:aCompiler
 !
+codeIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for x ifxxx:[ ... ] yyy:[ ...]"
+|pos pos2 theReceiver theArg theByteCode optByteCode subsel code|
+theReceiver := receiver.
+"
+(theReceiver isMessage) ifTrue:[
+	subsel := theReceiver selector.
+	(subsel == #and:) ifTrue:[
+	    self codeAndIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	    ^ self
+	].
+	(subsel == #or:) ifTrue:[
+	    self codeOrIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	    ^ self
+	]
+].
+"
+(selector == #ifTrue:ifFalse:) ifTrue:[
+	theByteCode := #falseJump
+] ifFalse:[
+	(selector == #ifFalse:ifTrue:) ifTrue:[
+	    theByteCode := #trueJump
+	]
+].
+optByteCode := self optimizedConditionFor:theReceiver
+					 with:theByteCode.
+optByteCode notNil ifTrue:[
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := theReceiver arg1
+	].
+	theReceiver := theReceiver receiver.
+	theByteCode := optByteCode
+].
+theByteCode notNil ifTrue:[
+	theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	theArg notNil ifTrue:[
+	    theArg codeOn:aStream inBlock:b for:aCompiler
+	].
+	(lineNr between:1 and:255) ifTrue:[
+	    aStream nextPut:#lineno; nextPut:lineNr.
+	].
+	aStream nextPut:theByteCode.
+	pos := aStream position.
+	aStream nextPut:0.
+	(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	aStream nextPut:#jump.
+	pos2 := aStream position.
+	aStream nextPut:0.
+	code := aStream contents.
+	code at:pos put:(aStream position).
+	(argArray at:2) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	code at:pos2 put:(aStream position)
+]
+!
+codeIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for x ifxxx:[ ... ]"
+|pos pos2 theReceiver theArg theByteCode optByteCode subsel code
+needLineNr|
+theReceiver := receiver.
+(theReceiver isMessage) ifTrue:[
+	subsel := theReceiver selector.
+	(subsel == #and:) ifTrue:[
+	    self codeAndIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	    ^ self
+	].
+	(subsel == #or:) ifTrue:[
+	    self codeOrIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	    ^ self
+	]
+].
+(selector == #ifTrue:) ifTrue:[
+	theByteCode := #falseJump
+] ifFalse:[
+	theByteCode := #trueJump
+].
+optByteCode := self optimizedConditionFor:theReceiver
+					 with:theByteCode.
+optByteCode notNil ifTrue:[
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := theReceiver arg1
+	].
+	theReceiver := theReceiver receiver.
+	theByteCode := optByteCode
+].
+theReceiver codeOn:aStream inBlock:b for:aCompiler.
+theArg notNil ifTrue:[
+	theArg codeOn:aStream inBlock:b for:aCompiler
+].
+needLineNr := true.
+theArg isNil ifTrue:[
+	theReceiver isMessage ifTrue:[
+	    (self class hasLineNumber:(theReceiver selector)) ifTrue:[
+		theReceiver lineNumber == lineNr ifTrue:[
+		    needLineNr := false
+		]
+	    ]
+	]
+].
+needLineNr ifTrue:[
+	(lineNr between:1 and:255) ifTrue:[
+	    aStream nextPut:#lineno; nextPut:lineNr.
+	]
+].
+aStream nextPut:theByteCode.
+pos := aStream position.
+aStream nextPut:0.
+(argArray at: 1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+code := aStream contents.
+valueNeeded ifTrue:[
+	aStream nextPut:#jump.
+	pos2 := aStream position.
+	aStream nextPut:0.
+	code at:pos put:(aStream position).
+	aStream nextPut:#pushNil.
+	code at:pos2 put:(aStream position)
+] ifFalse:[
+	code at:pos put:(aStream position)
+]
+!
 codeOn:aStream inBlock:b for:aCompiler
 self codeOn:aStream inBlock:b valueNeeded:true for:aCompiler
+!
+codeOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+|recType nargs isBuiltIn litIndex cls clsLitIndex code|
+argArray isNil ifTrue:[
+	nargs := 0
+] ifFalse:[
+	nargs := argArray size
+].
+isBuiltIn := false.
+recType := receiver type.
+(nargs == 0) ifTrue:[
+	(recType == #ThisContext) ifTrue:[
+	    valueNeeded ifFalse:[
+		"for now, only do it in methods"
+		b isNil ifTrue:[
+		    (selector == #restart) ifTrue:[
+			aStream nextPut:#jump; nextPut:1.      "jump to start"
+			^ self
+		    ].
+		].
+		(selector == #return) ifTrue:[  "^ nil"
+		    aStream nextPut:#retNil.
+		    ^ self
+		].
+	    ]
+	].
+	receiver isBlock ifTrue:[
+	    selector == #value ifTrue:[
+		receiver codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+		^ self
+	    ].
+	].
+	isBuiltIn := self class isBuiltInUnarySelector:selector
+].
+(nargs == 1) ifTrue:[
+	(recType == #ThisContext) ifTrue:[
+	    valueNeeded ifFalse:[
+		(selector == #return:) ifTrue:[
+		    (argArray at:1) codeOn:aStream inBlock:b for:aCompiler.  "^ value"
+		    aStream nextPut:#retTop.
+		    ^ self
+		].
+	     ].
+	].
+	((argArray at:1) isBlock) ifTrue:[
+	    ((selector == #ifTrue:) or:[selector == #ifFalse:]) ifTrue:[
+		receiver isBlock ifFalse:[
+		    self codeIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+		    ^ self
+		].
+	    ].
+"
+	    ((selector == #and:) or:[selector == #or:]) ifTrue:[
+		self codeAndOrOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+		^ self
+	    ].
+"
+	    (selector == #timesRepeat:) ifTrue:[
+		(receiver isConstant and:[receiver evaluate isNumber]) ifTrue:[
+		    self codeTimesRepeatOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+		    ^ self
+		]
+	    ].
+	    ((selector == #whileTrue:) or:[selector == #whileFalse:]) ifTrue:[
+		(receiver isBlock) ifTrue:[
+		    self codeWhileOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+		    ^ self
+		]
+	    ]
+	].
+	isBuiltIn := self class isBuiltIn1ArgSelector:selector
+].
+(nargs == 2) ifTrue:[
+	((selector == #ifTrue:ifFalse:) or:[selector == #ifFalse:ifTrue:]) ifTrue:[
+	    receiver isBlock ifFalse:[
+		(argArray at:1) isBlock ifTrue:[
+		    (argArray at:2) isBlock ifTrue:[
+			self codeIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+			^ self
+		    ]
+		]
+	    ]
+	].
+	isBuiltIn := self class isBuiltIn2ArgSelector:selector
+].
+"can we use a send-bytecode ?"
+isBuiltIn ifTrue:[
+	receiver isSuper ifFalse:[
+	    receiver codeOn:aStream inBlock:b for:aCompiler.
+	    (nargs > 0) ifTrue:[
+		(argArray at:1) codeOn:aStream inBlock:b for:aCompiler.
+		(nargs > 1) ifTrue:[
+		    (argArray at:2) codeOn:aStream inBlock:b for:aCompiler
+		]
+	    ].
+	    aStream nextPut:selector.
+	    (self class hasLineNumber:selector) ifTrue:[
+		aStream nextPut:lineNr.
+	    ].
+	    valueNeeded ifFalse:[
+		aStream nextPut:#drop
+	    ].
+	    ^ self
+	]
+].
+((nargs == 0) and:[selector == #yourself]) ifTrue:[
+	"yourself is often added to get the receiver -
+	 we get it without the yourself-message"
+	valueNeeded ifTrue:[
+	    receiver codeOn:aStream inBlock:b for:aCompiler
+	].
+	^ self
+].
+"no - generate a send"
+receiver isSuper ifTrue:[
+	cls := aCompiler targetClass.
+	receiver isHere ifTrue:[
+	    code := #hereSend.
+	] ifFalse:[
+	    code := #superSend.
+	    cls := cls superclass.
+	].
+	clsLitIndex := aCompiler addLiteral:cls.
+] ifFalse:[
+	clsLitIndex := 0.
+].
+litIndex := aCompiler addLiteral:selector.
+(litIndex <= 255 and:[clsLitIndex <= 255]) ifTrue:[
+	(recType ~~ #Self) ifTrue:[
+	    receiver codeOn:aStream inBlock:b for:aCompiler
+	].
+	argArray notNil ifTrue:[
+	    argArray do:[:arg |
+		arg codeOn:aStream inBlock:b for:aCompiler
+	    ]
+	].
+	receiver isSuper ifTrue:[
+	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs; nextPut:clsLitIndex.
+	    valueNeeded ifFalse:[
+		aStream nextPut:#drop
+	    ].
+	    ^ self
+	].
+	(nargs <= 3) ifTrue:[
+	    |codes|
+	    valueNeeded ifTrue:[
+		(receiver type == #Self) ifTrue:[
+		    codes := #(sendSelf0 sendSelf1 sendSelf2 sendSelf3)
+		] ifFalse:[
+		    codes := #(send0 send1 send2 send3)
+		]
+	    ] ifFalse:[
+		(receiver type == #Self) ifTrue:[
+		    codes := #(sendSelfDrop0 sendSelfDrop1 sendSelfDrop2 sendSelfDrop3)
+		] ifFalse:[
+		    codes := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3)
+		]
+	    ].
+	    aStream nextPut:(codes at:(nargs + 1)); nextPut:lineNr; nextPut:litIndex.
+	    ^ self
+	].
+	(recType == #Self) ifTrue:[
+	    code := #sendSelf
+	] ifFalse:[
+	    valueNeeded ifTrue:[
+		code := #send
+	    ] ifFalse:[
+		code := #sendDrop
+	    ]
+	].
+	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs.
+	valueNeeded ifFalse:[
+	    (recType == #Self) ifTrue:[
+		aStream nextPut:#drop
+	    ]
+	].
+	^ self
+].
+"needs 16bit literal index"
+receiver isSuper ifTrue:[
+	argArray notNil ifTrue:[
+	    argArray do:[:arg |
+		arg codeOn:aStream inBlock:b for:aCompiler
+	    ]
+	].
+	receiver isHere ifTrue:[
+	    code := #hereSendL
+	] ifFalse:[
+	    code := #superSendL.
+	].
+	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs; nextPut:clsLitIndex; nextPut:0.
+] ifFalse:[
+	recType ~~ #Self ifTrue:[
+	    receiver codeOn:aStream inBlock:b for:aCompiler.
+	].
+	argArray notNil ifTrue:[
+	    argArray do:[:arg |
+		arg codeOn:aStream inBlock:b for:aCompiler
+	    ]
+	].
+	recType == #Self ifTrue:[
+	    code := #sendSelfL
+	] ifFalse:[
+	    code := #sendL
+	].
+	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs.
+].
+valueNeeded ifFalse:[
+	aStream nextPut:#drop
+].
+"Modified: 3.9.1995 / 12:55:42 / claus"
+!
+codeOrIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for (x or:[y]) ifxxx:[ ... ]"
+|theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here jmp|
+theByteCode := #trueJump.
+theReceiver := receiver receiver.
+optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
+optByteCode notNil ifTrue:[
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := theReceiver arg1
+	].
+	theReceiver := theReceiver receiver.
+	theByteCode := optByteCode
+].
+theReceiver codeOn:aStream inBlock:b for:aCompiler.
+theArg notNil ifTrue:[
+	theArg codeOn:aStream inBlock:b for:aCompiler
+].
+aStream nextPut:theByteCode.
+pos1 := aStream position.
+aStream nextPut:0.
+theReceiver := receiver arg1.
+"new:"
+(selector == #ifTrue:) ifTrue:[
+	theByteCode := #falseJump
+] ifFalse:[
+	theByteCode := #trueJump
+].
+optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
+optByteCode notNil ifTrue:[
+	theReceiver isBlock ifTrue:[
+	    theReceiver := theReceiver statements expression
+	].
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := theReceiver arg1
+	].
+	theReceiver := theReceiver receiver.
+	theByteCode := optByteCode.
+	theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	theArg notNil ifTrue:[
+	    theArg codeOn:aStream inBlock:b for:aCompiler
+	].
+	aStream nextPut:theByteCode.
+] ifFalse:[
+"org"
+	theReceiver codeInlineOn:aStream inBlock:b for:aCompiler.
+	(selector == #ifTrue:) ifTrue:[
+	    jmp := #falseJump
+	] ifFalse:[
+	    jmp := #trueJump
+	].
+	aStream nextPut:jmp
+].
+pos2 := aStream position.
+aStream nextPut:0.
+(selector == #ifTrue:) ifTrue:[
+	(aStream contents) at:pos1 put:(aStream position)
+].
+(argArray at: 1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+code := aStream contents.
+valueNeeded ifTrue:[
+	aStream nextPut:#jump.
+	pos3 := aStream position.
+	aStream nextPut:0.
+	here := aStream position.
+	(selector == #ifFalse:) ifTrue:[
+	    code at:pos1 put:here
+	].
+	code at:pos2 put:here.
+	aStream nextPut:#pushNil.
+	code at:pos3 put:(aStream position)
+] ifFalse:[
+	here := aStream position.
+	(selector == #ifFalse:) ifTrue:[
+	    code at:pos1 put:here
+	].
+	code at:pos2 put:here
+]
+!
+codeSendOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"like code on, but assumes that receiver has already been
+coded onto stack - needed for cascade"
+|nargs isBuiltIn code litIndex|
+argArray isNil ifTrue:[
+	nargs := 0
+] ifFalse:[
+	nargs := argArray size
+].
+isBuiltIn := false.
+(nargs == 0) ifTrue:[
+	isBuiltIn := self class isBuiltInUnarySelector:selector
+].
+(nargs == 1) ifTrue:[
+	isBuiltIn := self class isBuiltIn1ArgSelector:selector
+].
+(nargs == 2) ifTrue:[
+	isBuiltIn := self class isBuiltIn2ArgSelector:selector
+].
+"can we use a send-bytecode ?"
+isBuiltIn ifTrue:[
+	receiver isSuper ifFalse:[
+	    (nargs > 0) ifTrue:[
+		(argArray at:1) codeOn:aStream inBlock:b for:aCompiler.
+		(nargs > 1) ifTrue:[
+		    (argArray at:2) codeOn:aStream inBlock:b for:aCompiler
+		]
+	    ].
+	    aStream nextPut:selector.
+	    (self class hasLineNumber:selector) ifTrue:[
+		aStream nextPut:lineNr.
+	    ].
+	    valueNeeded ifFalse:[
+		aStream nextPut:#drop
+	    ].
+	    ^ self
+	]
+].
+argArray notNil ifTrue:[
+	argArray do:[:arg |
+	    arg codeOn:aStream inBlock:b for:aCompiler
+	]
+].
+receiver isSuper ifTrue:[
+	litIndex := aCompiler addLiteral:selector.
+	litIndex <= 255 ifTrue:[
+	    receiver isHere ifTrue:[
+		code := #hereSend
+	    ] ifFalse:[
+		code := #superSend.
+	    ].
+	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs; nextPut:nil.
+	] ifFalse:[
+	    receiver isHere ifTrue:[
+		code := #hereSendL
+	    ] ifFalse:[
+		code := #superSendL.
+	    ].
+	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs; nextPut:nil.
+	].
+	valueNeeded ifFalse:[
+	    aStream nextPut:#drop
+	].
+	^ self
+].
+(nargs == 0) ifTrue:[
+	(selector == #yourself) ifTrue:[
+	    "yourself is often added to get the receiver -
+	     we get it without the yourself-message"
+	    valueNeeded ifFalse:[
+		aStream nextPut:#drop
+	    ].
+	    ^ self
+	].
+].
+litIndex := aCompiler addLiteral:selector.
+litIndex <= 255 ifTrue:[
+	(nargs <= 3) ifTrue:[
+	    valueNeeded ifTrue:[
+		code := #(send0 send1 send2 send3) at:(nargs+1).
+	    ] ifFalse:[
+		code := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1).
+	    ].
+	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex.
+	    ^ self
+	].
+	valueNeeded ifTrue:[
+	    code := #send
+	] ifFalse:[
+	    code := #sendDrop
+	].
+	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs.
+	^ self
+].
+valueNeeded ifTrue:[
+	code := #sendL
+] ifFalse:[
+	code := #sendDropL
+].
+aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs
+!
+codeTimesRepeatOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for n timesRepeat:[ ... ]"
+|pos pos2 theReceiver|
+theReceiver := receiver.
+theReceiver codeOn:aStream inBlock:b for:aCompiler.
+valueNeeded ifTrue:[aStream nextPut:#dup].
+pos := aStream position.
+"/    aStream nextPut:#dup; nextPut:#push0; nextPut:#>; nextPut:lineNr; nextPut:#falseJump.
+"/    aStream nextPut:#dup; nextPut:#gt0; nextPut:lineNr; nextPut:#falseJump.
+aStream nextPut:#pushgt0; nextPut:lineNr; nextPut:#falseJump.
+pos2 := aStream position.
+aStream nextPut:0.
+(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:false for:aCompiler.
+aStream nextPut:#minus1; nextPut:lineNr; nextPut:#jump; nextPut:pos.
+(aStream contents) at:pos2 put:(aStream position).
+aStream nextPut:#drop.
+!
+codeWhileOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+"generate code for [...] whilexxx:[ ... ]"
+|pos pos2 theReceiver theArg theByteCode optByteCode|
+(selector == #whileTrue:) ifTrue:[
+	theByteCode := #falseJump
+] ifFalse:[
+	theByteCode := #trueJump
+].
+theReceiver := receiver.
+optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
+optByteCode notNil ifTrue:[
+	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	    theArg := receiver statements expression arg1
+	].
+	theReceiver := receiver statements expression receiver.
+	theByteCode := optByteCode
+].
+"/ OLD:
+"/    valueNeeded ifTrue:[aStream nextPut:#pushNil].
+"/
+pos := aStream position.
+optByteCode notNil ifTrue:[
+	theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	theArg notNil ifTrue:[
+	    theArg codeOn:aStream inBlock:b for:aCompiler
+	]
+] ifFalse:[
+	theReceiver codeInlineOn:aStream inBlock:b for:aCompiler
+].
+(lineNr between:1 and:255) ifTrue:[
+	aStream nextPut:#lineno; nextPut:lineNr.
+].
+aStream nextPut:theByteCode.
+pos2 := aStream position.
+aStream nextPut:0.
+"/ OLD:
+"/    valueNeeded ifTrue:[aStream nextPut:#drop].
+"/
+"/ OLD:
+"/    (argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+"/ NEW:
+(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:false for:aCompiler.
+aStream nextPut:#jump; nextPut:pos.
+(aStream contents) at:pos2 put:(aStream position).
+"/ NEW:
+valueNeeded ifTrue:[aStream nextPut:#pushNil].
 !
 optimizedConditionFor:aReceiver with:aByteCode
 |rec sel|
 	    (aByteCode == #falseJump) ifTrue:[^ #eqJump].
 	    (aByteCode == #trueJump) ifTrue:[^ #notEqJump]
 	]
 ].
 ^ nil
-!
+! !
-codeWhileOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+!MessageNode methodsFor:'evaluating'!
-"generate code for [...] whilexxx:[ ... ]"
+evaluate
-|pos pos2 theReceiver theArg theByteCode optByteCode|
+|r nargs argValueArray class|
-(selector == #whileTrue:) ifTrue:[
+receiver isSuper ifTrue:[
-	theByteCode := #falseJump
+	r := receiver value.
-] ifFalse:[
+	receiver isHere ifTrue:[
-	theByteCode := #trueJump
+	    class := receiver definingClass.
-].
+	] ifFalse:[
+	    class := receiver definingClass superclass.
-theReceiver := receiver.
+	].
-optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
+	argArray notNil ifTrue:[
-optByteCode notNil ifTrue:[
+	    argValueArray := argArray collect:[:arg | arg evaluate].
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+	] ifFalse:[
-	    theArg := receiver statements expression arg1
+	    argValueArray := #()
 	].
-	theReceiver := receiver statements expression receiver.
+	^ r perform:selector inClass:class withArguments:argValueArray
-	theByteCode := optByteCode
+].
-].
-"/ OLD:
+argArray isNil ifTrue:[
-"/    valueNeeded ifTrue:[aStream nextPut:#pushNil].
+	^ (receiver evaluate) perform:selector
-"/
+].
-pos := aStream position.
+nargs := argArray size.
-optByteCode notNil ifTrue:[
+(nargs == 1) ifTrue:[
-	theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	^ (receiver evaluate) perform:selector with:(argArray at:1) evaluate
-	theArg notNil ifTrue:[
+].
-	    theArg codeOn:aStream inBlock:b for:aCompiler
+(nargs == 2) ifTrue:[
-	]
+	^ (receiver evaluate) perform:selector
-] ifFalse:[
+				 with:(argArray at:1) evaluate
-	theReceiver codeInlineOn:aStream inBlock:b for:aCompiler
+				 with:(argArray at:2) evaluate
 ].
+(nargs == 3) ifTrue:[
-(lineNr between:1 and:255) ifTrue:[
+	^ (receiver evaluate) perform:selector
-	aStream nextPut:#lineno; nextPut:lineNr.
+				 with:(argArray at:1) evaluate
-].
+				 with:(argArray at:2) evaluate
+				 with:(argArray at:3) evaluate
-aStream nextPut:theByteCode.
+].
-pos2 := aStream position.
+r := receiver evaluate.
-aStream nextPut:0.
+argValueArray := argArray collect:[:arg | arg evaluate].
-"/ OLD:
+^ r perform:selector withArguments:argValueArray
-"/    valueNeeded ifTrue:[aStream nextPut:#drop].
+!
-"/
-"/ OLD:
+evaluateForCascade
-"/    (argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+|r nargs argValueArray class|
-"/ NEW:
-(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:false for:aCompiler.
+receiver isSuper ifTrue:[
-aStream nextPut:#jump; nextPut:pos.
+	r := receiver value.
-(aStream contents) at:pos2 put:(aStream position).
+	class := receiver definingClass.
-"/ NEW:
+	receiver isHere ifFalse:[
-valueNeeded ifTrue:[aStream nextPut:#pushNil].
+	    class := class superclass.
-!
+	].
+	argArray notNil ifTrue:[
-XXcodeWhileOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+	    argValueArray := argArray collect:[:arg | arg evaluate].
-"generate code for [...] whilexxx:[ ... ]"
+	] ifFalse:[
+	    argValueArray := #()
-|pos pos2 theReceiver theArg theByteCode optByteCode|
+	].
+	r perform:selector inClass:class withArguments:argValueArray.
-(selector == #whileTrue:) ifTrue:[
+	^ r
-	theByteCode := #falseJump
+].
-] ifFalse:[
-	theByteCode := #trueJump
+r := receiver evaluate.
-].
+argArray isNil ifTrue:[
+	r perform:selector.
-theReceiver := receiver.
+	^ r
-optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
+].
-optByteCode notNil ifTrue:[
+nargs := argArray size.
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
+(nargs == 1) ifTrue:[
-	    theArg := receiver statements expression arg1
+	r perform:selector with:(argArray at:1) evaluate.
-	].
+	^ r
-	theReceiver := receiver statements expression receiver.
+].
-	theByteCode := optByteCode
+(nargs == 2) ifTrue:[
-].
+	r perform:selector with:(argArray at:1) evaluate
+			   with:(argArray at:2) evaluate.
-valueNeeded ifTrue:[aStream nextPut:#pushNil].
+	^ r
-pos := aStream position.
+].
-optByteCode notNil ifTrue:[
+(nargs == 3) ifTrue:[
-	theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	r perform:selector with:(argArray at:1) evaluate
-	theArg notNil ifTrue:[
+			   with:(argArray at:2) evaluate
-	    theArg codeOn:aStream inBlock:b for:aCompiler
+			   with:(argArray at:3) evaluate.
-	]
+	^ r
-] ifFalse:[
+].
-	theReceiver codeInlineOn:aStream inBlock:b for:aCompiler
+argValueArray := argArray collect:[:arg | arg evaluate].
-].
+r perform:selector withArguments:argValueArray.
+^ r
-(lineNr between:1 and:255) ifTrue:[
+! !
-	aStream nextPut:#lineno; nextPut:lineNr.
-].
+!MessageNode methodsFor:'printing'!
-aStream nextPut:theByteCode.
+printOn:aStream indent:i
-pos2 := aStream position.
+|needParen selectorParts index index2 arg|
-aStream nextPut:0.
-valueNeeded ifTrue:[aStream nextPut:#drop].
+(#(whileTrue: whileFalse:) includes:selector) ifTrue:[
-(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	receiver isBlock ifTrue:[
-aStream nextPut:#jump; nextPut:pos.
+	    ^ self printWhileOn:aStream indent:i
-(aStream contents) at:pos2 put:(aStream position).
+	].
-!
+].
-codeTimesRepeatOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+index := 1.
-"generate code for n timesRepeat:[ ... ]"
+selectorParts := OrderedCollection new.
+[index == 0] whileFalse:[
-|pos pos2 theReceiver|
+	index2 := selector indexOf:$: startingAt:index.
+	index2 ~~ 0 ifTrue:[
-theReceiver := receiver.
+	    selectorParts add:(selector copyFrom:index to:index2).
-theReceiver codeOn:aStream inBlock:b for:aCompiler.
+	    index2 := index2 + 1
-valueNeeded ifTrue:[aStream nextPut:#dup].
+	].
+	index := index2
-pos := aStream position.
+].
-"/    aStream nextPut:#dup; nextPut:#push0; nextPut:#>; nextPut:lineNr; nextPut:#falseJump.
-"/    aStream nextPut:#dup; nextPut:#gt0; nextPut:lineNr; nextPut:#falseJump.
+needParen := false.
-aStream nextPut:#pushgt0; nextPut:lineNr; nextPut:#falseJump.
+receiver isMessage ifTrue:[
-pos2 := aStream position.
+	receiver isUnaryMessage ifFalse:[
-aStream nextPut:0.
+	    receiver isBinaryMessage ifFalse:[
+		needParen := true
-(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:false for:aCompiler.
+	    ].
-aStream nextPut:#minus1; nextPut:lineNr; nextPut:#jump; nextPut:pos.
+	].
+].
-(aStream contents) at:pos2 put:(aStream position).
+needParen ifTrue:[
-aStream nextPut:#drop.
+	aStream nextPutAll:'('
-!
+].
+receiver printOn:aStream indent:i.
-codeIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+needParen ifTrue:[
-"generate code for x ifxxx:[ ... ] yyy:[ ...]"
+	aStream nextPutAll:')'
+].
-|pos pos2 theReceiver theArg theByteCode optByteCode subsel code|
+1 to:(argArray size) do:[:argIndex |
-theReceiver := receiver.
+	aStream space.
+	(selectorParts at:argIndex) printOn:aStream.
-"
+	aStream space.
-(theReceiver isMessage) ifTrue:[
+	arg := argArray at:argIndex.
-	subsel := theReceiver selector.
+	needParen := false.
-	(subsel == #and:) ifTrue:[
+	arg isMessage ifTrue:[
-	    self codeAndIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	    arg isBinaryMessage ifFalse:[
-	    ^ self
+		arg isUnaryMessage ifFalse:[
-	].
+		    needParen := true
-	(subsel == #or:) ifTrue:[
+		]
-	    self codeOrIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+	    ].
-	    ^ self
+	].
-	]
+	needParen ifTrue:[
-].
+	    aStream nextPutAll:'('
-"
+	].
-(selector == #ifTrue:ifFalse:) ifTrue:[
+	arg printOn:aStream indent:i.
-	theByteCode := #falseJump
+	needParen ifTrue:[
-] ifFalse:[
+	    aStream nextPutAll:') '
-	(selector == #ifFalse:ifTrue:) ifTrue:[
+	].
-	    theByteCode := #trueJump
-	]
-].
-optByteCode := self optimizedConditionFor:theReceiver
-					 with:theByteCode.
-optByteCode notNil ifTrue:[
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
-	    theArg := theReceiver arg1
-	].
-	theReceiver := theReceiver receiver.
-	theByteCode := optByteCode
-].
-theByteCode notNil ifTrue:[
-	theReceiver codeOn:aStream inBlock:b for:aCompiler.
-	theArg notNil ifTrue:[
-	    theArg codeOn:aStream inBlock:b for:aCompiler
-	].
-	(lineNr between:1 and:255) ifTrue:[
-	    aStream nextPut:#lineno; nextPut:lineNr.
-	].
-	aStream nextPut:theByteCode.
-	pos := aStream position.
-	aStream nextPut:0.
-	(argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-	aStream nextPut:#jump.
-	pos2 := aStream position.
-	aStream nextPut:0.
-	code := aStream contents.
-	code at:pos put:(aStream position).
-	(argArray at:2) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-	code at:pos2 put:(aStream position)
 ]
 !
-codeIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
+printWhileOn:aStream indent:i
-"generate code for x ifxxx:[ ... ]"
+|needParen arg|
-|pos pos2 theReceiver theArg theByteCode optByteCode subsel code
+"special handling of whileTrue/whileFalse"
-needLineNr|
+aStream nextPutAll:'['.
-theReceiver := receiver.
+receiver statements printOn:aStream indent:i.
+aStream nextPutAll:'] whileTrue: '.
-(theReceiver isMessage) ifTrue:[
-	subsel := theReceiver selector.
+arg := argArray at:1.
-	(subsel == #and:) ifTrue:[
+needParen := false.
-	    self codeAndIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
+arg isMessage ifTrue:[
-	    ^ self
+	arg isBinaryMessage ifFalse:[
-	].
+	    arg isUnaryMessage ifFalse:[
-	(subsel == #or:) ifTrue:[
+		needParen := true
-	    self codeOrIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-	    ^ self
-	]
-].
-(selector == #ifTrue:) ifTrue:[
-	theByteCode := #falseJump
-] ifFalse:[
-	theByteCode := #trueJump
-].
-optByteCode := self optimizedConditionFor:theReceiver
-					 with:theByteCode.
-optByteCode notNil ifTrue:[
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
-	    theArg := theReceiver arg1
-	].
-	theReceiver := theReceiver receiver.
-	theByteCode := optByteCode
-].
-theReceiver codeOn:aStream inBlock:b for:aCompiler.
-theArg notNil ifTrue:[
-	theArg codeOn:aStream inBlock:b for:aCompiler
-].
-needLineNr := true.
-theArg isNil ifTrue:[
-	theReceiver isMessage ifTrue:[
-	    (self class hasLineNumber:(theReceiver selector)) ifTrue:[
-		theReceiver lineNumber == lineNr ifTrue:[
-		    needLineNr := false
-		]
 	    ]
-	]
+	].
 ].
+needParen ifTrue:[
-needLineNr ifTrue:[
+	aStream nextPutAll:'('
-	(lineNr between:1 and:255) ifTrue:[
+].
-	    aStream nextPut:#lineno; nextPut:lineNr.
+arg printOn:aStream indent:i.
-	]
+needParen ifTrue:[
-].
+	aStream nextPutAll:') '
+].
-aStream nextPut:theByteCode.
-pos := aStream position.
-aStream nextPut:0.
-(argArray at: 1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-code := aStream contents.
-valueNeeded ifTrue:[
-	aStream nextPut:#jump.
-	pos2 := aStream position.
-	aStream nextPut:0.
-	code at:pos put:(aStream position).
-	aStream nextPut:#pushNil.
-	code at:pos2 put:(aStream position)
-] ifFalse:[
-	code at:pos put:(aStream position)
-]
-!
-codeAndIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
-"generate code for (x and:[y]) ifxxx:[ ... ]"
-|theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here jmp|
-theByteCode := #falseJump.
-theReceiver := receiver receiver.
-optByteCode := self optimizedConditionFor:theReceiver
-					 with:theByteCode.
-optByteCode notNil ifTrue:[
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
-	    theArg := theReceiver arg1
-	].
-	theReceiver := theReceiver receiver.
-	theByteCode := optByteCode
-].
-theReceiver codeOn:aStream inBlock:b for:aCompiler.
-theArg notNil ifTrue:[
-	theArg codeOn:aStream inBlock:b for:aCompiler
-].
-aStream nextPut:theByteCode.
-pos1 := aStream position.
-aStream nextPut:0.
-theReceiver := receiver arg1.
-theReceiver codeInlineOn:aStream inBlock:b for:aCompiler.
-(selector == #ifTrue:) ifTrue:[
-	jmp := #falseJump
-] ifFalse:[
-	jmp := #trueJump
-].
-aStream nextPut:jmp.
-pos2 := aStream position.
-aStream nextPut:0.
-code := aStream contents.
-(selector == #ifFalse:) ifTrue:[
-	code at:pos1 put:(aStream position)
-].
-(argArray at: 1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-valueNeeded ifTrue:[
-	aStream nextPut:#jump.
-	pos3 := aStream position.
-	aStream nextPut:0.
-	here := aStream position.
-	(selector == #ifTrue:) ifTrue:[
-	    code at:pos1 put:here
-	].
-	code at:pos2 put:here.
-	aStream nextPut:#pushNil.
-	code at:pos3 put:(aStream position)
-] ifFalse:[
-	here := aStream position.
-	(selector == #ifTrue:) ifTrue:[
-	    code at:pos1 put:here
-	].
-	code at:pos2 put:here
-]
-!
-codeOrIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
-"generate code for (x or:[y]) ifxxx:[ ... ]"
-|theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here jmp|
-theByteCode := #trueJump.
-theReceiver := receiver receiver.
-optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
-optByteCode notNil ifTrue:[
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
-	    theArg := theReceiver arg1
-	].
-	theReceiver := theReceiver receiver.
-	theByteCode := optByteCode
-].
-theReceiver codeOn:aStream inBlock:b for:aCompiler.
-theArg notNil ifTrue:[
-	theArg codeOn:aStream inBlock:b for:aCompiler
-].
-aStream nextPut:theByteCode.
-pos1 := aStream position.
-aStream nextPut:0.
-theReceiver := receiver arg1.
-"new:"
-(selector == #ifTrue:) ifTrue:[
-	theByteCode := #falseJump
-] ifFalse:[
-	theByteCode := #trueJump
-].
-optByteCode := self optimizedConditionFor:theReceiver with:theByteCode.
-optByteCode notNil ifTrue:[
-	theReceiver isBlock ifTrue:[
-	    theReceiver := theReceiver statements expression
-	].
-	((optByteCode == #eqJump) or:[optByteCode == #notEqJump]) ifTrue:[
-	    theArg := theReceiver arg1
-	].
-	theReceiver := theReceiver receiver.
-	theByteCode := optByteCode.
-	theReceiver codeOn:aStream inBlock:b for:aCompiler.
-	theArg notNil ifTrue:[
-	    theArg codeOn:aStream inBlock:b for:aCompiler
-	].
-	aStream nextPut:theByteCode.
-] ifFalse:[
-"org"
-	theReceiver codeInlineOn:aStream inBlock:b for:aCompiler.
-	(selector == #ifTrue:) ifTrue:[
-	    jmp := #falseJump
-	] ifFalse:[
-	    jmp := #trueJump
-	].
-	aStream nextPut:jmp
-].
-pos2 := aStream position.
-aStream nextPut:0.
-(selector == #ifTrue:) ifTrue:[
-	(aStream contents) at:pos1 put:(aStream position)
-].
-(argArray at: 1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-code := aStream contents.
-valueNeeded ifTrue:[
-	aStream nextPut:#jump.
-	pos3 := aStream position.
-	aStream nextPut:0.
-	here := aStream position.
-	(selector == #ifFalse:) ifTrue:[
-	    code at:pos1 put:here
-	].
-	code at:pos2 put:here.
-	aStream nextPut:#pushNil.
-	code at:pos3 put:(aStream position)
-] ifFalse:[
-	here := aStream position.
-	(selector == #ifFalse:) ifTrue:[
-	    code at:pos1 put:here
-	].
-	code at:pos2 put:here
-]
-!
-codeAndOrOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
-"generate code for x and/or:[y] - but not in an if"
-|pos theReceiver theByteCode|
-self halt.
-theReceiver := receiver.
-(selector == #and:) ifTrue:[
-	theByteCode := #falseJump
-] ifFalse:[
-	theByteCode := #trueJump
-].
-"
-(self canOptimizeConditionFor:receiver) ifTrue:[
-	theByteCode := self optimizedConditionFor:theReceiver
-					     with:theByteCode.
-	theReceiver := theReceiver receiver
-].
-"
-theReceiver codeOn:aStream inBlock:b for:aCompiler.
-aStream nextPut:theByteCode.
-pos := aStream position.
-aStream nextPut:0.
-(argArray at: 1) codeInlineOn:aStream inBlock:b for:aCompiler.
-(aStream contents) at:pos put:(aStream position).
-valueNeeded ifFalse:[aStream nextPut:#drop]
-!
-codeOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
-|recType nargs isBuiltIn litIndex cls clsLitIndex code|
-argArray isNil ifTrue:[
-	nargs := 0
-] ifFalse:[
-	nargs := argArray size
-].
-isBuiltIn := false.
-recType := receiver type.
-(nargs == 0) ifTrue:[
-	(recType == #ThisContext) ifTrue:[
-	    valueNeeded ifFalse:[
-		"for now, only do it in methods"
-		b isNil ifTrue:[
-		    (selector == #restart) ifTrue:[
-			aStream nextPut:#jump; nextPut:1.      "jump to start"
-			^ self
-		    ].
-		].
-		(selector == #return) ifTrue:[  "^ nil"
-		    aStream nextPut:#retNil.
-		    ^ self
-		].
-	    ]
-	].
-	receiver isBlock ifTrue:[
-	    selector == #value ifTrue:[
-		receiver codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-		^ self
-	    ].
-	].
-	isBuiltIn := self class isBuiltInUnarySelector:selector
-].
-(nargs == 1) ifTrue:[
-	(recType == #ThisContext) ifTrue:[
-	    valueNeeded ifFalse:[
-		(selector == #return:) ifTrue:[
-		    (argArray at:1) codeOn:aStream inBlock:b for:aCompiler.  "^ value"
-		    aStream nextPut:#retTop.
-		    ^ self
-		].
-	     ].
-	].
-	((argArray at:1) isBlock) ifTrue:[
-	    ((selector == #ifTrue:) or:[selector == #ifFalse:]) ifTrue:[
-		receiver isBlock ifFalse:[
-		    self codeIfOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-		    ^ self
-		].
-	    ].
-"
-	    ((selector == #and:) or:[selector == #or:]) ifTrue:[
-		self codeAndOrOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-		^ self
-	    ].
-"
-	    (selector == #timesRepeat:) ifTrue:[
-		(receiver isConstant and:[receiver evaluate isNumber]) ifTrue:[
-		    self codeTimesRepeatOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-		    ^ self
-		]
-	    ].
-	    ((selector == #whileTrue:) or:[selector == #whileFalse:]) ifTrue:[
-		(receiver isBlock) ifTrue:[
-		    self codeWhileOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-		    ^ self
-		]
-	    ]
-	].
-	isBuiltIn := self class isBuiltIn1ArgSelector:selector
-].
-(nargs == 2) ifTrue:[
-	((selector == #ifTrue:ifFalse:) or:[selector == #ifFalse:ifTrue:]) ifTrue:[
-	    receiver isBlock ifFalse:[
-		(argArray at:1) isBlock ifTrue:[
-		    (argArray at:2) isBlock ifTrue:[
-			self codeIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler.
-			^ self
-		    ]
-		]
-	    ]
-	].
-	isBuiltIn := self class isBuiltIn2ArgSelector:selector
-].
-"can we use a send-bytecode ?"
-isBuiltIn ifTrue:[
-	receiver isSuper ifFalse:[
-	    receiver codeOn:aStream inBlock:b for:aCompiler.
-	    (nargs > 0) ifTrue:[
-		(argArray at:1) codeOn:aStream inBlock:b for:aCompiler.
-		(nargs > 1) ifTrue:[
-		    (argArray at:2) codeOn:aStream inBlock:b for:aCompiler
-		]
-	    ].
-	    aStream nextPut:selector.
-	    (self class hasLineNumber:selector) ifTrue:[
-		aStream nextPut:lineNr.
-	    ].
-	    valueNeeded ifFalse:[
-		aStream nextPut:#drop
-	    ].
-	    ^ self
-	]
-].
-((nargs == 0) and:[selector == #yourself]) ifTrue:[
-	"yourself is often added to get the receiver -
-	 we get it without the yourself-message"
-	valueNeeded ifTrue:[
-	    receiver codeOn:aStream inBlock:b for:aCompiler
-	].
-	^ self
-].
-"no - generate a send"
-receiver isSuper ifTrue:[
-	cls := aCompiler targetClass.
-	receiver isHere ifTrue:[
-	    code := #hereSend.
-	] ifFalse:[
-	    code := #superSend.
-	    cls := cls superclass.
-	].
-	clsLitIndex := aCompiler addLiteral:cls.
-] ifFalse:[
-	clsLitIndex := 0.
-].
-litIndex := aCompiler addLiteral:selector.
-(litIndex <= 255 and:[clsLitIndex <= 255]) ifTrue:[
-	(recType ~~ #Self) ifTrue:[
-	    receiver codeOn:aStream inBlock:b for:aCompiler
-	].
-	argArray notNil ifTrue:[
-	    argArray do:[:arg |
-		arg codeOn:aStream inBlock:b for:aCompiler
-	    ]
-	].
-	receiver isSuper ifTrue:[
-	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs; nextPut:clsLitIndex.
-	    valueNeeded ifFalse:[
-		aStream nextPut:#drop
-	    ].
-	    ^ self
-	].
-	(nargs <= 3) ifTrue:[
-	    |codes|
-	    valueNeeded ifTrue:[
-		(receiver type == #Self) ifTrue:[
-		    codes := #(sendSelf0 sendSelf1 sendSelf2 sendSelf3)
-		] ifFalse:[
-		    codes := #(send0 send1 send2 send3)
-		]
-	    ] ifFalse:[
-		(receiver type == #Self) ifTrue:[
-		    codes := #(sendSelfDrop0 sendSelfDrop1 sendSelfDrop2 sendSelfDrop3)
-		] ifFalse:[
-		    codes := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3)
-		]
-	    ].
-	    aStream nextPut:(codes at:(nargs + 1)); nextPut:lineNr; nextPut:litIndex.
-	    ^ self
-	].
-	(recType == #Self) ifTrue:[
-	    code := #sendSelf
-	] ifFalse:[
-	    valueNeeded ifTrue:[
-		code := #send
-	    ] ifFalse:[
-		code := #sendDrop
-	    ]
-	].
-	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs.
-	valueNeeded ifFalse:[
-	    (recType == #Self) ifTrue:[
-		aStream nextPut:#drop
-	    ]
-	].
-	^ self
-].
-"needs 16bit literal index"
-receiver isSuper ifTrue:[
-	argArray notNil ifTrue:[
-	    argArray do:[:arg |
-		arg codeOn:aStream inBlock:b for:aCompiler
-	    ]
-	].
-	receiver isHere ifTrue:[
-	    code := #hereSendL
-	] ifFalse:[
-	    code := #superSendL.
-	].
-	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs; nextPut:clsLitIndex; nextPut:0.
-] ifFalse:[
-	recType ~~ #Self ifTrue:[
-	    receiver codeOn:aStream inBlock:b for:aCompiler.
-	].
-	argArray notNil ifTrue:[
-	    argArray do:[:arg |
-		arg codeOn:aStream inBlock:b for:aCompiler
-	    ]
-	].
-	recType == #Self ifTrue:[
-	    code := #sendSelfL
-	] ifFalse:[
-	    code := #sendL
-	].
-	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs.
-].
-valueNeeded ifFalse:[
-	aStream nextPut:#drop
-].
-"Modified: 3.9.1995 / 12:55:42 / claus"
-!
-codeSendOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
-"like code on, but assumes that receiver has already been
-coded onto stack - needed for cascade"
-|nargs isBuiltIn code litIndex|
-argArray isNil ifTrue:[
-	nargs := 0
-] ifFalse:[
-	nargs := argArray size
-].
-isBuiltIn := false.
-(nargs == 0) ifTrue:[
-	isBuiltIn := self class isBuiltInUnarySelector:selector
-].
-(nargs == 1) ifTrue:[
-	isBuiltIn := self class isBuiltIn1ArgSelector:selector
-].
-(nargs == 2) ifTrue:[
-	isBuiltIn := self class isBuiltIn2ArgSelector:selector
-].
-"can we use a send-bytecode ?"
-isBuiltIn ifTrue:[
-	receiver isSuper ifFalse:[
-	    (nargs > 0) ifTrue:[
-		(argArray at:1) codeOn:aStream inBlock:b for:aCompiler.
-		(nargs > 1) ifTrue:[
-		    (argArray at:2) codeOn:aStream inBlock:b for:aCompiler
-		]
-	    ].
-	    aStream nextPut:selector.
-	    (self class hasLineNumber:selector) ifTrue:[
-		aStream nextPut:lineNr.
-	    ].
-	    valueNeeded ifFalse:[
-		aStream nextPut:#drop
-	    ].
-	    ^ self
-	]
-].
-argArray notNil ifTrue:[
-	argArray do:[:arg |
-	    arg codeOn:aStream inBlock:b for:aCompiler
-	]
-].
-receiver isSuper ifTrue:[
-	litIndex := aCompiler addLiteral:selector.
-	litIndex <= 255 ifTrue:[
-	    receiver isHere ifTrue:[
-		code := #hereSend
-	    ] ifFalse:[
-		code := #superSend.
-	    ].
-	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs; nextPut:nil.
-	] ifFalse:[
-	    receiver isHere ifTrue:[
-		code := #hereSendL
-	    ] ifFalse:[
-		code := #superSendL.
-	    ].
-	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs; nextPut:nil.
-	].
-	valueNeeded ifFalse:[
-	    aStream nextPut:#drop
-	].
-	^ self
-].
-(nargs == 0) ifTrue:[
-	(selector == #yourself) ifTrue:[
-	    "yourself is often added to get the receiver -
-	     we get it without the yourself-message"
-	    valueNeeded ifFalse:[
-		aStream nextPut:#drop
-	    ].
-	    ^ self
-	].
-].
-litIndex := aCompiler addLiteral:selector.
-litIndex <= 255 ifTrue:[
-	(nargs <= 3) ifTrue:[
-	    valueNeeded ifTrue:[
-		code := #(send0 send1 send2 send3) at:(nargs+1).
-	    ] ifFalse:[
-		code := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1).
-	    ].
-	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex.
-	    ^ self
-	].
-	valueNeeded ifTrue:[
-	    code := #send
-	] ifFalse:[
-	    code := #sendDrop
-	].
-	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs.
-	^ self
-].
-valueNeeded ifTrue:[
-	code := #sendL
-] ifFalse:[
-	code := #sendDropL
-].
-aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs
-!
-codeForCascadeOn:aStream inBlock:b for:aCompiler
-"like codeOn, but always leave the receiver instead of the result"
-|nargs isBuiltIn code litIndex|
-argArray isNil ifTrue:[
-	nargs := 0
-] ifFalse:[
-	nargs := argArray size
-].
-isBuiltIn := false.
-(nargs == 0) ifTrue:[
-	isBuiltIn := self class isBuiltInUnarySelector:selector
-].
-(nargs == 1) ifTrue:[
-	isBuiltIn := self class isBuiltIn1ArgSelector:selector
-].
-(nargs == 2) ifTrue:[
-	isBuiltIn := self class isBuiltIn2ArgSelector:selector
-].
-receiver codeOn:aStream inBlock:b for:aCompiler.
-aStream nextPut:#dup.
-"can we use a send-bytecode ?"
-isBuiltIn ifTrue:[
-	receiver isSuper ifFalse:[
-	    (nargs > 0) ifTrue:[
-		(argArray at:1) codeOn:aStream inBlock:b for:aCompiler.
-		(nargs > 1) ifTrue:[
-		    (argArray at:2) codeOn:aStream inBlock:b for:aCompiler
-		]
-	    ].
-	    aStream nextPut:selector.
-	    (self class hasLineNumber:selector) ifTrue:[
-		aStream nextPut:lineNr.
-	    ].
-	    aStream nextPut:#drop.
-	    ^ self
-	]
-].
-"no - generate a send"
-argArray notNil ifTrue:[
-	argArray do:[:arg |
-	    arg codeOn:aStream inBlock:b for:aCompiler
-	]
-].
-litIndex := aCompiler addLiteral:selector.
-litIndex <= 255 ifTrue:[
-	receiver isSuper ifTrue:[
-	    receiver isHere ifTrue:[
-		code := #hereSend
-	    ] ifFalse:[
-		code := #superSend.
-	    ].
-	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs; nextPut:nil; nextPut:#drop.
-	    ^ self
-	].
-	(nargs <= 3) ifTrue:[
-	    code := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1).
-	    aStream nextPut:code; nextPut:lineNr; nextPut:litIndex.
-	    ^ self
-	].
-	aStream nextPut:#sendDrop; nextPut:lineNr; nextPut:litIndex; nextPut:nargs.
-	^ self
-].
-"need 16bit litIndex"
-receiver isSuper ifTrue:[
-	receiver isHere ifTrue:[
-	    code := #hereSendL
-	] ifFalse:[
-	    code := #superSendL.
-	].
-	aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs; nextPut:nil; nextPut:#drop.
-	^ self
-].
-aStream nextPut:#sendDropL; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs
 ! !
+!MessageNode methodsFor:'queries'!
+isMessage
+^ true
+! !

changeset 140	1ef1d1395146
parent 135	aa4f7b8f121e
child 148	ef0e604209ec