Start to rename SettingManager to ModuleLoader, and move the current (very minimalistic) module loading to there, in anticipation of expanding it with extra pieces soon.

Author: jnthn

src/HLL/SerializationContextBuilder.pm

@@ -149,7 +149,7 @@ class HLL::Compiler::SerializationContextBuilder {
             # Once it's loaded, set it as the outer context of the code
             # being compiled.
             my $path := %*COMPILING<%?OPTIONS><setting-path>;
-            %*COMPILING<%?OPTIONS><outer_ctx> := HLL::SettingManager.load_setting(
+            %*COMPILING<%?OPTIONS><outer_ctx> := ModuleLoader.load_setting(
                 $path ?? "$path/$setting_name" !! $setting_name);
 
             # Do load for pre-compiled situation.
@@ -162,7 +162,7 @@ class HLL::Compiler::SerializationContextBuilder {
                        PAST::Var.new( :name('block'), :scope('register') ),
                        PAST::Op.new(
                            :pasttype('callmethod'), :name('load_setting'),
-                           PAST::Var.new( :name('SettingManager'), :namespace('HLL'), :scope('package') ),
+                           PAST::Var.new( :name('ModuleLoader'), :namespace([]), :scope('package') ),
                            $setting_name
                        )
                 )
@@ -174,17 +174,18 @@ class HLL::Compiler::SerializationContextBuilder {
     # during the deserialization.
     method load_module($module_name) {
         # Immediate loading.
-        my $*MAIN_CTX;
-		my $*CTXSAVE := HLL::Compiler;
-        my $path := pir::join('/', pir::split('::', $module_name)) ~ '.pbc';
-        pir::load_bytecode($path);
+        ModuleLoader.load_module($module_name);
 
         # Make sure we do the loading during deserialization.
-        self.add_event(:deserialize_past(
-            PAST::Op.new( :pirop('load_bytecode vs'), $path )));
-        
-        # Return UNIT of the loaded module.
-        $*MAIN_CTX
+        self.add_event(:deserialize_past(PAST::Stmts.new(
+            PAST::Op.new(
+                :pirop('load_bytecode vs'), 'SettingManager.pbc'
+            ),
+            PAST::Op.new(
+               :pasttype('callmethod'), :name('load_module'),
+               PAST::Var.new( :name('ModuleLoader'), :namespace([]), :scope('package') ),
+               $module_name
+            ))));
     }
 
     # Installs a symbol into the package. Does so immediately, and

src/HLL/SettingManager.pm

@@ -1,4 +1,4 @@
-knowhow HLL::SettingManager {
+knowhow ModuleLoader {
     my %settings_loaded;
 
     method ctxsave() {
@@ -10,6 +10,15 @@ knowhow HLL::SettingManager {
         $*CTXSAVE := 0;
     }
 
+    method load_module($module_name) {
+        # XXX Implement the various bits of GLOBAL merging of the loaded
+        # module. For now we just make sure we capture the mainline, though.
+        my $*CTXSAVE := self;
+        my $*MAIN_CTX;
+        my $path := pir::join('/', pir::split('::', $module_name)) ~ '.pbc';
+        pir::load_bytecode($path);
+    }
+    
     method load_setting($setting_name) {
         if $setting_name ne 'NULL' {
             # Unless we already did so, load the setting.
@@ -26,3 +35,10 @@ knowhow HLL::SettingManager {
         return %settings_loaded{$setting_name};
     }
 }
+
+# XXX For backwards compat while renaming to the above.
+knowhow HLL::SettingManager {
+    method load_setting($setting_name) {
+        ModuleLoader.load_setting($setting_name);
+    }
+}