|
@@ -1451,7 +1451,7 @@ var self=this,$self=this;
|
|
|
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
|
|
|
-$self._class_instanceVariables_(aClass,$self._instanceVariableNamesFor_(ivarNames));
|
|
|
+$self._class_instanceVariables_(aClass,$self._slotsFromInstanceVariablesString_(ivarNames));
|
|
|
return self;
|
|
|
|
|
|
}, function($ctx1) {$ctx1.fill(self,"class:instanceVariableNames:",{aClass:aClass,ivarNames:ivarNames},$globals.ClassBuilder)});
|
|
@@ -1459,10 +1459,10 @@ return self;
|
|
|
},
|
|
|
|
|
|
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: [],
|
|
|
|
|
|
-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;
|
|
|
-
|
|
|
-return $core.withContext(function($ctx1) {
|
|
|
-
|
|
|
-return $recv($recv(aString)._tokenize_(" "))._reject_((function(each){
|
|
|
-
|
|
|
-return $core.withContext(function($ctx2) {
|
|
|
-
|
|
|
-return $recv(each)._isEmpty();
|
|
|
-
|
|
|
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
|
|
|
-
|
|
|
-}));
|
|
|
-
|
|
|
-}, function($ctx1) {$ctx1.fill(self,"instanceVariableNamesFor:",{aString:aString},$globals.ClassBuilder)});
|
|
|
-
|
|
|
-},
|
|
|
-
|
|
|
-args: ["aString"],
|
|
|
-source: "instanceVariableNamesFor: aString\x0a\x09^ (aString tokenize: ' ') reject: [ :each | each isEmpty ]",
|
|
|
-referencedClasses: [],
|
|
|
-
|
|
|
-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;
|
|
|
+
|
|
|
+return $core.withContext(function($ctx1) {
|
|
|
+
|
|
|
+return $recv($recv(aString)._tokenize_(" "))._reject_((function(each){
|
|
|
+
|
|
|
+return $core.withContext(function($ctx2) {
|
|
|
+
|
|
|
+return $recv(each)._isEmpty();
|
|
|
+
|
|
|
+}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
|
|
|
+
|
|
|
+}));
|
|
|
+
|
|
|
+}, function($ctx1) {$ctx1.fill(self,"slotsFromInstanceVariablesString:",{aString:aString},$globals.ClassBuilder)});
|
|
|
+
|
|
|
+},
|
|
|
+
|
|
|
+args: ["aString"],
|
|
|
+source: "slotsFromInstanceVariablesString: aString\x0a\x09^ (aString tokenize: ' ') reject: [ :each | each isEmpty ]",
|
|
|
+referencedClasses: [],
|
|
|
+
|
|
|
+messageSends: ["reject:", "tokenize:", "isEmpty"]
|
|
|
+}),
|
|
|
+$globals.ClassBuilder);
|
|
|
+
|
|
|
$core.addMethod(
|
|
|
$core.method({
|
|
|
selector: "superclass:subclass:",
|
|
@@ -1895,7 +1895,7 @@ var newClass;
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
|
|
|
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;
|
|
|
},
|
|
|
|
|
|
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"],
|
|
|
|
|
|
-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);
|
|
|
|