/* support for Hash::Util::FieldHash, prefix HUF_ */
-/* The object registry, a package variable */
-#define HUF_OB_REG "Hash::Util::FieldHash::ob_reg"
+/* A Perl sub that returns a hashref to the object registry */
+#define HUF_OB_REG "Hash::Util::FieldHash::_ob_reg"
/* Magic cookies to recognize object id's. Hi, Eva, David */
#define HUF_COOKIE 2805.1980
#define HUF_REFADDR_COOKIE 1811.1976
-
/* For global cache of object registry */
#define MY_CXT_KEY "Hash::Util::FieldHash::_guts" XS_VERSION
typedef struct {
} my_cxt_t;
START_MY_CXT
+/* Inquire the object registry (a lexical hash) from perl */
+HV* HUF_get_ob_reg(void) {
+ dSP;
+ HV* ob_reg = NULL;
+ I32 items;
+ ENTER;
+ SAVETMPS;
+
+ PUSHMARK(SP);
+ items = call_pv(HUF_OB_REG, G_SCALAR|G_NOARGS);
+ SPAGAIN;
+
+ if (items == 1 && TOPs && SvROK(TOPs) && SvTYPE(SvRV(TOPs)) == SVt_PVHV)
+ ob_reg = (HV*)SvRV(POPs);
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
+
+ if (!ob_reg)
+ Perl_die(aTHX_ "Can't get object registry hash");
+ return ob_reg;
+}
+
/* Deal with global context */
#define HUF_INIT 1
#define HUF_CLONE 0
void HUF_global(I32 how) {
if (how == HUF_INIT) {
MY_CXT_INIT;
- MY_CXT.ob_reg = get_hv(HUF_OB_REG, 1);
+ MY_CXT.ob_reg = HUF_get_ob_reg();
} else if (how == HUF_CLONE) {
MY_CXT_CLONE;
- MY_CXT.ob_reg = get_hv(HUF_OB_REG, 0);
+ MY_CXT.ob_reg = HUF_get_ob_reg();
} else if (how == HUF_RESET) {
dMY_CXT;
- MY_CXT.ob_reg = get_hv(HUF_OB_REG, 0);
+ MY_CXT.ob_reg = HUF_get_ob_reg();
}
}
SvNV_set(id, cookie);
SvNOK_on(id);
}
- SvIV_set(id, (IV)SvRV(ref));
+ SvIV_set(id, PTR2UV(SvRV(ref)));
SvIOK_on(id);
return id;
}
return HUF_id(obj, 0.0);
}
-/* object id (may be different in future) */
+/* object id (same as plain, may be different in future) */
SV* HUF_obj_id(SV* obj) {
return HUF_id(obj, 0.0);
}
/* set up uvar magic for any sv */
void HUF_add_uvar_magic(
- SV* sv, /* the sv to enchant, visible to * get/set */
+ SV* sv, /* the sv to enchant, visible to get/set */
I32(* val)(pTHX_ IV, SV*), /* "get" function */
I32(* set)(pTHX_ IV, SV*), /* "set" function */
I32 index, /* get/set will see this */
hv_store_ent(field_tab, field_id, field_ref, 0);
}
-#define HV_FETCH_ISSTORE 0x01
-#define HV_FETCH_ISEXISTS 0x02
-#define HV_FETCH_LVALUE 0x04
-#define HV_FETCH_JUST_SV 0x08
-
-#define HUF_WOULD_CREATE_KEY(x) ((x) != -1 && ((x) & (HV_FETCH_ISSTORE | HV_FETCH_LVALUE)))
+#define HUF_WOULD_CREATE_KEY(x) ((x) != HV_DELETE && ((x) & (HV_FETCH_ISSTORE | HV_FETCH_LVALUE)))
/* The key exchange function. It communicates with S_hv_magic_uvar_xkey
* in hv.c */
I32 HUF_watch_key(pTHX_ IV action, SV* field) {
MAGIC* mg = mg_find(field, PERL_MAGIC_uvar);
- SV* keysv = mg->mg_obj;
- if (keysv && SvROK(keysv)) {
- SV* ob_id = HUF_obj_id(keysv);
- mg->mg_obj = ob_id; /* key replacement */
- if (HUF_WOULD_CREATE_KEY(action)) {
- SV* trigger = HUF_get_trigger(keysv, ob_id);
- HUF_mark_field(trigger, field);
+ SV* keysv;
+ if (mg) {
+ keysv = mg->mg_obj;
+ if (keysv && !SvROK(keysv)) { /* is string an object-id? */
+ SV* obj = HUF_ask_trigger(keysv);
+ if (obj)
+ keysv = obj; /* use the object instead, so registry happens */
+ }
+ if (keysv && SvROK(keysv)) {
+ SV* ob_id = HUF_obj_id(keysv);
+ mg->mg_obj = ob_id; /* key replacement */
+ if (HUF_WOULD_CREATE_KEY(action)) {
+ SV* trigger = HUF_get_trigger(keysv, ob_id);
+ HUF_mark_field(trigger, field);
+ }
}
+ } else {
+ Perl_die(aTHX_ "Rogue call of 'HUF_watch_key'");
}
return 0;
}
/* Go over object registry and fix all objects. Also fix the object
* registry.
*/
-void HUF_fix_objects() {
+void HUF_fix_objects(void) {
dMY_CXT;
I32 i, len;
HE* ent;
RETVAL
void
-CLONE(char* class)
+CLONE(char* classname)
CODE:
- if (0 == strcmp(class, "Hash::Util::FieldHash")) {
+ if (0 == strcmp(classname, "Hash::Util::FieldHash")) {
HUF_global(HUF_CLONE);
HUF_fix_objects();
}
-SV*
-_get_obj_id(SV* obj)
-CODE:
- RETVAL = NULL;
- if (SvROK(obj))
- RETVAL = HUF_obj_id(obj);
-OUTPUT:
- RETVAL
-
void
_active_fields(SV* obj)
PPCODE: