From 1ce471c1cc8d19035b9b5f4eca17468850c07c69 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 24 Mar 2016 07:59:58 +0900 Subject: `||=` with cvars and constants should work with false values; #3138 --- mrbgems/mruby-compiler/core/parse.y | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 2fb07bc1f..7329747e2 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -709,14 +709,13 @@ new_masgn(parser_state *p, node *a, node *b) static node* new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b) { + node *n = list4((node*)NODE_OP_ASGN, a, nsym(op), b); if (op == mrb_intern_lit(p->mrb, "||") && ((intptr_t)a->car == NODE_CONST || (intptr_t)a->car == NODE_CVAR)) { - return new_rescue(p, a, list1(list3(list1(new_const(p, mrb_intern_lit(p->mrb, "NameError"))), + return new_rescue(p, n, list1(list3(list1(new_const(p, mrb_intern_lit(p->mrb, "NameError"))), 0, new_asgn(p, a, b))), NULL); } - else { - return list4((node*)NODE_OP_ASGN, a, nsym(op), b); - } + return n; } /* (:int . i) */ -- cgit v1.2.3