* match.c (mingap_k, maxgap_k, gap_k, times_k, lines_k): New

symbol variables.
(match_lines): Keyword arguments in collect implemented.
(match_init): New function.

* match.h (match_init): Declared.

* parser.l (COLLECT): Lexical syntax changed for COLLECT to
allow for argument material.

* parser.y (%union): obj renamed to val.
(exprs_opt): New nonterminal.
(collect_clause): Rewritten for arguments.

* txr.c (main): Call to match_init introduced.

1 files changed, 2 insertions, 2 deletions

diff --git a/parser.l b/parser.l
index 0fd39c5b..9f40dec8 100644
--- a/parser.l
+++ b/parser.l
@@ -270,8 +270,8 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
                                   return END;
                                 }
 
-<SPECIAL>\({WS}collect{WS}\)    {
-                                  yy_pop_state();
+<SPECIAL>\({WS}collect/{ID_END} {
+                                  yy_push_state(NESTED);
                                   return COLLECT;
                                 }