Add tiny tweaks stolen from Class::XSAccessor 1.07

[gitmo/Mouse.git] / mouse.h

diff --git a/mouse.h b/mouse.h
index 01518fd..b4f63ec 100644 (file)
--- a/mouse.h
+++ b/mouse.h
@@ -4,7 +4,9 @@
 #define PERL_NO_GET_CONTEXT
 #include <EXTERN.h>
 #include <perl.h>
+#define PERL_CORE
 #include <XSUB.h>
+#undef PERL_CORE
 
 #include "ppport.h"
 
@@ -25,10 +27,15 @@
 #define GvNAMELEN_get GvNAMELEN
 #endif
 
+#ifndef CvGV_set
+#define CvGV_set(cv, gv) (CvGV(cv) = (gv))
+#endif
+
 #ifndef mro_get_linear_isa
 #define no_mro_get_linear_isa
 #define mro_get_linear_isa(stash) mouse_mro_get_linear_isa(aTHX_ stash)
 AV* mouse_mro_get_linear_isa(pTHX_ HV* const stash);
+#define mro_method_changed_in(stash) ((void)++PL_sub_generation)
 #endif /* !mro_get_linear_isa */
 
 #ifndef mro_get_pkg_gen
@@ -70,6 +77,15 @@ mouse_throw_error(SV* const metaobject, SV* const data /* not used */, const cha
     ;
 #endif
 
+/* workaround RT #69939 */
+I32
+mouse_call_sv_safe(pTHX_ SV*, I32);
+
+#define call_sv_safe(sv, flags)     mouse_call_sv_safe(aTHX_ sv, flags)
+#define call_method_safe(m, flags)  mouse_call_sv_safe(aTHX_ newSVpvn_flags(m, strlen(m), SVs_TEMP), flags | G_METHOD)
+#define call_method_safes(m, flags) mouse_call_sv_safe(aTHX_ newSVpvs_flags(m, SVs_TEMP),            flags | G_METHOD)
+
+
 #define is_class_loaded(sv) mouse_is_class_loaded(aTHX_ sv)
 bool mouse_is_class_loaded(pTHX_ SV*);
 
@@ -101,6 +117,13 @@ GV* mouse_stash_fetch(pTHX_ HV* const stash, const char* const name, I32 const n
 #define stash_fetch(s, n, l, c) mouse_stash_fetch(aTHX_ (s), (n), (l), (c))
 #define stash_fetchs(s, n, c)   mouse_stash_fetch(aTHX_ (s), STR_WITH_LEN(n), (c))
 
+void mouse_install_sub(pTHX_ GV* const gv, SV* const code_ref);
+
+void mouse_must_defined(pTHX_ SV* const value, const char* const name);
+void mouse_must_ref(pTHX_ SV* const value, const char* const name, svtype const t);
+
+#define must_defined(sv, name)   mouse_must_defined(aTHX_ sv, name)
+#define must_ref(sv, name, svt)  mouse_must_ref(aTHX_ sv, name, svt)
 
 #define MOUSEf_DIE_ON_FAIL 0x01
 MAGIC* mouse_mg_find(pTHX_ SV* const sv, const MGVTBL* const vtbl, I32 const flags);
@@ -165,7 +188,6 @@ void mouse_instance_weaken_slot(pTHX_ SV* const instance, SV* const slot);
 
 CV* mouse_simple_accessor_generate(pTHX_ const char* const fq_name, const char* const key, I32 const keylen, XSUBADDR_t const accessor_impl, void* const dptr, I32 const dlen);
 
-XS(XS_Mouse_simple_accessor);
 XS(XS_Mouse_simple_reader);
 XS(XS_Mouse_simple_writer);
 XS(XS_Mouse_simple_clearer);