Uprooting stupidities in handling of output variables.

* parser.y (o_elems_transform): Remove useless function which
was only unwrapping the strange parse of output vars.
(o_elems_opt, rep_elem, quasilit, wordsqlit): Eliminate
o_elems_transform call.
(o_var, q_var): Eliminate the phrase structure rules which
match an extra o_elem or quasi_item, and which incorporate
them into the var syntax tree element. Place the modifiers
into the third position, not fourth.

* eval.c (subst_vars): Eliminate handling of "pat"
element. Actually that was not even there thanks to
o_elems_transform being applied: dead code. Pull modifiers
from the third element of the var form now, not fourth.

* match.c (subst_vars): Similar changes as in the match.c
subst_vars function. Here the pat variable is even more obviously
useless; if it is not nil, it is just punted back to the spec.

1 files changed, 3 insertions, 6 deletions

diff --git a/eval.c b/eval.c
index d9f1c51d..ae05adb0 100644
--- a/eval.c
+++ b/eval.c
@@ -1973,8 +1973,7 @@ static val subst_vars(val forms, val env)
 
       if (sym == var_s) {
         val expr = second(form);
-        val pat = third(form);
-        val modifiers = fourth(form);
+        val modifiers = third(form);
         val str = eval(expr, env, form);
 
         /* If the object is a list, we let format_field deal with the
@@ -1983,10 +1982,8 @@ static val subst_vars(val forms, val env)
         if (!stringp(str) && !listp(str))
           str = tostringp(str);
 
-        if (pat) {
-          forms = cons(str, cons(pat, rest(forms)));
-        } else if (modifiers) {
-          forms = cons(format_field(str, modifiers, nil, 
+        if (modifiers) {
+          forms = cons(format_field(str, modifiers, nil,
                                     curry_123_1(func_n3(eval), env, form)),
                        rest(forms));
         } else {