Eliminating the extra list wrapping applied to regular

expression objects in the syntax tree. The parser
just puts out a #<regex ...> instead of (#<regex ...> regex-syntax).

* eval.c (do_eval): We no longer need the hack of
treating (#<regex> ...) as a special form which
evaluates to #<regex>.
(expand): We no longer have to skip over regex syntax,
so the case is removed.

* match.c (h_var, do_txeval, do_match_line): regexp cases are no longer
subcases of consp but stand on their own. In do_match_line, we
introduce a COBJ case into the type switch for regexes.

* parser.y: regexes are now compiled in the regex and lisp_regex
grammar rules instead of the dependent rules, and are not wrapped in
extra syntax.

1 files changed, 15 insertions, 23 deletions

diff --git a/eval.c b/eval.c
index 3adeb6b8..48df1f38 100644
--- a/eval.c
+++ b/eval.c
@@ -938,30 +938,24 @@ static val do_eval(val form, val env, val ctx_form,
     }
   } else if (consp(form)) {
     val oper = car(form);
+    val entry = gethash(op_table, oper);
 
-    if (regexp(oper))
-      debug_return (oper);
-
-    {
-      val entry = gethash(op_table, oper);
-
-      if (entry) {
-        opfun_t fp = (opfun_t) cptr_get(entry);
+    if (entry) {
+      opfun_t fp = (opfun_t) cptr_get(entry);
+      last_form_evaled = form;
+      debug_return (fp(form, env));
+    } else {
+      val fbinding = lookup_fun(env, oper);
+      if (!fbinding) {
         last_form_evaled = form;
-        debug_return (fp(form, env));
+        eval_error(form, lit("no such function or operator: ~s"), oper, nao);
+        abort();
       } else {
-        val fbinding = lookup_fun(env, oper);
-        if (!fbinding) {
-          last_form_evaled = form;
-          eval_error(form, lit("no such function or operator: ~s"), oper, nao);
-          abort();
-        } else {
-          val args = do_eval_args(rest(form), env, form, &lookup_var);
-          debug_frame(oper, args, nil, env, nil, nil, nil);
-          last_form_evaled = form;
-          debug_return (apply(cdr(fbinding), args, form));
-          debug_end;
-        }
+        val args = do_eval_args(rest(form), env, form, &lookup_var);
+        debug_frame(oper, args, nil, env, nil, nil, nil);
+        last_form_evaled = form;
+        debug_return (apply(cdr(fbinding), args, form));
+        debug_end;
       }
     }
   } else {
@@ -2817,8 +2811,6 @@ tail:
       return rlcp(cons(sym, quasi_ex), form);
     } else if (sym == catch_s) {
       return expand_catch(rest(form), menv);
-    } else if (sym == regex_s || regexp(sym)) {
-      return form; /* regex syntax isn't Lisp code; don't expand! */
     } else if (sym == macro_time_s) {
       val args = rest(form);
       val args_ex = expand_forms(args, menv);