diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-03-24 07:59:58 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-03-24 07:59:58 +0900 |
| commit | 1ce471c1cc8d19035b9b5f4eca17468850c07c69 (patch) | |
| tree | 9d10902a5c62e1866bae5a9d3df52a3a1ce412e7 | |
| parent | 4fcff347474088e72d8b6016219d35ceb00c5a22 (diff) | |
| download | mruby-1ce471c1cc8d19035b9b5f4eca17468850c07c69.tar.gz mruby-1ce471c1cc8d19035b9b5f4eca17468850c07c69.zip | |
`||=` with cvars and constants should work with false values; #3138
| -rw-r--r-- | mrbgems/mruby-compiler/core/parse.y | 7 |
1 files 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) */ |