class: ObjectFileLoader
authorClaus Gittinger <cg@exept.de>
Wed, 05 Jun 2013 10:50:24 +0200
changeset 3179 3b6ee2e181bb
parent 3178 24c2aa0da075
child 3180 acb7a3d569bd
class: ObjectFileLoader changed: #loadObjectFile:invokeInitializeMethods: when split-loading a package, after loadig the prjDef, let it ONLY load its mandatory prereqs (i.e. classes from which it inherits). Then load its body, then load the remaining prereqs. Otherwise we might get into trouble, when any of the non-mandatory prereqs requires parts of the body (a subpackage). Was leading to autoloading whith manualtest in expecco
ObjectFileLoader.st
--- a/ObjectFileLoader.st	Tue Jun 04 12:07:51 2013 +0200
+++ b/ObjectFileLoader.st	Wed Jun 05 10:50:24 2013 +0200
@@ -1307,7 +1307,7 @@
                     definitionClass notNil ifTrue:[
                         definitionClass 
                             initialize;
-                            loadPreRequisitesAsAutoloaded:false.
+                            loadMandatoryPreRequisitesAsAutoloaded:false.
                     ].
                 ].
             ]
@@ -1469,6 +1469,8 @@
 
         (definitionClass notNil and:[definitionClass isLoaded]) ifTrue:[
             definitionClass loadAllClassesAsAutoloaded:true.
+            "/ load non-mandatory prerequisites
+            definitionClass loadPreRequisitesAsAutoloaded:true.
             definitionClass projectIsLoaded:true.
         ].
         Smalltalk isInitialized ifTrue:[
@@ -4506,11 +4508,11 @@
 !ObjectFileLoader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.352 2013-06-04 09:41:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.353 2013-06-05 08:50:24 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.352 2013-06-04 09:41:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.353 2013-06-05 08:50:24 cg Exp $'
 ! !