* encoding.c (rb_enc_internal_get_index): extracted from

  rb_enc_get_index.
  (rb_enc_internal_set_index): extracted from rb_enc_associate_index

* include/ruby/encoding.h (ENCODING_SET): work over ENCODING_INLINE_MAX.
  (ENCODING_GET): ditto.
  (ENCODING_IS_ASCII8BIT): defined.
  (ENCODING_CODERANGE_SET): defined.

* re.c (rb_reg_fixed_encoding_p): use ENCODING_IS_ASCII8BIT.

* string.c (rb_enc_str_buf_cat): use ENCODING_IS_ASCII8BIT.

* parse.y (reg_fragment_setenc_gen): use ENCODING_IS_ASCII8BIT.

* marshal.c (has_ivars): use ENCODING_IS_ASCII8BIT.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/re.c b/re.c
index fb05e2e892..fc9e830131 100644
--- a/re.c
+++ b/re.c
@@ -937,7 +937,7 @@ rb_match_busy(VALUE match)
 static VALUE
 rb_reg_fixed_encoding_p(VALUE re)
 {
-    if (ENCODING_GET(re) != 0 || FL_TEST(re, KCODE_FIXED))
+    if (!ENCODING_IS_ASCII8BIT(re) || FL_TEST(re, KCODE_FIXED))
         return Qtrue;
     else
         return Qfalse;