Merge pull request #786 from vrurg/rakuast-origins

Add support for RakuAST::Origin::Match
Raku · Dec 20, 2022 · 315372e · 315372e
2 parents 0724fd6 + 3685c47
commit 315372e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -4457,7 +4457,13 @@ class QAST::CompilerJAST {
         for @stmts {
             if $_.node && nqp::can($_.node,'orig') {
                 my $node := $_.node;
-                my $line := HLL::Compiler.lineof($node.orig(), $node.from(), :cache(1), :directives(0));
+                my $line;
+                if nqp::can($node, 'orig-line') {
+                    $line := $node.orig-line();
+                }
+                else {
+                    $line := HLL::Compiler.lineof($node.orig(), $node.from(), :cache(1), :directuves(0));
+                }
                 $il.append(JAST::Annotation.new( :line($line) ));
             }
 

diff --git a/src/vm/moar/QAST/QASTCompilerMAST.nqp b/src/vm/moar/QAST/QASTCompilerMAST.nqp
@@ -1469,9 +1469,17 @@ my class MASTCompilerInstance {
     method compile_annotation($qast) {
         my $node := $qast.node;
         if nqp::isconcrete($node) && nqp::can($node,'orig') {
-            my @line_file := HLL::Compiler.linefileof($node.orig(), $node.from(), :cache(1), :directives(1));
-            my $line := @line_file[0];
-            my $file := @line_file[1] || $!file;
+            my $line;
+            my $file;
+            if nqp::can($node, 'file') && nqp::can($node, 'line') {
+                $line := $node.line();
+                $file := $node.file();
+            }
+            else {
+                my @line_file := HLL::Compiler.linefileof($node.orig(), $node.from(), :cache(1), :directives(1));
+                $line := @line_file[0];
+                $file := @line_file[1] || $!file;
+            }
             MAST::Annotated.new(:$file, :$line);
         }
     }