Allow nesting of quotes.

jnthn · jnthn · commit 21af32a88f18 · 2012-10-17T23:37:35.000+02:00
diff --git a/src/HLL/Grammar.pm b/src/HLL/Grammar.pm
@@ -32,7 +32,6 @@ grammar HLL::Grammar {
     # Return <termish> if it matches, <nullterm_alt> otherwise.
     method nulltermish() { self.termish || self.nullterm_alt }
 
-    # token quote_EXPR is in src/cheats/hll-grammar.pir
     token quote_delimited {
         <starter> <quote_atom>* <stopper>
     }
@@ -41,7 +40,8 @@ grammar HLL::Grammar {
         <!stopper>
         [
         | <quote_escape>
-        | [ <-quote_escape-stopper> ]+
+        | [ <-quote_escape-stopper-starter> ]+
+        | <starter> <quote_atom>* <stopper>
         ]
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ grammar HLL::Grammar {`
`32`	`32`	`# Return <termish> if it matches, <nullterm_alt> otherwise.`
`33`	`33`	`method nulltermish() { self.termish \|\| self.nullterm_alt }`
`34`	`34`
`35`		`- # token quote_EXPR is in src/cheats/hll-grammar.pir`
`36`	`35`	`token quote_delimited {`
`37`	`36`	`<starter> <quote_atom>* <stopper>`
`38`	`37`	`}`
`@@ -41,7 +40,8 @@ grammar HLL::Grammar {`
`41`	`40`	`<!stopper>`
`42`	`41`	`[`
`43`	`42`	`\| <quote_escape>`
`44`		`- \| [ <-quote_escape-stopper> ]+`
	`43`	`+ \| [ <-quote_escape-stopper-starter> ]+`
	`44`	`+ \| <starter> <quote_atom>* <stopper>`
`45`	`45`	`]`
`46`	`46`	`}`
`47`	`47`