Browse Source

Add instVarNamed:[put:].

Deprecate instVarAt:[put:].
Herby Vojčík 4 years ago
parent
commit
667465d036

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

@@ -3913,17 +3913,17 @@ selector: "inContext:",
 protocol: "*Compiler-Interpreter",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aContext"],
-source: "inContext: aContext\x0a\x09^ aContext receiver instVarAt: self name",
+source: "inContext: aContext\x0a\x09^ aContext receiver instVarNamed: self name",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["instVarAt:", "receiver", "name"]
+messageSends: ["instVarNamed:", "receiver", "name"]
 }, function ($methodClass){ return function (aContext){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv(aContext)._receiver())._instVarAt_($self._name());
+return $recv($recv(aContext)._receiver())._instVarNamed_($self._name());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inContext:",{aContext:aContext})});
 //>>excludeEnd("ctx");
@@ -3936,17 +3936,17 @@ selector: "inContext:put:",
 protocol: "*Compiler-Interpreter",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aContext", "anObject"],
-source: "inContext: aContext put: anObject\x0a\x09aContext receiver instVarAt: self name put: anObject",
+source: "inContext: aContext put: anObject\x0a\x09aContext receiver instVarNamed: self name put: anObject",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["instVarAt:put:", "receiver", "name"]
+messageSends: ["instVarNamed:put:", "receiver", "name"]
 }, function ($methodClass){ return function (aContext,anObject){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(aContext)._receiver())._instVarAt_put_($self._name(),anObject);
+$recv($recv(aContext)._receiver())._instVarNamed_put_($self._name(),anObject);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inContext:put:",{aContext:aContext,anObject:anObject})});

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

@@ -1044,11 +1044,11 @@ inContext: aContext
 !InstanceVar methodsFor: '*Compiler-Interpreter'!
 
 inContext: aContext
-	^ aContext receiver instVarAt: self name
+	^ aContext receiver instVarNamed: self name
 !
 
 inContext: aContext put: anObject
-	aContext receiver instVarAt: self name put: anObject
+	aContext receiver instVarNamed: self name put: anObject
 ! !
 
 !JSStatementNode methodsFor: '*Compiler-Interpreter'!

+ 9 - 9
lang/src/Kernel-Objects.js

@@ -333,11 +333,11 @@ $globals.ProtoObject);
 
 $core.addMethod(
 $core.method({
-selector: "instVarAt:",
+selector: "instVarNamed:",
 protocol: "accessing",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "instVarAt: aString\x0a\x09<inlineJS: 'return $self[aString]'>",
+source: "instVarNamed: aString\x0a\x09<inlineJS: 'return $self[aString]'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [["inlineJS:", ["return $self[aString]"]]],
@@ -350,18 +350,18 @@ return $core.withContext(function($ctx1) {
 return $self[aString];
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"instVarAt:",{aString:aString})});
+}, function($ctx1) {$ctx1.fill(self,"instVarNamed:",{aString:aString})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.ProtoObject);
 
 $core.addMethod(
 $core.method({
-selector: "instVarAt:put:",
+selector: "instVarNamed:put:",
 protocol: "accessing",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "anObject"],
-source: "instVarAt: aString put: anObject\x0a\x09<inlineJS: '$self[aString] = anObject'>",
+source: "instVarNamed: aString put: anObject\x0a\x09<inlineJS: '$self[aString] = anObject'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [["inlineJS:", ["$self[aString] = anObject"]]],
@@ -374,7 +374,7 @@ return $core.withContext(function($ctx1) {
 $self[aString] = anObject;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"instVarAt:put:",{aString:aString,anObject:anObject})});
+}, function($ctx1) {$ctx1.fill(self,"instVarNamed:put:",{aString:aString,anObject:anObject})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.ProtoObject);
@@ -707,11 +707,11 @@ selector: "asJavaScriptObject",
 protocol: "converting",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "asJavaScriptObject\x0a\x09| variables |\x0a\x09variables := HashedCollection new.\x0a\x09self class allInstanceVariableNames do: [ :each |\x0a\x09\x09variables at: each put: (self instVarAt: each) asJavaScriptObject ].\x0a\x09^ variables",
+source: "asJavaScriptObject\x0a\x09| variables |\x0a\x09variables := HashedCollection new.\x0a\x09self class allInstanceVariableNames do: [ :each |\x0a\x09\x09variables at: each put: (self instVarNamed: each) asJavaScriptObject ].\x0a\x09^ variables",
 referencedClasses: ["HashedCollection"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["new", "do:", "allInstanceVariableNames", "class", "at:put:", "asJavaScriptObject", "instVarAt:"]
+messageSends: ["new", "do:", "allInstanceVariableNames", "class", "at:put:", "asJavaScriptObject", "instVarNamed:"]
 }, function ($methodClass){ return function (){
 var self=this,$self=this;
 var variables;
@@ -723,7 +723,7 @@ $recv($recv($self._class())._allInstanceVariableNames())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv(variables)._at_put_(each,$recv($self._instVarAt_(each))._asJavaScriptObject());
+return $recv(variables)._at_put_(each,$recv($self._instVarNamed_(each))._asJavaScriptObject());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");

+ 3 - 3
lang/src/Kernel-Objects.st

@@ -24,11 +24,11 @@ identityHash
 	'>
 !
 
-instVarAt: aString
+instVarNamed: aString
 	<inlineJS: 'return $self[aString]'>
 !
 
-instVarAt: aString put: anObject
+instVarNamed: aString put: anObject
 	<inlineJS: '$self[aString] = anObject'>
 !
 
@@ -232,7 +232,7 @@ asJavaScriptObject
 	| variables |
 	variables := HashedCollection new.
 	self class allInstanceVariableNames do: [ :each |
-		variables at: each put: (self instVarAt: each) asJavaScriptObject ].
+		variables at: each put: (self instVarNamed: each) asJavaScriptObject ].
 	^ variables
 !
 

+ 8 - 8
lang/src/Kernel-Tests.js

@@ -14692,11 +14692,11 @@ selector: "testInstVars",
 protocol: "tests",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "testInstVars\x0a\x09| o |\x0a\x09o := ObjectMock new.\x0a\x09self assert: (o instVarAt: #foo) equals: nil.\x0a\x0a\x09o instVarAt: #foo put: 1.\x0a\x09self assert: (o instVarAt: #foo) equals: 1.\x0a\x09self assert: (o instVarAt: 'foo') equals: 1",
+source: "testInstVars\x0a\x09| o |\x0a\x09o := ObjectMock new.\x0a\x09self assert: (o instVarNamed: #foo) equals: nil.\x0a\x0a\x09o instVarNamed: #foo put: 1.\x0a\x09self assert: (o instVarNamed: #foo) equals: 1.\x0a\x09self assert: (o instVarNamed: 'foo') equals: 1",
 referencedClasses: ["ObjectMock"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["new", "assert:equals:", "instVarAt:", "instVarAt:put:"]
+messageSends: ["new", "assert:equals:", "instVarNamed:", "instVarNamed:put:"]
 }, function ($methodClass){ return function (){
 var self=this,$self=this;
 var o;
@@ -14704,26 +14704,26 @@ var o;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 o=$recv($globals.ObjectMock)._new();
-[$self._assert_equals_([$recv(o)._instVarAt_("foo")
+[$self._assert_equals_([$recv(o)._instVarNamed_("foo")
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx1.sendIdx["instVarAt:"]=1
+,$ctx1.sendIdx["instVarNamed:"]=1
 //>>excludeEnd("ctx");
 ][0],nil)
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["assert:equals:"]=1
 //>>excludeEnd("ctx");
 ][0];
-$recv(o)._instVarAt_put_("foo",(1));
-[$self._assert_equals_([$recv(o)._instVarAt_("foo")
+$recv(o)._instVarNamed_put_("foo",(1));
+[$self._assert_equals_([$recv(o)._instVarNamed_("foo")
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx1.sendIdx["instVarAt:"]=2
+,$ctx1.sendIdx["instVarNamed:"]=2
 //>>excludeEnd("ctx");
 ][0],(1))
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["assert:equals:"]=2
 //>>excludeEnd("ctx");
 ][0];
-$self._assert_equals_($recv(o)._instVarAt_("foo"),(1));
+$self._assert_equals_($recv(o)._instVarNamed_("foo"),(1));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testInstVars",{o:o})});

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

@@ -2644,11 +2644,11 @@ testIfNil
 testInstVars
 	| o |
 	o := ObjectMock new.
-	self assert: (o instVarAt: #foo) equals: nil.
+	self assert: (o instVarNamed: #foo) equals: nil.
 
-	o instVarAt: #foo put: 1.
-	self assert: (o instVarAt: #foo) equals: 1.
-	self assert: (o instVarAt: 'foo') equals: 1
+	o instVarNamed: #foo put: 1.
+	self assert: (o instVarNamed: #foo) equals: 1.
+	self assert: (o instVarNamed: 'foo') equals: 1
 !
 
 testNilUndefined

+ 6 - 6
lang/src/Platform-Services.js

@@ -2131,11 +2131,11 @@ selector: "inspectOn:",
 protocol: "*Platform-Services",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anInspector"],
-source: "inspectOn: anInspector\x0a\x09| variables |\x0a\x09variables := Dictionary new.\x0a\x09variables at: '#self' put: self.\x0a\x09self class allInstanceVariableNames do: [ :each |\x0a\x09\x09variables at: each put: (self instVarAt: each) ].\x0a\x09anInspector\x0a\x09\x09setLabel: self printString;\x0a\x09\x09setVariables: variables",
+source: "inspectOn: anInspector\x0a\x09| variables |\x0a\x09variables := Dictionary new.\x0a\x09variables at: '#self' put: self.\x0a\x09self class allInstanceVariableNames do: [ :each |\x0a\x09\x09variables at: each put: (self instVarNamed: each) ].\x0a\x09anInspector\x0a\x09\x09setLabel: self printString;\x0a\x09\x09setVariables: variables",
 referencedClasses: ["Dictionary"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["new", "at:put:", "do:", "allInstanceVariableNames", "class", "instVarAt:", "setLabel:", "printString", "setVariables:"]
+messageSends: ["new", "at:put:", "do:", "allInstanceVariableNames", "class", "instVarNamed:", "setLabel:", "printString", "setVariables:"]
 }, function ($methodClass){ return function (anInspector){
 var self=this,$self=this;
 var variables;
@@ -2152,7 +2152,7 @@ $recv($recv($self._class())._allInstanceVariableNames())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv(variables)._at_put_(each,$self._instVarAt_(each));
+return $recv(variables)._at_put_(each,$self._instVarNamed_(each));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -2289,11 +2289,11 @@ selector: "inspectOn:",
 protocol: "*Platform-Services",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anInspector"],
-source: "inspectOn: anInspector\x0a\x09| variables |\x0a\x09variables := Dictionary new.\x0a\x09variables at: '#self' put: self.\x0a\x09variables at: '#home' put: self home.\x0a\x09variables at: '#receiver' put: self receiver.\x0a\x09variables at: '#selector' put: self selector.\x0a\x09variables at: '#locals' put: self locals.\x0a\x09self class instanceVariableNames do: [ :each |\x0a\x09\x09variables at: each put: (self instVarAt: each) ].\x0a\x09anInspector\x0a\x09\x09setLabel: self printString;\x0a\x09\x09setVariables: variables",
+source: "inspectOn: anInspector\x0a\x09| variables |\x0a\x09variables := Dictionary new.\x0a\x09variables at: '#self' put: self.\x0a\x09variables at: '#home' put: self home.\x0a\x09variables at: '#receiver' put: self receiver.\x0a\x09variables at: '#selector' put: self selector.\x0a\x09variables at: '#locals' put: self locals.\x0a\x09self class instanceVariableNames do: [ :each |\x0a\x09\x09variables at: each put: (self instVarNamed: each) ].\x0a\x09anInspector\x0a\x09\x09setLabel: self printString;\x0a\x09\x09setVariables: variables",
 referencedClasses: ["Dictionary"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["new", "at:put:", "home", "receiver", "selector", "locals", "do:", "instanceVariableNames", "class", "instVarAt:", "setLabel:", "printString", "setVariables:"]
+messageSends: ["new", "at:put:", "home", "receiver", "selector", "locals", "do:", "instanceVariableNames", "class", "instVarNamed:", "setLabel:", "printString", "setVariables:"]
 }, function ($methodClass){ return function (anInspector){
 var self=this,$self=this;
 var variables;
@@ -2330,7 +2330,7 @@ $recv($recv($self._class())._instanceVariableNames())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv(variables)._at_put_(each,$self._instVarAt_(each));
+return $recv(variables)._at_put_(each,$self._instVarNamed_(each));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");

+ 2 - 2
lang/src/Platform-Services.st

@@ -593,7 +593,7 @@ inspectOn: anInspector
 	variables := Dictionary new.
 	variables at: '#self' put: self.
 	self class allInstanceVariableNames do: [ :each |
-		variables at: each put: (self instVarAt: each) ].
+		variables at: each put: (self instVarNamed: each) ].
 	anInspector
 		setLabel: self printString;
 		setVariables: variables
@@ -645,7 +645,7 @@ inspectOn: anInspector
 	variables at: '#selector' put: self selector.
 	variables at: '#locals' put: self locals.
 	self class instanceVariableNames do: [ :each |
-		variables at: each put: (self instVarAt: each) ].
+		variables at: each put: (self instVarNamed: each) ].
 	anInspector
 		setLabel: self printString;
 		setVariables: variables