diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-02 00:16:24 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-02 00:16:24 +0000 |
commit | 21729a1c7796cb152f9dc13b56ca2d761e511a96 (patch) | |
tree | e0ae786506f1338549db59f637afe7a0c2264278 | |
parent | 5a930580c9ec152ac3940b3b5ecfe2a86813835c (diff) | |
download | ruby-21729a1c7796cb152f9dc13b56ca2d761e511a96.tar.gz |
* parse.y (regexp): fix /#{}\xa1\xa2/e to be EUC-JP.
(reg_fragment_setenc_gen): extracted from reg_compile_gen.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 22 | ||||
-rw-r--r-- | test/ruby/test_m17n.rb | 8 |
3 files changed, 32 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Dec 2 09:12:48 2007 Tanaka Akira <akr@fsij.org> + + * parse.y (regexp): fix /#{}\xa1\xa2/e to be EUC-JP. + (reg_fragment_setenc_gen): extracted from reg_compile_gen. + Sun Dec 2 01:39:51 2007 Tanaka Akira <akr@fsij.org> * include/ruby/intern.h (rb_uv_to_utf8): declared. @@ -442,6 +442,8 @@ extern int rb_parse_in_eval(void); static VALUE reg_compile_gen(struct parser_params*, VALUE, int); #define reg_compile(str,options) reg_compile_gen(parser, str, options) +static void reg_fragment_setenc_gen(struct parser_params*, VALUE, int); +#define reg_fragment_setenc(str,options) reg_fragment_setenc_gen(parser, str, options) #else #define remove_begin(node) (node) #endif /* !RIPPER */ @@ -3642,6 +3644,7 @@ regexp : tREGEXP_BEG xstring_contents tREGEXP_END /*%%%*/ int options = $3; NODE *node = $2; + NODE *list; if (!node) { node = NEW_LIT(reg_compile(STR_NEW0(), options)); } @@ -3663,6 +3666,12 @@ regexp : tREGEXP_BEG xstring_contents tREGEXP_END nd_set_type(node, NODE_DREGX); } node->nd_cflag = options & RE_OPTION_MASK; + reg_fragment_setenc(node->nd_lit, options); + for (list = node->nd_next; list; list = list->nd_next) { + if (nd_type(list->nd_head) == NODE_STR) { + reg_fragment_setenc(list->nd_head->nd_lit, options); + } + } break; } $$ = node; @@ -8436,10 +8445,9 @@ dvar_curr_gen(struct parser_params *parser, ID id) VALUE rb_reg_compile(VALUE str, int options); -static VALUE -reg_compile_gen(struct parser_params* parser, VALUE str, int options) +static void +reg_fragment_setenc_gen(struct parser_params* parser, VALUE str, int options) { - VALUE re; int c = RE_OPTION_ENCODING_IDX(options); if (c) { @@ -8453,6 +8461,14 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options) } ENCODING_SET(str, idx); } +} + +static VALUE +reg_compile_gen(struct parser_params* parser, VALUE str, int options) +{ + VALUE re; + + reg_fragment_setenc(str, options); re = rb_reg_compile(str, options & RE_OPTION_MASK); if (NIL_P(re)) { RB_GC_GUARD(re) = rb_obj_as_string(rb_errinfo()); diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index bb0a8a5010..8f763e029a 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -301,4 +301,12 @@ class TestM17N < Test::Unit::TestCase } } end + + def test_dynamic_euc_regexp + assert_encoding("EUC-JP", /#{}\xc0\xa1/e.encoding) + assert_raise(RegexpError) { eval('/\xa1#{}/e') } + assert_raise(RegexpError) { eval('/#{}\xa1/e') } + #assert_raise(SyntaxError) { eval('/\xa1#{}\xa1/e') } + #assert_raise(SyntaxError) { s = e('\xa1'); /#{s}#{s}/ } + end end |