Merge pull request #280 from peschwa/nom

Added X::Syntax::BlockTaken and use it from the Grammar.
rakudo · Jun 16, 2014 · 09134a7 · 09134a7
2 parents 6ca805d + ec27142
commit 09134a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -1183,13 +1183,13 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
                    if $*BORG<name> {
                         $/.CURSOR.'!clear_highwater'();
                         $/.CURSOR.'!cursor_pos'($*BORG<block>.CURSOR.pos);
-                        $/.CURSOR.sorry("Function '" ~ $*BORG<name> ~ "' needs parens to avoid taking the block");
+                        $/.CURSOR.typed_sorry('X::Syntax::BlockTaken', what => ~$*BORG<name>);
                         $/.CURSOR.'!cursor_pos'($pos);
                         $/.CURSOR.missing("block (apparently taken by '" ~ $*BORG<name> ~ "')");
                    } else {
                         $/.CURSOR.'!clear_highwater'();
                         $/.CURSOR.'!cursor_pos'($*BORG<block>.CURSOR.pos);
-                        $/.CURSOR.sorry("Expression needs parens to avoid taking the block");
+                        $/.CURSOR.typed_sorry('X::Syntax::BlockTaken');
                         $/.CURSOR.'!cursor_pos'($pos);
                         $/.CURSOR.missing("block (apparently taken by expression)");
                    }

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -904,6 +904,10 @@ my class X::Syntax::Missing does X::Syntax {
     has $.what;
     method message() { "Missing $.what" }
 }
+my class X::Syntax::BlockTaken does X::Syntax {
+    has $.what;
+    method message() { "{ $.what ?? 'Function ' ~ $.what !! 'Expression' } needs parens to avoid taking the block." };
+}
 
 my class X::Syntax::Perl5Var does X::Syntax {
     has $.name;