Mouse::Tiny shouldn't include Test::Mouse

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

diff --git a/xs-src/MouseAttribute.xs b/xs-src/MouseAttribute.xs
index a11471f..63da0ce 100644 (file)
--- a/xs-src/MouseAttribute.xs
+++ b/xs-src/MouseAttribute.xs
@@ -48,10 +48,10 @@ mouse_get_xa(pTHX_ SV* const attr) {
                 SV* const is_a_type_of = sv_2mortal(newSVpvs_share("is_a_type_of"));
 
                 flags |= MOUSEf_ATTR_SHOULD_AUTO_DEREF;
-                if( SvTRUEx(mcall1(tc, is_a_type_of, newSVpvs_flags("ArrayRef", SVs_TEMP))) ){
+                if( sv_true(mcall1(tc, is_a_type_of, newSVpvs_flags("ArrayRef", SVs_TEMP))) ){
                     flags |= MOUSEf_TC_IS_ARRAYREF;
                 }
-                else if( SvTRUEx(mcall1(tc, is_a_type_of, newSVpvs_flags("HashRef", SVs_TEMP))) ){
+                else if( sv_true(mcall1(tc, is_a_type_of, newSVpvs_flags("HashRef", SVs_TEMP))) ){
                     flags |= MOUSEf_TC_IS_HASHREF;
                 }
                 else{
@@ -111,7 +111,7 @@ mouse_xa_apply_type_constraint(pTHX_ AV* const xa, SV* value, U16 const flags){
     SV* tc_code;
 
     if(flags & MOUSEf_ATTR_SHOULD_COERCE){
-          value = mcall1s(tc, "coerce", value);
+          value = mcall1(tc, mouse_coerce, value);
     }
 
     if(!SvOK(MOUSE_xa_tc_code(xa))){
@@ -324,7 +324,7 @@ CODE:
         XPUSHs(*svp);
         PUTBACK;
 
-        call_pv("Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint",
+        call_pv("Mouse::Util::TypeConstraints::find_or_create_does_type_constraint",
             G_SCALAR);
         SPAGAIN;
         tc = newSVsv(POPs);