pdl.h.PL (PDL-2.077) | : | pdl.h.PL (PDL-2.078) | ||
---|---|---|---|---|
skipping to change at line 555 | skipping to change at line 555 | |||
pdl_trans_children trans_children; | pdl_trans_children trans_children; | |||
PDL_Indx def_dims[PDL_NDIMS]; /* Preallocated space for efficiency */ | PDL_Indx def_dims[PDL_NDIMS]; /* Preallocated space for efficiency */ | |||
PDL_Indx def_dimincs[PDL_NDIMS]; /* Preallocated space for efficiency */ | PDL_Indx def_dimincs[PDL_NDIMS]; /* Preallocated space for efficiency */ | |||
PDL_Indx def_broadcastids[PDL_NBROADCASTIDS]; | PDL_Indx def_broadcastids[PDL_NBROADCASTIDS]; | |||
struct pdl_magic *magic; | struct pdl_magic *magic; | |||
void *hdrsv; /* "header", settable from Perl */ | void *hdrsv; /* "header", settable from Perl */ | |||
PDL_Value value; /* to store at least one value */ | ||||
}; | }; | |||
typedef struct pdl_slice_args { | typedef struct pdl_slice_args { | |||
PDL_Indx start; /* maps to start index of slice range (inclusive) */ | PDL_Indx start; /* maps to start index of slice range (inclusive) */ | |||
PDL_Indx end; /* maps to end index of slice range (inclusive) */ | PDL_Indx end; /* maps to end index of slice range (inclusive) */ | |||
PDL_Indx inc; /* maps to increment of slice range */ | PDL_Indx inc; /* maps to increment of slice range */ | |||
char dummy, squish; /* boolean */ | char dummy, squish; /* boolean */ | |||
struct pdl_slice_args *next; /* NULL is last */ | struct pdl_slice_args *next; /* NULL is last */ | |||
} pdl_slice_args; | } pdl_slice_args; | |||
skipping to change at line 584 | skipping to change at line 585 | |||
if(p##__c->trans[p##__i]) { | if(p##__c->trans[p##__i]) { | |||
#define PDL_CHILDLOOP_THISCHILD(p) p##__c->trans[p##__i] | #define PDL_CHILDLOOP_THISCHILD(p) p##__c->trans[p##__i] | |||
#define PDL_END_CHILDLOOP(p) \ | #define PDL_END_CHILDLOOP(p) \ | |||
} \ | } \ | |||
} \ | } \ | |||
if(!p##__c) break; \ | if(!p##__c) break; \ | |||
if(!p##__c->next) break; \ | if(!p##__c->next) break; \ | |||
p##__c=p##__c->next; \ | p##__c=p##__c->next; \ | |||
} while(1); | } while(1); | |||
#define PDL_USESTRUCTVALUE(it) \ | ||||
(it->nbytes <= sizeof(it->value)) | ||||
#define PDLMAX(a,b) ((a) > (b) ? (a) : (b)) | #define PDLMAX(a,b) ((a) > (b) ? (a) : (b)) | |||
#define PDLMIN(a,b) ((a) < (b) ? (a) : (b)) | #define PDLMIN(a,b) ((a) < (b) ? (a) : (b)) | |||
/*************** | /*************** | |||
* Some macros to guard against dataflow infinite recursion. | * Some macros to guard against dataflow infinite recursion. | |||
*/ | */ | |||
#define DECL_RECURSE_GUARD static int __nrec=0; | #define DECL_RECURSE_GUARD static int __nrec=0; | |||
#define START_RECURSE_GUARD __nrec++; if(__nrec > 1000) {__nrec=0; return pdl_ma ke_error_simple(PDL_EUSERERROR, "PDL:Internal Error: data structure recursion li mit exceeded (max 1000 levels)\n\tThis could mean that you have found an infinit e-recursion error in PDL, or\n\tthat you are building data structures with very long dataflow dependency\n\tchains. You may want to try using sever() to break the dependency.\n");} | #define START_RECURSE_GUARD __nrec++; if(__nrec > 1000) {__nrec=0; return pdl_ma ke_error_simple(PDL_EUSERERROR, "PDL:Internal Error: data structure recursion li mit exceeded (max 1000 levels)\n\tThis could mean that you have found an infinit e-recursion error in PDL, or\n\tthat you are building data structures with very long dataflow dependency\n\tchains. You may want to try using sever() to break the dependency.\n");} | |||
#define ABORT_RECURSE_GUARD __nrec=0; | #define ABORT_RECURSE_GUARD __nrec=0; | |||
#define END_RECURSE_GUARD __nrec--; | #define END_RECURSE_GUARD __nrec--; | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |