s/push_self/push_cur_meth/g

Raku · Jun 12, 2013 · 9514dbe · 9514dbe
1 parent a640d5a
commit 9514dbe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -3264,7 +3264,7 @@ class QAST::CompilerJAST {
             if $block.num_save_sites {
                 my $saver := JAST::InstructionList.new;
                 $saver.append(JAST::Label.new( :name( 'SAVER' ) ));
-                $saver.append(JAST::PushSelf.new);
+                $saver.append(JAST::PushCurMeth.new);
 
                 my @merged;
                 for $*JMETH.arguments { nqp::push(@merged, $_); }

diff --git a/src/vm/jvm/QAST/JASTNodes.nqp b/src/vm/jvm/QAST/JASTNodes.nqp
@@ -367,13 +367,13 @@ class JAST::PushCVal is JAST::Node {
     method dump() { ".push_cc $!value" }
 }
 
-class JAST::PushSelf is JAST::Node {
+class JAST::PushCurMeth is JAST::Node {
     method new() {
-        my $node := nqp::create(JAST::PushSelf);
+        my $node := nqp::create(JAST::PushCurMeth);
         $node
     }
 
-    method dump() { ".push_self" }
+    method dump() { ".push_cur_meth" }
 }
 
 class JAST::TryCatch is JAST::Node {

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/jast2bc/JASTToJVMBytecode.java b/src/vm/jvm/runtime/org/perl6/nqp/jast2bc/JASTToJVMBytecode.java
@@ -304,7 +304,7 @@ else if (curLine.startsWith(".push_cc ")) {
                     Type t = Type.getType(cName);
                     m.visitLdcInsn(t);
                 }
-                else if (curLine.equals(".push_self")) {
+                else if (curLine.equals(".push_self") || curLine.equals(".push_cur_meth")) {
                     m.visitLdcInsn(new Handle(
                         isStatic ? Opcodes.H_INVOKESTATIC : Opcodes.H_INVOKESPECIAL,
                         className, methodName, desc));