diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-17 02:27:38 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-17 02:27:38 +0000 |
commit | 288ceaeec2077d06df3ba46bca97960f76f283e1 (patch) | |
tree | 8593a93244c96b098dd6611ee7e4dfe2c7ba9957 /parse.y | |
parent | 3ad741f132133bb542a84a01d8e7644fc4b51e4c (diff) | |
download | ruby-288ceaeec2077d06df3ba46bca97960f76f283e1.tar.gz |
* re.c (rb_reg_initialize_m): should raise exception instead of
compile error. [ruby-core:03755]
* string.c (rb_str_splice): move rb_str_modify() after
StringValue(), which may alter the receiver. [ruby-dev:24878]
* error.c (rb_error_frozen): now raise RuntimeError instead of
TypeError.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -3599,7 +3599,7 @@ string_content : tSTRING_CONTENT COND_LEXPOP(); CMDARG_LEXPOP(); /*%%%*/ - FL_UNSET($3, NODE_NEWLINE); + $3->flags &= ~NODE_NEWLINE; $$ = new_evstr($3); /*% $$ = dispatch1(string_embexpr, $3); @@ -6507,7 +6507,9 @@ static NODE* newline_node(node) NODE *node; { - FL_SET(node, NODE_NEWLINE); + if (node) { + node->flags |= NODE_NEWLINE; + } return node; } |