Reinstate "regcomp.c: Move 2 hdr inversion fields to SV hdr"

This reverts commit 67434bafe4f2406e7c92e69013aecd446c896a9a, which
reverted 4fdeca7844470c929f35857f49078db1fd124dbc, thus reinstating the
latter commit.  It turns out that the error being chased down was not
due to this commit.

Its original message was:

This commit continues the process of separating the header area of
inversion lists from the body.  2 more fields are moved out of the
header portion of the inversion list, and into the header portion of the
SV that contains it.

1 files changed, 34 insertions, 102 deletions

diff --git a/charclass_invlists.h b/charclass_invlists.h
index 57fbe47af1..00b84bf878 100644
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -11,9 +11,7 @@
 
 static UV Latin1_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -27,9 +25,7 @@ static UV Latin1_invlist[] = {
 
 static UV AboveLatin1_invlist[] = {
 	1,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -42,9 +38,7 @@ static UV AboveLatin1_invlist[] = {
 
 static UV ASCII_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -58,9 +52,7 @@ static UV ASCII_invlist[] = {
 
 static UV L1Cased_invlist[] = {
 	16,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -88,9 +80,7 @@ static UV L1Cased_invlist[] = {
 
 static UV VertSpace_invlist[] = {
 	6,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -108,9 +98,7 @@ static UV VertSpace_invlist[] = {
 
 static UV PerlSpace_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -126,9 +114,7 @@ static UV PerlSpace_invlist[] = {
 
 static UV XPerlSpace_invlist[] = {
 	22,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -162,9 +148,7 @@ static UV XPerlSpace_invlist[] = {
 
 static UV PosixAlnum_invlist[] = {
 	6,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -182,9 +166,7 @@ static UV PosixAlnum_invlist[] = {
 
 static UV L1PosixAlnum_invlist[] = {
 	18,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -214,9 +196,7 @@ static UV L1PosixAlnum_invlist[] = {
 
 static UV PosixAlpha_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -232,9 +212,7 @@ static UV PosixAlpha_invlist[] = {
 
 static UV L1PosixAlpha_invlist[] = {
 	16,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -262,9 +240,7 @@ static UV L1PosixAlpha_invlist[] = {
 
 static UV PosixBlank_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -280,9 +256,7 @@ static UV PosixBlank_invlist[] = {
 
 static UV XPosixBlank_invlist[] = {
 	18,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -312,9 +286,7 @@ static UV XPosixBlank_invlist[] = {
 
 static UV PosixCntrl_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -330,9 +302,7 @@ static UV PosixCntrl_invlist[] = {
 
 static UV XPosixCntrl_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -348,9 +318,7 @@ static UV XPosixCntrl_invlist[] = {
 
 static UV PosixDigit_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -364,9 +332,7 @@ static UV PosixDigit_invlist[] = {
 
 static UV PosixGraph_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -380,9 +346,7 @@ static UV PosixGraph_invlist[] = {
 
 static UV L1PosixGraph_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -398,9 +362,7 @@ static UV L1PosixGraph_invlist[] = {
 
 static UV PosixLower_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -414,9 +376,7 @@ static UV PosixLower_invlist[] = {
 
 static UV L1PosixLower_invlist[] = {
 	12,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -440,9 +400,7 @@ static UV L1PosixLower_invlist[] = {
 
 static UV PosixPrint_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -456,9 +414,7 @@ static UV PosixPrint_invlist[] = {
 
 static UV L1PosixPrint_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -474,9 +430,7 @@ static UV L1PosixPrint_invlist[] = {
 
 static UV PosixPunct_invlist[] = {
 	8,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -496,9 +450,7 @@ static UV PosixPunct_invlist[] = {
 
 static UV L1PosixPunct_invlist[] = {
 	20,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -530,9 +482,7 @@ static UV L1PosixPunct_invlist[] = {
 
 static UV PosixSpace_invlist[] = {
 	4,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -548,9 +498,7 @@ static UV PosixSpace_invlist[] = {
 
 static UV XPosixSpace_invlist[] = {
 	22,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -584,9 +532,7 @@ static UV XPosixSpace_invlist[] = {
 
 static UV PosixUpper_invlist[] = {
 	2,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -600,9 +546,7 @@ static UV PosixUpper_invlist[] = {
 
 static UV L1PosixUpper_invlist[] = {
 	6,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -620,9 +564,7 @@ static UV L1PosixUpper_invlist[] = {
 
 static UV PosixWord_invlist[] = {
 	8,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -642,9 +584,7 @@ static UV PosixWord_invlist[] = {
 
 static UV L1PosixWord_invlist[] = {
 	20,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -676,9 +616,7 @@ static UV L1PosixWord_invlist[] = {
 
 static UV PosixXDigit_invlist[] = {
 	6,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -696,9 +634,7 @@ static UV PosixXDigit_invlist[] = {
 
 static UV XPosixXDigit_invlist[] = {
 	12,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -720,9 +656,7 @@ static UV XPosixXDigit_invlist[] = {
 
 static UV NonL1_Perl_Non_Final_Folds_invlist[] = {
 	44,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,
@@ -776,9 +710,7 @@ static UV NonL1_Perl_Non_Final_Folds_invlist[] = {
 
 static UV _Perl_Multi_Char_Folds_invlist[] = {
 	58,	/* Number of elements */
-	0,	/* Current iteration position */
-	0,	/* Cache of previous search index result */
-	1039476070, /* Version and data structure type */
+	1511554547, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0,