This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
uc(sharp s) is itself in very early Unicode versions
authorKarl Williamson <khw@cpan.org>
Mon, 22 Jun 2015 03:52:58 +0000 (21:52 -0600)
committerKarl Williamson <khw@cpan.org>
Wed, 29 Jul 2015 04:15:53 +0000 (22:15 -0600)
perl.h
pp.c
utf8.c

diff --git a/perl.h b/perl.h
index 9d57450..bb4dac4 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -4779,7 +4779,14 @@ EXTCONST  unsigned char PL_mod_latin1_uc[] = {
        192,    193,    194,    195,    196,    197,    198,    199,
        200,    201,    202,    203,    204,    205,    206,    207,
        208,    209,    210,    211,    212,    213,    214,    215,
-       216,    217,    218,    219,    220,    221,    222,    255 /*sharp s*/,        
+       216,    217,    218,    219,    220,    221,    222,
+#if    UNICODE_MAJOR_VERSION > 2                                        \
+   || (UNICODE_MAJOR_VERSION == 2 && UNICODE_DOT_VERSION >= 1          \
+                                  && UNICODE_DOT_DOT_VERSION >= 8)
+                                                               255 /*sharp s*/,
+#else   /* uc() is itself in early unicode */
+                                                               223,
+#endif
        224-32, 225-32, 226-32, 227-32, 228-32, 229-32, 230-32, 231-32,
        232-32, 233-32, 234-32, 235-32, 236-32, 237-32, 238-32, 239-32,
        240-32, 241-32, 242-32, 243-32, 244-32, 245-32, 246-32, 247,
diff --git a/pp.c b/pp.c
index 57b05b3..a963478 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -4096,6 +4096,9 @@ PP(pp_uc)
                     * just above.  
                     * Use the source to distinguish between the three cases */
 
+#if    UNICODE_MAJOR_VERSION > 2                                        \
+   || (UNICODE_MAJOR_VERSION == 2 && UNICODE_DOT_VERSION >= 1          \
+                                  && UNICODE_DOT_DOT_VERSION >= 8)
                    if (*s == LATIN_SMALL_LETTER_SHARP_S) {
 
                        /* uc() of this requires 2 characters, but they are
@@ -4108,6 +4111,7 @@ PP(pp_uc)
                        *d++ = 'S'; *d = 'S'; /* upper case is 'SS' */
                        continue;   /* Back to the tight loop; still in ASCII */
                    }
+#endif
 
                    /* The other two special handling characters have their
                     * upper cases outside the latin1 range, hence need to be
diff --git a/utf8.c b/utf8.c
index 8ea0268..5c4648c 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1413,11 +1413,15 @@ Perl__to_upper_title_latin1(pTHX_ const U8 c, U8* p, STRLEN *lenp, const char S_
            case MICRO_SIGN:
                converted = GREEK_CAPITAL_LETTER_MU;
                break;
+#if    UNICODE_MAJOR_VERSION > 2                                        \
+   || (UNICODE_MAJOR_VERSION == 2 && UNICODE_DOT_VERSION >= 1           \
+                                  && UNICODE_DOT_DOT_VERSION >= 8)
            case LATIN_SMALL_LETTER_SHARP_S:
                *(p)++ = 'S';
                *p = S_or_s;
                *lenp = 2;
                return 'S';
+#endif
            default:
                Perl_croak(aTHX_ "panic: to_upper_title_latin1 did not expect '%c' to map to '%c'", c, LATIN_SMALL_LETTER_Y_WITH_DIAERESIS);
                NOT_REACHED; /* NOTREACHED */