* include/ruby/oniguruma.h (OnigEncodingType): new member

  ruby_encoding_index to avoid linear search in rb_enc_to_index.

* include/ruby/encoding.h (rb_enc_to_index): macro defined to use
  ruby_encoding_index.

* encoding.c (rb_enc_to_index): removed.
  (enc_register_at): initialize ruby_encoding_index member.


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

2 files changed, 2 insertions, 1 deletions

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 3810d86b39..6536cb51ae 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -67,7 +67,7 @@ typedef OnigEncodingType rb_encoding;
 int rb_enc_replicate(const char *, rb_encoding *);
 int rb_define_dummy_encoding(const char *);
 int rb_enc_dummy_p(rb_encoding *);
-int rb_enc_to_index(rb_encoding*);
+#define rb_enc_to_index(enc) ((enc) ? ((enc)->ruby_encoding_index) : 0)
 int rb_enc_get_index(VALUE obj);
 int rb_enc_find_index(const char *name);
 int rb_to_encoding_index(VALUE);
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
index 37305bc17c..7b11b51780 100644
--- a/include/ruby/oniguruma.h
+++ b/include/ruby/oniguruma.h
@@ -167,6 +167,7 @@ typedef struct OnigEncodingTypeST {
   OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, struct OnigEncodingTypeST* enc);
   int    (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
   void *auxiliary_data;
+  int ruby_encoding_index;
 } OnigEncodingType;
 
 typedef OnigEncodingType* OnigEncoding;