Update loadlibs handling to QAST::VM approach.

rakudo · Jul 2, 2012 · f62e3e3 · f62e3e3
1 parent 6e0b080
commit f62e3e3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/QPerl6/World.pm b/src/QPerl6/World.pm
@@ -177,7 +177,10 @@ class QPerl6::World is HLL::World {
                     QAST::BVal.new( :value($*UNIT_OUTER) ),
                     QAST::Op.new(
                         :op('callmethod'), :name('load_setting'),
-                        QAST::VM.new( pirop('get_hll_global Ps'), QAST::SVal.new( :value('ModuleLoader') ) ),
+                        QAST::VM.new(
+                            pirop => 'get_hll_global Ps',
+                            QAST::SVal.new( :value('ModuleLoader') )
+                        ),
                         QAST::SVal.new( :value($setting_name) )
                     )
                 )
@@ -1400,10 +1403,11 @@ class QPerl6::World is HLL::World {
 
     # Adds required libraries to a compilation unit.
     method add_libs($comp_unit) {
-        $comp_unit.loadlibs('nqp_group', 'nqp_ops', 'perl6_group', 'perl6_ops',
-                            'bit_ops', 'math_ops', 'trans_ops', 'io_ops',
-                            'obscure_ops', 'os', 'file', 'sys_ops',
-                            'nqp_bigint_ops', 'nqp_dyncall_ops');
+        $comp_unit.push(QAST::VM.new(
+            loadlibs => ['nqp_group', 'nqp_ops', 'perl6_group', 'perl6_ops',
+                         'bit_ops', 'math_ops', 'trans_ops', 'io_ops',
+                         'obscure_ops', 'os', 'file', 'sys_ops',
+                         'nqp_bigint_ops', 'nqp_dyncall_ops' ]));
     }
 
     # Represents a longname after having parsed it.