diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | parser.l | 7 | ||||
| -rw-r--r-- | parser.y | 2 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2015-04-15 Kaz Kylheku <kaz@kylheku.com> + + 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. + 2015-04-14 Kaz Kylheku <kaz@kylheku.com> Diagnose trailing junk in numeric literals. @@ -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]; } @@ -949,6 +949,8 @@ quasi_item : litchars { $$ = lit_char_helper($1); } | METANUM { $$ = cons(var_s, cons($1, nil)); rl($$, num(parser->lineno)); } | list { $$ = rlcp(cons(expr_s, $1), $1); } + | '\'' n_expr { $$ = rlcp(cons(expr_s, list(quote_s, $2, nao)), $2); } + | '^' n_expr { $$ = rlcp(cons(expr_s, list(sys_qquote_s, $2, nao)), $2); } | ',' n_expr { $$ = rlcp(cons(expr_s, list(sys_unquote_s, $2, nao)), $2); } | SPLICE n_expr { $$ = rlcp(cons(expr_s, list(sys_splice_s, $2, nao)), $2); } ; |