diff -r a404d6ce2caf -r f11d0862c65e MessageNode.st --- a/MessageNode.st Fri May 10 15:35:07 2013 +0200 +++ b/MessageNode.st Fri May 10 15:35:10 2013 +0200 @@ -827,7 +827,7 @@ (selector == #timesRepeat:) ifTrue:[ "/ now, always inline #timesRepeat:; "/ the receiver must understand #> and #- - + ^ self codeTimesRepeatOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler. ]. @@ -934,7 +934,7 @@ ] ]. lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:usedSelector. (aCompiler hasLineNumber:usedSelector) ifTrue:[ @@ -991,7 +991,7 @@ cls := cls superclass. ]. clsLitIndex := aCompiler addLiteral:cls. - self emitSuperSendLiteralIndex:litIndex classLiteralIndex:clsLitIndex numArgs:nargs line:lineNr on:aStream. + self emitSuperSendLiteralIndex:litIndex classLiteralIndex:clsLitIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. valueNeeded ifFalse:[ aStream nextPut:#drop ]. @@ -1059,11 +1059,11 @@ useSelfSend ifTrue:[ aStream nextPut:#sendSelfL; nextPut:lineNr; nextPut:litIndex; nextPut:0; nextPut:nargs. ] ifFalse:[ - self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream. + self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. ]. ] ifFalse:[ "needs 32bit literal index" - self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream. + self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. ]. valueNeeded ifFalse:[ @@ -1097,7 +1097,6 @@ "Modified: 19.6.1997 / 17:08:28 / cg" ! ! - !MessageNode methodsFor:'evaluation'! evaluateForCascadeIn:anEnvironment @@ -1562,7 +1561,7 @@ ] ]. lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:selector. (aCompiler hasLineNumber:selector) ifTrue:[ @@ -1588,7 +1587,7 @@ cls := cls superclass. ]. clsLitIndex := aCompiler addLiteral:cls. - self emitSuperSendLiteralIndex:litIndex classLiteralIndex:clsLitIndex numArgs:nargs line:lineNr on:aStream. + self emitSuperSendLiteralIndex:litIndex classLiteralIndex:clsLitIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. aStream nextPut:#drop. ^ self ]. @@ -1598,20 +1597,20 @@ (nargs <= 3) ifTrue:[ code := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1). lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:code; nextPut:lineNr; nextPut:litIndex. ^ self ]. lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:#sendDrop; nextPut:lineNr; nextPut:litIndex; nextPut:nargs. ^ self ]. ]. - self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream. + self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. aStream nextPut:#drop. "Modified: / 04-07-1999 / 19:06:53 / cg" @@ -2263,7 +2262,7 @@ ] ]. lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:selector. (aCompiler hasLineNumber:selector) ifTrue:[ @@ -2290,7 +2289,7 @@ cls := cls superclass. ]. clsLitIndex := aCompiler addLiteral:cls. - self emitSuperSendLiteralIndex:litIndex classLiteralIndex:clsLitIndex numArgs:nargs line:lineNr on:aStream. + self emitSuperSendLiteralIndex:litIndex classLiteralIndex:clsLitIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. valueNeeded ifFalse:[ aStream nextPut:#drop ]. @@ -2321,7 +2320,7 @@ alreadyDropped := true. ]. lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:code; nextPut:lineNr; nextPut:litIndex. valueNeeded ifFalse:[ @@ -2339,7 +2338,7 @@ alreadyDropped := true. ]. lineNr >= 255 ifTrue:[ - self codeLineNumber: lineNr on: aStream for: nil. + self codeLineNumber: lineNr on: aStream for:aCompiler. ]. aStream nextPut:code; nextPut:lineNr; nextPut:litIndex; nextPut:nargs. valueNeeded ifFalse:[ @@ -2350,7 +2349,7 @@ ^ self ]. - self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream. + self emitSendLiteralIndex:litIndex numArgs:nargs line:lineNr on:aStream for:aCompiler. valueNeeded ifFalse:[ aStream nextPut:#drop ]. @@ -3327,14 +3326,14 @@ !MessageNode class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.196 2013-04-13 09:40:03 vrany Exp $' + ^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.197 2013-05-10 13:35:10 stefan Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.196 2013-04-13 09:40:03 vrany Exp $' + ^ '$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.197 2013-05-10 13:35:10 stefan Exp $' ! version_SVN - ^ '§ Id §' + ^ '$ Id $' ! !