* 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.

1 files changed, 6 insertions, 1 deletions

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