2
0
Переглянути джерело

Fixed PackageLoader classes initialization

Nicolas Petton 12 роки тому
батько
коміт
ee41fea23d
3 змінених файлів з 8 додано та 6 видалено
  1. 2 2
      js/Importer-Exporter.deploy.js
  2. 3 3
      js/Importer-Exporter.js
  3. 3 1
      st/Importer-Exporter.st

+ 2 - 2
js/Importer-Exporter.deploy.js

@@ -608,9 +608,9 @@ selector: "initializePackageNamed:prefix:",
 fn: function (packageName,aString){
 var self=this;
 var $1,$2;
-smalltalk.send(smalltalk.send(smalltalk.send((smalltalk.Package || Package),"_named_",[packageName]),"_classes",[]),"_do_",[(function(each){
-smalltalk.init(each);
+smalltalk.init(smalltalk.Object);
 ;
+smalltalk.send(smalltalk.send(smalltalk.send((smalltalk.Package || Package),"_named_",[packageName]),"_classes",[]),"_do_",[(function(each){
 return smalltalk.send(each,"_initialize",[]);
 })]);
 $1=smalltalk.send((smalltalk.Package || Package),"_named_",[packageName]);

+ 3 - 3
js/Importer-Exporter.js

@@ -734,9 +734,9 @@ category: 'not yet classified',
 fn: function (packageName,aString){
 var self=this;
 var $1,$2;
-smalltalk.send(smalltalk.send(smalltalk.send((smalltalk.Package || Package),"_named_",[packageName]),"_classes",[]),"_do_",[(function(each){
-smalltalk.init(each);
+smalltalk.init(smalltalk.Object);
 ;
+smalltalk.send(smalltalk.send(smalltalk.send((smalltalk.Package || Package),"_named_",[packageName]),"_classes",[]),"_do_",[(function(each){
 return smalltalk.send(each,"_initialize",[]);
 })]);
 $1=smalltalk.send((smalltalk.Package || Package),"_named_",[packageName]);
@@ -744,7 +744,7 @@ smalltalk.send($1,"_commitPathJs_",[smalltalk.send(smalltalk.send("/","__comma",
 $2=smalltalk.send($1,"_commitPathSt_",[smalltalk.send(smalltalk.send("/","__comma",[aString]),"__comma",["/st"])]);
 return self},
 args: ["packageName", "aString"],
-source: "initializePackageNamed: packageName prefix: aString\x0a\x0a\x09(Package named: packageName) classes do: [ :each |\x0a    \x09<smalltalk.init(each)>.\x0a        each initialize. ].\x0a        \x0a    (Package named: packageName) \x0a    \x09commitPathJs: '/', aString, '/js';\x0a        commitPathSt: '/', aString, '/st'",
+source: "initializePackageNamed: packageName prefix: aString\x0a\x0a\x09\x0a    <smalltalk.init(smalltalk.Object)>.\x0a\x0a\x09(Package named: packageName) classes do: [ :each |\x0a        each initialize. ].\x0a        \x0a    (Package named: packageName) \x0a    \x09commitPathJs: '/', aString, '/js';\x0a        commitPathSt: '/', aString, '/st'",
 messageSends: ["do:", "initialize", "classes", "named:", "commitPathJs:", ",", "commitPathSt:"],
 referencedClasses: ["Package"]
 }),

+ 3 - 1
st/Importer-Exporter.st

@@ -349,8 +349,10 @@ Object subclass: #PackageLoader
 
 initializePackageNamed: packageName prefix: aString
 
+	
+    <smalltalk.init(smalltalk.Object)>.
+
 	(Package named: packageName) classes do: [ :each |
-    	<smalltalk.init(each)>.
         each initialize. ].
         
     (Package named: packageName)