From f8eb0a80d0e1b2c51461bb59aa69e83a82639081 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 26 Jun 2015 19:07:25 -0700 Subject: Second round of quasiliteral-related fixes. * parser.l: Only shift to QSPECIAL state when @ is followed by a trailing context consisting of certain characters. Not every kind of Lisp object syntax can be introduced with @ in a quasiliteral. Adding a rule to produce an error when @ appears that is not followed by an allowed character. --- ChangeLog | 11 +++++++++++ parser.l | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 09b4be30..feb36da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-06-26 Kaz Kylheku + + Second round of quasiliteral-related fixes. + + * parser.l: Only shift to QSPECIAL state when @ is followed + by a trailing context consisting of certain characters. + Not every kind of Lisp object syntax can be introduced + with @ in a quasiliteral. Adding a rule to produce an + error when @ appears that is not followed by an allowed + character. + 2015-06-26 Kaz Kylheku First round of quasiliteral-related fixes. diff --git a/parser.l b/parser.l index 4a133836..7ec31991 100644 --- a/parser.l +++ b/parser.l @@ -895,11 +895,16 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} return ' '; } -@ { +@/([[({'^,@]|{TOK}) { yy_push_state(QSPECIAL, yyscanner); return yytext[0]; } +@ { + yyerrprepf(yyg, lit("malformed @ expression in quasiliteral"), nao); + return ERRTOK; +} + {WS} { return ' '; } -- cgit v1.2.3