Merge pull request #787 from vrurg/better-backtrace

Better backtrace
Raku · Dec 10, 2022 · f7e399c · f7e399c
2 parents d51a1c5 + 5df3bfb
commit f7e399c
Show file tree

Hide file tree

Showing 28 changed files with 25 additions and 8 deletions.
diff --git a/src/HLL/Compiler.nqp b/src/HLL/Compiler.nqp
@@ -301,6 +301,7 @@ class HLL::Compiler does HLL::Backend::Default {
                                      || %adverbs<show-config>;
         self.nqpevent(%adverbs<nqpevent>) if %adverbs<nqpevent>;
 
+        my @*comp_line_directives;
         my $result;
         my $error;
         my $has_error := 0;

diff --git a/src/HLL/Grammar.nqp b/src/HLL/Grammar.nqp
@@ -220,8 +220,17 @@ of the match.
     method panic(*@args) {
         my $pos := self.pos();
         my $target := self.target();
-        @args.push(' at line ');
-        @args.push(HLL::Compiler.lineof($target, $pos) + 1);
+        my $actual-file := nqp::getlexdyn('$?FILES');
+        my @line-file := HLL::Compiler.linefileof($target, $pos, :cache, :directives);
+        if $actual-file {
+            @args.unshift('===SORRY!=== Error while compiling ' ~ $actual-file ~ "\n");
+        }
+        if @line-file[1] && (!$actual-file || nqp::isne_s($actual-file, @line-file[1])) {
+            @args.push(' at ' ~ @line-file[1] ~ ':' ~ @line-file[0])
+        }
+        else {
+            @args.push(' at line ' ~ @line-file[0]);
+        }
         @args.push(', near "');
         @args.push(nqp::escape(nqp::substr($target, $pos, 10)));
         @args.push('"');

diff --git a/src/NQP/Actions.nqp b/src/NQP/Actions.nqp
@@ -139,7 +139,7 @@ class NQP::Actions is HLL::Actions {
                 my $sunk := $ast.ann('sink');
                 $ast := $sunk if nqp::defined($sunk);
                 if $ast.ann('bareblock') { $ast := block_immediate($ast[0]); }
-                $ast := QAST::Stmts.new($ast) if nqp::istype($ast, QAST::Node);
+                $ast := QAST::Stmts.new($ast, :node($_)) if nqp::istype($ast, QAST::Node);
                 $ast_list.push( $ast );
             }
         }

diff --git a/src/NQP/Grammar.nqp b/src/NQP/Grammar.nqp
@@ -60,7 +60,7 @@ grammar NQP::Grammar is HLL::Grammar {
         ||  <?MARKED('ws')>
         ||  <!ww>
             [ \v+
-            | '#' \N*
+            | <.comment>
             | ^^ <.pod_comment>
             | \h+
             ]*
@@ -71,11 +71,17 @@ grammar NQP::Grammar is HLL::Grammar {
         # :dba('horizontal whitespace')
         [
         | ^^ <?before \h* '=' [ \w | '\\'] > <.pod_comment>
-        | \h* '#' \N*
+        | \h* <.comment>
         | \h+
         ]
     }
 
+    proto token comment {*}
+
+    token comment:sym<#> {
+       '#' {} \N*
+    }
+
     token pod_comment {
         ^^ \h* '='
         [

diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -4457,7 +4457,7 @@ 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));
+                my $line := HLL::Compiler.lineof($node.orig(), $node.from(), :cache(1), :directives(0));
                 $il.append(JAST::Annotation.new( :line($line) ));
             }
 

diff --git a/src/vm/jvm/stage0/JASTNodes.jar b/src/vm/jvm/stage0/JASTNodes.jar
diff --git a/src/vm/jvm/stage0/ModuleLoader.jar b/src/vm/jvm/stage0/ModuleLoader.jar
diff --git a/src/vm/jvm/stage0/NQPCORE.setting.jar b/src/vm/jvm/stage0/NQPCORE.setting.jar
diff --git a/src/vm/jvm/stage0/NQPHLL.jar b/src/vm/jvm/stage0/NQPHLL.jar
diff --git a/src/vm/jvm/stage0/NQPP6QRegex.jar b/src/vm/jvm/stage0/NQPP6QRegex.jar
diff --git a/src/vm/jvm/stage0/QAST.jar b/src/vm/jvm/stage0/QAST.jar
diff --git a/src/vm/jvm/stage0/QASTNode.jar b/src/vm/jvm/stage0/QASTNode.jar
diff --git a/src/vm/jvm/stage0/QRegex.jar b/src/vm/jvm/stage0/QRegex.jar
diff --git a/src/vm/jvm/stage0/nqp.jar b/src/vm/jvm/stage0/nqp.jar
diff --git a/src/vm/jvm/stage0/nqpmo.jar b/src/vm/jvm/stage0/nqpmo.jar
diff --git a/src/vm/moar/stage0/MASTNodes.moarvm b/src/vm/moar/stage0/MASTNodes.moarvm
diff --git a/src/vm/moar/stage0/MASTOps.moarvm b/src/vm/moar/stage0/MASTOps.moarvm
diff --git a/src/vm/moar/stage0/ModuleLoader.moarvm b/src/vm/moar/stage0/ModuleLoader.moarvm
diff --git a/src/vm/moar/stage0/NQPCORE.setting.moarvm b/src/vm/moar/stage0/NQPCORE.setting.moarvm
diff --git a/src/vm/moar/stage0/NQPHLL.moarvm b/src/vm/moar/stage0/NQPHLL.moarvm
diff --git a/src/vm/moar/stage0/NQPP6QRegex.moarvm b/src/vm/moar/stage0/NQPP6QRegex.moarvm
diff --git a/src/vm/moar/stage0/QAST.moarvm b/src/vm/moar/stage0/QAST.moarvm
diff --git a/src/vm/moar/stage0/QASTNode.moarvm b/src/vm/moar/stage0/QASTNode.moarvm
diff --git a/src/vm/moar/stage0/QRegex.moarvm b/src/vm/moar/stage0/QRegex.moarvm
diff --git a/src/vm/moar/stage0/nqp.moarvm b/src/vm/moar/stage0/nqp.moarvm
diff --git a/src/vm/moar/stage0/nqpmo.moarvm b/src/vm/moar/stage0/nqpmo.moarvm
diff --git a/t/nqp/114-pod-panic.t b/t/nqp/114-pod-panic.t
@@ -24,7 +24,8 @@ my $args := nqp::list($cmd, $cmdargs);
 
 # expected first line output to stderr:
 #   Obsolete pod format ... , please use =begin/=end instead at line 4, near "\n"
-my $regex := /^ \h* Obsolete \h+ pod \h+ format \h+ .+ ',' \h+ please \h+ use \h+ '=begin/=end' \h+ instead \h+ /;
+my $regex := /^ '===SORRY!=== Error while compiling pod-test.nqp' \n \h*
+                Obsolete \h+ pod \h+ format \h+ .+ ',' \h+ please \h+ use \h+ '=begin/=end' \h+ instead \h+ /;
 
 # running with only stderr capture"
 my @arr := run-command($args, :stderr);

diff --git a/tools/build/gen-cat.pl b/tools/build/gen-cat.pl
@@ -21,7 +21,7 @@
 
 
 foreach my $file (@files) {
-    print "# From $file\n\n";
+    print "#line 1 NQP::$file\n";
     open(my $fh, "<:utf8",  $file) or die "$file: $!";
     my $in_omit = 0;
     my @conds;