Browse Source

In various places, `arguments` is an array.

Herby Vojčík 4 years ago
parent
commit
ccfdb6babd

+ 3 - 7
lang/src/Compiler-Core.js

@@ -616,7 +616,7 @@ selector: "compile:forClass:protocol:",
 protocol: "compiling",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "aClass", "anotherString"],
-source: "compile: aString forClass: aClass protocol: anotherString\x0a\x09| compilationResult result pragmas closureFactory |\x0a\x09compilationResult := self\x0a\x09\x09start: aString forClass: aClass protocol: anotherString;\x0a\x09\x09compileNode: (self parse: aString).\x0a\x09closureFactory := self\x0a\x09\x09eval: (self wrappedSourceOf: compilationResult)\x0a\x09\x09forPackage: self currentPackage.\x0a\x09result := Smalltalk core method: #{\x0a\x09\x09#selector -> compilationResult selector.\x0a\x09\x09#protocol -> anotherString.\x0a\x09\x09#source -> aString.\x0a\x09\x09#messageSends -> compilationResult messageSends asArray.\x0a\x09\x09#args -> compilationResult arguments asArray.\x0a\x09\x09#referencedClasses -> compilationResult classReferences asArray.\x0a\x09} withFactory: closureFactory.\x0a\x09result pragmas: compilationResult pragmas.\x0a\x09^ result",
+source: "compile: aString forClass: aClass protocol: anotherString\x0a\x09| compilationResult result pragmas closureFactory |\x0a\x09compilationResult := self\x0a\x09\x09start: aString forClass: aClass protocol: anotherString;\x0a\x09\x09compileNode: (self parse: aString).\x0a\x09closureFactory := self\x0a\x09\x09eval: (self wrappedSourceOf: compilationResult)\x0a\x09\x09forPackage: self currentPackage.\x0a\x09result := Smalltalk core method: #{\x0a\x09\x09#selector -> compilationResult selector.\x0a\x09\x09#protocol -> anotherString.\x0a\x09\x09#source -> aString.\x0a\x09\x09#messageSends -> compilationResult messageSends asArray.\x0a\x09\x09#args -> compilationResult arguments.\x0a\x09\x09#referencedClasses -> compilationResult classReferences asArray.\x0a\x09} withFactory: closureFactory.\x0a\x09result pragmas: compilationResult pragmas.\x0a\x09^ result",
 referencedClasses: ["Smalltalk"],
 //>>excludeEnd("ide");
 pragmas: [],
@@ -627,7 +627,7 @@ var compilationResult,result,pragmas,closureFactory;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$5,$2;
+var $1,$3,$4,$2;
 $self._start_forClass_protocol_(aString,aClass,anotherString);
 compilationResult=$self._compileNode_($self._parse_(aString));
 closureFactory=$self._eval_forPackage_($self._wrappedSourceOf_(compilationResult),$self._currentPackage());
@@ -637,11 +637,7 @@ $4=$recv($recv(compilationResult)._messageSends())._asArray();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["asArray"]=1;
 //>>excludeEnd("ctx");
-$5=$recv($recv(compilationResult)._arguments())._asArray();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["asArray"]=2;
-//>>excludeEnd("ctx");
-$2=$globals.HashedCollection._newFromPairs_(["selector",$3,"protocol",anotherString,"source",aString,"messageSends",$4,"args",$5,"referencedClasses",$recv($recv(compilationResult)._classReferences())._asArray()]);
+$2=$globals.HashedCollection._newFromPairs_(["selector",$3,"protocol",anotherString,"source",aString,"messageSends",$4,"args",$recv(compilationResult)._arguments(),"referencedClasses",$recv($recv(compilationResult)._classReferences())._asArray()]);
 result=$recv($1)._method_withFactory_($2,closureFactory);
 $recv(result)._pragmas_($recv(compilationResult)._pragmas());
 return result;

+ 1 - 1
lang/src/Compiler-Core.st

@@ -166,7 +166,7 @@ compile: aString forClass: aClass protocol: anotherString
 		#protocol -> anotherString.
 		#source -> aString.
 		#messageSends -> compilationResult messageSends asArray.
-		#args -> compilationResult arguments asArray.
+		#args -> compilationResult arguments.
 		#referencedClasses -> compilationResult classReferences asArray.
 	} withFactory: closureFactory.
 	result pragmas: compilationResult pragmas.

