From a31e81a8ee319b1fc37b6f47fa3c4ec99d451eec Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 29 Aug 2014 21:26:57 -0700 Subject: * eval.c (expand_quasi): Regression: fix broken handling of @{var mod} syntax triggering a bogus assertion. Mods are the third element in the abstract syntax now, not fourth. There is no next link. Removing bogus comment referring to a nonexistent function. --- ChangeLog | 7 +++++++ eval.c | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cca3dc5..62082926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-08-29 Kaz Kylheku + + * eval.c (expand_quasi): Regression: fix broken handling + of @{var mod} syntax triggering a bogus assertion. Mods are the third + element in the abstract syntax now, not fourth. There is no next link. + Removing bogus comment referring to a nonexistent function. + 2014-08-29 Kaz Kylheku * match.c (v_load): Fix regression introduced in 94: broken @(load). diff --git a/eval.c b/eval.c index ae05adb0..56eb844e 100644 --- a/eval.c +++ b/eval.c @@ -2350,16 +2350,10 @@ static val expand_quasi(val quasi_forms, val menv) form_ex = rlcp(cons(sym, expr_ex), form); } else if (sym == var_s) { val param = second(form); - val next = third(form); - val mods = fourth(form); + val mods = third(form); val param_ex = expand(param, menv); val mods_ex = expand_forms(mods, menv); - /* next should be nil because this structure should have - been passed through o_elemes_transform in the parser - which unravels the nesting. */ - assert (next == nil); - if (param_ex != param || mods_ex != mods) form_ex = rlcp(list(sym, param_ex, nil, mods_ex, nao), form); } -- cgit v1.2.3