ruby-dev

なかだです。

At Mon, 10 Dec 2007 14:01:48 +0900 (JST),
matz@ruby-lang.org wrote in [ruby-cvs:21409]:
>     * transcode.c: new file to provide encoding conversion features.
>       code contributed by Martin Duerst.

変換テーブルを自前で持つようにするんでしょうか。メンテナンスを考
えると、外部に任せるのかと思っていましたが。

とりあえず、いろいろ警告が出たりprefixも付いてない関数がグローバ
ルになってたりマクロがどかっとコピーされてたりして居心地が悪いの
で、パッチです。

transcode_data_iso_8859.cみたいのはenc/transあたりにでも分けたい
とか、元データと生成に使ったであろうスクリプトを入れておいてくれ
たほうがむしろありがたいとか、動的に追加する方法が必要だろうとか、
これでstatefullなエンコーディングに対応できるんだろうかとか、あ
りますが。


Index: string.c
===================================================================
--- string.c	(revision 14174)
+++ string.c	(working copy)
@@ -180,5 +180,5 @@ str_alloc(VALUE klass)
 }
 
-VALUE
+static VALUE
 str_new(VALUE klass, const char *ptr, long len)
 {
@@ -371,4 +371,10 @@ rb_str_buf_new2(const char *ptr)
 }
 
+VALUE
+rb_str_tmp_new(long len)
+{
+    return str_new(0, 0, len);
+}
+
 void
 rb_str_free(VALUE str)
@@ -385,5 +391,5 @@ rb_str_to_str(VALUE str)
 }
 
-static void
+void
 rb_str_shared_replace(VALUE str, VALUE str2)
 {
@@ -626,5 +632,5 @@ str_modifiable(VALUE str)
 }
 
-int
+static int
 str_independent(VALUE str)
 {
Index: transcode.c
===================================================================
--- transcode.c	(revision 14174)
+++ transcode.c	(working copy)
@@ -17,53 +17,6 @@
 
 
-/*
- * prototypes and macros copied from string.c (temporarily !!!)
- */
-VALUE str_new(VALUE klass, const char *ptr, long len);
-int str_independent(VALUE str);
-#define STR_NOCAPA_P(s) (FL_TEST(s,STR_NOEMBED) && FL_ANY(s,ELTS_SHARED|STR_ASSOC))
-#define STR_NOEMBED FL_USER1
-#define STR_ASSOC   FL_USER3
-#define STR_SET_NOEMBED(str) do {\
-    FL_SET(str, STR_NOEMBED);\
-    STR_SET_EMBED_LEN(str, 0);\
-} while (0)
-#define STR_UNSET_NOCAPA(s) do {\
-    if (FL_TEST(s,STR_NOEMBED)) FL_UNSET(s,(ELTS_SHARED|STR_ASSOC));\
-} while (0)
-#define STR_SET_EMBED_LEN(str, n) do { \
-    long tmp_n = (n);\
-    RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\
-    RBASIC(str)->flags |= (tmp_n) << RSTRING_EMBED_LEN_SHIFT;\
-} while (0)
-#define STR_SET_LEN(str, n) do { \
-    if (STR_EMBED_P(str)) {\
-	STR_SET_EMBED_LEN(str, n);\
-    }\
-    else {\
-	RSTRING(str)->as.heap.len = (n);\
-    }\
-} while (0) 
-#define STR_EMBED_P(str) (!FL_TEST(str, STR_NOEMBED))
-#define RESIZE_CAPA(str,capacity) do {\
-    if (STR_EMBED_P(str)) {\
-	if ((capacity) > RSTRING_EMBED_LEN_MAX) {\
-	    char *tmp = ALLOC_N(char, capacity+1);\
-	    memcpy(tmp, RSTRING_PTR(str), RSTRING_LEN(str));\
-	    RSTRING(str)->as.heap.ptr = tmp;\
-	    RSTRING(str)->as.heap.len = RSTRING_LEN(str);\
-            STR_SET_NOEMBED(str);\
-	    RSTRING(str)->as.heap.aux.capa = (capacity);\
-	}\
-    }\
-    else {\
-	REALLOC_N(RSTRING(str)->as.heap.ptr, char, (capacity)+1);\
-	if (!STR_NOCAPA_P(str))\
-	    RSTRING(str)->as.heap.aux.capa = (capacity);\
-    }\
-} while (0)
-/* end of copied prototypes and macros */
-
-
+VALUE rb_str_tmp_new(long);
+VALUE rb_str_shared_replace(VALUE, VALUE);
 
 /*
@@ -124,5 +77,5 @@ static transcoder transcoder_table[MAX_T
 /* if we move this to another file???? */
 static void
