diff options
| author | Karl Williamson <public@khwilliamson.com> | 2013-07-06 14:13:35 -0600 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2013-07-16 13:58:07 -0600 |
| commit | 3388db2c1477e99d8063e43491760752e6d05d8d (patch) | |
| tree | d7f562dd79f93427f231506529369cc5ab55291c /inline_invlist.c | |
| parent | 6658a1d80ed82c7328a5e2b1c365abb7de45ff92 (diff) | |
| download | perl-3388db2c1477e99d8063e43491760752e6d05d8d.tar.gz | |
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.
Diffstat (limited to 'inline_invlist.c')
| -rw-r--r-- | inline_invlist.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/inline_invlist.c b/inline_invlist.c index f20f6daae0..5d239bd6cd 100644 --- a/inline_invlist.c +++ b/inline_invlist.c @@ -9,20 +9,16 @@ #if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) #define INVLIST_LEN_OFFSET 0 /* Number of elements in the inversion list */ -#define INVLIST_ITER_OFFSET 1 /* Current iteration position */ -#define INVLIST_PREVIOUS_INDEX_OFFSET 2 /* Place to cache index of previous - result */ /* This is a combination of a version and data structure type, so that one * being passed in can be validated to be an inversion list of the correct * vintage. When the structure of the header is changed, a new random number - * in the range 2**31-1 should be generated and the new() method changed to - * insert that at this location. Then, if an auxiliary program doesn't change - * correspondingly, it will be discovered immediately */ -#define INVLIST_VERSION_ID_OFFSET 3 -#define INVLIST_VERSION_ID 1039476070 + * in the range 2**31-1 should be generated. Then, if an auxiliary program + * doesn't change correspondingly, it will be discovered immediately */ +#define INVLIST_VERSION_ID_OFFSET 1 +#define INVLIST_VERSION_ID 1511554547 -#define INVLIST_ZERO_OFFSET 4 /* 0 or 1 */ +#define INVLIST_ZERO_OFFSET 2 /* 0 or 1 */ /* The UV at position ZERO contains either 0 or 1. If 0, the inversion list * contains the code point U+00000, and begins at element [0] in the array, * which always contains 0. If 1, the inversion list doesn't contain U+0000, |