Merge jv
authorMerge Script
Wed, 10 Jun 2015 06:37:04 +0200
branchjv
changeset 3649 2ac6462c60b6
parent 3647 5fdf14e5420d (current diff)
parent 3648 a7e535c13f00 (diff)
child 3650 a1ee22ea4ec2
Merge
ByteCodeCompiler.st
--- a/ByteCodeCompiler.st	Tue Jun 09 22:18:26 2015 +0100
+++ b/ByteCodeCompiler.st	Wed Jun 10 06:37:04 2015 +0200
@@ -2082,7 +2082,7 @@
     ].
 
     newMethod numberOfVars:(self numberOfMethodVars + (maxNumTemp ? 0)).
-    newMethod numberOfArgs:(self argumentCount).
+    newMethod numberOfArgs:(self numberOfMethodArgs).
     newMethod stackSize:(self maxStackDepth).
 
     primitiveResource notNil ifTrue:[
@@ -3507,12 +3507,12 @@
 
     newMethod := self methodClass new:(litArray size).
     litArray notNil ifTrue:[
-        newMethod literals:litArray
+	newMethod literals:litArray
     ].
 
     newMethod makeUncompiled.
     newMethod numberOfVars:(self numberOfMethodVars).
-    newMethod numberOfArgs:(self argumentCount).
+    newMethod numberOfArgs:(self numberOfMethodArgs).
     newMethod source:aString string.
     newMethod setCategory:cat.
     ^ newMethod
@@ -3689,11 +3689,11 @@
 !ByteCodeCompiler class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.295 2015-06-05 16:08:54 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.295 2015-06-05 16:08:54 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN