Browse Source

Rename method.

Herby Vojčík 5 years ago
parent
commit
bf94270fa2
4 changed files with 47 additions and 47 deletions
  1. 37 37
      lang/src/Kernel-Classes.js
  2. 3 3
      lang/src/Kernel-Classes.st
  3. 5 5
      lang/src/Kernel-Tests.js
  4. 2 2
      lang/src/Kernel-Tests.st

+ 37 - 37
lang/src/Kernel-Classes.js

@@ -1451,7 +1451,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self._class_instanceVariables_(aClass,$self._instanceVariableNamesFor_(ivarNames));
+$self._class_instanceVariables_(aClass,$self._slotsFromInstanceVariablesString_(ivarNames));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"class:instanceVariableNames:",{aClass:aClass,ivarNames:ivarNames},$globals.ClassBuilder)});
@@ -1459,10 +1459,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aClass", "ivarNames"],
-source: "class: aClass instanceVariableNames: ivarNames\x0a\x09self class: aClass instanceVariables:  (self instanceVariableNamesFor: ivarNames)",
+source: "class: aClass instanceVariableNames: ivarNames\x0a\x09self class: aClass instanceVariables:  (self slotsFromInstanceVariablesString: ivarNames)",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["class:instanceVariables:", "instanceVariableNamesFor:"]
+messageSends: ["class:instanceVariables:", "slotsFromInstanceVariablesString:"]
 }),
 $globals.ClassBuilder);
 
@@ -1670,37 +1670,6 @@ messageSends: ["protocol:", "addCompiledMethod:"]
 }),
 $globals.ClassBuilder);
 
