NQPQ's Grammar used the ** ',' syntax, which is now gone from QRegex,…

… but it builds this in stage 1 too, using the old regex engine which doesn't do %. So, eliminate those two cases for something a little more verbose.
Raku · May 17, 2012 · 7a76f20 · 7a76f20
1 parent 44e1c14
commit 7a76f20
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/NQPQ/Grammar.pm b/src/NQPQ/Grammar.pm
@@ -39,7 +39,7 @@ grammar NQP::Grammar is HLL::Grammar {
 
     token identifier { <.ident> [ <[\-']> <.ident> ]* }
 
-    token name { <identifier> ** '::' }
+    token name { <identifier> ['::'<identifier>]* }
 
     token deflongname {
         <identifier> <colonpair>?
@@ -473,7 +473,7 @@ grammar NQP::Grammar is HLL::Grammar {
 
     token signature {
         [ <?{ $*INVOCANT_OK }> <.ws><invocant=.parameter><.ws> ':' ]?
-        [ [<.ws><parameter><.ws>] ** ',' ]?
+        [ [<.ws><parameter><.ws> [',' | <before \s* [')' | '{']>]]* ]?
     }
 
     token parameter {