Fix yet more incorrect op signatures.

Raku · Jul 21, 2012 · 60afa48 · 60afa48
1 parent 939c9ff
commit 60afa48
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/QAST/Compiler.nqp b/src/QAST/Compiler.nqp
@@ -529,8 +529,17 @@ class QAST::Compiler is HLL::Compiler {
 
     multi method as_post(QAST::Op $node) {
         my $hll := '';
+        my $result;
+        my $err;
         try $hll := $*HLL;
-        QAST::Operations.compile_op(self, $hll, $node)
+        try {
+            $result := QAST::Operations.compile_op(self, $hll, $node);
+            CATCH { $err := $! }
+        }
+        if $err {
+            nqp::die("Error while compiling op " ~ $node.op ~ ": $err");
+        }
+        $result
     }
 
     multi method as_post(QAST::VM $node) {

diff --git a/src/QAST/Operations.nqp b/src/QAST/Operations.nqp
@@ -1257,13 +1257,13 @@ QAST::Operations.add_core_pirop_mapping('push_s', 'push', '0Ps');
 QAST::Operations.add_core_pirop_mapping('push_i', 'push', '0Pi');
 QAST::Operations.add_core_pirop_mapping('push_n', 'push', '0Pn');
 QAST::Operations.add_core_pirop_mapping('pop', 'pop', 'PP');
-QAST::Operations.add_core_pirop_mapping('pop_s', 'pop', 'sP');
-QAST::Operations.add_core_pirop_mapping('pop_i', 'pop', 'iP');
-QAST::Operations.add_core_pirop_mapping('pop_n', 'pop', 'nP');
+QAST::Operations.add_core_pirop_mapping('pop_s', 'pop', 'SP');
+QAST::Operations.add_core_pirop_mapping('pop_i', 'pop', 'IP');
+QAST::Operations.add_core_pirop_mapping('pop_n', 'pop', 'NP');
 QAST::Operations.add_core_pirop_mapping('shift', 'shift', 'PP');
-QAST::Operations.add_core_pirop_mapping('shift_s', 'shift', 'sP');
-QAST::Operations.add_core_pirop_mapping('shift_i', 'shift', 'iP');
-QAST::Operations.add_core_pirop_mapping('shift_n', 'shift', 'nP');
+QAST::Operations.add_core_pirop_mapping('shift_s', 'shift', 'SP');
+QAST::Operations.add_core_pirop_mapping('shift_i', 'shift', 'IP');
+QAST::Operations.add_core_pirop_mapping('shift_n', 'shift', 'NP');
 QAST::Operations.add_core_pirop_mapping('unshift', 'unshift', '0PP');
 QAST::Operations.add_core_pirop_mapping('unshift_s', 'unshift', '0Ps');
 QAST::Operations.add_core_pirop_mapping('unshift_i', 'unshift', '0Pi');