Sigh; more lexical-syntactic hacks. This adds handling

for the @' combination, as in @(bind a @'(foo ,bar))

* parser.l: Handle the new METAQUO token.

* parser.y (METAQUO): New token.
(meta_expr): New "METAQUO expr" case. Added missing METABKT
error handling case.

1 files changed, 17 insertions, 6 deletions

diff --git a/parser.l b/parser.l
index 0dca7331..cc348cc2 100644
--- a/parser.l
+++ b/parser.l
@@ -432,17 +432,28 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return yytext[0];
 }
 
-<SPECIAL>[(\[] |
-<NESTED,BRACED>@?[(\[] {
+<SPECIAL,NESTED,BRACED>[(\[] {
  yy_push_state(NESTED);
- if (yytext[0] == '@') {
-   yylval.chr = yytext[1];
-   return yytext[1] == '(' ? METAPAR : METABKT;
- }
  yylval.lineno = lineno;
  return yytext[0];
 }
 
+<NESTED,BRACED>@[(\['] {
+ yylval.chr = yytext[1];
+ yylval.lineno = lineno;
+ switch (yytext[1]) {
+ case '(': 
+   yy_push_state(NESTED);
+   return METAPAR;
+ case '[':
+   yy_push_state(NESTED);
+   return METABKT;
+ default:
+ case '\'':
+   return METAQUO;
+ }
+}
+
 <NESTED>,[*] {
   yylval.chr = '*';
   return SPLICE;