Quellcode durchsuchen

Fix for Smalltalk current packages.

Göran Krampe vor 12 Jahren
Ursprung
Commit
fd11cef4d2
4 geänderte Dateien mit 7 neuen und 6 gelöschten Zeilen
  1. 1 1
      js/Kernel.deploy.js
  2. 2 2
      js/Kernel.js
  3. 3 2
      js/boot.js
  4. 1 1
      st/Kernel.st

+ 1 - 1
js/Kernel.deploy.js

@@ -675,7 +675,7 @@ smalltalk.method({
 selector: 'packages',
 fn: function (){
 var self=this;
-return self.packages;
+return self.packages.all();
 return self;}
 }),
 smalltalk.Smalltalk);

+ 2 - 2
js/Kernel.js

@@ -961,10 +961,10 @@ selector: 'packages',
 category: 'accessing',
 fn: function (){
 var self=this;
-return self.packages;
+return self.packages.all();
 return self;},
 args: [],
-source: unescape('packages%0A%09%3Creturn%20self.packages%3E'),
+source: unescape('packages%0A%09%3Creturn%20self.packages.all%28%29%3E'),
 messageSends: [],
 referencedClasses: []
 }),

+ 3 - 2
js/boot.js

@@ -141,15 +141,16 @@ function Smalltalk(){
 	}
     };
 
-    /* Answer all registered Packages
+    /* Answer all registered Packages as Array */
 
     st.packages.all = function() {
 	var packages = [];
 	for(var i in st.packages) {
+          if (!st.packages.hasOwnProperty(i) || typeof(st.packages[i]) === "function") continue;
 	    packages.push(st.packages[i]);
 	}
 	return packages
-    };*/
+    };
 
     /* Answer all registered Smalltalk classes */
 

+ 1 - 1
st/Kernel.st

@@ -341,7 +341,7 @@ parseError: anException parsing: aString
 !
 
 packages
-	<return self.packages>
+	<return self.packages.all()>
 ! !
 
 Smalltalk class instanceVariableNames: 'current'!