X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=mouse.h;h=94f44317672f5adec1657b94c09e6e9ea8d857df;hp=66c4735c6e14499f653c4d6733f4107edbe18d46;hb=a4b901ac53a9eb592740cd6fb20a136e142671db;hpb=016e46812a519214fa28c597955ceb0b0bccc43a

diff --git a/mouse.h b/mouse.h
index 66c4735..94f4431 100644
--- a/mouse.h
+++ b/mouse.h
@@ -63,8 +63,8 @@ bool mouse_is_class_loaded(pTHX_ SV*);
 
 #define mcall0(invocant, m)        mouse_call0(aTHX_ (invocant), (m))
 #define mcall1(invocant, m, arg1)  mouse_call1(aTHX_ (invocant), (m), (arg1))
-#define mcall0s(invocant, m)       mcall0((invocant), newSVpvs_flags(m, SVs_TEMP))
-#define mcall1s(invocant, m, arg1) mcall1((invocant), newSVpvs_flags(m, SVs_TEMP), (arg1))
+#define mcall0s(invocant, m)       mcall0((invocant), sv_2mortal(newSVpvs_share(m)))
+#define mcall1s(invocant, m, arg1) mcall1((invocant), sv_2mortal(newSVpvs_share(m)), (arg1))
 
 SV* mouse_call0(pTHX_ SV *const self, SV *const method);
 SV* mouse_call1(pTHX_ SV *const self, SV *const method, SV* const arg1);
@@ -101,6 +101,15 @@ SV*  mouse_instance_set_slot   (pTHX_ SV* const instance, SV* const slot, SV* co
 SV*  mouse_instance_delete_slot(pTHX_ SV* const instance, SV* const slot);
 void mouse_instance_weaken_slot(pTHX_ SV* const instance, SV* const slot);
 
+#define has_slot(self, key)         mouse_instance_has_slot(aTHX_ self, key)
+#define get_slot(self, key)         mouse_instance_get_slot(aTHX_ self, key)
+#define set_slot(self, key, value)  mouse_instance_set_slot(aTHX_ self, key, value)
+#define delete_slot(self, key)      mouse_instance_delete_slot(aTHX_ self, key)
+#define weaken_slot(self, key)      mouse_instance_weaken_slot(aTHX_ self, key)
+
+#define has_slots(self, key)        has_slot(self, sv_2mortal(newSVpvs_share(key)))
+#define get_slots(self, key)        get_slot(self, sv_2mortal(newSVpvs_share(key)))
+#define set_slots(self, key, value) set_slot(self, sv_2mortal(newSVpvs_share(key)), value)
 
 /* mouse_simle_accessor.xs */
 #define INSTALL_SIMPLE_READER(klass, name)                  INSTALL_SIMPLE_READER_WITH_KEY(klass, name, name)
@@ -125,61 +134,35 @@ XS(mouse_xs_accessor);
 XS(mouse_xs_reader);
 XS(mouse_xs_writer);
 
-typedef enum mouse_tc{
-     MOUSE_TC_ANY,
-     MOUSE_TC_ITEM,
-     MOUSE_TC_UNDEF,
-     MOUSE_TC_DEFINED,
-     MOUSE_TC_BOOL,
-     MOUSE_TC_VALUE,
-     MOUSE_TC_REF,
-     MOUSE_TC_STR,
-     MOUSE_TC_NUM,
-     MOUSE_TC_INT,
-     MOUSE_TC_SCALAR_REF,
-     MOUSE_TC_ARRAY_REF,
-     MOUSE_TC_HASH_REF,
-     MOUSE_TC_CODE_REF,
-     MOUSE_TC_GLOB_REF,
-     MOUSE_TC_FILEHANDLE,
-     MOUSE_TC_REGEXP_REF,
-     MOUSE_TC_OBJECT,
-     MOUSE_TC_CLASS_NAME,
-     MOUSE_TC_ROLE_NAME,
-
-     MOUSE_TC_last
-} mouse_tc;
-
 /* type constraints */
 
 int mouse_tc_check(pTHX_ SV* const tc, SV* const sv);
-int mouse_builtin_tc_check(pTHX_ mouse_tc const tc, SV* const sv);
-
-int mouse_tc_Any       (pTHX_ SV* const sv);
-int mouse_tc_Bool      (pTHX_ SV* const sv);
-int mouse_tc_Undef     (pTHX_ SV* const sv);
-int mouse_tc_Defined   (pTHX_ SV* const sv);
-int mouse_tc_Value     (pTHX_ SV* const sv);
-int mouse_tc_Num       (pTHX_ SV* const sv);
-int mouse_tc_Int       (pTHX_ SV* const sv);
-int mouse_tc_Str       (pTHX_ SV* const sv);
-int mouse_tc_ClassName (pTHX_ SV* const sv);
-int mouse_tc_RoleName  (pTHX_ SV* const sv);
-int mouse_tc_Ref       (pTHX_ SV* const sv);
-int mouse_tc_ScalarRef (pTHX_ SV* const sv);
-int mouse_tc_ArrayRef  (pTHX_ SV* const sv);
-int mouse_tc_HashRef   (pTHX_ SV* const sv);
-int mouse_tc_CodeRef   (pTHX_ SV* const sv);
-int mouse_tc_RegexpRef (pTHX_ SV* const sv);
-int mouse_tc_GlobRef   (pTHX_ SV* const sv);
-int mouse_tc_FileHandle(pTHX_ SV* const sv);
-int mouse_tc_Object    (pTHX_ SV* const sv);
+
+int mouse_tc_Any       (pTHX_ SV*, SV* const sv);
+int mouse_tc_Bool      (pTHX_ SV*, SV* const sv);
+int mouse_tc_Undef     (pTHX_ SV*, SV* const sv);
+int mouse_tc_Defined   (pTHX_ SV*, SV* const sv);
+int mouse_tc_Value     (pTHX_ SV*, SV* const sv);
+int mouse_tc_Num       (pTHX_ SV*, SV* const sv);
+int mouse_tc_Int       (pTHX_ SV*, SV* const sv);
+int mouse_tc_Str       (pTHX_ SV*, SV* const sv);
+int mouse_tc_ClassName (pTHX_ SV*, SV* const sv);
+int mouse_tc_RoleName  (pTHX_ SV*, SV* const sv);
+int mouse_tc_Ref       (pTHX_ SV*, SV* const sv);
+int mouse_tc_ScalarRef (pTHX_ SV*, SV* const sv);
+int mouse_tc_ArrayRef  (pTHX_ SV*, SV* const sv);
+int mouse_tc_HashRef   (pTHX_ SV*, SV* const sv);
+int mouse_tc_CodeRef   (pTHX_ SV*, SV* const sv);
+int mouse_tc_RegexpRef (pTHX_ SV*, SV* const sv);
+int mouse_tc_GlobRef   (pTHX_ SV*, SV* const sv);
+int mouse_tc_FileHandle(pTHX_ SV*, SV* const sv);
+int mouse_tc_Object    (pTHX_ SV*, SV* const sv);
 
 CV* mouse_generate_isa_predicate_for(pTHX_ SV* const klass, const char* const predicate_name);
 
 int mouse_is_an_instance_of(pTHX_ HV* const stash, SV* const instance);
 
-XS(XS_Mouse_parameterized_check);
+XS(XS_Mouse_constraint_check);
 
 #endif /* !MOUSE_H */