Dot with no whitespace generates qref syntax.

a.b.(expr ...).c -> (qref a b (expr ...) c)
Consing dot requires whitespace.

* eval.c (qref_s): New symbol global variable.
(eval_init): Initialize qref_s.

* eval.h (qref_s): Declared.

* parser.l (REQWS): New pattern definition, required whitespace.
(grammar): New rules to scan CONSDOT (space required on both
sides) and LAMBDOT (space required after).

* parser.y (CONSDOT, LAMBDOT): New token types.
(list): (. n_expr) rule replaced with LAMBDOT and CONSDOT.
(r_exprs): r_exprs . n_expr consing dot rule replaced with CONSDOT.
(n_expr): New n_expr . n_expr rule introduced here for producing
qref expressions.
(yybadtoken): Handle CONSDOT and LAMBDOT.

* txr.1: Documented qref dot.

1 files changed, 11 insertions, 0 deletions

diff --git a/parser.l b/parser.l
index ca7c893d..dc083867 100644
--- a/parser.l
+++ b/parser.l
@@ -197,6 +197,7 @@ NTREG   ({NT0}|{NT1})?:{NT2}?|({NT0}|{NT1})(:{NT2})?
 NTKEY   @?:{NT2}?
 NTOK    {NTREG}|{NTKEY}
 WS      [\t ]*
+REQWS   [\t ]+
 HEX     [0-9A-Fa-f]
 OCT     [0-7]
 
@@ -665,6 +666,16 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return '/';
 }
 
+<SPECIAL,QSPECIAL,NESTED>{REQWS}\.{REQWS} {
+  yylval->chr = '.';
+  return CONSDOT;
+}
+
+<SPECIAL,QSPECIAL,NESTED>\.{REQWS} {
+  yylval->chr = '.';
+  return LAMBDOT;
+}
+
 <SPECIAL,QSPECIAL,NESTED>\. {
   yylval->chr = '.';
   return '.';