diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-06 10:06:47 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-06 10:06:47 +0000 |
| commit | 341d15a026820c2561b394ab748759f0a9244d8b (patch) | |
| tree | 69bb1b6700d4a4dc749d6549972b2baab7541c52 | |
| parent | 072b62608b588e0c80487c56096daa6acc6ddc1e (diff) | |
| download | ruby-341d15a026820c2561b394ab748759f0a9244d8b.tar.gz ruby-341d15a026820c2561b394ab748759f0a9244d8b.tar.xz ruby-341d15a026820c2561b394ab748759f0a9244d8b.zip | |
* re.c (rb_reg_initialize_m): shoule not preset "kcode" unless
encoding is explicitly specified.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | re.c | 32 |
2 files changed, 22 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Thu Feb 6 19:04:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * re.c (rb_reg_initialize_m): shoule not preset "kcode" unless + encoding is explicitly specified. + Thu Feb 6 19:01:32 2003 Minero Aoki <aamine@loveruby.net> * lib/fileutils.rb: new method FileUtils.pwd. @@ -1239,21 +1239,23 @@ rb_reg_initialize_m(argc, argv, self) } rb_reg_check(argv[0]); flags = RREGEXP(argv[0])->ptr->options & 0xf; - switch (RBASIC(argv[0])->flags & KCODE_MASK) { - case KCODE_NONE: - flags |= 16; - break; - case KCODE_EUC: - flags |= 32; - break; - case KCODE_SJIS: - flags |= 48; - break; - case KCODE_UTF8: - flags |= 64; - break; - default: - break; + if (FL_TEST(argv[0], KCODE_FIXED)) { + switch (RBASIC(argv[0])->flags & KCODE_MASK) { + case KCODE_NONE: + flags |= 16; + break; + case KCODE_EUC: + flags |= 32; + break; + case KCODE_SJIS: + flags |= 48; + break; + case KCODE_UTF8: + flags |= 64; + break; + default: + break; + } } s = RREGEXP(argv[0])->str; len = RREGEXP(argv[0])->len; |