Просмотр исходного кода

Ensure that Package >> classes don't answer duplicates (with aliased classes)

Nicolas Petton 10 лет назад
Родитель
Сommit
8bcd744ca1
3 измененных файлов с 8 добавлено и 8 удалено
  1. 2 2
      js/Kernel-Infrastructure.deploy.js
  2. 4 4
      js/Kernel-Infrastructure.js
  3. 2 2
      st/Kernel-Infrastructure.st

+ 2 - 2
js/Kernel-Infrastructure.deploy.js

@@ -914,10 +914,10 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(self._organization())._elements();
+$1=_st(_st(_st(self._organization())._elements())._asSet())._asArray();
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"classes",{},smalltalk.Package)})},
-messageSends: ["elements", "organization"]}),
+messageSends: ["asArray", "asSet", "elements", "organization"]}),
 smalltalk.Package);
 
 smalltalk.addMethod(

+ 4 - 4
js/Kernel-Infrastructure.js

@@ -1218,12 +1218,12 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(self._organization())._elements();
+$1=_st(_st(_st(self._organization())._elements())._asSet())._asArray();
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"classes",{},smalltalk.Package)})},
 args: [],
-source: "classes\x0a\x09^ self organization elements",
-messageSends: ["elements", "organization"],
+source: "classes\x0a\x09^ self organization elements asSet asArray",
+messageSends: ["asArray", "asSet", "elements", "organization"],
 referencedClasses: []
 }),
 smalltalk.Package);
@@ -1414,7 +1414,7 @@ $1=_st(self._class())._sortedClasses_(self._classes());
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"sortedClasses",{},smalltalk.Package)})},
 args: [],
-source: "sortedClasses\x0a\x09\x22Answer all classes in the receiver, sorted by superclass/subclasses and by class name for common subclasses (Issue #143).\x22\x0a\x0a\x09^self class sortedClasses: self classes",
+source: "sortedClasses\x0a\x09\x22Answer all classes in the receiver, sorted by superclass/subclasses and by class name for common subclasses (Issue #143).\x22\x0a\x0a\x09^ self class sortedClasses: self classes",
 messageSends: ["sortedClasses:", "classes", "class"],
 referencedClasses: []
 }),

+ 2 - 2
st/Kernel-Infrastructure.st

@@ -493,7 +493,7 @@ withDefaultTransport
 !Package methodsFor: 'classes'!
 
 classes
-	^ self organization elements
+	^ self organization elements asSet asArray
 !
 
 setupClasses
@@ -505,7 +505,7 @@ setupClasses
 sortedClasses
 	"Answer all classes in the receiver, sorted by superclass/subclasses and by class name for common subclasses (Issue #143)."
 
-	^self class sortedClasses: self classes
+	^ self class sortedClasses: self classes
 ! !
 
 !Package methodsFor: 'dependencies'!