Allow quasiquotes in braces and quasiliterals, and quotes in braces.

* parser.l: Consolidate rules for recognizing quote, unquote, and
quasiquote. An effect of this is that quasiquotes can now occur in
braces and in string quasiliterals.

* parser.y (quasi_item): Support quotes and quasiquotes as quasi items:
that is to say, i.e. objects denoted by @ in a quasiliteral.

1 files changed, 1 insertions, 6 deletions

diff --git a/parser.l b/parser.l
index 9121de12..70c21d79 100644
--- a/parser.l
+++ b/parser.l
@@ -565,12 +565,7 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return SPLICE;
 }
 
-<NESTED>[,'^] {
-  yylval->chr = yytext[0];
-  return yytext[0];
-}
-
-<QSPECIAL,BRACED>[,'] {
+<QSPECIAL,NESTED,BRACED>[,'^] {
   yylval->chr = yytext[0];
   return yytext[0];
 }