diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-04 06:54:11 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-04 06:54:11 +0000 |
commit | 9133f6648d6c5efbd3c4fa3bc81b03210d848820 (patch) | |
tree | 6fa7140941e608b5c0fdca64de2682129743ba4c | |
parent | 05e82555e1677d75cb054b1ff1a426e80bd28013 (diff) | |
download | ruby-9133f6648d6c5efbd3c4fa3bc81b03210d848820.tar.gz |
parse.y: make shared string modifiable
* parse.y (dedent_string): ensure that the string is modifiable,
not to set the length of shared string.
[ruby-core:80987] [Bug #13540]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | parse.y | 6 | ||||
-rw-r--r-- | test/ruby/test_parse.rb | 10 |
2 files changed, 15 insertions, 1 deletions
@@ -6392,6 +6392,11 @@ dedent_string(VALUE string, int width) break; } } + if (!i) return 0; + rb_str_modify(string); + str = RSTRING_PTR(string); + if (RSTRING_LEN(string) != len) + rb_fatal("literal string changed: %+"PRIsVALUE, string); MEMMOVE(str, str + i, char, len - i); rb_str_set_len(string, len - i); return i; @@ -6448,7 +6453,6 @@ parser_dedent_string(VALUE self, VALUE input, VALUE width) StringValue(input); wid = NUM2UINT(width); - rb_str_modify(input); col = dedent_string(input, wid); return INT2NUM(col); } diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index 56e1020c5a..6030dad605 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -988,6 +988,16 @@ x = __ENCODING__ assert_equal(-100, e.backtrace_locations.first.lineno, bug) end + def test_file_in_indented_heredoc + name = '[ruby-core:80987] [Bug #13540]' # long enough to be shared + assert_equal(name+"\n", eval("#{<<-"begin;"}\n#{<<-'end;'}", nil, name)) + begin; + <<~HEREDOC + #{__FILE__} + HEREDOC + end; + end + =begin def test_past_scope_variable assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}} |