Allow hyphen and single-quotes in NQP identifiers.

src/NQP/Grammar.pm

@@ -14,7 +14,7 @@ method TOP() {
 
 ## Lexer stuff
 
-token identifier { <ident> }
+token identifier { <.ident> [ <[\-']> <.ident> ]* }
 
 token name { <identifier> ** '::' }
 
@@ -582,7 +582,7 @@ grammar NQP::Regex is Regex::P6Regex::Grammar {
     }
 
     token assertion:sym<name> {
-        $<longname>=[\w+]
+        <longname=.identifier>
             [
             | <?before '>'>
             | '=' <assertion>

t/nqp/31-grammar.t

@@ -2,11 +2,13 @@
 
 # Test grammars and regexes
 
-plan(4);
+plan(6);
 
 grammar ABC {
     token TOP { ok ' ' <integer> }
     token integer { \d+ }
+    token TOP2 { ok ' ' <int-num> }
+    token int-num { \d+ }
 }
 
 my $match := ABC.parse('not ok');
@@ -19,6 +21,7 @@ ok( ?$match, 'parse method works on positive match');
 
 ok( $match<integer> == 123, 'captured $<integer>');
 
+$match := ABC.parse('ok 123', :rule<TOP2> );
+ok( ?$match, 'parse method works with :rule');
 
-
-
+ok( $match<int-num> == 123, 'captured $<int-num>');