merge trans_check_pdls behaviour into type_coerce - #517

Author: mohawk2

lib/PDL/Core/pdlaffine.c

@@ -116,8 +116,6 @@ pdl_error pdl_affine_new(pdl *PARENT,pdl *CHILD,PDL_Indx offset,PDL_Indx *dims,P
   pdl_params_affine *params = trans->params;
   trans->pdls[0] = PARENT;
   trans->pdls[1] = CHILD;
-  PDL_RETERROR(PDL_err, pdl_trans_check_pdls(trans));
-  char badflag_cache = pdl_trans_badflag_from_inputs((pdl_trans *)trans);
   pdl_type_coerce((pdl_trans *)trans);
   PARENT = trans->pdls[0];
   CHILD = trans->pdls[1];
@@ -137,7 +135,5 @@ pdl_error pdl_affine_new(pdl *PARENT,pdl *CHILD,PDL_Indx offset,PDL_Indx *dims,P
     params->sincs[i] = incs[i];
   }
   PDL_RETERROR(PDL_err, pdl_make_trans_mutual((pdl_trans *)trans));
-  if (badflag_cache)
-    CHILD->state |= PDL_BADVAL;
   return PDL_err;
 }

lib/PDL/Core/pdlapi.c

@@ -1316,9 +1316,11 @@ pdl_error pdl__type_convert(pdl_trans *trans, int recurse_count) {
   return PDL_err;
 }
 
+pdl_error pdl__trans_check_pdls_actual(pdl_trans *trans);
 pdl_error pdl__type_coerce_recprotect(pdl_trans *trans, int recurse_count) {
   pdl_error PDL_err = {0, NULL, 0};
   PDL_RECURSE_CHECK(recurse_count);
+  PDL_RETERROR(PDL_err, pdl__trans_check_pdls_actual(trans));
   pdl_datatypes trans_dtype;
   PDL_RETERROR(PDL_err, pdl__transtype_select(trans, &trans_dtype));
   trans->__datatype = trans_dtype;
@@ -1341,7 +1343,7 @@ char pdl_trans_badflag_from_inputs(pdl_trans *trans) {
   return 0; /* CORE21 get rid */
 }
 
-pdl_error pdl_trans_check_pdls(pdl_trans *trans) {
+pdl_error pdl__trans_check_pdls_actual(pdl_trans *trans) {
   pdl_error PDL_err = {0, NULL, 0};
   PDL_Indx i;
   pdl_transvtable *vtable = trans->vtable;
@@ -1362,3 +1364,7 @@ pdl_error pdl_trans_check_pdls(pdl_trans *trans) {
         );
   return PDL_err;
 }
+pdl_error pdl_trans_check_pdls(pdl_trans *trans) {
+  pdl_error PDL_err = {0, NULL, 0};
+  return PDL_err; /* CORE21 get rid */
+}

lib/PDL/Core/pdlconv.c

@@ -255,11 +255,6 @@ pdl_error pdl__converttypei_new_recprotect(pdl *PARENT, pdl *CHILD, pdl_datatype
   pdl_params_converttypei *params = trans->params;
   trans->pdls[0] = PARENT;
   trans->pdls[1] = CHILD;
-  PDL_RETERROR(PDL_err, pdl_trans_check_pdls(trans));
-  if (PARENT->state & PDL_BADVAL) {
-    trans->bvalflag = 1;
-    trans->pdls[1]->state |= PDL_BADVAL;
-  }
   trans->__datatype = PARENT->datatype = force_intype;
   PDL_RETERROR(PDL_err, pdl__set_output_type_badvalue(trans, recurse_count + 1));
   trans->pdls[2] = trans->pdls[1]; /* copy for make_trans_mutual */

lib/PDL/PP.pm

@@ -1937,15 +1937,6 @@ sub make_vfn_args {
    PDL::PP::Rule::Returns::EmptyString->new("NewXSCoerceMustNS"),
    PDL::PP::Rule::Substitute->new("NewXSCoerceMustCompSubd", "NewXSCoerceMustNS"),
 
-   PDL::PP::Rule->new("NewXSFindBadStatusNS", [qw(StructName)],
-      "Rule to find the bad value status of the input ndarrays",
-      sub {
-        indent(2, <<EOF);
-PDL_RETERROR(PDL_err, PDL->trans_check_pdls($_[0]));
-EOF
-      }),
-   PDL::PP::Rule::Substitute->new("NewXSFindBadStatusSubd", "NewXSFindBadStatusNS"),
-
    PDL::PP::Rule->new("NewXSStructInit0",
 		      ["StructName","VTableName","ParamStructName","ParamStructType"],
 		      "Rule to create and initialise the private trans structure",
@@ -1962,7 +1953,6 @@ EOF
       ["RunFuncHdr",
         "NewXSStructInit0",
         "NewXSSetTransPDLs",
-        "NewXSFindBadStatusSubd",
         "NewXSTypeCoerceSubd",
         "NewXSExtractTransPDLs",
         "MakeCompiledReprSubd",