Use the funcs in mro.c
*/
-
-/* structure may change, so not public yet */
-struct mro_alg;
+struct mro_alg {
+ AV *(*resolve)(pTHX_ HV* stash, U32 level);
+ const char *name;
+ U16 length;
+ U16 kflags; /* For the hash API - set HVhek_UTF8 if name is UTF-8 */
+ U32 hash; /* or 0 */
+};
struct mro_meta {
- /* repurposed as a hash holding the different MROs private data. */
- AV *mro_linear_dfs; /* cached dfs @ISA linearization */
- /* repurposed as a pointer directly to the current MROs private data. */
- AV *mro_linear_c3; /* cached c3 @ISA linearization */
+ /* a hash holding the different MROs private data. */
+ HV *mro_linear_all;
+ /* a pointer directly to the current MROs private data. If mro_linear_all
+ is NULL, this owns the SV reference, else it is just a pointer to a
+ value stored in and owned by mro_linear_all. */
+ SV *mro_linear_current;
HV *mro_nextmethod; /* next::method caching */
U32 cache_gen; /* Bumping this invalidates our method cache */
U32 pkg_gen; /* Bumps when local methods/@ISA change */
HV *isa; /* Everything this class @ISA */
};
+#define MRO_GET_PRIVATE_DATA(smeta, which) \
+ (((smeta)->mro_which && (which) == (smeta)->mro_which) \
+ ? (smeta)->mro_linear_current \
+ : Perl_mro_get_private_data(aTHX_ (smeta), (which)))
+
/* Subject to change.
Don't access this directly.
*/
struct mro_meta *xhv_mro_meta;
};
-#define _XPVHV_ALLOCATED_HEAD \
- STRLEN xhv_fill; /* how full xhv_array currently is */ \
- STRLEN xhv_max /* subscript of last element of xhv_array */
-
-#define _XPVHV_HEAD \
- union _xnvu xnv_u; \
- _XPVHV_ALLOCATED_HEAD
-
/* hash structure: */
/* This structure must match the beginning of struct xpvmg in sv.h. */
struct xpvhv {
- _XPVHV_HEAD;
+ union _xnvu xnv_u;
+ STRLEN xhv_fill; /* how full xhv_array currently is */
+ STRLEN xhv_max; /* subscript of last element of xhv_array */
_XPVMG_HEAD;
};
#define xhv_keys xiv_u.xivu_iv
-typedef struct {
- _XPVHV_ALLOCATED_HEAD;
- _XPVMG_HEAD;
-} xpvhv_allocated;
-
-#undef _XPVHV_ALLOCATED_HEAD
-#undef _XPVHV_HEAD
-
/* hash a key */
/* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins
* from requirements by Colin Plumb.
caller's responsibility */
#define HvMROMETA(hv) (HvAUX(hv)->xhv_mro_meta \
? HvAUX(hv)->xhv_mro_meta \
- : mro_meta_init(hv))
+ : Perl_mro_meta_init(aTHX_ hv))
/* FIXME - all of these should use a UTF8 aware API, which should also involve
getting the length. */
#define HVhek_FREEKEY 0x100 /* Internal flag to say key is malloc()ed. */
#define HVhek_PLACEHOLD 0x200 /* Internal flag to create placeholder.
* (may change, but Storable is a core module) */
+#define HVhek_KEYCANONICAL 0x400 /* Internal flag - key is in canonical form.
+ If the string is UTF-8, it cannot be
+ converted to bytes. */
#define HVhek_MASK 0xFF
/* Which flags enable HvHASKFLAGS? Somewhat a hack on a hack, as