@(rep) as shorthand for @(coll :vars nil).

* match.c (h_coll): Check for rep symbol, and handle similarly
to v_coll. Use symbol in error message.
(dir_tables_init): Bind rep symbol to h_coll.

* parser.y (elems): Don't generate rep_elem phrase structure
for the sake of catching "rep outside of output"; this
production now conflicts with the intent to allow this.
(elem): Add various REP productions which clones of COLL.

* txr.1: Documented new @(rep) usage.

1 files changed, 9 insertions, 2 deletions

diff --git a/parser.y b/parser.y
index cd351bbd..00bf0adf 100644
--- a/parser.y
+++ b/parser.y
@@ -387,8 +387,6 @@ elems : elem                    { $$ = cons($1, nil);
                                   rlcp($$, $1); }
       | elem elems              { $$ = cons($1, $2);
                                   rlcp($$, $1); }
-      | rep_elem                { $$ = nil;
-                                  yyerr("rep outside of output"); }
       ;
 
 
@@ -429,8 +427,17 @@ elem : texts                    { $$ = rlcp(cons(text_s, $1), $1);
                                             $2, nao);
                                   rl($$, num($1));
                                   rl($6, car($5)); }
+     | REP exprs_opt ')' elems END     { $$ = list(rep_s, $4, nil, $2, nao);
+                                         rl($$, num($1)); }
+     | REP exprs_opt ')' elems
+       until_last elems END     { $$ = list(rep_s, $4, cons(cdr($5), $6),
+                                            $2, nao);
+                                  rl($$, num($1));
+                                  rl($6, car($5)); }
      | COLL error               { $$ = nil;
                                   yybadtok(yychar, lit("coll clause")); }
+     | REP error               { $$ = nil;
+                                 yybadtok(yychar, lit("rep clause")); }
      | ALL clause_parts_h       { $$ = rl(list(all_s, t, $2, nao), num($1)); }
      | ALL END                  { yyerr("empty all clause"); }
      | SOME exprs_opt ')'