1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (rb_intern3): fix to changing encoding to default, and

Browse Source 
uncommented r13835, which is rare but not impossible.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-05 06:25:56 +00:00
parent e8ffe28214
commit 0af432ce08
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Dec 5 15:25:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (rb_intern3): fix to changing encoding to default, and
uncommented r13835, which is rare but not impossible.
Wed Dec 5 15:15:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Dec 5 15:15:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* range.c (step_i, range_step): support non-fixnum steps. * range.c (step_i, range_step): support non-fixnum steps.

24
parse.y
View File

@ -8876,31 +8876,19 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
} }
} }
if (m - name < len) id = ID_JUNK; if (m - name < len) id = ID_JUNK;
/* if (enc != rb_default_encoding()) {
* davidflanagan: commented out because this just doesn't make sense. /*
* * this clause makes sense only when called from other than
* If we were called with a non-ascii encoding, then change * rb_intern_str() taking care of code-range.
* the encoding to ASCII, unless the symbol had multi-byte characters */
* and there are trailing non-identifier characters that are
* outside of ASCII. But all multi-byte characters
* are identifier chars, so there will never be trailing characters
* so this clause always changes the encoding of the string.
*
* The upshot is that the symbol is placed in the hashtable with
* an ASCII encoding, but is queried (at the top of this function)
* with its real encoding. So :x == :x is false when x is a
* multi-byte character.
*
if (enc != rb_enc_from_index(0)) {
if (!mb) { if (!mb) {
for (; m <= name + len; ++m) { for (; m <= name + len; ++m) {
if (!ISASCII(*m)) goto mbstr; if (!ISASCII(*m)) goto mbstr;
} }
enc = rb_default_encoding();
} }
enc = rb_enc_from_index(0);
mbstr:; mbstr:;
} }
*/
new_id: new_id:
id |= ++global_symbols.last_id << ID_SCOPE_SHIFT; id |= ++global_symbols.last_id << ID_SCOPE_SHIFT;
id_register: id_register: