Ensure backward compatiblity

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

diff --git a/xs-src/MouseTypeConstraints.xs b/xs-src/MouseTypeConstraints.xs
index 6c84858..27bf1a3 100644 (file)
--- a/xs-src/MouseTypeConstraints.xs
+++ b/xs-src/MouseTypeConstraints.xs
@@ -19,26 +19,22 @@ typedef int (*check_fptr_t)(pTHX_ SV* const data, SV* const sv);
 int
 mouse_tc_check(pTHX_ SV* const tc_code, SV* const sv) {
     CV* const cv = (CV*)SvRV(tc_code);
-    assert(SvTYPE(cv) == Svt_PVCV);
+    assert(SvTYPE(cv) == SVt_PVCV);
 
-    if(CvISXSUB(cv)){ /* can be built-in tc */
-        if(CvXSUB(cv) == XS_Mouse__Util__TypeConstraints_Item){
-            assert(CvXSUBANY(cv).any_iv > 0);
+    if(CvXSUB(cv) == XS_Mouse__Util__TypeConstraints_Item){ /* built-in */
+        assert(CvXSUBANY(cv).any_iv > 0);
 
-            return mouse_builtin_tc_check(aTHX_ CvXSUBANY(cv).any_iv, sv);
-        }
-        else if(CvXSUB(cv) == XS_Mouse_parameterized_check){
-            MAGIC* const mg = (MAGIC*)CvXSUBANY(cv).any_ptr;
+        return mouse_builtin_tc_check(aTHX_ CvXSUBANY(cv).any_iv, sv);
+    }
+    else if(CvXSUB(cv) == XS_Mouse_parameterized_check){ /* built-in, parameterizad */
+        MAGIC* const mg = (MAGIC*)CvXSUBANY(cv).any_ptr;
 
-            assert(CvXSUBANY(cv).any_ptr != NULL);
+        assert(CvXSUBANY(cv).any_ptr != NULL);
 
-            /* call the check function directly, skipping call_sv() */
-            return CALL_FPTR((check_fptr_t)mg->mg_ptr)(aTHX_ mg->mg_obj, sv);
-        }
+        /* call the check function directly, skipping call_sv() */
+        return CALL_FPTR((check_fptr_t)mg->mg_ptr)(aTHX_ mg->mg_obj, sv);
     }
-
-    /* user-defined type constraints */
-    {
+    else { /* custom */
         int ok;
         dSP;
 
@@ -280,6 +276,53 @@ mouse_tc_Object(pTHX_ SV* const sv) {
     return SvROK(sv) && SvOBJECT(SvRV(sv)) && !SvRXOK(sv);
 }
 
+/* Parameterized type constraints */
+
+int
+mouse_parameterized_ArrayRef(pTHX_ SV* const param, SV* const sv) {
+    if(mouse_tc_ArrayRef(aTHX_ sv)){
+        AV* const av  = (AV*)SvRV(sv);
+        I32 const len = av_len(av) + 1;
+        I32 i;
+        for(i = 0; i < len; i++){
+            SV* const value = *av_fetch(av, i, TRUE);
+            SvGETMAGIC(value);
+            if(!mouse_tc_check(aTHX_ param, value)){
+                return FALSE;
+            }
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+int
+mouse_parameterized_HashRef(pTHX_ SV* const param, SV* const sv) {
+    if(mouse_tc_HashRef(aTHX_ sv)){
+        HV* const hv  = (HV*)SvRV(sv);
+        HE* he;
+
+        hv_iterinit(hv);
+        while((he = hv_iternext(hv))){
+            SV* const value = hv_iterval(hv, he);
+            SvGETMAGIC(value);
+            if(!mouse_tc_check(aTHX_ param, value)){
+                return FALSE;
+            }
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+int
+mouse_parameterized_Maybe(pTHX_ SV* const param, SV* const sv) {
+    if(SvOK(sv)){
+        return mouse_tc_check(aTHX_ param, sv);
+    }
+    return TRUE;
+}
+
 /*
  *  This class_type generator is taken from Scalar::Util::Instance
  */
@@ -380,10 +423,11 @@ mouse_is_an_instance_of_universal(pTHX_ SV* const data, SV* const sv){
 
 static MGVTBL mouse_util_type_constraints_vtbl; /* not used, only for identity */
 
-CV*
+static CV*
 mouse_tc_parameterize(pTHX_ const char* const name, check_fptr_t const fptr, SV* const param) {
-    CV* const xsub = newXS(name, XS_Mouse_parameterized_check, __FILE__);
+    CV* xsub;
 
+    xsub = newXS(name, XS_Mouse_parameterized_check, __FILE__);
     CvXSUBANY(xsub).any_ptr = sv_magicext(
         (SV*)xsub,
         param,       /* mg_obj: refcnt will be increased */
@@ -495,3 +539,32 @@ CODE:
     XSRETURN(1);
 
 
+CV*
+_parameterize_ArrayRef_for(SV* param)
+ALIAS:
+    _parameterize_ArrayRef_for = MOUSE_TC_ARRAY_REF
+    _parameterize_HashRef_for  = MOUSE_TC_HASH_REF
+    _parameterize_Maybe_for    = MOUSE_TC_MAYBE
+CODE:
+{
+    check_fptr_t fptr;
+    SV* const tc_code = mcall0s(param, "_compiled_type_constraint");
+    if(!(SvROK(tc_code) && SvTYPE(SvRV(tc_code)) == SVt_PVCV)){
+        croak("_compiled_type_constraint didn't return a CODE reference");
+    }
+
+    switch(ix){
+    case MOUSE_TC_ARRAY_REF:
+        fptr = mouse_parameterized_ArrayRef;
+        break;
+    case MOUSE_TC_HASH_REF:
+        fptr = mouse_parameterized_HashRef;
+        break;
+    default: /* Maybe type */
+        fptr = mouse_parameterized_Maybe;
+    }
+    RETVAL = mouse_tc_parameterize(aTHX_ NULL, fptr, tc_code);
+}
+OUTPUT:
+    RETVAL
+