Implemented the regular expression ~ and & operators.

This turns out to be easy to do in NFA land.
The complement of an NFA has exactly the same number
and configuration of states and transitions, except
that the states have an inverted meaning; and furthermore,
failed character transitions are routed to an extra
state (which in this impelmentation is permanently
allocated and shared by all regexes). The regex &
is implemented trivially using DeMorgan's.

Also, bugfix: regular expressions like A|B|C are allowed
now by the syntax, rather than constituting syntax error.
Previously, this would have been entered as (A|B)|C.

1 files changed, 3 insertions, 1 deletions

diff --git a/lib.c b/lib.c
index 8094f678..b41a7cc5 100644
--- a/lib.c
+++ b/lib.c
@@ -52,7 +52,7 @@ val system_package, keyword_package, user_package;
 val null, t, cons_s, str_s, chr_s, num_s, sym_s, pkg_s, fun_s, vec_s;
 val stream_s, hash_s, lcons_s, lstr_s, cobj_s;
 val var_s, regex_s, set_s, cset_s, wild_s, oneplus_s;
-val zeroplus_s, optional_s, compound_s, or_s, quasi_s;
+val zeroplus_s, optional_s, compl_s, compound_s, or_s, and_s, quasi_s;
 val skip_s, trailer_s, block_s, next_s, freeform_s, fail_s, accept_s;
 val all_s, some_s, none_s, maybe_s, cases_s, collect_s, until_s, coll_s;
 val define_s, output_s, single_s, first_s, last_s, empty_s;
@@ -1891,8 +1891,10 @@ static void obj_init(void)
   oneplus_s = intern(lit("1+"), user_package);
   zeroplus_s = intern(lit("0+"), user_package);
   optional_s = intern(lit("?"), user_package);
+  compl_s = intern(lit("~"), user_package);
   compound_s = intern(lit("compound"), user_package);
   or_s = intern(lit("or"), user_package);
+  and_s = intern(lit("and"), user_package);
   quasi_s = intern(lit("quasi"), system_package);
   skip_s = intern(lit("skip"), user_package);
   trailer_s = intern(lit("trailer"), user_package);