diff options
| author | yui-knk <[email protected]> | 2024-01-06 17:33:20 +0900 |
|---|---|---|
| committer | Yuichiro Kaneko <[email protected]> | 2024-02-10 09:23:17 +0900 |
| commit | ea91ab696e6ee7225a2dde909e60dd9d0b241935 () | |
| tree | 47963367b2840fc1b425d47eee15cc7c59c1dbdd /ruby_parser.c | |
| parent | bf72cb84ca52bc062cc1711c03622ed6c928fed8 (diff) | |
Fix constant name of `Ractor::IsolationError` message
`dest` of `const_decl_path` is `NODE_COLON2` or `NODE_COLON3` in some cases. For example, `B::C ||= [“Not ” + “shareable”]` passes `NODE_COLON2` and `::C ||= [“Not ” + “shareable”]` passes `NODE_COLON3`. This commit fixes `Ractor::IsolationError` message for such case. ``` # shareable_constant_value: literal ::C ||= ["Not " + "shareable"] # Before # => cannot assign unshareable object to C (Ractor::IsolationError) # After # => cannot assign unshareable object to ::C (Ractor::IsolationError) ```
| -rw-r--r-- | ruby_parser.c | 43 |
1 files changed, 31 insertions, 12 deletions
@@ -1045,22 +1045,40 @@ VALUE rb_node_const_decl_val(const NODE *node) { VALUE path; - if (RNODE_CDECL(node)->nd_vid) { - path = rb_id2str(RNODE_CDECL(node)->nd_vid); } - else { - NODE *n = RNODE_CDECL(node)->nd_else; - path = rb_ary_new(); - for (; n && nd_type_p(n, NODE_COLON2); n = RNODE_COLON2(n)->nd_head) { - rb_ary_push(path, rb_id2str(RNODE_COLON2(n)->nd_mid)); } - if (n && nd_type_p(n, NODE_CONST)) { // Const::Name - rb_ary_push(path, rb_id2str(RNODE_CONST(n)->nd_vid)); } - else if (n && nd_type_p(n, NODE_COLON3)) { // ::Const::Name - rb_ary_push(path, rb_id2str(RNODE_COLON3(n)->nd_mid)); rb_ary_push(path, rb_str_new(0, 0)); } else { @@ -1068,7 +1086,8 @@ rb_node_const_decl_val(const NODE *node) rb_ary_push(path, rb_str_new_cstr("...")); } path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::")); - path = rb_fstring(path); } return path; } |