-$core.addMethod(
-$core.method({
-selector: "instanceVariableNamesFor:",
-protocol: "accessing",
-fn: function (aString){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return $recv($recv(aString)._tokenize_(" "))._reject_((function(each){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv(each)._isEmpty();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
-//>>excludeEnd("ctx");
-}));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"instanceVariableNamesFor:",{aString:aString},$globals.ClassBuilder)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aString"],
-source: "instanceVariableNamesFor: aString\x0a\x09^ (aString tokenize: ' ') reject: [ :each | each isEmpty ]",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["reject:", "tokenize:", "isEmpty"]
-}),
-$globals.ClassBuilder);
-
 $core.addMethod(
 $core.method({
 selector: "migrateClass:superclass:",
@@ -1861,6 +1830,37 @@ messageSends: ["basicRenameClass:to:", "recompile", "announce:", "current", "the
 }),
 $globals.ClassBuilder);
 
+$core.addMethod(
+$core.method({
+selector: "slotsFromInstanceVariablesString:",
+protocol: "accessing",
+fn: function (aString){
+var self=this,$self=this;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx1) {
+//>>excludeEnd("ctx");
+return $recv($recv(aString)._tokenize_(" "))._reject_((function(each){
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx2) {
+//>>excludeEnd("ctx");
+return $recv(each)._isEmpty();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
+//>>excludeEnd("ctx");
+}));
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx1) {$ctx1.fill(self,"slotsFromInstanceVariablesString:",{aString:aString},$globals.ClassBuilder)});
+//>>excludeEnd("ctx");
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: ["aString"],
+source: "slotsFromInstanceVariablesString: aString\x0a\x09^ (aString tokenize: ' ') reject: [ :each | each isEmpty ]",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: ["reject:", "tokenize:", "isEmpty"]
+}),
+$globals.ClassBuilder);
+
 $core.addMethod(
 $core.method({
 selector: "superclass:subclass:",
@@ -1895,7 +1895,7 @@ var newClass;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$3,$5,$4,$receiver;
-$1=$self._instanceVariableNamesFor_(ivarNames);
+$1=$self._slotsFromInstanceVariablesString_(ivarNames);
 if(($receiver = packageName) == null || $receiver.a$nil){
 $2="unclassified";
 } else {
@@ -1914,10 +1914,10 @@ return newClass;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aClass", "className", "ivarNames", "packageName"],
-source: "superclass: aClass subclass: className instanceVariableNames: ivarNames package: packageName\x0a\x09| newClass |\x0a\x09\x0a\x09newClass := self addSubclassOf: aClass\x0a\x09\x09named: className instanceVariableNames: (self instanceVariableNamesFor: ivarNames)\x0a\x09\x09package: (packageName ifNil: [ 'unclassified' ]).\x0a\x09\x0a\x09SystemAnnouncer current\x0a\x09\x09announce: (ClassAdded new\x0a\x09\x09\x09theClass: newClass;\x0a\x09\x09\x09yourself).\x0a\x09\x0a\x09^ newClass",
+source: "superclass: aClass subclass: className instanceVariableNames: ivarNames package: packageName\x0a\x09| newClass |\x0a\x09\x0a\x09newClass := self addSubclassOf: aClass\x0a\x09\x09named: className instanceVariableNames: (self slotsFromInstanceVariablesString: ivarNames)\x0a\x09\x09package: (packageName ifNil: [ 'unclassified' ]).\x0a\x09\x0a\x09SystemAnnouncer current\x0a\x09\x09announce: (ClassAdded new\x0a\x09\x09\x09theClass: newClass;\x0a\x09\x09\x09yourself).\x0a\x09\x0a\x09^ newClass",
 referencedClasses: ["SystemAnnouncer", "ClassAdded"],
 //>>excludeEnd("ide");
-messageSends: ["addSubclassOf:named:instanceVariableNames:package:", "instanceVariableNamesFor:", "ifNil:", "announce:", "current", "theClass:", "new", "yourself"]
+messageSends: ["addSubclassOf:named:instanceVariableNames:package:", "slotsFromInstanceVariablesString:", "ifNil:", "announce:", "current", "theClass:", "new", "yourself"]
 }),
 $globals.ClassBuilder);
 

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

@@ -294,7 +294,7 @@ Rather than using me directly to compile a class, use `Class >> subclass:instanc
 
 !ClassBuilder methodsFor: 'accessing'!
 
-instanceVariableNamesFor: aString
+slotsFromInstanceVariablesString: aString
 	^ (aString tokenize: ' ') reject: [ :each | each isEmpty ]
 ! !
 
@@ -336,7 +336,7 @@ addTraitNamed: traitName package: packageName
 !
 
 class: aClass instanceVariableNames: ivarNames
-	self class: aClass instanceVariables:  (self instanceVariableNamesFor: ivarNames)
+	self class: aClass instanceVariables:  (self slotsFromInstanceVariablesString: ivarNames)
 !
 
 class: aClass instanceVariables: aCollection
@@ -356,7 +356,7 @@ superclass: aClass subclass: className instanceVariableNames: ivarNames package:
 	| newClass |
 	
 	newClass := self addSubclassOf: aClass
-		named: className instanceVariableNames: (self instanceVariableNamesFor: ivarNames)
+		named: className instanceVariableNames: (self slotsFromInstanceVariablesString: ivarNames)
 		package: (packageName ifNil: [ 'unclassified' ]).
 	
 	SystemAnnouncer current

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

@@ -2289,25 +2289,25 @@ $globals.ClassBuilderTest);
 
 $core.addMethod(
 $core.method({
-selector: "testInstanceVariableNames",
+selector: "testSlotsFromInstanceVariablesString",
 protocol: "tests",
 fn: function (){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self._assert_equals_($recv($self.builder)._instanceVariableNamesFor_("  hello   world   "),["hello", "world"]);
+$self._assert_equals_($recv($self.builder)._slotsFromInstanceVariablesString_("  hello   world   "),["hello", "world"]);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testInstanceVariableNames",{},$globals.ClassBuilderTest)});
+}, function($ctx1) {$ctx1.fill(self,"testSlotsFromInstanceVariablesString",{},$globals.ClassBuilderTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "testInstanceVariableNames\x0a\x09self assert: (builder instanceVariableNamesFor: '  hello   world   ') equals: #('hello' 'world')",
+source: "testSlotsFromInstanceVariablesString\x0a\x09self assert: (builder slotsFromInstanceVariablesString: '  hello   world   ') equals: #('hello' 'world')",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["assert:equals:", "instanceVariableNamesFor:"]
+messageSends: ["assert:equals:", "slotsFromInstanceVariablesString:"]
 }),
 $globals.ClassBuilderTest);
 

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

@@ -436,8 +436,8 @@ testClassMigrationWithSubclasses
 	ObjectMock allSubclasses reverseDo: [ :each | Smalltalk removeClass: each ]
 !
 
-testInstanceVariableNames
-	self assert: (builder instanceVariableNamesFor: '  hello   world   ') equals: #('hello' 'world')
+testSlotsFromInstanceVariablesString
+	self assert: (builder slotsFromInstanceVariablesString: '  hello   world   ') equals: #('hello' 'world')
 !
 
 testSubclass