diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-04 07:28:35 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-04 07:28:35 +0000 |
commit | 47732dbd2ba2430c22d10663399a42447e98b240 (patch) | |
tree | 58b056860aa6493e8bee96c21124dc717ad3f57a | |
parent | 0f09f59ef7ae5179936c48311574f5607034ef43 (diff) | |
download | ruby-47732dbd2ba2430c22d10663399a42447e98b240.tar.gz |
* parse.y (reg_compile_gen): copy encoding from source string if
non-empty.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -1,8 +1,9 @@ -Thu Oct 4 16:15:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Oct 4 16:28:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (rb_obj_encoding): returns encoding of the given object. - * parse.y (reg_compile_gen): copy encoding from source string. + * parse.y (reg_compile_gen): copy encoding from source string if + non-empty. * re.c (Init_Regexp): new method Regexp#encoding. @@ -8170,7 +8170,7 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options) compile_error(PARSER_ARG "%s", RSTRING_PTR(re)); return Qnil; } - rb_enc_copy(re, str); + if (str) rb_enc_copy(re, str); return re; } |