Get our comment parsing more STD-ish by introducing the comment proto…

…regex, and add support for #`(...) to fix a regression from alpha.
rakudo · May 29, 2010 · a4dc280 · a4dc280
1 parent d42fd31
commit a4dc280
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -207,9 +207,9 @@ token vws {
 token ws {
     ||  <?MARKED('ws')>
     ||  <!ww>
-        [ \s+
-        | '#' \N*
-        | ^^ <.pod_comment>
+        [
+        | \s+
+        | <.unv>
         ]*
         <?MARKER('ws')>
 }
@@ -218,11 +218,21 @@ token unv {
     # :dba('horizontal whitespace')
     [
     | ^^ <?before \h* '=' [ \w | '\\'] > <.pod_comment>
-    | \h* '#' \N*
+    | \h* <comment>
     | \h+
     ]
 }
 
+proto token comment { <...> }
+
+token comment:sym<#> {
+   '#' {} \N*
+}
+
+token comment:sym<#`(...)> {
+    '#`' {}
+    [ <quote_EXPR> || <.panic: "Opening bracket is required for #` comment"> ]
+}
 
 token pod_comment {
     ^^ \h* '='