Allow braced output variables to actually be arbitrary substitutions.

* eval.c (subst_vars): Treat the variable as an arbitrary
expression rather than just a symbol.

* match.c (subst_vars): Likewise.

* parser.y (o_var): Further simplification. The first item in
an output var is an expr and not an IDENT.

* txr.1: Updated.

* txr.vim: Likewise.

1 files changed, 4 insertions, 5 deletions

diff --git a/parser.y b/parser.y
index 7dc5d67b..ebcf63b3 100644
--- a/parser.y
+++ b/parser.y
@@ -636,11 +636,10 @@ o_var : IDENT                   { $$ = list(var_s, intern(string_own($1), nil),
                                             nao); }
       | IDENT o_elem            { $$ = list(var_s, intern(string_own($1), nil),
                                             $2, nao); }
-      | '{' IDENT exprs_opt '}' { $$ = list(var_s, intern(string_own($2), nil),
-                                            nil, $3, nao); }
-      | '{' IDENT exprs_opt '}' o_elem      
-                                { $$ = list(var_s, intern(string_own($2), nil),
-                                            $5, $3, nao); }
+      | '{' expr exprs_opt '}' 
+                                { $$ = list(var_s, $2, nil, $3, nao); }
+      | '{' expr exprs_opt '}' o_elem      
+                                { $$ = list(var_s, $2, $5, $3, nao); }
       | IDENT error             { $$ = nil;
                                     yybadtoken(yychar, lit("variable spec")); }
       ;