archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* encoding.c (rb_enc_associate_index): deal with ASCII compatible

Browse source 
flags.

* encoding.c (rb_enc_check): allow ASCII compatible strings.

* parse.y (rb_intern_str): use ASCII encoding for ASCII string.

* string.c (rb_enc_str_coderange): check for code-range.

* string.c (rb_str_modify): clear code-range flags.

* string.c (rb_str_hash, rb_str_eql): ASCII compatible strings are
  comparable.

* include/ruby/encoding.h: added code-range flags.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-09-26 19:46:58 +00:00
parent b416cc6f3f
commit e41b84895e
5 changed files with 120 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
encoding.c
View file

@ -122,6 +122,10 @@ void
rb_enc_associate_index(VALUE obj, int idx)
{
enc_check_capable(obj);
if (!ENC_CODERANGE_ASCIIONLY(obj) ||
!rb_enc_asciicompat(rb_enc_from_index(idx))) {
ENC_CODERANGE_CLEAR(obj);
}
if (idx < ENCODING_INLINE_MAX) {
ENCODING_SET(obj, idx);
return;
@ -204,6 +208,14 @@ rb_enc_check(VALUE str1, VALUE str2)
return enc;
}
}
if (BUILTIN_TYPE(str1) == T_STRING &&
BUILTIN_TYPE(str2) == T_STRING &&
rb_enc_asciicompat(rb_enc_from_index(idx1)) &&
rb_enc_asciicompat(rb_enc_from_index(idx2)) &&
rb_enc_str_coderange(str1) == ENC_CODERANGE_SINGLE &&
rb_enc_str_coderange(str2) == ENC_CODERANGE_SINGLE) {
return ONIG_ENCODING_ASCII;
}
rb_raise(rb_eArgError, "character encodings differ");
}