* enc/iso_8859_1.c: Implement non-ASCII case mapping.
* test/ruby/enc/test_case_comprehensive.rb: Tests for above. * string.c: Add iso-8859-1 to supported encodings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e8700ab03d
commit
02f7ad6237
@ -1,3 +1,11 @@
|
|||||||
|
Sat Jun 11 09:46:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
|
||||||
|
|
||||||
|
* enc/iso_8859_1.c: Implement non-ASCII case mapping.
|
||||||
|
|
||||||
|
* test/ruby/enc/test_case_comprehensive.rb: Tests for above.
|
||||||
|
|
||||||
|
* string.c: Add iso-8859-1 to supported encodings.
|
||||||
|
|
||||||
Sat Jun 11 09:31:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sat Jun 11 09:31:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/forwardable.rb (_delegator_method): leave the backtrace
|
* lib/forwardable.rb (_delegator_method): leave the backtrace
|
||||||
|
@ -254,6 +254,49 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ONIG_CASE_MAPPING
|
||||||
|
static int
|
||||||
|
case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
|
||||||
|
const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
|
||||||
|
const struct OnigEncodingTypeST* enc)
|
||||||
|
{
|
||||||
|
OnigCodePoint code, lower;
|
||||||
|
OnigUChar *to_start = to;
|
||||||
|
OnigCaseFoldType flags = *flagP;
|
||||||
|
|
||||||
|
while (*pp<end && to<to_end) {
|
||||||
|
code = *(*pp)++;
|
||||||
|
if (code==0xdf) { /* sharp s */
|
||||||
|
if (flags&ONIGENC_CASE_UPCASE) {
|
||||||
|
flags |= ONIGENC_CASE_MODIFIED;
|
||||||
|
*to++ = 'S';
|
||||||
|
code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
|
||||||
|
}
|
||||||
|
else if (flags&ONIGENC_CASE_FOLD) {
|
||||||
|
flags |= ONIGENC_CASE_MODIFIED;
|
||||||
|
*to++ = 's';
|
||||||
|
code = 's';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if ((lower=ONIGENC_ISO_8859_1_TO_LOWER_CASE(code)) != code)
|
||||||
|
&& (flags&ONIGENC_CASE_UPCASE)) {
|
||||||
|
flags |= ONIGENC_CASE_MODIFIED;
|
||||||
|
code = lower;
|
||||||
|
}
|
||||||
|
else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER)
|
||||||
|
&& (flags&ONIGENC_CASE_UPCASE)) {
|
||||||
|
flags |= ONIGENC_CASE_MODIFIED;
|
||||||
|
code -= 0x20;
|
||||||
|
}
|
||||||
|
*to++ = code;
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
#endif /* ONIG_CASE_MAPPING */
|
||||||
|
|
||||||
OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
|
OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
|
||||||
onigenc_single_byte_mbc_enc_len,
|
onigenc_single_byte_mbc_enc_len,
|
||||||
"ISO-8859-1", /* name */
|
"ISO-8859-1", /* name */
|
||||||
@ -274,7 +317,7 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
|
|||||||
0,
|
0,
|
||||||
ONIGENC_FLAG_NONE,
|
ONIGENC_FLAG_NONE,
|
||||||
#ifdef ONIG_CASE_MAPPING
|
#ifdef ONIG_CASE_MAPPING
|
||||||
onigenc_single_byte_ascii_only_case_map,
|
case_map,
|
||||||
#endif /* ONIG_CASE_MAPPING */
|
#endif /* ONIG_CASE_MAPPING */
|
||||||
};
|
};
|
||||||
ENC_ALIAS("ISO8859-1", "ISO-8859-1")
|
ENC_ALIAS("ISO8859-1", "ISO-8859-1")
|
||||||
|
2
string.c
2
string.c
@ -6011,7 +6011,7 @@ rb_str_downcase_bang(int argc, VALUE *argv, VALUE str)
|
|||||||
* by case mapping operations.
|
* by case mapping operations.
|
||||||
*
|
*
|
||||||
* Non-ASCII case mapping/folding is currently supported for UTF-8,
|
* Non-ASCII case mapping/folding is currently supported for UTF-8,
|
||||||
* UTF-16BE/LE, and UTF-32BE/LE Strings/Symbols.
|
* UTF-16BE/LE, UTF-32BE/LE, and ISO-8859-1 Strings/Symbols.
|
||||||
* This support will be extended to other encodings.
|
* This support will be extended to other encodings.
|
||||||
*
|
*
|
||||||
* "hEllO".downcase #=> "hello"
|
* "hEllO".downcase #=> "hello"
|
||||||
|
@ -186,7 +186,6 @@ class TestComprehensiveCaseFold < Test::Unit::TestCase
|
|||||||
%w[UnicodeData CaseFolding SpecialCasing].each { |f| check_file_available f }
|
%w[UnicodeData CaseFolding SpecialCasing].each { |f| check_file_available f }
|
||||||
end
|
end
|
||||||
|
|
||||||
generate_ascii_only_case_mapping_tests 'ISO-8859-1'
|
|
||||||
generate_ascii_only_case_mapping_tests 'ISO-8859-2'
|
generate_ascii_only_case_mapping_tests 'ISO-8859-2'
|
||||||
generate_ascii_only_case_mapping_tests 'ISO-8859-3'
|
generate_ascii_only_case_mapping_tests 'ISO-8859-3'
|
||||||
generate_ascii_only_case_mapping_tests 'ISO-8859-4'
|
generate_ascii_only_case_mapping_tests 'ISO-8859-4'
|
||||||
@ -215,6 +214,7 @@ class TestComprehensiveCaseFold < Test::Unit::TestCase
|
|||||||
generate_ascii_only_case_mapping_tests 'Windows-1254'
|
generate_ascii_only_case_mapping_tests 'Windows-1254'
|
||||||
generate_ascii_only_case_mapping_tests 'Windows-1256'
|
generate_ascii_only_case_mapping_tests 'Windows-1256'
|
||||||
generate_ascii_only_case_mapping_tests 'Windows-1257'
|
generate_ascii_only_case_mapping_tests 'Windows-1257'
|
||||||
|
generate_case_mapping_tests 'ISO-8859-1'
|
||||||
generate_case_mapping_tests 'US-ASCII'
|
generate_case_mapping_tests 'US-ASCII'
|
||||||
generate_case_mapping_tests 'ASCII-8BIT'
|
generate_case_mapping_tests 'ASCII-8BIT'
|
||||||
generate_case_mapping_tests 'UTF-8'
|
generate_case_mapping_tests 'UTF-8'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user