Semantics change. If a variable is followed by a mixture

of text and regular expressions, that whole mixture is
considered to follow the variable and used for matching.

The earlier semantics change whereby a single unescaped
space denotes the regular expression / +/ broke the
simple case   @a word.   It caused the @a to be followed
not by the text " word"  but by just the regular expression
element.

With this change @a word means that a is followed by
the regex / +/ and "word".

* match.c (text_s): New symbol variable.
(h_text): New function.
(syms_init): Initialize new symbol variable.
(dir_tables_init): Hook h_text into horizontal directives table.

* match.h (text_s): Declared.

* parser.y (text, texts): New nonterminals.
(elem): TEXT, SPACE and regex are now handled under texts
grammar production. All texts are run together and produce
an item which looks like (text items ...).

* txr.1, RELNOTES: Updated.

* txr.c (remove_hash_bang_line): Updated to find #! buried
in (text ...) syntax.

1 files changed, 9 insertions, 5 deletions

diff --git a/txr.c b/txr.c
index 66ee31ac..21e30f87 100644
--- a/txr.c
+++ b/txr.c
@@ -130,11 +130,15 @@ static val remove_hash_bang_line(val spec)
   {
     val shbang = string(L"#!");
     val firstline = first(spec);
-
-    if (stringp(first(firstline))) {
-      val twochars = sub_str(first(firstline), zero, two);
-      if (equal(twochars, shbang))
-        return rest(spec);
+    val firstelem = first(firstline);
+
+    if (consp(firstelem) && first(firstelem) == text_s) {
+      val item = second(firstelem);
+      if (stringp(item)) {
+        val twochars = sub_str(item, zero, two);
+        if (equal(twochars, shbang))
+          return rest(spec);
+      }
     }
 
     return spec;