summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <public@khwilliamson.com>2013-08-20 21:43:03 -0600
committerKarl Williamson <public@khwilliamson.com>2013-08-29 10:57:00 -0600
commitdf38da56ea2adcf9854f6ca209dbb8630c7b9187 (patch)
treed3883b7bc730f23b5ad041db376ceb0b0cef1f33
parentcb117658254e99ff28e9ae2c0ab36ffef6e9a319 (diff)
downloadperl-df38da56ea2adcf9854f6ca209dbb8630c7b9187.tar.gz
Remove no longer necessary constants
These character constants were used only for a special edge case in trie construction that has been removed -- except for one instance in regexec.c which could just as well be some other character.
-rw-r--r--regen/unicode_constants.pl6
-rw-r--r--regexec.c4
-rw-r--r--unicode_constants.h6
3 files changed, 2 insertions, 14 deletions
diff --git a/regen/unicode_constants.pl b/regen/unicode_constants.pl
index bbd4497f1c..a953f2b025 100644
--- a/regen/unicode_constants.pl
+++ b/regen/unicode_constants.pl
@@ -143,16 +143,10 @@ __DATA__
U+017F string
U+0300 string
-U+0301 string
-U+0308 string
U+0399 string
U+03BC string
-U+03B9 string
-
-U+03C5 string
-
U+1E9E string
U+FB05 string
diff --git a/regexec.c b/regexec.c
index c417e50088..30d7eea5a3 100644
--- a/regexec.c
+++ b/regexec.c
@@ -165,13 +165,13 @@ static const char* const non_utf8_target_but_utf8_required
#define LOAD_UTF8_CHARCLASS_ALNUM() LOAD_UTF8_CHARCLASS_DEBUG_TEST( \
PL_utf8_swash_ptrs[_CC_WORDCHAR], \
swash_property_names[_CC_WORDCHAR], \
- GREEK_SMALL_LETTER_IOTA_UTF8)
+ LATIN_CAPITAL_LETTER_SHARP_S_UTF8);
#define LOAD_UTF8_CHARCLASS_GCB() /* Grapheme cluster boundaries */ \
STMT_START { \
LOAD_UTF8_CHARCLASS_DEBUG_TEST(PL_utf8_X_regular_begin, \
"_X_regular_begin", \
- GREEK_SMALL_LETTER_IOTA_UTF8); \
+ LATIN_CAPITAL_LETTER_SHARP_S_UTF8); \
LOAD_UTF8_CHARCLASS_DEBUG_TEST(PL_utf8_X_extend, \
"_X_extend", \
COMBINING_GRAVE_ACCENT_UTF8); \
diff --git a/unicode_constants.h b/unicode_constants.h
index 4037950e03..2ae9d77646 100644
--- a/unicode_constants.h
+++ b/unicode_constants.h
@@ -23,16 +23,10 @@
#define LATIN_SMALL_LETTER_LONG_S_UTF8 "\xC5\xBF" /* U+017F */
#define COMBINING_GRAVE_ACCENT_UTF8 "\xCC\x80" /* U+0300 */
-#define COMBINING_ACUTE_ACCENT_UTF8 "\xCC\x81" /* U+0301 */
-#define COMBINING_DIAERESIS_UTF8 "\xCC\x88" /* U+0308 */
#define GREEK_CAPITAL_LETTER_IOTA_UTF8 "\xCE\x99" /* U+0399 */
#define GREEK_SMALL_LETTER_MU_UTF8 "\xCE\xBC" /* U+03BC */
-#define GREEK_SMALL_LETTER_IOTA_UTF8 "\xCE\xB9" /* U+03B9 */
-
-#define GREEK_SMALL_LETTER_UPSILON_UTF8 "\xCF\x85" /* U+03C5 */
-
#define LATIN_CAPITAL_LETTER_SHARP_S_UTF8 "\xE1\xBA\x9E" /* U+1E9E */
#define LATIN_SMALL_LIGATURE_LONG_S_T_UTF8 "\xEF\xAC\x85" /* U+FB05 */