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

  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: http://svn.ruby-lang.org/repos/ruby/trunk@13529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/parse.y b/parse.y
index 8db9ce33c..d499ec8b8 100644
--- a/parse.y
+++ b/parse.y
@@ -8548,7 +8548,14 @@ rb_intern(const char *name)
 ID
 rb_intern_str(VALUE str)
 {
-    ID id = rb_intern3(RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str));
+    int idx = 0;
+    ID id;
+
+    if (rb_enc_str_coderange(str) != ENC_CODERANGE_SINGLE) {
+	idx = rb_enc_get_index(str);
+    }
+    id = rb_intern3(RSTRING_PTR(str), RSTRING_LEN(str),
+		    rb_enc_from_index(idx));
     RB_GC_GUARD(str);
     return id;
 }