* eval.c (meta_meta_p, meta_meta_strip): New static functions.

(transform_op): Recognize compounded metas, and strip one level off.
(eval_init): Intern sys:expand function so we have access to the
form expander from TXR Lisp.

* lib.c (obj_print, obj_pprint): Fix: wasn't rendering metanumbers.

* parser.y (list): Support @ in front of anything. If it's an atom,
treat it similarly to a metasymbol or metanumber.

* txr.1: Documented meta-meta arguments in nested op.

* genvim.txr, txr.vim: Support coloring for compounded meta syntax.

1 files changed, 4 insertions, 1 deletions

diff --git a/parser.y b/parser.y
index 8089522a..16d761c7 100644
--- a/parser.y
+++ b/parser.y
@@ -699,7 +699,10 @@ list : '(' n_exprs ')'          { $$ = rl($2, num($1)); }
      | '(' ')'                  { $$ = nil; }
      | '[' n_exprs ']'          { $$ = rl(cons(dwim_s, $2), num($1)); }
      | '[' ']'                  { $$ = rl(cons(dwim_s, nil), num($1)); }
-     | '@' list                 { $$ = rlcp(cons(expr_s, $2), $2); }
+     | '@' n_expr               { if (consp($2))
+                                    $$ = rlcp(cons(expr_s, $2), $2);
+                                  else
+                                    $$ = rlcp(cons(var_s, cons($2, nil)), $2); }
      | '(' error                { $$ = nil;
                                   yybadtoken(yychar, lit("list expression")); }
      | '[' error                { $$ = nil;