Merge Onigmo 6.0.0

* https://github.com/k-takata/Onigmo/blob/Onigmo-6.0.0/HISTORY
* fix for ruby 2.4: https://github.com/k-takata/Onigmo/pull/78
* suppress warning: https://github.com/k-takata/Onigmo/pull/79
* include/ruby/oniguruma.h: include onigmo.h.
* template/encdb.h.tmpl: ignore duplicated definition of EUC-CN in
  enc/euc_kr.c. It is defined in enc/gb2313.c with CRuby macro.

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

1 files changed, 18 insertions, 17 deletions

diff --git a/enc/windows_1251.c b/enc/windows_1251.c
index 0f9b7fa69a..fcd0f1015d 100644
--- a/enc/windows_1251.c
+++ b/enc/windows_1251.c
@@ -181,49 +181,50 @@ cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 static int
-case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
-		const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-		const struct OnigEncodingTypeST* enc)
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
 {
   OnigCodePoint code;
   OnigUChar *to_start = to;
   OnigCaseFoldType flags = *flagP;
 
-  while (*pp<end && to<to_end) {
+  while (*pp < end && to < to_end) {
     code = *(*pp)++;
     if ((EncCP1251_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
       code = ENC_CP1251_TO_LOWER_CASE(code);
     }
-    else if (code==0xB5)  ;
+    else if (code == 0xB5)
+      ;
     else if ((EncCP1251_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags&ONIGENC_CASE_UPCASE)) {
+	     && (flags & ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if ((0x61<=code && code<=0x7A) || (0xE0<=code && code<=0xFF))
+      if ((0x61 <= code && code <= 0x7A) || (0xE0 <= code && code <= 0xFF))
 	code -= 0x20;
-      else if (code==0xA2 || code==0xB3 || code==0xBE)
+      else if (code == 0xA2 || code == 0xB3 || code == 0xBE)
 	code -= 0x01;
-      else if (code==0x83)
+      else if (code == 0x83)
 	code = 0x81;
-      else if (code==0xBC)
+      else if (code == 0xBC)
 	code = 0xA3;
-      else if (code==0xB4)
+      else if (code == 0xB4)
 	code = 0xA5;
       else
 	code -= 0x10;
     }
     *to++ = code;
-    if (flags&ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
   }
   *flagP = flags;
-  return (int)(to-to_start);
+  return (int )(to - to_start);
 }
 
 OnigEncodingDefine(windows_1251, Windows_1251) = {
   onigenc_single_byte_mbc_enc_len,
-  "Windows-1251",      /* name */
+  "Windows-1251",/* name */
   1,             /* max enc length */
   1,             /* min enc length */
   onigenc_is_mbc_newline_0x0a,
@@ -238,9 +239,9 @@ OnigEncodingDefine(windows_1251, Windows_1251) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-  case_map,
 };
 /*
  * Name: windows-1251