Fix Grammar. Closes #8

Fix digit zero being used instead of a null byte. Fix ignoring of underscores in nicknames

2 files changed, 9 insertions, 4 deletions

diff --git a/Changes b/Changes
index 16a6311..cbe634b 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision History for 'IRC::Client' Perl 6 Distribution
 
+2.002002 2016-01-01
+  - Fix grammar parsing errors that ignored nicks/usernames with underscores
+      and digit 0
+  -
+
 2.001002 2015-12-30
   - Minor doc updates and fixed missing prepreqs in META.info file
   - Bumped required perl version to 6.c
diff --git a/lib/IRC/Grammar.pm6 b/lib/IRC/Grammar.pm6
index 241c497..f1303ee 100644
--- a/lib/IRC/Grammar.pm6
+++ b/lib/IRC/Grammar.pm6
@@ -8,13 +8,13 @@ token message { [':' <prefix> <SPACE> ]? <command> <params> \n }
     }
         token servername { <host> }
         token nick { <letter> [ <letter> | <number> | <special> ]* }
-        token user { <-[\ \0\r\n]>+?  <before [<SPACE> | '@']>}
+        token user { <-[\ \x0\r\n]>+?  <before [<SPACE> | '@']>}
         token host { <-[\s!@]>+ }
     token command { <letter>+ | <number>**3 }
     token params { <SPACE>* [ ':' <trailing> | <middle> <params> ]? }
-        token middle { <-[:\ \0\r\n]> <-[\ \0\r\n]>* }
-        token trailing { <-[\0\r\n]>* }
+        token middle { <-[:\ \x0\r\n]> <-[\ \x0\r\n]>* }
+        token trailing { <-[\x0\r\n]>* }
 
     token letter { <[a..zA..Z]> }
     token number { <[0..9]> }
-    token special { <[-\[\]\\`^{}]> }
+    token special { <[-_\[\]\\`^{}]> }