XS constructor

[gitmo/Mouse.git] / xs-src / MouseAccessor.xs

diff --git a/xs-src/MouseAccessor.xs b/xs-src/MouseAccessor.xs
index 0e53ca8..aa87df3 100644 (file)
--- a/xs-src/MouseAccessor.xs
+++ b/xs-src/MouseAccessor.xs
@@ -6,8 +6,10 @@
         }                                                             \
     } STMT_END
 
-/* Moose XS Attribute object */
+/* Mouse XS Attribute object */
 enum mouse_xa_ix_t{
+    MOUSE_XA_SLOT,      /* for constructors, sync to mg_obj */
+    MOUSE_XA_FLAGS,     /* for constructors, sync to mg_private */
     MOUSE_XA_ATTRIBUTE,
     MOUSE_XA_TC,
     MOUSE_XA_TC_CODE,
@@ -25,7 +27,7 @@ enum mouse_xa_flags_t{
     MOUSEf_ATTR_HAS_TC          = 0x0001,
     MOUSEf_ATTR_HAS_DEFAULT     = 0x0002,
     MOUSEf_ATTR_HAS_BUILDER     = 0x0004,
-    MOUSEf_ATTR_HAS_INITIALIZER = 0x0008, /* not used in Mouse */
+    MOUSEf_ATTR_HAS_INITIALIZER = 0x0008,
     MOUSEf_ATTR_HAS_TRIGGER     = 0x0010,
 
     MOUSEf_ATTR_IS_LAZY         = 0x0020,
@@ -165,7 +167,7 @@ mouse_apply_type_constraint(pTHX_ AV* const xa, SV* value, U16 const flags){
         tc_code = mcall0s(tc, "_compiled_type_constraint");
         av_store(xa, MOUSE_XA_TC_CODE, newSVsv(tc_code));
 
-        if(!(SvROK(tc_code) && SvTYPE(SvRV(tc_code)) == SVt_PVCV)){
+        if(!IsCodeRef(tc_code)){
             mouse_throw_error(MOUSE_xa_attribute(xa), tc, "Not a CODE reference");
         }
     }
@@ -206,14 +208,15 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){
     }
 
     if(flags & MOUSEf_TC_IS_ARRAYREF){
-        AV* const av = (AV*)SvRV(value);
+        AV* av;
         I32 len;
         I32 i;
 
-        if(SvTYPE(av) != SVt_PVAV){
+        if(!IsArrayRef(value)){
             croak("Mouse-panic: Not an ARRAY reference");
         }
 
+        av  = (AV*)SvRV(value);
         len = av_len(av) + 1;
         EXTEND(SP, len);
         for(i = 0; i < len; i++){
@@ -222,13 +225,14 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){
         }
     }
     else if(flags & MOUSEf_TC_IS_HASHREF){
-        HV* const hv = (HV*)SvRV(value);
+        HV* hv;
         HE* he;
 
-        if(SvTYPE(hv) != SVt_PVHV){
+        if(!IsHashRef(value)){
             croak("Mouse-panic: Not a HASH reference");
         }
 
+        hv = (HV*)SvRV(value);
         hv_iterinit(hv);
         while((he = hv_iternext(hv))){
             EXTEND(SP, 2);
@@ -261,7 +265,7 @@ mouse_attr_get(pTHX_ SV* const self, MAGIC* const mg){
         else {
             value = mcall0s(attr, "default");
 
-            if(SvROK(value) && SvTYPE(SvRV(value)) == SVt_PVCV){
+            if(IsCodeRef(value)){
                 value = mcall0(self, value);
             }
         }
@@ -463,6 +467,7 @@ XS(XS_Mouse_simple_predicate)
 SV*
 mouse_instance_create(pTHX_ HV* const stash) {
     assert(stash);
+    assert(SvTYPE(stash) == SVt_PVHV);
     return sv_bless( newRV_noinc((SV*)newHV()), stash );
 }