From 7cebd162dcd582b1ff031c43f7f57d76087e8b8b Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 18 Apr 2016 06:46:40 -0700 Subject: Bugfix: @(if expr) not macro-expanding expr. * parser.y (if_clause, elif_clauses_opt): Add missing expand calls. --- parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parser.y b/parser.y index af2efad9..dbaff205 100644 --- a/parser.y +++ b/parser.y @@ -366,7 +366,7 @@ if_clause : IF exprs_opt ')' val cases = nappend2(nappend2(iff, elifs), els); $$ = list(cases_s, cases, nao); } else - { val expr = car($2); + { val expr = expand(car($2), nil); val ifs = $5; val branch = cons(cons(expr, ifs), nil); val elifs = $6; @@ -386,7 +386,7 @@ elif_clauses_opt : ELIF exprs_opt ')' newl { val req = rlcp(cons(require_s, $2), $2); $$ = cons(cons(cons(req, nil), $5), $6); } else - { val expr = car($2); + { val expr = expand(car($2), nil); val elifs = $5; val branch = cons(cons(expr, elifs), nil); if (cdr($2)) -- cgit v1.2.3