[前][次][番号順一覧][スレッド一覧]

ruby-changes:43667

From: duerst <ko1@a...>
Date: Sun, 24 Jul 2016 16:33:25 +0900 (JST)
Subject: [ruby-changes:43667] duerst:r55740 (trunk): * regenc.h/c, include/ruby/oniguruma.h, enc/ascii.c, big5.c, cp949.c,

duerst	2016-07-24 16:33:15 +0900 (Sun, 24 Jul 2016)

  New Revision: 55740

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55740

  Log:
    * regenc.h/c, include/ruby/oniguruma.h, enc/ascii.c, big5.c, cp949.c,
      emacs_mule.c, euc_jp.c, euc_kr.c, euc_tw.c, gb18030.c, gbk.c,
      iso_8859_1|2|3|4|5|6|7|8|9|10|11|13|14|15|16.c, koi8_r.c, koi8_u.c,
      shift_jis.c, unicode.c, us_ascii.c, utf_16|32be|le.c, utf_8.c,
      windows_1250|51|52|53|54|57.c, windows_31j.c, unicode.c:
      Remove conditional compilation macro ONIG_CASE_MAPPING. [Feature #12386].

  Modified files:
    trunk/ChangeLog
    trunk/enc/ascii.c
    trunk/enc/big5.c
    trunk/enc/cp949.c
    trunk/enc/emacs_mule.c
    trunk/enc/euc_jp.c
    trunk/enc/euc_kr.c
    trunk/enc/euc_tw.c
    trunk/enc/gb18030.c
    trunk/enc/gbk.c
    trunk/enc/iso_8859_1.c
    trunk/enc/iso_8859_10.c
    trunk/enc/iso_8859_11.c
    trunk/enc/iso_8859_13.c
    trunk/enc/iso_8859_14.c
    trunk/enc/iso_8859_15.c
    trunk/enc/iso_8859_16.c
    trunk/enc/iso_8859_2.c
    trunk/enc/iso_8859_3.c
    trunk/enc/iso_8859_4.c
    trunk/enc/iso_8859_5.c
    trunk/enc/iso_8859_6.c
    trunk/enc/iso_8859_7.c
    trunk/enc/iso_8859_8.c
    trunk/enc/iso_8859_9.c
    trunk/enc/koi8_r.c
    trunk/enc/koi8_u.c
    trunk/enc/shift_jis.c
    trunk/enc/unicode.c
    trunk/enc/us_ascii.c
    trunk/enc/utf_16be.c
    trunk/enc/utf_16le.c
    trunk/enc/utf_32be.c
    trunk/enc/utf_32le.c
    trunk/enc/utf_8.c
    trunk/enc/windows_1250.c
    trunk/enc/windows_1251.c
    trunk/enc/windows_1252.c
    trunk/enc/windows_1253.c
    trunk/enc/windows_1254.c
    trunk/enc/windows_1257.c
    trunk/enc/windows_31j.c
    trunk/include/ruby/oniguruma.h
    trunk/regenc.c
    trunk/regenc.h
Index: enc/iso_8859_7.c
===================================================================
--- enc/iso_8859_7.c	(revision 55739)
+++ enc/iso_8859_7.c	(revision 55740)
@@ -205,7 +205,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_7.c#L205
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
 case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
 					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -260,7 +259,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_7.c#L259
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
   onigenc_single_byte_mbc_enc_len,
@@ -281,8 +279,6 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_ https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_7.c#L279
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-7", "ISO-8859-7")
Index: enc/iso_8859_8.c
===================================================================
--- enc/iso_8859_8.c	(revision 55739)
+++ enc/iso_8859_8.c	(revision 55740)
@@ -95,9 +95,7 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_ https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_8.c#L95
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-8", "ISO-8859-8")
 
Index: enc/iso_8859_9.c
===================================================================
--- enc/iso_8859_9.c	(revision 55739)
+++ enc/iso_8859_9.c	(revision 55740)
@@ -213,7 +213,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_9.c#L213
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 #define DOTLESS_i        (0xFD)
 #define I_WITH_DOT_ABOVE (0xDD)
 static int
@@ -265,7 +264,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_9.c#L264
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
   onigenc_single_byte_mbc_enc_len,
@@ -286,8 +284,6 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_ https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_9.c#L284
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-9", "ISO-8859-9")
Index: enc/shift_jis.c
===================================================================
--- enc/shift_jis.c	(revision 55739)
+++ enc/shift_jis.c	(revision 55740)
@@ -565,9 +565,7 @@ OnigEncodingDefine(shift_jis, Shift_JIS) https://github.com/ruby/ruby/blob/trunk/enc/shift_jis.c#L565
   is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: Shift_JIS
Index: enc/utf_32le.c
===================================================================
--- enc/utf_32le.c	(revision 55739)
+++ enc/utf_32le.c	(revision 55740)
@@ -189,8 +189,6 @@ OnigEncodingDefine(utf_32le, UTF_32LE) = https://github.com/ruby/ruby/blob/trunk/enc/utf_32le.c#L189
   onigenc_always_false_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("UCS-4LE", "UTF-32LE")
Index: enc/utf_16le.c
===================================================================
--- enc/utf_16le.c	(revision 55739)
+++ enc/utf_16le.c	(revision 55740)
@@ -244,7 +244,5 @@ OnigEncodingDefine(utf_16le, UTF_16LE) = https://github.com/ruby/ruby/blob/trunk/enc/utf_16le.c#L244
   onigenc_always_false_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
Index: enc/utf_8.c
===================================================================
--- enc/utf_8.c	(revision 55739)
+++ enc/utf_8.c	(revision 55740)
@@ -430,9 +430,7 @@ OnigEncodingDefine(utf_8, UTF_8) = { https://github.com/ruby/ruby/blob/trunk/enc/utf_8.c#L430
   onigenc_always_true_is_allowed_reverse_match,
   ENCINDEX_UTF_8,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("CP65001", "UTF-8")
 
Index: enc/unicode.c
===================================================================
--- enc/unicode.c	(revision 55739)
+++ enc/unicode.c	(revision 55740)
@@ -137,7 +137,6 @@ code3_equal(const OnigCodePoint *x, cons https://github.com/ruby/ruby/blob/trunk/enc/unicode.c#L137
   return 1;
 }
 
-#ifdef ONIG_CASE_MAPPING
 /* macros related to ONIGENC_CASE flags */
 /* defined here because not used in other files */
 #define ONIGENC_CASE_SPECIALS       (ONIGENC_CASE_TITLECASE|ONIGENC_CASE_IS_TITLECASE|ONIGENC_CASE_UP_SPECIAL|ONIGENC_CASE_DOWN_SPECIAL)
@@ -162,11 +161,9 @@ code3_equal(const OnigCodePoint *x, cons https://github.com/ruby/ruby/blob/trunk/enc/unicode.c#L161
 #define IT ONIGENC_CASE_IS_TITLECASE
 #define I(n) OnigSpecialIndexEncode(n)
 #define L(n) SpecialsLengthEncode(n)
-#endif   /* ONIG_CASE_MAPPING */
 
 #include "casefold.h"
 
-#ifdef ONIG_CASE_MAPPING
 #undef U
 #undef D
 #undef F
@@ -176,7 +173,6 @@ code3_equal(const OnigCodePoint *x, cons https://github.com/ruby/ruby/blob/trunk/enc/unicode.c#L173
 #undef IT
 #undef I
 #undef L
-#endif   /* ONIG_CASE_MAPPING */
 
 #include "name2ctype.h"
 
@@ -655,8 +651,6 @@ onigenc_unicode_get_case_fold_codes_by_s https://github.com/ruby/ruby/blob/trunk/enc/unicode.c#L651
   return n;
 }
 
-#ifdef ONIG_CASE_MAPPING
-
 /* length in bytes for three characters in UTF-32; e.g. needed for ffi (U+FB03) */
 #define CASE_MAPPING_SLACK 12
 #define MODIFIED (flags |= ONIGENC_CASE_MODIFIED)
@@ -799,8 +793,6 @@ onigenc_unicode_case_map(OnigCaseFoldTyp https://github.com/ruby/ruby/blob/trunk/enc/unicode.c#L793
     return (int)(to-to_start);
 }
 
-#endif   /* ONIG_CASE_MAPPING */
-
 #if 0
 const char onigenc_unicode_version_string[] =
 #ifdef ONIG_UNICODE_VERSION_STRING
Index: enc/iso_8859_10.c
===================================================================
--- enc/iso_8859_10.c	(revision 55739)
+++ enc/iso_8859_10.c	(revision 55740)
@@ -224,7 +224,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_10.c#L224
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
 case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
 					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -269,7 +268,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_10.c#L268
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
   onigenc_single_byte_mbc_enc_len,
@@ -290,8 +288,6 @@ OnigEncodingDefine(iso_8859_10, ISO_8859 https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_10.c#L288
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-10", "ISO-8859-10")
Index: enc/iso_8859_11.c
===================================================================
--- enc/iso_8859_11.c	(revision 55739)
+++ enc/iso_8859_11.c	(revision 55740)
@@ -95,9 +95,7 @@ OnigEncodingDefine(iso_8859_11, ISO_8859 https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_11.c#L95
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-11", "ISO-8859-11")
 
Index: enc/ascii.c
===================================================================
--- enc/ascii.c	(revision 55739)
+++ enc/ascii.c	(revision 55740)
@@ -53,9 +53,7 @@ OnigEncodingDefine(ascii, ASCII) = { https://github.com/ruby/ruby/blob/trunk/enc/ascii.c#L53
   onigenc_always_true_is_allowed_reverse_match,
   ENCINDEX_ASCII,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
 ENC_REPLICATE("IBM437", "ASCII-8BIT")
Index: enc/iso_8859_13.c
===================================================================
--- enc/iso_8859_13.c	(revision 55739)
+++ enc/iso_8859_13.c	(revision 55740)
@@ -217,7 +217,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_13.c#L217
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
 case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
 					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -264,7 +263,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_13.c#L263
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   onigenc_single_byte_mbc_enc_len,
@@ -285,8 +283,6 @@ OnigEncodingDefine(iso_8859_13, ISO_8859 https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_13.c#L283
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-13", "ISO-8859-13")
Index: enc/iso_8859_14.c
===================================================================
--- enc/iso_8859_14.c	(revision 55739)
+++ enc/iso_8859_14.c	(revision 55740)
@@ -226,7 +226,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_14.c#L226
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
 case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
 					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -281,7 +280,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_14.c#L280
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
   onigenc_single_byte_mbc_enc_len,
@@ -302,8 +300,6 @@ OnigEncodingDefine(iso_8859_14, ISO_8859 https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_14.c#L300
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-14", "ISO-8859-14")
Index: enc/koi8_r.c
===================================================================
--- enc/koi8_r.c	(revision 55739)
+++ enc/koi8_r.c	(revision 55740)
@@ -216,9 +216,7 @@ OnigEncodingDefine(koi8_r, KOI8_R) = { https://github.com/ruby/ruby/blob/trunk/enc/koi8_r.c#L216
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("CP878", "KOI8-R")
 
Index: enc/iso_8859_15.c
===================================================================
--- enc/iso_8859_15.c	(revision 55739)
+++ enc/iso_8859_15.c	(revision 55740)
@@ -220,7 +220,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_15.c#L220
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
 case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
 					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -271,8 +270,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_15.c#L270
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
-
 
 OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
   onigenc_single_byte_mbc_enc_len,
@@ -293,8 +290,6 @@ OnigEncodingDefine(iso_8859_15, ISO_8859 https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_15.c#L290
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-15", "ISO-8859-15")
Index: enc/iso_8859_16.c
===================================================================
--- enc/iso_8859_16.c	(revision 55739)
+++ enc/iso_8859_16.c	(revision 55740)
@@ -222,7 +222,6 @@ get_case_fold_codes_by_str(OnigCaseFoldT https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_16.c#L222
 	     flag, p, end, items);
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
 case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
 					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -276,7 +275,6 @@ case_map (OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_16.c#L275
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
   onigenc_single_byte_mbc_enc_len,
@@ -297,8 +295,6 @@ OnigEncodingDefine(iso_8859_16, ISO_8859 https://github.com/ruby/ruby/blob/trunk/enc/iso_8859_16.c#L295
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-16", "ISO-8859-16")
Index: enc/koi8_u.c
===================================================================
--- enc/koi8_u.c	(revision 55739)
+++ enc/koi8_u.c	(revision 55740)
@@ -220,7 +220,5 @@ OnigEncodingDefine(koi8_u, KOI8_U) = { https://github.com/ruby/ruby/blob/trunk/enc/koi8_u.c#L220
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
Index: enc/euc_jp.c
===================================================================
--- enc/euc_jp.c	(revision 55739)
+++ enc/euc_jp.c	(revision 55740)
@@ -578,9 +578,7 @@ OnigEncodingDefine(euc_jp, EUC_JP) = { https://github.com/ruby/ruby/blob/trunk/enc/euc_jp.c#L578
   is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: EUC-JP
Index: enc/gb18030.c
===================================================================
--- enc/gb18030.c	(revision 55739)
+++ enc/gb18030.c	(revision 55740)
@@ -599,8 +599,6 @@ OnigEncodingDefine(gb18030, GB18030) = { https://github.com/ruby/ruby/blob/trunk/enc/gb18030.c#L599
   gb18030_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 
Index: enc/big5.c
===================================================================
--- enc/big5.c	(revision 55739)
+++ enc/big5.c	(revision 55740)
@@ -302,9 +302,7 @@ OnigEncodingDefine(big5, BIG5) = { https://github.com/ruby/ruby/blob/trunk/enc/big5.c#L302
   big5_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 
 /*
@@ -339,9 +337,7 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSC https://github.com/ruby/ruby/blob/trunk/enc/big5.c#L337
   big5_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS")
 
@@ -376,7 +372,5 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = https://github.com/ruby/ruby/blob/trunk/enc/big5.c#L372
   big5_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
Index: enc/euc_tw.c
===================================================================
--- enc/euc_tw.c	(revision 55739)
+++ enc/euc_tw.c	(revision 55740)
@@ -223,8 +223,6 @@ OnigEncodingDefine(euc_tw, EUC_TW) = { https://github.com/ruby/ruby/blob/trunk/enc/euc_tw.c#L223
   euctw_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("eucTW", "EUC-TW")
Index: enc/us_ascii.c
===================================================================
--- enc/us_ascii.c	(revision 55739)
+++ enc/us_ascii.c	(revision 55740)
@@ -31,9 +31,7 @@ OnigEncodingDefine(us_ascii, US_ASCII) = https://github.com/ruby/ruby/blob/trunk/enc/us_ascii.c#L31
   onigenc_always_true_is_allowed_reverse_match,
   ENCINDEX_US_ASCII,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ASCII", "US-ASCII")
 ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
Index: enc/windows_1250.c
===================================================================
--- enc/windows_1250.c	(revision 55739)
+++ enc/windows_1250.c	(revision 55740)
@@ -208,9 +208,7 @@ OnigEncodingDefine(windows_1250, Windows https://github.com/ruby/ruby/blob/trunk/enc/windows_1250.c#L208
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: windows-1250
Index: enc/windows_1251.c
===================================================================
--- enc/windows_1251.c	(revision 55739)
+++ enc/windows_1251.c	(revision 55740)
@@ -199,9 +199,7 @@ OnigEncodingDefine(windows_1251, Windows https://github.com/ruby/ruby/blob/trunk/enc/windows_1251.c#L199
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: windows-1251
Index: enc/windows_1252.c
===================================================================
--- enc/windows_1252.c	(revision 55739)
+++ enc/windows_1252.c	(revision 55740)
@@ -180,7 +180,7 @@ cp1252_get_case_fold_codes_by_str(OnigCa https://github.com/ruby/ruby/blob/trunk/enc/windows_1252.c#L180
 	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
-#ifdef ONIG_CASE_MAPPING
+
 static int
 case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
 	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
@@ -227,7 +227,6 @@ case_map(OnigCaseFoldType* flagP, const https://github.com/ruby/ruby/blob/trunk/enc/windows_1252.c#L227
   *flagP = flags;
   return (int)(to-to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(windows_1252, Windows_1252) = {
   onigenc_single_byte_mbc_enc_len,
@@ -248,9 +247,7 @@ OnigEncodingDefine(windows_1252, Windows https://github.com/ruby/ruby/blob/trunk/enc/windows_1252.c#L247
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: windows-1252
Index: enc/gbk.c
===================================================================
--- enc/gbk.c	(revision 55739)
+++ enc/gbk.c	(revision 55740)
@@ -213,9 +213,7 @@ OnigEncodingDefine(gbk, GBK) = { https://github.com/ruby/ruby/blob/trunk/enc/gbk.c#L213
   gbk_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: GBK
Index: enc/windows_1253.c
===================================================================
--- enc/windows_1253.c	(revision 55739)
+++ enc/windows_1253.c	(revision 55740)
@@ -233,8 +233,6 @@ OnigEncodingDefine(windows_1253, Windows https://github.com/ruby/ruby/blob/trunk/enc/windows_1253.c#L233
   onigenc_always_true_is_allowed_reverse_match,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
   onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("CP1253", "Windows-1253")
Index: enc/windows_1254.c
===================================================================
--- enc/windows_1254.c	(revisio (... truncated)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]