-register_transcoder (const char *from_e, const char *to_e,
+register_transcoder(const char *from_e, const char *to_e,
     const BYTE_LOOKUP *tree_start, int max_output, int from_utf8)
 {
@@ -142,5 +95,5 @@ register_transcoder (const char *from_e,
 
 static void
-init_transcoder_table (void)
+init_transcoder_table(void)
 {
     register_transcoder("ISO-8859-1",  "UTF-8", &from_ISO_8859_1, 2, 0);
@@ -177,5 +130,5 @@ init_transcoder_table (void)
 
 static transcoder*
-transcode_dispatch (char* from_encoding, char* to_encoding)
+transcode_dispatch(const char* from_encoding, const char* to_encoding)
 {
     transcoder *candidate = transcoder_table;
@@ -191,7 +144,8 @@ transcode_dispatch (char* from_encoding,
 /* dynamic structure, one per conversion (similar to iconv_t) */
 /* may carry conversion state (e.g. for iso-2022-jp) */
-typedef struct {
+typedef struct transcoding {
     VALUE ruby_string_dest; /* the String used as the conversion destination,
                                or NULL if something else is being converted */
+    char *(*flush_func)(struct transcoding*, int, int);
 } transcoding;
 
@@ -201,40 +155,30 @@ typedef struct {
  */
 static void
-transcode_loop (unsigned char **in_pos, unsigned char **out_pos,
-                unsigned char *in_stop, unsigned char *out_stop,
-                transcoder *my_transcoder,
-                transcoding *my_transcoding)
+transcode_loop(char **in_pos, char **out_pos,
+	       char *in_stop, char *out_stop,
+	       transcoder *my_transcoder,
+	       transcoding *my_transcoding)
 {
-    unsigned char *input = *in_pos, *output = *out_pos;
-    unsigned char *in_p = *in_pos, *out_p = *out_pos;
-    BYTE_LOOKUP *conv_tree_start = my_transcoder->conv_tree_start;
-    BYTE_LOOKUP *next_table;
+    char *in_p = *in_pos, *out_p = *out_pos;
+    const BYTE_LOOKUP *conv_tree_start = my_transcoder->conv_tree_start;
+    const BYTE_LOOKUP *next_table;
     unsigned int next_offset;
-    unsigned int next_info;
+    VALUE next_info;
     unsigned char next_byte;
     int from_utf8 = my_transcoder->from_utf8;
-    unsigned char *out_s = out_stop - my_transcoder->max_output + 1;
+    char *out_s = out_stop - my_transcoder->max_output + 1;
     while (in_p < in_stop) {
-        unsigned char *char_start = in_p;
         next_table = conv_tree_start;
         if (out_p >= out_s) {
-            VALUE dest_string = my_transcoding->ruby_string_dest;
-            if (!dest_string) {
-	        rb_raise(rb_eArgError /*@@@change exception*/, "Unable to obtain more space for transcoding");
-	    }
-	    else {
-	        int len = (out_p - *out_pos);
-	        int new_len = (len + my_transcoder->max_output) * 2;
-		RESIZE_CAPA(dest_string, new_len);
-		STR_SET_LEN(dest_string, new_len);
-		*out_pos = RSTRING_PTR(dest_string);
-		out_p = *out_pos + len;
-		out_s = *out_pos + new_len - my_transcoder->max_output;
-	    }
+	    int len = (out_p - *out_pos);
+	    int new_len = (len + my_transcoder->max_output) * 2;
+	    *out_pos = (*my_transcoding->flush_func)(my_transcoding, len, new_len);
+	    out_p = *out_pos + len;
+	    out_s = *out_pos + new_len - my_transcoder->max_output;
         }
-        next_byte = *in_p++;
+        next_byte = (unsigned char)*in_p++;
       follow_byte:
         next_offset = next_table->base[next_byte];
-        next_info = (unsigned int)next_table->info[next_offset];
+        next_info = (VALUE)next_table->info[next_offset];
         switch (next_info & 0x1F) {
             case NOMAP:
@@ -248,5 +192,5 @@ transcode_loop (unsigned char **in_pos, 
                     goto illegal;
                 }
-                next_byte = *in_p++;
+                next_byte = (unsigned char)*in_p++;
                 if (from_utf8) {
                     if ((next_byte&0xC0) == 0x80)
@@ -255,5 +199,5 @@ transcode_loop (unsigned char **in_pos, 
                         goto illegal;
                 }
-                next_table = (BYTE_LOOKUP*)next_info;
+                next_table = next_table->info[next_offset];
                 goto follow_byte;
             /* maybe rewrite the following cases to use fallthrough???? */
@@ -298,15 +242,21 @@ transcode_loop (unsigned char **in_pos, 
  */
 
+static char *
+str_transcoding_resize(transcoding *my_transcoding, int len, int new_len)
+{
+    VALUE dest_string = my_transcoding->ruby_string_dest;
+    rb_str_resize(dest_string, new_len);
+    return RSTRING_PTR(dest_string);
+}
+
 static VALUE
-str_transcode(int argc, VALUE *argv, VALUE str, int bang)
+str_transcode(int argc, VALUE *argv, VALUE str)
 {
     VALUE dest;
-    long blen, slen, len;
+    long blen, slen;
     char *buf, *bp, *sp, *fromp;
-    int tainted = 0;
     rb_encoding *from_enc, *to_enc;
-    char *from_e, *to_e;
+    const char *from_e, *to_e;
     transcoder *my_transcoder;
-    int idx;
     transcoding my_transcoding;
 
@@ -314,20 +264,20 @@ str_transcode(int argc, VALUE *argv, VAL
 	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
     }
-    to_enc = NULL; /* todo: work out later, 'to' parameter may be Encoding,
-                      or we want an encoding to set on result */
-    to_e = RSTRING_PTR(StringValue(argv[0]));
+    to_enc = rb_to_encoding(argv[0]);
+    to_e = rb_enc_name(to_enc);
     if (argc==1) {
         from_enc = rb_enc_get(str);
-        from_e = (char *)rb_enc_name(from_enc);
     }
     else {
-        from_enc = NULL; /* todo: work out later, 'from' parameter may be Encoding */
-        from_e = RSTRING_PTR(StringValue(argv[1]));
+        from_enc = rb_to_encoding(argv[1]);
     }
+    from_e = rb_enc_name(from_enc);
 
-    /* strcasecmp: hope we are in C locale or locale-insensitive */
-    if (0==strcasecmp(from_e, to_e)) { /* TODO: add tests for US-ASCII-clean data and ASCII-compatible encodings */
-	if (bang) return str;
-	return rb_str_dup(str);
+    if (from_enc == to_enc) {
+	return Qnil;
+    }
+    if (rb_enc_asciicompat(from_enc) && rb_enc_asciicompat(to_enc)) {
+	if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT)
+	    return Qnil;
     }
     if (!(my_transcoder = transcode_dispatch(from_e, to_e))) {
@@ -338,49 +288,22 @@ str_transcode(int argc, VALUE *argv, VAL
     slen = RSTRING_LEN(str);
     blen = slen + 30; /* len + margin */
-    dest = str_new(0, 0, blen);
-    bp = buf = RSTRING_PTR(dest);
+    dest = rb_str_tmp_new(blen);
+    bp = RSTRING_PTR(dest);
     my_transcoding.ruby_string_dest = dest;
+    my_transcoding.flush_func = str_transcoding_resize;
 
-    rb_str_locktmp(dest);
-    
     /* for simple testing: */
-    transcode_loop((unsigned char **)&fromp, (unsigned char **)&bp,
-                   (unsigned char*)(sp+slen), (unsigned char*)(bp+blen),
-                   my_transcoder, &my_transcoding);
+    transcode_loop(&fromp, &bp, (sp+slen), (bp+blen), my_transcoder, &my_transcoding);
     if (fromp != sp+slen) {
 	rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp);
     }
     buf = RSTRING_PTR(dest);
-    blen = RSTRING_LEN(dest);
     *bp = '\0';
-    rb_str_unlocktmp(dest);
-    if (bang) {
-	if (str_independent(str) && !STR_EMBED_P(str)) {
-	    free(RSTRING_PTR(str));
-	}
-	STR_SET_NOEMBED(str);
-	STR_UNSET_NOCAPA(str);
-	RSTRING(str)->as.heap.ptr = buf;
-	RSTRING(str)->as.heap.aux.capa = blen;
-	RSTRING(dest)->as.heap.ptr = 0;
-	RSTRING(dest)->as.heap.len = 0;
-    }
-    else {
-	RBASIC(dest)->klass = rb_obj_class(str);
-	OBJ_INFECT(dest, str);
-	str = dest;
-    }
-    STR_SET_LEN(str, bp - buf);
+    rb_str_set_len(dest, bp - buf);
 
-    /* set encoding */ /* would like to have an easier way to do this */
-    if ((idx = rb_enc_find_index(to_e)) < 0) {
-        if ((idx = rb_enc_find_index("ASCII-8BIT")) < 0) {
-	    rb_raise(rb_eArgError, "unknown encoding name: ASCII-8BIT");
-	}
-    }
-    rb_enc_associate(str, rb_enc_from_index(idx));
+    /* set encoding */
+    rb_enc_associate(dest, to_enc);
 
-    if (tainted) OBJ_TAINT(str); /* is this needed??? */
-    return str;
+    return dest;
 }
 
@@ -400,5 +323,8 @@ static VALUE
 rb_str_transcode_bang(int argc, VALUE *argv, VALUE str)
 {
-    return str_transcode(argc, argv, str, 1);
+    VALUE newstr = str_transcode(argc, argv, str);
+    if (NIL_P(newstr)) return str;
+    rb_str_shared_replace(str, newstr);
+    return str;
 }
 
@@ -416,16 +342,9 @@ static VALUE
 rb_str_transcode(int argc, VALUE *argv, VALUE str)
 {
-    return str_transcode(argc, argv, str, 0);
-}
-
-/* function to fool the optimizer (avoid inlining transcode_loop) */
-void
-transcode_fool_the_optimizer (void)
-{
-    unsigned char **in_pos, **out_pos, *in_stop, *out_stop;
-    transcoder *my_transcoder;
-    transcoding *my_transcoding;
-    transcode_loop(in_pos, out_pos, in_stop, out_stop,
-                   my_transcoder, my_transcoding);
+    VALUE newstr = str_transcode(argc, argv, str);
+    if (NIL_P(newstr)) return rb_str_dup(str);
+    RBASIC(newstr)->klass = rb_obj_class(str);
+    OBJ_INFECT(newstr, str);
+    return newstr;
 }
 
Index: transcode_data.h
===================================================================
--- transcode_data.h	(revision 14174)
+++ transcode_data.h	(working copy)
@@ -1,13 +1,12 @@
 typedef unsigned char base_element;
-typedef const void * const info_element; 
 
 typedef struct byte_lookup {
     const base_element *base;
-    const void * const * const info;
+    const struct byte_lookup *const *info;
 } BYTE_LOOKUP;
 
 #ifdef TRANSCODE_DATA
 /* data file needs to treat this as a pointer, to remove warnings */
-#define PType (const void * const)
+#define PType (const BYTE_LOOKUP *)
 #else
 /* in code, this is treated as just an integer */
@@ -24,8 +23,8 @@ typedef struct byte_lookup {
 #define ZERObt  (PType 0x0A)   /* zero bytes of payload, i.e. remove */
 
-#define output1(b1)          ((void*)((((unsigned char)(b1))<<8)|ONEbt))
-#define output2(b1,b2)       ((void*)((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|TWObt))
-#define output3(b1,b2,b3)    ((void*)((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|THREEbt))
-#define output4(b0,b1,b2,b3) ((void*)((((unsigned char)(b1))<< 8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|((((unsigned char)(b0))&0x07)<<5)|FOURbt))
+#define output1(b1)          ((const BYTE_LOOKUP *)((((unsigned char)(b1))<<8)|ONEbt))
+#define output2(b1,b2)       ((const BYTE_LOOKUP *)((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|TWObt))
+#define output3(b1,b2,b3)    ((const BYTE_LOOKUP *)((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|THREEbt))
+#define output4(b0,b1,b2,b3) ((const BYTE_LOOKUP *)((((unsigned char)(b1))<< 8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|((((unsigned char)(b0))&0x07)<<5)|FOURbt))
 
 #define getBT1(a)      (((a)>> 8)&0xFF)
Index: transcode_data_iso_8859.c
===================================================================
--- transcode_data_iso_8859.c	(revision 14174)
+++ transcode_data_iso_8859.c	(working copy)
@@ -21,5 +21,5 @@ from_ISO_8859_1_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_1_infos[129] = {
                       NOMAP, output2('\xC2','\x80'),
@@ -102,5 +102,5 @@ to_ISO_8859_1_C2_offsets[64] = {
      48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_1_C2_infos[64] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -134,5 +134,5 @@ to_ISO_8859_1_C3_offsets[64] = {
      48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_1_C3_infos[64] = {
      output1('\xC0'), output1('\xC1'), output1('\xC2'), output1('\xC3'),
@@ -178,5 +178,5 @@ to_ISO_8859_1_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_1_infos[3] = {
                  NOMAP, &to_ISO_8859_1_C2, &to_ISO_8859_1_C3,
@@ -207,5 +207,5 @@ from_ISO_8859_2_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_2_infos[129] = {
                       NOMAP, output2('\xC2','\x80'),
@@ -288,5 +288,5 @@ to_ISO_8859_2_C2_offsets[64] = {
      37, -1, -1, -1, 38, -1, -1, -1,   39, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_2_C2_infos[40] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -314,5 +314,5 @@ to_ISO_8859_2_C3_offsets[64] = {
      -1, -1, -1, 24, 25, -1, 26, 27,   -1, -1, 28, -1, 29, 30, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_2_C3_infos[31] = {
      output1('\xC1'), output1('\xC2'), output1('\xC4'), output1('\xC7'),
@@ -338,5 +338,5 @@ to_ISO_8859_2_C4_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, 16, 17, -1, -1, 18, 19, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_2_C4_infos[20] = {
      output1('\xC3'), output1('\xE3'), output1('\xA1'), output1('\xB1'),
@@ -359,5 +359,5 @@ to_ISO_8859_2_C5_offsets[64] = {
      24, 25, -1, -1, -1, -1, -1, -1,   -1, 26, 27, 28, 29, 30, 31, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_2_C5_infos[32] = {
      output1('\xA3'), output1('\xB3'), output1('\xD1'), output1('\xF1'),
@@ -383,5 +383,5 @@ to_ISO_8859_2_CB_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_2_CB_infos[5] = {
      output1('\xB7'), output1('\xA2'), output1('\xFF'), output1('\xB2'),
@@ -413,5 +413,5 @@ to_ISO_8859_2_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_2_infos[6] = {
                  NOMAP, &to_ISO_8859_2_C2, &to_ISO_8859_2_C3, &to_ISO_8859_2_C4,
@@ -443,5 +443,5 @@ from_ISO_8859_3_offsets[256] = {
      -1,107,108,109,110,111,112,113,  114,115,116,117,118,119,120,121,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_3_infos[122] = {
                       NOMAP, output2('\xC2','\x80'),
@@ -520,5 +520,5 @@ to_ISO_8859_3_C2_offsets[64] = {
      38, -1, 39, 40, 41, 42, -1, 43,   44, -1, -1, -1, -1, 45, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_3_C2_infos[46] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -548,5 +548,5 @@ to_ISO_8859_3_C3_offsets[64] = {
      -1, 37, 38, 39, 40, -1, 41, 42,   -1, 43, 44, 45, 46, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_3_C3_infos[47] = {
      output1('\xC0'), output1('\xC1'), output1('\xC2'), output1('\xC4'),
@@ -576,5 +576,5 @@ to_ISO_8859_3_C4_offsets[64] = {
      14, 15, -1, -1, 16, 17, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_3_C4_infos[18] = {
      output1('\xC6'), output1('\xE6'), output1('\xC5'), output1('\xE5'),
@@ -597,5 +597,5 @@ to_ISO_8859_3_C5_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1,  6,  7, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_3_C5_infos[8] = {
      output1('\xDE'), output1('\xFE'), output1('\xAA'), output1('\xBA'),
@@ -615,5 +615,5 @@ to_ISO_8859_3_CB_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_3_CB_infos[2] = {
      output1('\xA2'), output1('\xFF'),
@@ -644,5 +644,5 @@ to_ISO_8859_3_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_3_infos[6] = {
                  NOMAP, &to_ISO_8859_3_C2, &to_ISO_8859_3_C3, &to_ISO_8859_3_C4,
@@ -674,5 +674,5 @@ from_ISO_8859_4_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_4_infos[129] = {
                       NOMAP, output2('\xC2','\x80'),
@@ -755,5 +755,5 @@ to_ISO_8859_4_C2_offsets[64] = {
      38, -1, -1, -1, 39, -1, -1, -1,   40, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_4_C2_infos[41] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -782,5 +782,5 @@ to_ISO_8859_4_C3_offsets[64] = {
      -1, -1, -1, -1, 29, 30, 31, 32,   33, -1, 34, 35, 36, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_4_C3_infos[37] = {
      output1('\xC1'), output1('\xC2'), output1('\xC3'), output1('\xC4'),
@@ -808,5 +808,5 @@ to_ISO_8859_4_C4_offsets[64] = {
      -1, -1, -1, -1, -1, -1, 22, 23,   24, -1, -1, 25, 26, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_4_C4_infos[27] = {
      output1('\xC0'), output1('\xE0'), output1('\xA1'), output1('\xB1'),
@@ -831,5 +831,5 @@ to_ISO_8859_4_C5_offsets[64] = {
      -1, -1, 16, 17, -1, -1, -1, -1,   -1, -1, -1, -1, -1, 18, 19, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_4_C5_infos[20] = {
      output1('\xD1'), output1('\xF1'), output1('\xBD'), output1('\xBF'),
@@ -852,5 +852,5 @@ to_ISO_8859_4_CB_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_4_CB_infos[3] = {
      output1('\xB7'), output1('\xFF'), output1('\xB2'),
@@ -881,5 +881,5 @@ to_ISO_8859_4_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_4_infos[6] = {
                  NOMAP, &to_ISO_8859_4_C2, &to_ISO_8859_4_C3, &to_ISO_8859_4_C4,
@@ -911,5 +911,5 @@ from_ISO_8859_5_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_5_infos[129] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -992,5 +992,5 @@ to_ISO_8859_5_C2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_5_C2_infos[35] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -1017,5 +1017,5 @@ to_ISO_8859_5_D0_offsets[64] = {
      46, 47, 48, 49, 50, 51, 52, 53,   54, 55, 56, 57, 58, 59, 60, 61,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_5_D0_infos[62] = {
      output1('\xA1'), output1('\xA2'), output1('\xA3'), output1('\xA4'),
@@ -1049,5 +1049,5 @@ to_ISO_8859_5_D1_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_5_D1_infos[30] = {
      output1('\xE0'), output1('\xE1'), output1('\xE2'), output1('\xE3'),
@@ -1073,5 +1073,5 @@ to_ISO_8859_5_E2_84_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_5_E2_84_infos[1] = {
      output1('\xF0'),
@@ -1090,5 +1090,5 @@ to_ISO_8859_5_E2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_5_E2_infos[1] = {
      &to_ISO_8859_5_E2_84,
@@ -1119,5 +1119,5 @@ to_ISO_8859_5_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_5_infos[5] = {
                  NOMAP, &to_ISO_8859_5_C2, &to_ISO_8859_5_D0, &to_ISO_8859_5_D1,
@@ -1149,5 +1149,5 @@ from_ISO_8859_6_offsets[256] = {
      81, 82, 83, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_6_infos[84] = {
                       NOMAP, output2('\xC2','\x80'),
@@ -1207,5 +1207,5 @@ to_ISO_8859_6_C2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_6_C2_infos[35] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -1232,5 +1232,5 @@ to_ISO_8859_6_D8_offsets[64] = {
      18, 19, 20, 21, 22, 23, 24, 25,   26, 27, 28, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_6_D8_infos[29] = {
      output1('\xAC'), output1('\xBB'), output1('\xBF'), output1('\xC1'),
@@ -1256,5 +1256,5 @@ to_ISO_8859_6_D9_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_6_D9_infos[19] = {
      output1('\xE0'), output1('\xE1'), output1('\xE2'), output1('\xE3'),
@@ -1289,5 +1289,5 @@ to_ISO_8859_6_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_6_infos[4] = {
                  NOMAP, &to_ISO_8859_6_C2, &to_ISO_8859_6_D8, &to_ISO_8859_6_D9,
@@ -1318,5 +1318,5 @@ from_ISO_8859_7_offsets[256] = {
     111,112,113,114,115,116,117,118,  119,120,121,122,123,124,125, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_7_infos[126] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -1397,5 +1397,5 @@ to_ISO_8859_7_C2_offsets[64] = {
      41, 42, 43, 44, -1, -1, -1, 45,   -1, -1, -1, 46, -1, 47, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_C2_infos[48] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -1425,5 +1425,5 @@ to_ISO_8859_7_CD_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1,  0, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_CD_infos[1] = {
      output1('\xAA'),
@@ -1442,5 +1442,5 @@ to_ISO_8859_7_CE_offsets[64] = {
      40, 41, 42, 43, 44, 45, 46, 47,   48, 49, 50, 51, 52, 53, 54, 55,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_CE_infos[56] = {
      output1('\xB4'), output1('\xB5'), output1('\xB6'), output1('\xB8'),
@@ -1472,5 +1472,5 @@ to_ISO_8859_7_CF_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_CF_infos[15] = {
      output1('\xF0'), output1('\xF1'), output1('\xF2'), output1('\xF3'),
@@ -1492,5 +1492,5 @@ to_ISO_8859_7_E2_80_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_E2_80_infos[3] = {
      output1('\xAF'), output1('\xA1'), output1('\xA2'),
@@ -1509,5 +1509,5 @@ to_ISO_8859_7_E2_82_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_E2_82_infos[2] = {
      output1('\xA4'), output1('\xA5'),
@@ -1526,5 +1526,5 @@ to_ISO_8859_7_E2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_E2_infos[2] = {
      &to_ISO_8859_7_E2_80, &to_ISO_8859_7_E2_82,
@@ -1555,5 +1555,5 @@ to_ISO_8859_7_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_7_infos[6] = {
                  NOMAP, &to_ISO_8859_7_C2, &to_ISO_8859_7_CD, &to_ISO_8859_7_CE,
@@ -1585,5 +1585,5 @@ from_ISO_8859_8_offsets[256] = {
      80, 81, 82, 83, 84, 85, 86, 87,   88, 89, 90, -1, -1, 91, 92, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_8_infos[93] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -1648,5 +1648,5 @@ to_ISO_8859_8_C2_offsets[64] = {
      46, 47, 48, 49, 50, 51, 52, 53,   54, 55, -1, 56, 57, 58, 59, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_8_C2_infos[60] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -1679,5 +1679,5 @@ to_ISO_8859_8_C3_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1,  1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_8_C3_infos[2] = {
      output1('\xAA'), output1('\xBA'),
@@ -1696,5 +1696,5 @@ to_ISO_8859_8_D7_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_8_D7_infos[27] = {
      output1('\xE0'), output1('\xE1'), output1('\xE2'), output1('\xE3'),
@@ -1719,5 +1719,5 @@ to_ISO_8859_8_E2_80_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_8_E2_80_infos[3] = {
      output1('\xFD'), output1('\xFE'), output1('\xDF'),
@@ -1736,5 +1736,5 @@ to_ISO_8859_8_E2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_8_E2_infos[1] = {
      &to_ISO_8859_8_E2_80,
@@ -1765,5 +1765,5 @@ to_ISO_8859_8_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_8_infos[5] = {
                  NOMAP, &to_ISO_8859_8_C2, &to_ISO_8859_8_C3, &to_ISO_8859_8_D7,
@@ -1795,5 +1795,5 @@ from_ISO_8859_9_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_9_infos[129] = {
                       NOMAP, output2('\xC2','\x80'),
@@ -1876,5 +1876,5 @@ to_ISO_8859_9_C2_offsets[64] = {
      48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_9_C2_infos[64] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -1908,5 +1908,5 @@ to_ISO_8859_9_C3_offsets[64] = {
      -1, 45, 46, 47, 48, 49, 50, 51,   52, 53, 54, 55, 56, -1, -1, 57,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_9_C3_infos[58] = {
      output1('\xC0'), output1('\xC1'), output1('\xC2'), output1('\xC3'),
@@ -1939,5 +1939,5 @@ to_ISO_8859_9_C4_offsets[64] = {
       2,  3, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_9_C4_infos[4] = {
      output1('\xD0'), output1('\xF0'), output1('\xDD'), output1('\xFD'),
@@ -1956,5 +1956,5 @@ to_ISO_8859_9_C5_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_9_C5_infos[2] = {
      output1('\xDE'), output1('\xFE'),
@@ -1985,5 +1985,5 @@ to_ISO_8859_9_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_9_infos[5] = {
                  NOMAP, &to_ISO_8859_9_C2, &to_ISO_8859_9_C3, &to_ISO_8859_9_C4,
@@ -2015,5 +2015,5 @@ from_ISO_8859_10_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_10_infos[129] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -2096,5 +2096,5 @@ to_ISO_8859_10_C2_offsets[64] = {
      35, -1, -1, -1, -1, -1, -1, 36,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_C2_infos[37] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -2122,5 +2122,5 @@ to_ISO_8859_10_C3_offsets[64] = {
      34, -1, -1, 35, 36, 37, 38, -1,   39, -1, 40, 41, 42, 43, 44, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_C3_infos[45] = {
      output1('\xC1'), output1('\xC2'), output1('\xC3'), output1('\xC4'),
@@ -2150,5 +2150,5 @@ to_ISO_8859_10_C4_offsets[64] = {
      -1, -1, -1, -1, -1, -1, 22, 23,   24, -1, -1, 25, 26, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_C4_infos[27] = {
      output1('\xC0'), output1('\xE0'), output1('\xA1'), output1('\xB1'),
@@ -2173,5 +2173,5 @@ to_ISO_8859_10_C5_offsets[64] = {
      -1, -1, 14, 15, -1, -1, -1, -1,   -1, -1, -1, -1, -1, 16, 17, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_C5_infos[18] = {
      output1('\xD1'), output1('\xF1'), output1('\xAF'), output1('\xBF'),
@@ -2194,5 +2194,5 @@ to_ISO_8859_10_E2_80_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_E2_80_infos[1] = {
      output1('\xBD'),
@@ -2211,5 +2211,5 @@ to_ISO_8859_10_E2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_E2_infos[1] = {
      &to_ISO_8859_10_E2_80,
@@ -2240,5 +2240,5 @@ to_ISO_8859_10_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_10_infos[6] = {
                   NOMAP, &to_ISO_8859_10_C2, &to_ISO_8859_10_C3, &to_ISO_8859_10_C4,
@@ -2270,5 +2270,5 @@ from_ISO_8859_11_offsets[256] = {
     109,110,111,112,113,114,115,116,  117,118,119,120, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_11_infos[121] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -2347,5 +2347,5 @@ to_ISO_8859_11_C2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_11_C2_infos[33] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -2372,5 +2372,5 @@ to_ISO_8859_11_E0_B8_offsets[64] = {
      47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, -1, -1, -1, -1, 58,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_11_E0_B8_infos[59] = {
      output1('\xA1'), output1('\xA2'), output1('\xA3'), output1('\xA4'),
@@ -2403,5 +2403,5 @@ to_ISO_8859_11_E0_B9_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_11_E0_B9_infos[28] = {
      output1('\xE0'), output1('\xE1'), output1('\xE2'), output1('\xE3'),
@@ -2426,5 +2426,5 @@ to_ISO_8859_11_E0_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,    0,  1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_11_E0_infos[2] = {
      &to_ISO_8859_11_E0_B8, &to_ISO_8859_11_E0_B9,
@@ -2455,5 +2455,5 @@ to_ISO_8859_11_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_11_infos[3] = {
                   NOMAP, &to_ISO_8859_11_C2, &to_ISO_8859_11_E0,
@@ -2484,5 +2484,5 @@ from_ISO_8859_13_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_13_infos[129] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -2565,5 +2565,5 @@ to_ISO_8859_13_C2_offsets[64] = {
      43, 44, 45, 46, -1, 47, 48, 49,   -1, 50, -1, 51, 52, 53, 54, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_C2_infos[55] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -2595,5 +2595,5 @@ to_ISO_8859_13_C3_offsets[64] = {
      -1, -1, -1, 15, -1, 16, 17, 18,   19, -1, -1, -1, 20, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_C3_infos[21] = {
      output1('\xC4'), output1('\xC5'), output1('\xAF'), output1('\xC9'),
@@ -2617,5 +2617,5 @@ to_ISO_8859_13_C4_offsets[64] = {
      -1, -1, -1, -1, -1, -1, 20, 21,   -1, -1, -1, 22, 23, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_C4_infos[24] = {
      output1('\xC2'), output1('\xE2'), output1('\xC0'), output1('\xE0'),
@@ -2639,5 +2639,5 @@ to_ISO_8859_13_C5_offsets[64] = {
      -1, -1, 16, 17, -1, -1, -1, -1,   -1, 18, 19, 20, 21, 22, 23, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_C5_infos[24] = {
      output1('\xD9'), output1('\xF9'), output1('\xD1'), output1('\xF1'),
@@ -2661,5 +2661,5 @@ to_ISO_8859_13_E2_80_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_E2_80_infos[4] = {
      output1('\xFF'), output1('\xB4'), output1('\xA1'), output1('\xA5'),
@@ -2678,5 +2678,5 @@ to_ISO_8859_13_E2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_E2_infos[1] = {
      &to_ISO_8859_13_E2_80,
@@ -2707,5 +2707,5 @@ to_ISO_8859_13_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_13_infos[6] = {
                   NOMAP, &to_ISO_8859_13_C2, &to_ISO_8859_13_C3, &to_ISO_8859_13_C4,
@@ -2737,5 +2737,5 @@ from_ISO_8859_14_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_14_infos[129] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -2818,5 +2818,5 @@ to_ISO_8859_14_C2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, 38, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_C2_infos[39] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -2844,5 +2844,5 @@ to_ISO_8859_14_C3_offsets[64] = {
      -1, 45, 46, 47, 48, 49, 50, -1,   51, 52, 53, 54, 55, 56, -1, 57,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_C3_infos[58] = {
      output1('\xC0'), output1('\xC1'), output1('\xC2'), output1('\xC3'),
@@ -2875,5 +2875,5 @@ to_ISO_8859_14_C4_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_C4_infos[4] = {
      output1('\xA4'), output1('\xA5'), output1('\xB2'), output1('\xB3'),
@@ -2892,5 +2892,5 @@ to_ISO_8859_14_C5_offsets[64] = {
      -1, -1, -1, -1,  0,  1,  2,  3,    4, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_C5_infos[5] = {
      output1('\xD0'), output1('\xF0'), output1('\xDE'), output1('\xFE'),
@@ -2910,5 +2910,5 @@ to_ISO_8859_14_E1_B8_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_E1_B8_infos[6] = {
      output1('\xA1'), output1('\xA2'), output1('\xA6'), output1('\xAB'),
@@ -2928,5 +2928,5 @@ to_ISO_8859_14_E1_B9_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_E1_B9_infos[8] = {
      output1('\xB4'), output1('\xB5'), output1('\xB7'), output1('\xB9'),
@@ -2946,5 +2946,5 @@ to_ISO_8859_14_E1_BA_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_E1_BA_infos[6] = {
      output1('\xA8'), output1('\xB8'), output1('\xAA'), output1('\xBA'),
@@ -2964,5 +2964,5 @@ to_ISO_8859_14_E1_BB_offsets[64] = {
      -1, -1,  0,  1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_E1_BB_infos[2] = {
      output1('\xAC'), output1('\xBC'),
@@ -2981,5 +2981,5 @@ to_ISO_8859_14_E1_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,    0,  1,  2,  3, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_E1_infos[4] = {
      &to_ISO_8859_14_E1_B8, &to_ISO_8859_14_E1_B9,
@@ -3011,5 +3011,5 @@ to_ISO_8859_14_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_14_infos[6] = {
                   NOMAP, &to_ISO_8859_14_C2, &to_ISO_8859_14_C3, &to_ISO_8859_14_C4,
@@ -3041,5 +3041,5 @@ from_ISO_8859_15_offsets[256] = {
     113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
 };
-static const void* const
+static const struct byte_lookup* const
 from_ISO_8859_15_infos[129] = {
                              NOMAP,        output2('\xC2','\x80'),
@@ -3122,5 +3122,5 @@ to_ISO_8859_15_C2_offsets[64] = {
      45, 46, 47, 48, -1, 49, 50, 51,   -1, 52, 53, 54, -1, -1, -1, 55,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_15_C2_infos[56] = {
      output1('\x80'), output1('\x81'), output1('\x82'), output1('\x83'),
@@ -3152,5 +3152,5 @@ to_ISO_8859_15_C3_offsets[64] = {
      48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_15_C3_infos[64] = {
      output1('\xC0'), output1('\xC1'), output1('\xC2'), output1('\xC3'),
@@ -3184,5 +3184,5 @@ to_ISO_8859_15_C5_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,    4, -1, -1, -1, -1,  5,  6, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_15_C5_infos[7] = {
      output1('\xBC'), output1('\xBD'), output1('\xA6'), output1('\xA8'),
@@ -3202,5 +3202,5 @@ to_ISO_8859_15_E2_82_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_15_E2_82_infos[1] = {
      output1('\xA4'),
@@ -3219,5 +3219,5 @@ to_ISO_8859_15_E2_offsets[64] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_15_E2_infos[1] = {
      &to_ISO_8859_15_E2_82,
@@ -3248,5 +3248,5 @@ to_ISO_8859_15_offsets[256] = {
      -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
 };
-static const void* const
+static const struct byte_lookup* const
 to_ISO_8859_15_infos[5] = {
                   NOMAP, &to_ISO_8859_15_C2, &to_ISO_8859_15_C3, &to_ISO_8859_15_C5,



-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦

Thread

Prev Next

In This Thread

Prev Next

[#32429] eval("\"\xfd".force_encoding("utf-8")) generages garbage in error message. — Tanaka Akira <akr@...>

[#32430] "wrong number of arguments (6 for 2)" by def m(a, b=:b, c, d, e) — Tanaka Akira <akr@...>

[#32432] eval("a"): illegal multibyte char — Tanaka Akira <akr@...>

[#32434] signature of exit() on C++ — "KISHIMOTO, Makoto" <ksmakoto@...4u.or.jp>

[#32447] ruby 1.9 trunk NKF and KCONV Encoding:ASCII-8BIT — WATANABE Tetsuya <Tetsuya.WATANABE@...>

[#32448] SEGV on "abcd\xf0".force_encoding("utf-8").reverse — Tanaka Akira <akr@...>

[#32451] -e:1:in `conv': no implicit conversion from nil to integer (TypeError) — Tanaka Akira <akr@...>

[#32452] `split': negative string size (or size too big) (ArgumentError) — Tanaka Akira <akr@...>

[#32459] Enumerator raises `dead fiber called' — "Yusuke ENDOH" <mame@...>

[#32462] SEGV by test/ruby/test_fiber.rb — Tanaka Akira <akr@...>

[#32468] Iconv.list patch for NetBSD/Citrus — "NARUSE, Yui" <naruse@...>

[#32473] about to_path and to_open — "Yusuke ENDOH" <mame@...>

[#32475] ext/tk/sample/tkextlib/vu/canvSticker2.rb — Tanaka Akira <akr@...>

[#32485] self-calling method dumps core — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32493] Regexp#names, MatchData#names, MatchData#regexp — Tanaka Akira <akr@...>

[#32498] Re: [ruby-cvs:21399] Ruby:r14162 (trunk): * parse.y (expr): redefinable not (!) operator. — SASADA Koichi <ko1@...>

[#32502] :!@.inspect — Kazuhiro NISHIYAMA <zn@...>

[#32509] ruby-core:13961での問題(Error while bulding Ruby 1.9 from snapshot 2007/12/09) — KIMURA Koichi <kimura.koichi@...>

[#32512] Re: [ruby-cvs:21409] Ruby:r14172 (trunk): * transcode.c: new file to provide encoding conversion features. — Nobuyoshi Nakada <nobu@...>

[#32514] typo in lib/uri/common.rb — Ueda Satoshi <s-ueda@...>

[#32518] bug in Array#slice! — Satoshi Nakagawa <snakagawa@...>

[#32531] eigenmethod definition for BasicObjects dumps core — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32536] timezone 関数が cygwin で見つかりません — Martin Duerst <duerst@...>

[#32550] Binary String — Hidetoshi NAGAI <nagai@...>

[#32556] default completion for irb1.9 — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32563] transcoder loading — Nobuyoshi Nakada <nobu@...>

[#32565] Re: [ruby-cvs:21436] Ruby:r14199 (trunk): * io.c (rb_io_check_readable): set default external encoding to — Tanaka Akira <akr@...>

[#32566] hang with write — Tanaka Akira <akr@...>

[#32567] [nil, [...]] — Tanaka Akira <akr@...>

[#32569] Re: [ruby-cvs:21441] Ruby:r14204 (trunk): * io.c (rb_io_getc): use default external encoding if fptr->enc is — Tanaka Akira <akr@...>

[#32581] expandarray may mark dirty VALUE beyond stack — "Yusuke ENDOH" <mame@...>

[#32585] SEGV by IO.pipe — Tanaka Akira <akr@...>

[#32588] /(?<foo>...)/ =~ str assigns foo — Tanaka Akira <akr@...>

[#32590] Circular dependency on AIX — "Yutaka Kanemoto" <kinpoco@...>

[#32604] stack overflow by GC in a thread — Tanaka Akira <akr@...>

[#32606] encoding loading — Nobuyoshi Nakada <nobu@...>

[#32608] $! == 8 — Tanaka Akira <akr@...>

[#32609] Re: [ruby-cvs:21475] Ruby:r14238 (trunk): * configure.in (enc/Makefile): add external encoding objects list. — Yukihiro Matsumoto <matz@...>

[#32610] 1.9.1 issues left (as of 12/15) — Yukihiro Matsumoto <matz@...>

[#32622] binding of caller — Nobuyoshi Nakada <nobu@...>

[#32624] rss and base64 — Tanaka Akira <akr@...>

[#32625] Re: [ruby-cvs:21528] Ruby:r14292 (trunk): more tests. — Yukihiro Matsumoto <matz@...>

[#32628] Bignum#to_s doesn't check base — "Yusuke ENDOH" <mame@...>

[#32629] faster Bignum#* — "Yusuke ENDOH" <mame@...>

[#32631] Cygwin 上で Ruby最新版 をインストールする場合 — "Koji Tominaga" <crimsonshower@...>

[#32636] Re: [ruby-cvs:21552] Ruby:r14315 (trunk): * ext/nkf/nkf.c (NKF::_ENCODING): removed. — Tanaka Akira <akr@...>

[#32640] inspect closed dir. — Tanaka Akira <akr@...>

[#32641] interrupt in * — Tanaka Akira <akr@...>

[#32644] unparenthesized method call with block — "Yusuke ENDOH" <mame@...>

[#32645] unparenthesized method call with block — "Yusuke ENDOH" <mame@...>

[#32662] encode! は変換しないときに <nil> になってしまう。 — Martin Duerst <duerst@...>

[#32665] Net::POP3#enable_sslの仕様変更 — Shugo Maeda <shugo@...>

[#32668] syntax errors on ext/tk/sample — "U.Nakamura" <usa@...>

[#32675] /(?<break>a)/ =~ "a" 等によるローカル変数 — "Keita Yamaguchi" <keita.yamaguchi@...>

[#32677] nil.freeze in date.rb — Shugo Maeda <shugo@...>

[#32680] fail to compile version.c in trunk — Masaki Suketa <masaki.suketa@...>

[#32685] test/webrick/test_server.rb hang — Tanaka Akira <akr@...>

[#32686] enum_inject の説明文 — "Keita Yamaguchi" <keita.yamaguchi@...>

[#32687] Re: [ruby-cvs:21753] Ruby:r14516 (trunk): * lib/time.rb (Time.httpdate): use Time.utc for — Tadayoshi Funaba <tadf@...>

[#32691] Why only inject() accepts :symbols as if it's a Proc in Enumerable? — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32693] String#== is not transitive — Tanaka Akira <akr@...>

[#32695] ISO-2022-JP output for transcode — "NARUSE, Yui" <naruse@...>

[#32699] cygwin 上で r14576 現在の test の失敗 — Martin Duerst <duerst@...>

[#32706] Fwd: RDoc: [FATAL] failed to allocate memory — Martin Duerst <duerst@...>

[#32708] Enumerable can't take multiple parameters — GOTOU Yuuzou <gotoyuzo@...>

[#32709] Re: [ruby-cvs:21826] Ruby:r14589 (trunk): Mon Dec 24 17:20:34 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org> — Tadayoshi Funaba <tadf@...>

[#32710] \e — "U.Nakamura" <usa@...>

[#32713] pre-release note for the christmas release. — Yukihiro Matsumoto <matz@...>

[#32715] issues left as of 12/25 2:00am JST — Yukihiro Matsumoto <matz@...>

[#32718] next dumps core when poped is 0 — "Yusuke ENDOH" <mame@...>

[#32725] more ANSI'ize — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32726] Can't build on MacOSX 10.4(Tiger) (was Re: Re: 1.9.1 issues left (as of 12/15)) — "MOROHASHI Kyosuke" <moronatural@...>

[#32740] distinguish "w" and "w:euc-jp" — Tanaka Akira <akr@...>

[#32746] appendline Invalid read of size 1 — Tanaka Akira <akr@...>

[#32747] test-all on Debian/GNU etch — SASADA Koichi <ko1@...>

[#32748] resut of make test on cygwin — SASADA Koichi <ko1@...>

[#32756] make rdoc cause segv on OpenBSD — SASADA Koichi <ko1@...>

[#32763] Re: [ruby-cvs:21913] Ruby:r14676 (trunk): * trunk/common.mk, goruby.c, golf_prelude.rb: for golfers. — Yukihiro Matsumoto <matz@...>

[#32765] test/ruby/test_transcode.rb の問題 — Martin Duerst <duerst@...>

[#32767] result of test-all on FreeBSD 6.2 — SASADA Koichi <ko1@...>

[#32631] Cygwin 上で Ruby最新版をインストールする場合 — "Koji Tominaga" <crimsonshower@...>