|
@@ -1033,17 +1033,17 @@ var self=this,$self=this;
|
|
|
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
|
|
|
-return $self._slots_($self._slotsFromInstanceVariablesString_(aString));
|
|
|
+return $self._slots_($recv(aString)._instanceVariablesStringAsSlotList());
|
|
|
|
|
|
}, function($ctx1) {$ctx1.fill(self,"instanceVariableNames:",{aString:aString},$globals.Metaclass)});
|
|
|
|
|
|
},
|
|
|
|
|
|
args: ["aString"],
|
|
|
-source: "instanceVariableNames: aString\x0a\x09\x22Kept for file-in compatibility.\x22\x0a\x09^ self slots: (self slotsFromInstanceVariablesString: aString)",
|
|
|
+source: "instanceVariableNames: aString\x0a\x09\x22Kept for file-in compatibility.\x22\x0a\x09^ self slots: aString instanceVariablesStringAsSlotList",
|
|
|
referencedClasses: [],
|
|
|
|
|
|
-messageSends: ["slots:", "slotsFromInstanceVariablesString:"]
|
|
|
+messageSends: ["slots:", "instanceVariablesStringAsSlotList"]
|
|
|
}),
|
|
|
$globals.Metaclass);
|
|
|
|
|
@@ -1208,17 +1208,17 @@ var self=this,$self=this;
|
|
|
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
|
|
|
-return $self._uses_slots_(aTraitCompositionDescription,$self._slotsFromInstanceVariablesString_(aString));
|
|
|
+return $self._uses_slots_(aTraitCompositionDescription,$recv(aString)._instanceVariablesStringAsSlotList());
|
|
|
|
|
|
}, function($ctx1) {$ctx1.fill(self,"uses:instanceVariableNames:",{aTraitCompositionDescription:aTraitCompositionDescription,aString:aString},$globals.Metaclass)});
|
|
|
|
|
|
},
|
|
|
|
|
|
args: ["aTraitCompositionDescription", "aString"],
|
|
|
-source: "uses: aTraitCompositionDescription instanceVariableNames: aString\x0a\x09\x22Kept for file-in compatibility.\x22\x0a\x09^ self uses: aTraitCompositionDescription slots: (self slotsFromInstanceVariablesString: aString)",
|
|
|
+source: "uses: aTraitCompositionDescription instanceVariableNames: aString\x0a\x09\x22Kept for file-in compatibility.\x22\x0a\x09^ self uses: aTraitCompositionDescription slots: aString instanceVariablesStringAsSlotList",
|
|
|
referencedClasses: [],
|
|
|
|
|
|
-messageSends: ["uses:slots:", "slotsFromInstanceVariablesString:"]
|
|
|
+messageSends: ["uses:slots:", "instanceVariablesStringAsSlotList"]
|
|
|
}),
|
|
|
$globals.Metaclass);
|
|
|
|
|
@@ -3048,37 +3048,6 @@ messageSends: []
|
|
|
}),
|
|
|
$globals.TBehaviorProvider);
|
|
|
|
|
|
-$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.TBehaviorProvider)});
|
|
|
-
|
|
|
-},
|
|
|
-
|
|
|
-args: ["aString"],
|
|
|
-source: "slotsFromInstanceVariablesString: aString\x0a\x09^ (aString tokenize: ' ') reject: [ :each | each isEmpty ]",
|
|
|
-referencedClasses: [],
|
|
|
-
|
|
|
-messageSends: ["reject:", "tokenize:", "isEmpty"]
|
|
|
-}),
|
|
|
-$globals.TBehaviorProvider);
|
|
|
-
|
|
|
$core.addMethod(
|
|
|
$core.method({
|
|
|
selector: "traitComposition",
|
|
@@ -4489,4 +4458,35 @@ messageSends: ["collect:", "asTraitTransformation"]
|
|
|
}),
|
|
|
$globals.Array);
|
|
|
|
|
|
+$core.addMethod(
|
|
|
+$core.method({
|
|
|
+selector: "instanceVariablesStringAsSlotList",
|
|
|
+protocol: "*Kernel-Classes",
|
|
|
+fn: function (){
|
|
|
+var self=this,$self=this;
|
|
|
+
|
|
|
+return $core.withContext(function($ctx1) {
|
|
|
+
|
|
|
+return $recv($self._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,"instanceVariablesStringAsSlotList",{},$globals.String)});
|
|
|
+
|
|
|
+},
|
|
|
+
|
|
|
+args: [],
|
|
|
+source: "instanceVariablesStringAsSlotList\x0a\x09^ (self tokenize: ' ') reject: [ :each | each isEmpty ]",
|
|
|
+referencedClasses: [],
|
|
|
+
|
|
|
+messageSends: ["reject:", "tokenize:", "isEmpty"]
|
|
|
+}),
|
|
|
+$globals.String);
|
|
|
+
|
|
|
});
|