#define ELEMENT_RANGE_MATCHES_INVLIST(i) (! ((i) & 1))
#define PREV_RANGE_MATCHES_INVLIST(i) (! ELEMENT_RANGE_MATCHES_INVLIST(i))
-PERL_STATIC_INLINE STRLEN*
-S__get_invlist_len_addr(pTHX_ SV* invlist)
+/* This converts to/from our UVs to what the SV code is expecting: bytes. */
+#define TO_INTERNAL_SIZE(x) ((x) * sizeof(UV))
+#define FROM_INTERNAL_SIZE(x) ((x)/ sizeof(UV))
+
+PERL_STATIC_INLINE bool*
+S_get_invlist_offset_addr(SV* invlist)
{
- /* Return the address of the UV that contains the current number
- * of used elements in the inversion list */
+ /* Return the address of the field that says whether the inversion list is
+ * offset (it contains 1) or not (contains 0) */
+ PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR;
- PERL_ARGS_ASSERT__GET_INVLIST_LEN_ADDR;
+ assert(SvTYPE(invlist) == SVt_INVLIST);
- return &(LvTARGLEN(invlist));
+ return &(((XINVLIST*) SvANY(invlist))->is_offset);
}
PERL_STATIC_INLINE UV
-S__invlist_len(pTHX_ SV* const invlist)
+S__invlist_len(SV* const invlist)
{
/* Returns the current number of elements stored in the inversion list's
* array */
PERL_ARGS_ASSERT__INVLIST_LEN;
- return *_get_invlist_len_addr(invlist);
+ assert(SvTYPE(invlist) == SVt_INVLIST);
+
+ return (SvCUR(invlist) == 0)
+ ? 0
+ : FROM_INTERNAL_SIZE(SvCUR(invlist)) - *get_invlist_offset_addr(invlist);
}
PERL_STATIC_INLINE bool
-S__invlist_contains_cp(pTHX_ SV* const invlist, const UV cp)
+S__invlist_contains_cp(SV* const invlist, const UV cp)
{
/* Does <invlist> contain code point <cp> as part of the set? */
return index >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index);
}
+# if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGEXEC_C)
+
+/* These symbols are only needed later in regcomp.c */
+# undef TO_INTERNAL_SIZE
+# undef FROM_INTERNAL_SIZE
+# endif
+
#endif