added QAST::VM variants for moar idential to jvm

rakudo · Oct 28, 2013 · 753af50 · 753af50
1 parent 6838abf
commit 753af50
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -1346,7 +1346,8 @@ class Perl6::Actions is HLL::Actions does STDActions {
                             QAST::Op.new( :op('null') ),
                             QAST::Op.new( :op('exception') )
                         )),
-                        :jvm(QAST::Op.new( :op('null') ))
+                        :jvm(QAST::Op.new( :op('null') )),
+                        :moar(QAST::Op.new( :op('null') ))
                     ),
                     QAST::WVal.new(
                         :value( $*W.find_symbol(['Nil']) ),
@@ -5778,7 +5779,8 @@ class Perl6::Actions is HLL::Actions does STDActions {
                     :pirop('perl6_skip_handlers_in_rethrow__0Pi'),
                     $ex,
                     QAST::IVal.new( :value(1) ))),
-                :jvm($ex));
+                :jvm($ex),
+                :moar($ex));
         }
         else {
             my $prev_content := QAST::Stmts.new();
@@ -5797,6 +5799,10 @@ class Perl6::Actions is HLL::Actions does STDActions {
                     :jvm(QAST::Op.new(
                         :op('rethrow'),
                         QAST::Op.new( :op('exception') )
+                    )),
+                    :moar(QAST::Op.new(
+                        :op('rethrow'),
+                        QAST::Op.new( :op('exception') )
                     )))));
 
             # rethrow the exception if we reach the end of the handler

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -365,7 +365,8 @@ class Perl6::World is HLL::World {
                 :op('loadbytecode'),
                 QAST::VM.new(
                     :parrot(QAST::SVal.new( :value('ModuleLoader.pbc') )),
-                    :jvm(QAST::SVal.new( :value('ModuleLoader.class') ))
+                    :jvm(QAST::SVal.new( :value('ModuleLoader.class') )),
+                    :moar(QAST::SVal.new( :value('ModuleLoader.moarvm') ))
                 )),
             QAST::Op.new(
                 :op('callmethod'), :name('load_module'),
@@ -1787,7 +1788,8 @@ class Perl6::World is HLL::World {
                          'bit_ops', 'math_ops', 'trans_ops', 'io_ops',
                          'obscure_ops', 'os', 'file', 'sys_ops',
                          'nqp_bigint_ops', 'nqp_dyncall_ops' ],
-            jvm => QAST::Op.new( :op('null') )));
+            jvm => QAST::Op.new( :op('null') ),
+            moar => QAST::Op.new( :op('null') )));
     }
 
     # Represents a longname after having parsed it.
@@ -2392,7 +2394,8 @@ class Perl6::World is HLL::World {
                         QAST::VM.new( :pirop('get_class Ps'), QAST::SVal.new( :value('NQPLexPad') ) )
                     )
                 )),
-                :jvm(QAST::Op.new( :op('null') ))
+                :jvm(QAST::Op.new( :op('null') )),
+                :moar(QAST::Op.new( :op('null') ))
             )));
         }
     }