From ff4d78c938128cd0572f6469425005d9019a7f38 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Wed, 30 Jul 2014 07:29:44 -0700
Subject: * parser.l: Allow unquotes and splices in QSPECIAL and BRACED states.

* parser.y (quasi_item): Support splices as items.

* genvim.txr: Syntax highlighting support for unquotes in
quasiliterals.

* txr.vim: Updated.
---
 parser.l | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'parser.l')

diff --git a/parser.l b/parser.l
index be3365e2..4edb90ee 100644
--- a/parser.l
+++ b/parser.l
@@ -547,7 +547,7 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return yytext[0];
 }
 
-<NESTED>,[*] {
+<NESTED,QSPECIAL,BRACED>,[*] {
   yylval.chr = '*';
   return SPLICE;
 }
@@ -557,6 +557,11 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return yytext[0];
 }
 
+<QSPECIAL,BRACED>[,'] {
+  yylval.chr = yytext[0];
+  return yytext[0];
+}
+
 <BRACED>[}] {
   yy_pop_state();
   if (yy_top_state() == INITIAL
-- 
cgit v1.2.3