MessageNd.st
changeset 95 13c0174506d3
parent 76 55d64cb1ffea
child 96 ae3b3d960476
--- a/MessageNd.st	Fri May 19 05:57:50 1995 +0200
+++ b/MessageNd.st	Tue Jun 06 06:04:36 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libcomp/Attic/MessageNd.st,v 1.22 1995-03-06 19:20:14 claus Exp $
+$Header: /cvs/stx/stx/libcomp/Attic/MessageNd.st,v 1.23 1995-06-06 04:04:02 claus Exp $
 '!
 
 !MessageNode class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libcomp/Attic/MessageNd.st,v 1.22 1995-03-06 19:20:14 claus Exp $
+$Header: /cvs/stx/stx/libcomp/Attic/MessageNd.st,v 1.23 1995-06-06 04:04:02 claus Exp $
 "
 !
 
@@ -689,8 +689,7 @@
     ].
 
     (lineNr between:1 and:255) ifTrue:[
-	aStream nextPut:#lineno.
-	aStream nextPut:lineNr.
+	aStream nextPut:#lineno; nextPut:lineNr.
     ].
 
     aStream nextPut:theByteCode.
@@ -698,8 +697,7 @@
     aStream nextPut:0.
     valueNeeded ifTrue:[aStream nextPut:#drop].
     (argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:valueNeeded.
-    aStream nextPut:#jump.
-    aStream nextPut:pos.
+    aStream nextPut:#jump; nextPut:pos.
     (aStream contents) at:pos2 put:(aStream position)
 !
 
@@ -713,19 +711,12 @@
     valueNeeded ifTrue:[aStream nextPut:#dup].
 
     pos := aStream position.
-    aStream nextPut:#dup.
-    aStream nextPut:#push0.
-    aStream nextPut:#>.
-    aStream nextPut:lineNr.
-    aStream nextPut:#falseJump.
+    aStream nextPut:#dup; nextPut:#push0; nextPut:#>; nextPut:lineNr; nextPut:#falseJump.
     pos2 := aStream position.
     aStream nextPut:0.
 
     (argArray at:1) codeInlineOn:aStream inBlock:b valueNeeded:false.
-    aStream nextPut:#minus1.
-    aStream nextPut:lineNr.
-    aStream nextPut:#jump.
-    aStream nextPut:pos.
+    aStream nextPut:#minus1; nextPut:lineNr; nextPut:#jump; nextPut:pos.
 
     (aStream contents) at:pos2 put:(aStream position).
     aStream nextPut:#drop.
@@ -774,8 +765,7 @@
 	].
 
 	(lineNr between:1 and:255) ifTrue:[
-	    aStream nextPut:#lineno.
-	    aStream nextPut:lineNr.
+	    aStream nextPut:#lineno; nextPut:lineNr.
 	].
 
 	aStream nextPut:theByteCode.
@@ -831,8 +821,7 @@
     ].
 
     (lineNr between:1 and:255) ifTrue:[
-	aStream nextPut:#lineno.
-	aStream nextPut:lineNr.
+	aStream nextPut:#lineno; nextPut:lineNr.
     ].
 
     aStream nextPut:theByteCode.
@@ -856,7 +845,7 @@
 codeAndIfOn:aStream inBlock:b valueNeeded:valueNeeded
     "generate code for (x and:[y]) ifxxx:[ ... ]"
 
-    |theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here|
+    |theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here jmp|
 
 
     theByteCode := #falseJump.
@@ -882,10 +871,11 @@
     theReceiver := receiver arg1.
     theReceiver codeInlineOn:aStream inBlock:b.
     (selector == #ifTrue:) ifTrue:[
-	aStream nextPut:#falseJump
+	jmp := #falseJump
     ] ifFalse:[
-	aStream nextPut:#trueJump
+	jmp := #trueJump
     ].
+    aStream nextPut:jmp.
     pos2 := aStream position.
     aStream nextPut:0.
 
@@ -918,7 +908,7 @@
 codeOrIfOn:aStream inBlock:b valueNeeded:valueNeeded
     "generate code for (x or:[y]) ifxxx:[ ... ]"
 
-    |theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here|
+    |theByteCode optByteCode theReceiver theArg pos1 pos2 pos3 code here jmp|
 
     theByteCode := #trueJump.
     theReceiver := receiver receiver.
@@ -969,10 +959,11 @@
 "org"
 	theReceiver codeInlineOn:aStream inBlock:b.
 	(selector == #ifTrue:) ifTrue:[
-	    aStream nextPut:#falseJump
+	    jmp := #falseJump
 	] ifFalse:[
-	    aStream nextPut:#trueJump
+	    jmp := #trueJump
 	].
+	aStream nextPut:jmp
     ].
     pos2 := aStream position.
     aStream nextPut:0.
