Switch comments from quote_EXPR to quibble.

rakudo · Oct 28, 2012 · f0291ac · f0291ac
1 parent 6fcac2e
commit f0291ac
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -18,6 +18,29 @@ role stop[$stop] {
 # This role captures things that STD factors out from any individual grammar,
 # but that don't make sense to go in HLL::Grammar.
 role STD {
+    token opener {
+        <[
+        \x0028 \x003C \x005B \x007B \x00AB \x0F3A \x0F3C \x169B \x2018 \x201A \x201B
+        \x201C \x201E \x201F \x2039 \x2045 \x207D \x208D \x2208 \x2209 \x220A \x2215
+        \x223C \x2243 \x2252 \x2254 \x2264 \x2266 \x2268 \x226A \x226E \x2270 \x2272
+        \x2274 \x2276 \x2278 \x227A \x227C \x227E \x2280 \x2282 \x2284 \x2286 \x2288
+        \x228A \x228F \x2291 \x2298 \x22A2 \x22A6 \x22A8 \x22A9 \x22AB \x22B0 \x22B2
+        \x22B4 \x22B6 \x22C9 \x22CB \x22D0 \x22D6 \x22D8 \x22DA \x22DC \x22DE \x22E0
+        \x22E2 \x22E4 \x22E6 \x22E8 \x22EA \x22EC \x22F0 \x22F2 \x22F3 \x22F4 \x22F6
+        \x22F7 \x2308 \x230A \x2329 \x23B4 \x2768 \x276A \x276C \x276E \x2770 \x2772
+        \x2774 \x27C3 \x27C5 \x27D5 \x27DD \x27E2 \x27E4 \x27E6 \x27E8 \x27EA \x2983
+        \x2985 \x2987 \x2989 \x298B \x298D \x298F \x2991 \x2993 \x2995 \x2997 \x29C0
+        \x29C4 \x29CF \x29D1 \x29D4 \x29D8 \x29DA \x29F8 \x29FC \x2A2B \x2A2D \x2A34
+        \x2A3C \x2A64 \x2A79 \x2A7D \x2A7F \x2A81 \x2A83 \x2A8B \x2A91 \x2A93 \x2A95
+        \x2A97 \x2A99 \x2A9B \x2AA1 \x2AA6 \x2AA8 \x2AAA \x2AAC \x2AAF \x2AB3 \x2ABB
+        \x2ABD \x2ABF \x2AC1 \x2AC3 \x2AC5 \x2ACD \x2ACF \x2AD1 \x2AD3 \x2AD5 \x2AEC
+        \x2AF7 \x2AF9 \x2E02 \x2E04 \x2E09 \x2E0C \x2E1C \x2E20 \x3008 \x300A \x300C
+        \x300E \x3010 \x3014 \x3016 \x3018 \x301A \x301D \xFD3E \xFE17 \xFE35 \xFE37
+        \xFE39 \xFE3B \xFE3D \xFE3F \xFE41 \xFE43 \xFE47 \xFE59 \xFE5B \xFE5D \xFF08
+        \xFF1C \xFF3B \xFF5B \xFF5F \xFF62
+        ]>
+    }
+
     method balanced($start, $stop) {
         self.HOW.mixin(self, startstop.HOW.curry(startstop, $start, $stop));
     }
@@ -272,12 +295,12 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     }
 
     token comment:sym<#`(...)> {
-        '#`' {}
-        [ <.quote_EXPR> || <.typed_panic: 'X::Syntax::Comment::Embedded'> ]
+        '#`' <?opener> {}
+        [ <.quibble(%*LANG<Q>)> || <.typed_panic: 'X::Syntax::Comment::Embedded'> ]
     }
 
     token comment:sym<#=(...)> {
-        '#=' <!ws> $<attachment>=<quote_EXPR>
+        '#=' <?opener> $<attachment>=<.quibble(%*LANG<Q>)>
     }
 
     token comment:sym<#=> {