Merge branch 'nom' into newio

rakudo · Feb 24, 2015 · 6ea2a6f · 6ea2a6f
2 parents 9b00cce + 546000b
commit 6ea2a6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -268,7 +268,7 @@ role STD {
         );
     }
     method worryobs($old, $new, $when = 'in Perl 6') {
-        $*W.throw(self.MATCH(), ['X', 'Obsolete'],
+        self.typed_worry('X::Obsolete',
             old         => $old,
             replacement => $new,
             when        => $when,
@@ -3243,11 +3243,12 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
                             $/.CURSOR.worry("Use of non-subscript <...> where postfix is expected; please use whitespace")
                                 if $trap && nqp::substr($/.CURSOR.orig, $/.CURSOR.pos, 1) eq '<';
                             if $trap == 1 {        # probably misused P5ism
-                                $<longname>.CURSOR.sorryobs("bare '$name'", ".$name if you meant \$_, or use an explicit invocant or argument");
+                                $<longname>.CURSOR.worryobs("bare '$name'", ".$name if you meant \$_, or use an explicit invocant or argument");
                             }
                             elsif $trap == 2 {        # probably misused P6ism
-                                $<longname>.CURSOR.sorry("The '$name' listop may not be called without arguments (please use () or whitespace to clarify)");
+                                $<longname>.CURSOR.worry("The '$name' listop may not be called without arguments (please use () or whitespace to clarify)");
                             }
+                            $<longname>.CURSOR.sorry("No valid term seen where one is required");
                         }
                     }
                 }

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -2780,14 +2780,22 @@ class Perl6::World is HLL::World {
                 }
                 else {
                     my $expected_infix := 0;
+                    my $expected_term := 0;
                     for @expected {
                         if nqp::index($_, "infix") >= 0 {
                             $expected_infix := 1;
-                            last;
+                        }
+                        elsif nqp::index($_, "prefix or term") >= 0 {
+                            $expected_term := 1;
                         }
                     }
                     if $expected_infix {
-                        %opts<reason> := "Two terms in a row";
+			if $expected_term {
+			    %opts<reason> := "Bogus term";
+			}
+			else {
+			    %opts<reason> := "Two terms in a row";
+			}
                     }
                 }
             }