@@ -1047,8 +1038,7 @@
 		"for now, only do it in methods"
 		b isNil ifTrue:[
 		    (selector == #restart) ifTrue:[
-			aStream nextPut:#jump.      "jump to start"
-			aStream nextPut:1.
+			aStream nextPut:#jump; nextPut:1.      "jump to start"
 			^ self
 		    ].
 		].
@@ -1170,10 +1160,7 @@
 	] ifFalse:[
 	    aStream nextPut:#superSend.
 	].
-	aStream nextPut:lineNr.
-	aStream nextPut:selector.
-	aStream nextPut:nargs.
-	aStream nextPut:nil.
+	aStream nextPut:lineNr; nextPut:selector; nextPut:nargs; nextPut:nil.
 	valueNeeded ifFalse:[
 	    aStream nextPut:#drop
 	].
@@ -1196,9 +1183,7 @@
 		codes := #(sendDrop0 sendDrop1 sendDrop2 sendDrop3)
 	    ]
 	].
-	aStream nextPut:(codes at:nargs + 1).
-	aStream nextPut:lineNr.
-	aStream nextPut:selector.
+	aStream nextPut:(codes at:nargs + 1); nextPut:lineNr; nextPut:selector.
 	^ self
     ].
 
@@ -1207,9 +1192,7 @@
     ] ifFalse:[
 	aStream nextPut:#sendDrop
     ].
-    aStream nextPut:lineNr.
-    aStream nextPut:selector.
-    aStream nextPut:nargs
+    aStream nextPut:lineNr; nextPut:selector; nextPut:nargs
 !
 
 codeSendOn:aStream inBlock:b valueNeeded:valueNeeded
@@ -1268,10 +1251,7 @@
 	] ifFalse:[
 	    aStream nextPut:#superSend.
 	].
-	aStream nextPut:lineNr.
-	aStream nextPut:selector.
-	aStream nextPut:nargs.
-	aStream nextPut:nil.
+	aStream nextPut:lineNr; nextPut:selector; nextPut:nargs; nextPut:nil.
 	valueNeeded ifFalse:[
 	    aStream nextPut:#drop
 	].
@@ -1295,8 +1275,7 @@
 	] ifFalse:[
 	    aStream nextPut:( #( sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1) ).
 	].
-	aStream nextPut:lineNr.
-	aStream nextPut:selector.
+	aStream nextPut:lineNr; nextPut:selector.
 	^ self
     ].
 
@@ -1305,9 +1284,7 @@
     ] ifFalse:[
 	aStream nextPut:#sendDrop
     ].
-    aStream nextPut:lineNr.
-    aStream nextPut:selector.
-    aStream nextPut:nargs
+    aStream nextPut:lineNr; nextPut:selector; nextPut:nargs
 !
 
 codeForCascadeOn:aStream inBlock:b
@@ -1344,9 +1321,7 @@
 		    (argArray at:2) codeOn:aStream inBlock:b
 		]
 	    ].
-	    aStream nextPut:selector.
-	    aStream nextPut:lineNr.
-	    aStream nextPut:#drop.
+	    aStream nextPut:selector; nextPut:lineNr; nextPut:#drop.
 	    ^ self
 	]
     ].
@@ -1363,22 +1338,14 @@
 	] ifFalse:[
 	    aStream nextPut:#superSend.
 	].
-	aStream nextPut:lineNr.
-	aStream nextPut:selector.
-	aStream nextPut:nargs.
-	aStream nextPut:nil.
-	aStream nextPut:#drop.
+	aStream nextPut:lineNr; nextPut:selector; nextPut:nargs; nextPut:nil; nextPut:#drop.
 	^ self
     ].
     (nargs <= 3) ifTrue:[
 	aStream nextPut:( #( sendDrop0 sendDrop1 sendDrop2 sendDrop3) at:(nargs+1) ).
-	aStream nextPut:lineNr.
-	aStream nextPut:selector.
+	aStream nextPut:lineNr; nextPut:selector.
 	^ self
     ].
 
-    aStream nextPut:#sendDrop.
-    aStream nextPut:lineNr.
-    aStream nextPut:selector.
-    aStream nextPut:nargs
+    aStream nextPut:#sendDrop; nextPut:lineNr; nextPut:selector; nextPut:nargs
 ! !