int
mouse_tc_check(pTHX_ SV* const tc_code, SV* const sv) {
- CV* cv;
- assert(SvROK(tc_code) && SvTYPE(SvRV(tc_code)));
-
- cv = (CV*)SvRV(tc_code);
+ CV* const cv = (CV*)SvRV(tc_code);
+ assert(SvTYPE(cv) == Svt_PVCV);
if(CvISXSUB(cv)){ /* can be built-in tc */
if(CvXSUB(cv) == XS_Mouse__Util__TypeConstraints_Item){
MAGIC* const mg = (MAGIC*)CvXSUBANY(cv).any_ptr;
assert(CvXSUBANY(cv).any_ptr != NULL);
- return CALL_FPTR((check_fptr_t)mg->mg_ptr)(aTHX_ mg->mg_obj /* stash */, sv);
+
+ /* call the check function directly, skipping call_sv() */
+ return CALL_FPTR((check_fptr_t)mg->mg_ptr)(aTHX_ mg->mg_obj, sv);
}
}
case MOUSE_TC_CLASS_NAME: return mouse_tc_ClassName(aTHX_ sv);
case MOUSE_TC_ROLE_NAME: return mouse_tc_RoleName(aTHX_ sv);
default:
- /* custom type constraints */
NOOP;
}
- croak("Custom type constraint is not yet implemented");
+ croak("Mouse-panic: unrecognized type constraint id: %d", (int)tc);
return FALSE; /* not reached */
}
int
mouse_tc_Bool(pTHX_ SV* const sv) {
assert(sv);
- if(SvOK(sv)){
+
+ if(SvTRUE(sv)){
if(SvIOKp(sv)){
- return SvIVX(sv) == 1 || SvIVX(sv) == 0;
+ return SvIVX(sv) == 1;
}
else if(SvNOKp(sv)){
- return SvNVX(sv) == 1.0 || SvNVX(sv) == 0.0;
+ return SvNVX(sv) == 1.0;
}
- else if(SvPOKp(sv)){ /* "" or "1" or "0" */
- return SvCUR(sv) == 0
- || ( SvCUR(sv) == 1 && ( SvPVX(sv)[0] == '1' || SvPVX(sv)[0] == '0' ) );
+ else if(SvPOKp(sv)){ /* "1" */
+ return SvCUR(sv) == 1 && SvPVX(sv)[0] == '1';
}
else{
return FALSE;
}
}
else{
+ /* false must be boolean */
return TRUE;
}
}