X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=mouse.h;h=9974f816d8caf7069beb266383abad6aaa8d4909;hp=dc5858e2f7893463fdb2434367f1d4d806196bca;hb=6582d0e35a9937aa8869d868f10172935f48e1ce;hpb=441964ce2aaf63287281b9084b131ecb124a3405

diff --git a/mouse.h b/mouse.h
index dc5858e..9974f81 100644
--- a/mouse.h
+++ b/mouse.h
@@ -57,8 +57,7 @@ mouse_throw_error(SV* const metaobject, SV* const data /* not used */, const cha
 #define is_class_loaded(sv) mouse_is_class_loaded(aTHX_ sv)
 bool mouse_is_class_loaded(pTHX_ SV*);
 
-#define is_instance_of(sv, klass) mouse_is_instance_of(aTHX_ sv, klass)
-bool mouse_is_instance_of(pTHX_ SV* const sv, SV* const klass);
+#define is_an_instance_of(klass, sv) mouse_is_an_instance_of(aTHX_ gv_stashpvs(klass, GV_ADD), (sv))
 
 #define IsObject(sv) (SvROK(sv) && SvOBJECT(SvRV(sv)))
 
@@ -102,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)
@@ -129,6 +137,7 @@ XS(mouse_xs_writer);
 typedef enum mouse_tc{
      MOUSE_TC_ANY,
      MOUSE_TC_ITEM,
+     MOUSE_TC_MAYBE,
      MOUSE_TC_UNDEF,
      MOUSE_TC_DEFINED,
      MOUSE_TC_BOOL,
@@ -176,9 +185,13 @@ int mouse_tc_GlobRef   (pTHX_ SV* const sv);
 int mouse_tc_FileHandle(pTHX_ SV* const sv);
 int mouse_tc_Object    (pTHX_ SV* const sv);
 
-CV* generate_isa_predicate_for(pTHX_ SV* const klass, const char* const predicate_name);
+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__Util__TypeConstraints_Item);
+
 #endif /* !MOUSE_H */