diff options
| -rw-r--r-- | eval.c | 15 | ||||
| -rw-r--r-- | lib.c | 4 | ||||
| -rw-r--r-- | match.c | 11 | ||||
| -rw-r--r-- | parser.y | 25 |
4 files changed, 13 insertions, 42 deletions
@@ -2365,19 +2365,14 @@ val subst_vars(val forms, val env, val filter) iter = list_collect_append(iter, nested); forms = cdr(forms); continue; - } else if (sym == expr_s) { - val str = eval(rest(form), env, form); + } else { + val str = eval(form, env, form); if (listp(str)) str = cat_str(mapcar(func_n1(tostringp), str), lit(" ")); else if (!stringp(str)) str = tostringp(str); forms = cons(filter_string_tree(filter, tostringp(str)), rest(forms)); continue; - } else { - val nested = subst_vars(form, env, filter); - iter = list_collect_append(iter, nested); - forms = cdr(forms); - continue; } } else if (bindable(form)) { forms = cons(cons(var_s, cons(form, nil)), cdr(forms)); @@ -2983,12 +2978,8 @@ static val expand_quasi(val quasi_forms, val menv) if (consp(form)) { val sym = car(form); - if (sym == expr_s) { - val expr_ex = expand(rest(form), menv); - if (expr_ex != rest(form)) - form_ex = rlcp(cons(sym, expr_ex), form); - } else if (sym == var_s) { + if (sym == var_s) { val param = second(form); val mods = third(form); val param_ex = expand(param, menv); @@ -9481,9 +9481,9 @@ static void out_quasi_str(val args, val out, struct strm_ctx *ctx) } if (need_brace) put_char(chr('}'), out); - } else if (sym == expr_s) { + } else { put_char(chr('@'), out); - obj_print_impl(rest(elem), out, nil, ctx); + obj_print_impl(elem, out, nil, ctx); } } else { obj_print_impl(elem, out, nil, ctx); @@ -1493,13 +1493,13 @@ static val tx_subst_vars(val spec, val bindings, val filter) iter = list_collect_append(iter, nested); spec = cdr(spec); continue; - } else if (sym == expr_s) { + } else { if (opt_compat && opt_compat < 100) { - val result = tleval(spec, rest(elem), bindings); + val result = tleval(spec, elem, bindings); spec = cons(filter_string_tree(filter, tostringp(result)), rest(spec)); continue; } else { - val str = tleval(spec, rest(elem), bindings); + val str = tleval(spec, elem, bindings); if (listp(str)) str = cat_str(mapcar(func_n1(tostringp), str), lit(" ")); else if (!stringp(str)) @@ -1507,11 +1507,6 @@ static val tx_subst_vars(val spec, val bindings, val filter) spec = cons(filter_string_tree(filter, tostringp(str)), rest(spec)); continue; } - } else { - val nested = tx_subst_vars(elem, bindings, filter); - iter = list_collect_append(iter, nested); - spec = cdr(spec); - continue; } } @@ -68,7 +68,6 @@ static val rlrec(parser_t *, val form, val line); static wchar_t char_from_name(const wchar_t *name); static val make_expr(parser_t *, val sym, val rest, val lineno); static val check_for_include(val spec_rev); -static val quasi_meta_helper(val obj); static void misplaced_consing_dot_check(scanner_t *scanner, val term_atom_cons); #if YYBISON @@ -1165,7 +1164,11 @@ quasi_item : litchars { $$ = lit_char_helper($1); } | q_var { $$ = $1; } | METANUM { $$ = cons(var_s, cons($1, nil)); rl($$, num(parser->lineno)); } - | '@' n_expr { $$ = quasi_meta_helper($2); } + | '@' n_expr { if (integerp($2) || symbolp($2)) + $$ = rlcp_tree(cons(var_s, cons($2, nil)), + $2); + else + $$ = $2; } ; litchars : LITCHAR { $$ = rl(cons(chr($1), nil), num(parser->lineno)); } @@ -1644,24 +1647,6 @@ static val check_for_include(val spec_rev) return spec_rev; } -static val quasi_meta_helper(val obj) -{ - if (integerp(obj) || symbolp(obj)) - goto var; - - if (atom(obj)) - goto expr; - - if (first(obj) == var_s || first(obj) == expr_s) - return obj; - -expr: - return rlcp(cons(expr_s, obj), obj); - -var: - return rlcp_tree(cons(var_s, cons(obj, nil)), obj); -} - static void misplaced_consing_dot_check(scanner_t *scanner, val term_atom_cons) { if (car(term_atom_cons) != unique_s) { |