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.

diff --git a/regen/unicode_constants.pl b/regen/unicode_constants.pl
index bbd4497..a953f2b 100644 (file)
--- 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 c417e50..30d7eea 100644 (file)
--- 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 4037950..2ae9d77 100644 (file)
--- 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 */