--- rpl/src/rplexternals.h 2017/06/29 12:33:34 1.74 +++ rpl/src/rplexternals.h 2017/06/29 14:54:42 1.75 @@ -80,15 +80,22 @@ // new, dup, drop, disp, parse // __type_new(struct_rpl_arguments *rpl_arguments) #define declareTypeExtension(fct) \ - int __type_##fct(struct_processus *s_etat_processus) { \ - unsigned char *rptr, *ptr; \ - rptr = (*s_etat_processus).definitions_chainees + \ - (*s_etat_processus).position_courante; \ + int __type_##fct(struct_processus *s_etat_processus, void **arg) { \ + char *rptr, *ptr, *iptr; \ + rptr = (char *) ((*s_etat_processus).definitions_chainees + \ + (*s_etat_processus).position_courante); \ ptr = rptr; \ - if (ptr != rptr) goto __parse_error; + iptr = (char *) (*s_etat_processus).instruction_courante; \ + if ((ptr != rptr) && (iptr)) goto __parse_error; #define parseError { goto __parse_error; } while(0) +#define typeError { return(0); } while(0) +#define typeFound(a) { return(a); } while(0) #define endTypeExtension __parse_error: return(0); } #define sizeOfParse (rptr - ptr) +#define searchType { recherche_type(s_etat_processus); \ + if (((*s_etat_processus).erreur_execution != d_ex) || \ + ((*s_etat_processus).erreur_systeme != d_es)) \ + return(0); } while(0) /* --------------------------------------------------------------------------------