Remove PL_L1Posix_ptrs

This global array is no longer used, having been removed in previous
commits in this series.

Since it is a global, consideration need be given to possible uses of it
outside the core.  It has never been externally documented, and is an
opaque structure whose internals have changed with every release.  The
functions used to access it are almost all static to regcomp.c; those
few that aren't have been hidden from all but the few .c files that need
to have access to them, via #if's.

diff --git a/charclass_invlists.h b/charclass_invlists.h
index 8dcf152..c8de14e 100644 (file)
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -48,34 +48,6 @@ static const UV ASCII_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1Cased_invlist[] = {
-       17,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       65,
-       91,
-       97,
-       123,
-       170,
-       171,
-       181,
-       182,
-       186,
-       187,
-       192,
-       215,
-       216,
-       247,
-       248,
-       443
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV Cased_invlist[] = {
        239,    /* Number of elements */
        148565664, /* Version and data structure type */
@@ -410,36 +382,6 @@ static const UV PosixAlnum_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixAlnum_invlist[] = {
-       19,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       48,
-       58,
-       65,
-       91,
-       97,
-       123,
-       170,
-       171,
-       181,
-       182,
-       186,
-       187,
-       192,
-       215,
-       216,
-       247,
-       248,
-       706
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixAlnum_invlist[] = {
        1133,   /* Number of elements */
        148565664, /* Version and data structure type */
@@ -1600,34 +1542,6 @@ static const UV PosixAlpha_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixAlpha_invlist[] = {
-       17,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       65,
-       91,
-       97,
-       123,
-       170,
-       171,
-       181,
-       182,
-       186,
-       187,
-       192,
-       215,
-       216,
-       247,
-       248,
-       706
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixAlpha_invlist[] = {
        1081,   /* Number of elements */
        148565664, /* Version and data structure type */
@@ -2918,22 +2832,6 @@ static const UV PosixGraph_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixGraph_invlist[] = {
-       5,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       33,
-       127,
-       161,
-       888
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixGraph_invlist[] = {
        1089,   /* Number of elements */
        148565664, /* Version and data structure type */
@@ -4048,30 +3946,6 @@ static const UV PosixLower_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixLower_invlist[] = {
-       13,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       97,
-       123,
-       170,
-       171,
-       181,
-       182,
-       186,
-       187,
-       223,
-       247,
-       248,
-       256
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixLower_invlist[] = {
        1237,   /* Number of elements */
        148565664, /* Version and data structure type */
@@ -5334,22 +5208,6 @@ static const UV PosixPrint_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixPrint_invlist[] = {
-       5,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       32,
-       127,
-       160,
-       888
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixPrint_invlist[] = {
        1083,   /* Number of elements */
        148565664, /* Version and data structure type */
@@ -6464,38 +6322,6 @@ static const UV PosixPunct_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixPunct_invlist[] = {
-       21,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       33,
-       48,
-       58,
-       65,
-       91,
-       97,
-       123,
-       127,
-       161,
-       162,
-       167,
-       168,
-       171,
-       172,
-       182,
-       184,
-       187,
-       188,
-       191,
-       192
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixPunct_invlist[] = {
        273,    /* Number of elements */
        148565664, /* Version and data structure type */
@@ -6842,24 +6668,6 @@ static const UV PosixUpper_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixUpper_invlist[] = {
-       7,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       65,
-       91,
-       192,
-       215,
-       216,
-       223
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixUpper_invlist[] = {
        1221,   /* Number of elements */
        148565664, /* Version and data structure type */
@@ -8112,38 +7920,6 @@ static const UV PosixWord_invlist[] = {
 
 #ifndef PERL_IN_XSUB_RE
 
-static const UV L1PosixWord_invlist[] = {
-       21,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0,
-       48,
-       58,
-       65,
-       91,
-       95,
-       96,
-       97,
-       123,
-       170,
-       171,
-       181,
-       182,
-       186,
-       187,
-       192,
-       215,
-       216,
-       247,
-       248,
-       706
-};
-
-#endif
-
-#ifndef PERL_IN_XSUB_RE
-
 static const UV XPosixWord_invlist[] = {
        1131,   /* Number of elements */
        148565664, /* Version and data structure type */

diff --git a/embedvar.h b/embedvar.h
index 06d4e18..51fc265 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -53,7 +53,6 @@
 #define PL_Dir                 (vTHX->IDir)
 #define PL_Env                 (vTHX->IEnv)
 #define PL_HasMultiCharFold    (vTHX->IHasMultiCharFold)
-#define PL_L1Posix_ptrs                (vTHX->IL1Posix_ptrs)
 #define PL_LIO                 (vTHX->ILIO)
 #define PL_Latin1              (vTHX->ILatin1)
 #define PL_Mem                 (vTHX->IMem)

diff --git a/intrpvar.h b/intrpvar.h
index 4f48e4b..903f7ae 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -596,7 +596,6 @@ PERLVAR(I, utf8_charname_continue, SV *)
 
 PERLVARA(I, utf8_swash_ptrs, POSIX_SWASH_COUNT, SV *)
 PERLVARA(I, Posix_ptrs, POSIX_CC_COUNT, SV *)
-PERLVARA(I, L1Posix_ptrs, POSIX_CC_COUNT, SV *)
 PERLVARA(I, XPosix_ptrs, POSIX_CC_COUNT, SV *)
 
 PERLVAR(I, last_swash_hv, HV *)

diff --git a/perl.c b/perl.c
index 5590761..c633580 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -1035,9 +1035,6 @@ perl_destruct(pTHXx)
         SvREFCNT_dec(PL_Posix_ptrs[i]);
         PL_Posix_ptrs[i] = NULL;
 
-        SvREFCNT_dec(PL_L1Posix_ptrs[i]);
-        PL_L1Posix_ptrs[i] = NULL;
-
         SvREFCNT_dec(PL_XPosix_ptrs[i]);
         PL_XPosix_ptrs[i] = NULL;
     }

diff --git a/regcomp.c b/regcomp.c
index 38497e3..8bbc3ff 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -5975,18 +5975,13 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
         PL_utf8_foldable = _new_invlist_C_array(_Perl_Any_Folds_invlist);
 
         PL_Posix_ptrs[_CC_ASCII] = _new_invlist_C_array(ASCII_invlist);
-        PL_L1Posix_ptrs[_CC_ASCII] = _new_invlist_C_array(ASCII_invlist);
         PL_XPosix_ptrs[_CC_ASCII] = _new_invlist_C_array(ASCII_invlist);
 
-       PL_L1Posix_ptrs[_CC_ALPHANUMERIC]
-                                = _new_invlist_C_array(L1PosixAlnum_invlist);
        PL_Posix_ptrs[_CC_ALPHANUMERIC]
                                 = _new_invlist_C_array(PosixAlnum_invlist);
        PL_XPosix_ptrs[_CC_ALPHANUMERIC]
                                 = _new_invlist_C_array(XPosixAlnum_invlist);
 
-       PL_L1Posix_ptrs[_CC_ALPHA]
-                                = _new_invlist_C_array(L1PosixAlpha_invlist);
        PL_Posix_ptrs[_CC_ALPHA] = _new_invlist_C_array(PosixAlpha_invlist);
        PL_XPosix_ptrs[_CC_ALPHA] = _new_invlist_C_array(XPosixAlpha_invlist);
 
@@ -5994,7 +5989,6 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
        PL_XPosix_ptrs[_CC_BLANK] = _new_invlist_C_array(XPosixBlank_invlist);
 
         /* In the ASCII range, cased is the same as Alpha */
-       PL_L1Posix_ptrs[_CC_CASED] =  _new_invlist_C_array(L1Cased_invlist);
        PL_Posix_ptrs[_CC_CASED] =  _new_invlist_C_array(PosixAlpha_invlist);
        PL_XPosix_ptrs[_CC_CASED] =  _new_invlist_C_array(Cased_invlist);
 
@@ -6002,22 +5996,17 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
        PL_XPosix_ptrs[_CC_CNTRL] = _new_invlist_C_array(XPosixCntrl_invlist);
 
        PL_Posix_ptrs[_CC_DIGIT] = _new_invlist_C_array(PosixDigit_invlist);
-       PL_L1Posix_ptrs[_CC_DIGIT] = _new_invlist_C_array(PosixDigit_invlist);
        PL_XPosix_ptrs[_CC_DIGIT] = _new_invlist_C_array(XPosixDigit_invlist);
 
-       PL_L1Posix_ptrs[_CC_GRAPH] = _new_invlist_C_array(L1PosixGraph_invlist);
        PL_Posix_ptrs[_CC_GRAPH] = _new_invlist_C_array(PosixGraph_invlist);
        PL_XPosix_ptrs[_CC_GRAPH] = _new_invlist_C_array(XPosixGraph_invlist);
 
-       PL_L1Posix_ptrs[_CC_LOWER] = _new_invlist_C_array(L1PosixLower_invlist);
        PL_Posix_ptrs[_CC_LOWER] = _new_invlist_C_array(PosixLower_invlist);
        PL_XPosix_ptrs[_CC_LOWER] = _new_invlist_C_array(XPosixLower_invlist);
 
-       PL_L1Posix_ptrs[_CC_PRINT] = _new_invlist_C_array(L1PosixPrint_invlist);
        PL_Posix_ptrs[_CC_PRINT] = _new_invlist_C_array(PosixPrint_invlist);
        PL_XPosix_ptrs[_CC_PRINT] = _new_invlist_C_array(XPosixPrint_invlist);
 
-       PL_L1Posix_ptrs[_CC_PUNCT] = _new_invlist_C_array(L1PosixPunct_invlist);
        PL_Posix_ptrs[_CC_PUNCT] = _new_invlist_C_array(PosixPunct_invlist);
        PL_XPosix_ptrs[_CC_PUNCT] = _new_invlist_C_array(XPosixPunct_invlist);
 
@@ -6026,15 +6015,12 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
        PL_Posix_ptrs[_CC_PSXSPC] = _new_invlist_C_array(PosixSpace_invlist);
        PL_XPosix_ptrs[_CC_PSXSPC] = _new_invlist_C_array(XPosixSpace_invlist);
 
-       PL_L1Posix_ptrs[_CC_UPPER] = _new_invlist_C_array(L1PosixUpper_invlist);
        PL_Posix_ptrs[_CC_UPPER] = _new_invlist_C_array(PosixUpper_invlist);
        PL_XPosix_ptrs[_CC_UPPER] = _new_invlist_C_array(XPosixUpper_invlist);
 
         PL_XPosix_ptrs[_CC_VERTSPACE] = _new_invlist_C_array(VertSpace_invlist);
 
        PL_Posix_ptrs[_CC_WORDCHAR] = _new_invlist_C_array(PosixWord_invlist);
-       PL_L1Posix_ptrs[_CC_WORDCHAR]
-                                = _new_invlist_C_array(L1PosixWord_invlist);
        PL_XPosix_ptrs[_CC_WORDCHAR] = _new_invlist_C_array(XPosixWord_invlist);
 
        PL_Posix_ptrs[_CC_XDIGIT] = _new_invlist_C_array(PosixXDigit_invlist);

diff --git a/regen/mk_invlists.pl b/regen/mk_invlists.pl
index d7cb992..61649ed 100644 (file)
--- a/regen/mk_invlists.pl
+++ b/regen/mk_invlists.pl
@@ -157,16 +157,13 @@ output_invlist("AboveLatin1", [ 256 ]);
 
 for my $prop (qw(
                 ASCII
-                L1Cased
                 Cased
                VertSpace
                 PerlSpace
                     XPerlSpace
                 PosixAlnum
-                    L1PosixAlnum
                     XPosixAlnum
                 PosixAlpha
-                    L1PosixAlpha
                     XPosixAlpha
                 PosixBlank
                     XPosixBlank
@@ -175,24 +172,18 @@ for my $prop (qw(
                 PosixDigit
                     XPosixDigit
                 PosixGraph
-                    L1PosixGraph
                     XPosixGraph
                 PosixLower
-                    L1PosixLower
                     XPosixLower
                 PosixPrint
-                    L1PosixPrint
                     XPosixPrint
                 PosixPunct
-                    L1PosixPunct
                     XPosixPunct
                 PosixSpace
                     XPosixSpace
                 PosixUpper
-                    L1PosixUpper
                     XPosixUpper
                 PosixWord
-                    L1PosixWord
                     XPosixWord
                 PosixXDigit
                     XPosixXDigit

diff --git a/sv.c b/sv.c
index 676340b..7a4f567 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -13742,7 +13742,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     }
     for (i = 0; i < POSIX_CC_COUNT; i++) {
         PL_Posix_ptrs[i] = sv_dup_inc(proto_perl->IPosix_ptrs[i], param);
-        PL_L1Posix_ptrs[i] = sv_dup_inc(proto_perl->IL1Posix_ptrs[i], param);
         PL_XPosix_ptrs[i] = sv_dup_inc(proto_perl->IXPosix_ptrs[i], param);
     }
     PL_utf8_mark       = sv_dup_inc(proto_perl->Iutf8_mark, param);