Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* encoding.c (rb_enc_set_index, rb_enc_associate_index): should
check if frozen. * parse.y (rb_intern3), ruby.c (process_options, ruby_script): defer freezing after associating encodings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
- Loading branch information
Showing
6 changed files
with
49 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#include "ruby.h" | ||
|
||
VALUE | ||
bug_str_enc_associate(VALUE str, VALUE enc) | ||
{ | ||
return rb_enc_associate(str, rb_to_encoding(enc)); | ||
} | ||
|
||
void | ||
Init_enc_associate(VALUE klass) | ||
{ | ||
rb_define_method(klass, "associate_encoding!", bug_str_enc_associate, 1); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
require 'test/unit' | ||
require "-test-/string/string" | ||
|
||
class Test_StrEncAssociate < Test::Unit::TestCase | ||
def test_frozen | ||
s = Bug::String.new("abc") | ||
s.force_encoding(Encoding::US_ASCII) | ||
s.freeze | ||
assert_raise(RuntimeError) {s.associate_encoding!(Encoding::US_ASCII)} | ||
assert_raise(RuntimeError) {s.associate_encoding!(Encoding::UTF_8)} | ||
end | ||
end |