+ 6 - 10
lang/src/Compiler-Interpreter.js

@@ -2501,24 +2501,20 @@ $core.method({
 selector: "messageFromSendNode:arguments:",
 protocol: "private",
 //>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aSendNode", "aCollection"],
-source: "messageFromSendNode: aSendNode arguments: aCollection\x0a\x09^ Message new\x0a\x09\x09selector: aSendNode selector;\x0a\x09\x09arguments: aCollection;\x0a\x09\x09yourself",
+args: ["aSendNode", "anArray"],
+source: "messageFromSendNode: aSendNode arguments: anArray\x0a\x09^ Message selector: aSendNode selector arguments: anArray",
 referencedClasses: ["Message"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["selector:", "new", "selector", "arguments:", "yourself"]
-}, function ($methodClass){ return function (aSendNode,aCollection){
+messageSends: ["selector:arguments:", "selector"]
+}, function ($methodClass){ return function (aSendNode,anArray){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($globals.Message)._new();
-$recv($1)._selector_($recv(aSendNode)._selector());
-$recv($1)._arguments_(aCollection);
-return $recv($1)._yourself();
+return $recv($globals.Message)._selector_arguments_($recv(aSendNode)._selector(),anArray);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"messageFromSendNode:arguments:",{aSendNode:aSendNode,aCollection:aCollection})});
+}, function($ctx1) {$ctx1.fill(self,"messageFromSendNode:arguments:",{aSendNode:aSendNode,anArray:anArray})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.ASTInterpreter);

+ 2 - 5
lang/src/Compiler-Interpreter.st

@@ -728,11 +728,8 @@ eval: aString
 	^ function valueWithPossibleArguments: self context locals values
 !
 
-messageFromSendNode: aSendNode arguments: aCollection
-	^ Message new
-		selector: aSendNode selector;
-		arguments: aCollection;
-		yourself
+messageFromSendNode: aSendNode arguments: anArray
+	^ Message selector: aSendNode selector arguments: anArray
 !
 
 messageNotUnderstood: aMessage receiver: anObject

+ 10 - 10
lang/src/Kernel-Methods.js

@@ -2079,21 +2079,21 @@ $core.method({
 selector: "arguments:",
 protocol: "accessing",
 //>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aCollection"],
-source: "arguments: aCollection\x0a\x09message arguments: aCollection",
+args: ["anArray"],
+source: "arguments: anArray\x0a\x09message arguments: anArray",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
 messageSends: ["arguments:"]
-}, function ($methodClass){ return function (aCollection){
+}, function ($methodClass){ return function (anArray){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($self.message)._arguments_(aCollection);
+$recv($self.message)._arguments_(anArray);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"arguments:",{aCollection:aCollection})});
+}, function($ctx1) {$ctx1.fill(self,"arguments:",{anArray:anArray})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.MessageSend);
@@ -2368,21 +2368,21 @@ $core.method({
 selector: "valueWithPossibleArguments:",
 protocol: "evaluating",
 //>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aCollection"],
-source: "valueWithPossibleArguments: aCollection\x0a\x09self arguments: aCollection.\x0a\x09^ self value",
+args: ["anArray"],
+source: "valueWithPossibleArguments: anArray\x0a\x09self arguments: anArray.\x0a\x09^ self value",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
 messageSends: ["arguments:", "value"]
-}, function ($methodClass){ return function (aCollection){
+}, function ($methodClass){ return function (anArray){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self._arguments_(aCollection);
+$self._arguments_(anArray);
 return $self._value();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"valueWithPossibleArguments:",{aCollection:aCollection})});
+}, function($ctx1) {$ctx1.fill(self,"valueWithPossibleArguments:",{anArray:anArray})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.MessageSend);

+ 4 - 4
lang/src/Kernel-Methods.st

@@ -555,8 +555,8 @@ arguments
 	^ message arguments
 !
 
-arguments: aCollection
-	message arguments: aCollection
+arguments: anArray
+	message arguments: anArray
 !
 
 receiver
@@ -599,8 +599,8 @@ value: firstArgument value: secondArgument value: thirdArgument
 		sendTo: self receiver
 !
 
-valueWithPossibleArguments: aCollection
-	self arguments: aCollection.
+valueWithPossibleArguments: anArray
+	self arguments: anArray.
 	^ self value
 ! !