From dbf7e6f9f232a3173b118c5f1ad57f97aa7e4e9d Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 9 Nov 2010 07:36:33 +0000
Subject: * regenc.c (onigenc_minimum_property_name_to_ctype):   \p{...} should
 be case insensitive. [ruby-core:33000]

* regenc.c (onigenc_property_list_add_property):
  ditto.

* enc/euc_jp.c (init_property_list, property_name_to_ctype):
  to lowercase property names.

* enc/shift_jis.c (init_property_list, property_name_to_ctype):
  ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/euc_jp.c    | 14 ++++++++++----
 enc/shift_jis.c | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'enc')

diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index d4a9f57866..3b339f9600 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -274,8 +274,8 @@ init_property_list(void)
 {
   int r;
 
-  PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
+  PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
+  PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
   PropertyInited = 1;
 
  end:
@@ -286,11 +286,17 @@ static int
 property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
   st_data_t ctype;
+  UChar *s, *e;
 
   PROPERTY_LIST_INIT_CHECK;
 
-  if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
-    return onigenc_minimum_property_name_to_ctype(enc, p, end);
+  s = e = ALLOC_N(UChar, end-p+1);
+  for (; p < end; p++) {
+    *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+  }
+
+  if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
+    return onigenc_minimum_property_name_to_ctype(enc, s, e);
   }
 
   return ctype;
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
index f7614205af..cac4cf7751 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -283,8 +283,8 @@ init_property_list(void)
 {
   int r;
 
-  PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
+  PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
+  PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
   PropertyInited = 1;
 
  end:
@@ -295,11 +295,17 @@ static int
 property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
   hash_data_type ctype;
+  UChar *s, *e;
 
   PROPERTY_LIST_INIT_CHECK;
 
-  if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
-    return onigenc_minimum_property_name_to_ctype(enc, p, end);
+  s = e = ALLOC_N(UChar, end-p+1);
+  for (; p < end; p++) {
+    *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+  }
+
+  if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
+    return onigenc_minimum_property_name_to_ctype(enc, s, e);
   }
 
   return (int)ctype;
-- 
cgit v1.2.3