--- rpl/src/rplexternals.h 2014/04/25 07:37:34 1.57 +++ rpl/src/rplexternals.h 2014/06/16 18:48:22 1.58 @@ -56,12 +56,12 @@ struct_rpl_arguments __static_rpl_arguments; # define global # define initialize(a, b) a = b -# define declarePersistantObject(object) declareObject(object) +# define declarePersistantObject(rpl_object) declareObject(rpl_object) #else extern struct_rpl_arguments __static_rpl_arguments; # define global extern # define initialize(a, b) a; -# define declarePersistantObject(object) extern struct_objet *object; +# define declarePersistantObject(rpl_object) extern struct_objet *rpl_object #endif #define empty int @@ -72,7 +72,7 @@ -------------------------------------------------------------------------------- */ -#define declareObject(object) struct_objet *object = NULL +#define declareObject(rpl_object) struct_objet *rpl_object = NULL #define declareInteger(integer) integer8 integer #define declareReal(real) real8 real #define declareComplex(complex) complex16 complex @@ -143,8 +143,8 @@ #define endGroup __CATCH_SYSTEM_ERROR__; } #define beginMacro do beginGroup #define endMacro endGroup while(0) -#define stopRequest __CATCH_SYSTEM_ERROR__; \ - test_arret((*rpl_arguments).s_etat_processus) +#define stopRequest ({ __CATCH_SYSTEM_ERROR__; \ + test_arret((*rpl_arguments).s_etat_processus); }) /* -------------------------------------------------------------------------------- @@ -219,13 +219,13 @@ -------------------------------------------------------------------------------- */ -#define freeObject(object) \ +#define freeObject(rpl_object) \ __CATCH_SYSTEM_ERROR__; \ do { \ - if (object == NULL) \ + if (rpl_object == NULL) \ systemError("Nullified object"); \ - liberation(object); \ - object = NULL; \ + liberation(rpl_object); \ + rpl_object = NULL; \ } while(0) /* @@ -234,9 +234,9 @@ -------------------------------------------------------------------------------- */ -#define dupObject(object) \ +#define dupObject(rpl_object) \ __CATCH_SYSTEM_ERROR__; \ - do { if (copie_objet(object, 'P') != object) \ + do { if (copie_objet(rpl_object, 'P') != rpl_object) \ systemError("Memory allocation error"); } while(0) /* @@ -508,18 +508,19 @@ -------------------------------------------------------------------------------- */ -#define pushOnStack(object) do { \ +#define pushOnStack(rpl_object) do { \ __CATCH_SYSTEM_ERROR__; \ if (((*rpl_arguments).l_base_pile = \ - empilement_pile_operationnelle(rpl_arguments, object)) == NULL) \ + empilement_pile_operationnelle(rpl_arguments, rpl_object)) \ + == NULL) \ systemError("Memory allocation error"); \ - if ((*object).nombre_occurrences == 1) object = NULL; } while(0) + if ((*rpl_object).nombre_occurrences == 1) rpl_object = NULL; } while(0) -#define pullFromStack(object, ...) do { \ +#define pullFromStack(rpl_object, ...) do { \ __CATCH_SYSTEM_ERROR__; \ (*rpl_arguments).l_base_pile = \ - depilement_pile_operationnelle(rpl_arguments, &object); \ - if (object == NULL) \ + depilement_pile_operationnelle(rpl_arguments, &rpl_object); \ + if (rpl_object == NULL) \ { \ executionError("Too few arguments"); \ } \ @@ -533,15 +534,15 @@ { \ __type = 0; \ if (strstr(#__VA_ARGS__, "integer") != NULL) \ - if ((*object).type == INT) __type = 1; \ + if ((*rpl_object).type == INT) __type = 1; \ if (strstr(#__VA_ARGS__, "real") != NULL) \ - if ((*object).type == REL) __type = 1; \ + if ((*rpl_object).type == REL) __type = 1; \ if (strstr(#__VA_ARGS__, "complex") != NULL) \ - if ((*object).type == CPL) __type = 1; \ + if ((*rpl_object).type == CPL) __type = 1; \ if (strstr(#__VA_ARGS__, "string") != NULL) \ - if ((*object).type == CHN) __type = 1; \ + if ((*rpl_object).type == CHN) __type = 1; \ if (strstr(#__VA_ARGS__, "list") != NULL) \ - if ((*object).type == LST) __type = 1; \ + if ((*rpl_object).type == LST) __type = 1; \ if (strstr(#__VA_ARGS__, "unknown") != NULL) \ __type = 1; \ if (__type == 0) \ @@ -564,7 +565,7 @@ // Constantes symboliques -#define createSymbolicConstant(object, type, value) do { \ +#define createSymbolicConstant(rpl_object, type, value) do { \ if ((strcmp(#type, "integer") != 0) && (strcmp(#type, "real") != 0)) \ systemError("Type not allowed for symbolic constant"); \ __taille_bloc = sizeof(t_8_bits) * 8; \ @@ -573,7 +574,7 @@ __masque = ((t_8_bits) 1) << (__taille_bloc - __indice_bit - 1); \ if (((*rpl_arguments).drapeaux_etat[__indice_bloc] & __masque) != 0) \ { \ - createNameObject(object); \ + createNameObject(rpl_object); \ __CATCH_SYSTEM_ERROR__; \ { \ char *__constant_name; \ @@ -582,7 +583,7 @@ systemError("Memory allocation error"); \ sprintf(__constant_name, "%s$%s", __library_name, \ &(__function_name[11])); \ - setName(object, __constant_name); \ + setName(rpl_object, __constant_name); \ free(__constant_name); \ } \ } \ @@ -590,28 +591,28 @@ { \ if (strcmp(#type, "integer") == 0) \ { \ - createIntegerObject(object); \ + createIntegerObject(rpl_object); \ __CATCH_SYSTEM_ERROR__; \ - setInteger(object, value); \ + setInteger(rpl_object, value); \ } \ else if (strcmp(#type, "real") == 0) \ { \ - createRealObject(object); \ + createRealObject(rpl_object); \ __CATCH_SYSTEM_ERROR__; \ - setReal(object, value); \ + setReal(rpl_object, value); \ } \ } \ __CATCH_SYSTEM_ERROR__; \ __constante--; } while(0) -#define createSymbolicComplexConstant(object, rp, ip) do { \ +#define createSymbolicComplexConstant(rpl_object, rp, ip) do { \ __taille_bloc = sizeof(t_8_bits) * 8; \ __indice_bloc = (35 - 1) / __taille_bloc; \ __indice_bit = (35 - 1) % __taille_bloc; \ __masque = ((t_8_bits) 1) << (__taille_bloc - __indice_bit - 1); \ if (((*rpl_arguments).drapeaux_etat[__indice_bloc] & __masque) != 0) \ { \ - createNameObject(object); \ + createNameObject(rpl_object); \ __CATCH_SYSTEM_ERROR__; \ { \ char *__constant_name; \ @@ -620,285 +621,285 @@ systemError("Memory allocation error"); \ sprintf(__constant_name, "%s$%s", __library_name, \ __function_name); \ - setName(object, __constant_name); \ + setName(rpl_object, __constant_name); \ free(__constant_name); \ } \ } \ else \ { \ - createComplexObject(object); \ + createComplexObject(rpl_object); \ __CATCH_SYSTEM_ERROR__; \ - setComplex(object, rp, im); \ + setComplex(rpl_object, rp, im); \ } \ __CATCH_SYSTEM_ERROR__; \ __constante--; } while(0) // Integer -#define setInteger(object, value) do { \ - ifIsInteger(object) \ +#define setInteger(rpl_object, value) do { \ + ifIsInteger(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - (*((integer8 *) (*object).objet)) = (integer8) value; \ + (*((integer8 *) (*rpl_object).objet)) = (integer8) value; \ } \ else executionError("Type mistmatch error"); } while(0) -#define isInteger(object) \ - ((*object).type == INT) +#define isInteger(rpl_object) \ + ((*rpl_object).type == INT) -#define ifIsInteger(object) if (isInteger(object)) -#define elseIfIsInteger(object) } else ifIsInteger(object) +#define ifIsInteger(rpl_object) if (isInteger(rpl_object)) +#define elseIfIsInteger(rpl_object) } else ifIsInteger(rpl_object) -#define getInteger(object, value) do { \ +#define getInteger(rpl_object, value) do { \ value = 0; \ - ifIsInteger(object) value = (*((integer8 *) (*object).objet)); \ + ifIsInteger(rpl_object) value = (*((integer8 *) (*rpl_object).objet)); \ else executionError("Type mismatch error"); } while(0) -#define createIntegerObject(object) do { \ - if (object != NULL) \ +#define createIntegerObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(INT)) == NULL) \ + if ((rpl_object = allocation(INT)) == NULL) \ systemError("Memory allocation error"); \ - setInteger(object, 0); } while(0) + setInteger(rpl_object, 0); } while(0) // Real -#define setReal(object, value) do { \ - ifIsReal(object) \ +#define setReal(rpl_object, value) do { \ + ifIsReal(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - (*((real8 *) (*object).objet)) = (real8) value; \ + (*((real8 *) (*rpl_object).objet)) = (real8) value; \ } \ else executionError("Type mistmatch error"); } while(0) -#define isReal(object) \ - ((*object).type == REL) +#define isReal(rpl_object) \ + ((*rpl_object).type == REL) -#define ifIsReal(object) if (isReal(object)) -#define elseIfIsReal(object) } else ifIsReal(object) +#define ifIsReal(rpl_object) if (isReal(rpl_object)) +#define elseIfIsReal(rpl_object) } else ifIsReal(rpl_object) -#define getReal(object, value) do { \ +#define getReal(rpl_object, value) do { \ value = 0; \ - ifIsReal(object) value = (*((real8 *) (*object).objet)); \ + ifIsReal(rpl_object) value = (*((real8 *) (*rpl_object).objet)); \ else executionError("Type mismatch error"); } while(0) -#define createRealObject(object) do { \ - if (object != NULL) \ +#define createRealObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(REL)) == NULL) \ + if ((rpl_object = allocation(REL)) == NULL) \ systemError("Memory allocation error"); \ - setReal(object, 0); } while(0) + setReal(rpl_object, 0); } while(0) // Complex -#define setComplex(object, rp, ip) do { \ +#define setComplex(rpl_object, rp, ip) do { \ typeof(rp) __rp = rp; \ typeof(ip) __ip = ip; \ - ifIsComplex(object) \ + ifIsComplex(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - setRealPartOfComplex(object, __rp); \ - setImaginaryPartOfComplex(object, __ip); \ + setRealPartOfComplex(rpl_object, __rp); \ + setImaginaryPartOfComplex(rpl_object, __ip); \ } \ else executionError("Type mismatch error"); } while(0) -#define setRealPartOfComplex(object, value) do { \ - if ((*object).nombre_occurrences > 1) \ +#define setRealPartOfComplex(rpl_object, value) do { \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - ifIsComplex(object) (*((complex16 *) (*object).objet)).partie_reelle = \ - value; \ + ifIsComplex(rpl_object) (*((complex16 *) (*rpl_object).objet)) \ + .partie_reelle = value; \ else executionError("Type mismatch error"); } while(0) -#define setImaginaryPartOfComplex(object, value) do { \ - if ((*object).nombre_occurrences > 1) \ +#define setImaginaryPartOfComplex(rpl_object, value) do { \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - (*((complex16 *) (*object).objet)).partie_imaginaire = value; \ + (*((complex16 *) (*rpl_object).objet)).partie_imaginaire = value; \ else executionError("Type mismatch error"); } while(0) -#define getRealPartOfComplex(object, value) \ - value = (*((complex16 *) (*object).objet)).partie_reelle +#define getRealPartOfComplex(rpl_object, value) \ + value = (*((complex16 *) (*rpl_object).objet)).partie_reelle -#define getImaginaryPartOfComplex(object, value) \ - value = (*((complex16 *) (*object).objet)).partie_imaginaire +#define getImaginaryPartOfComplex(rpl_object, value) \ + value = (*((complex16 *) (*rpl_object).objet)).partie_imaginaire -#define isComplex(object) \ - ((*object).type == CPL) +#define isComplex(rpl_object) \ + ((*rpl_object).type == CPL) -#define ifIsComplex(object) if (isComplex(object)) -#define elseIfIsComplex(object) } else ifIsComplex(object) +#define ifIsComplex(rpl_object) if (isComplex(rpl_object)) +#define elseIfIsComplex(rpl_object) } else ifIsComplex(rpl_object) -#define getComplex(object, value) do { \ +#define getComplex(rpl_object, value) do { \ value.partie_reelle = 0; \ value.partie_imaginaire = 0; \ - ifIsComplex(object) value = (*((complex16 *) (*object).objet)); \ + ifIsComplex(rpl_object) value = (*((complex16 *) (*rpl_object).objet)); \ else systemError("Not a complex"); } while(0) -#define createComplexObject(object) do { \ - if (object != NULL) \ +#define createComplexObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(CPL)) == NULL) \ + if ((rpl_object = allocation(CPL)) == NULL) \ systemError("Memory allocation error"); \ - setComplex(object, 0, 0); } while(0) + setComplex(rpl_object, 0, 0); } while(0) // Generalized vectors -#define createVectorObject(object, size, otype, structure, cat) do { \ +#define createVectorObject(rpl_object, size, otype, structure, cat) do { \ integer8 i; \ - if (object != NULL) \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(cat)) == NULL) \ + if ((rpl_object = allocation(cat)) == NULL) \ systemError("Memory allocation error"); \ - (*((structure *) (*object).objet)).taille = size; \ - if (((*((structure *) (*object).objet)).tableau = \ + (*((structure *) (*rpl_object).objet)).taille = size; \ + if (((*((structure *) (*rpl_object).objet)).tableau = \ malloc(size * sizeof(otype))) == NULL) \ systemError("Memory allocation error"); \ if (cat != VCX) \ { \ if (cat == VIN) \ - (*((structure *) (*object).objet)).type = 'I'; \ + (*((structure *) (*rpl_object).objet)).type = 'I'; \ else \ - (*((structure *) (*object).objet)).type = 'R'; \ - for(i = 0; i < size; ((otype *) (*((structure *) (*object).objet)) \ + (*((structure *) (*rpl_object).objet)).type = 'R'; \ + for(i = 0; i < size; ((otype *) (*((structure *) (*rpl_object).objet)) \ .tableau)[i++] = (otype) 0); \ } \ else \ { \ - (*((structure *) (*object).objet)).type = 'C'; \ + (*((structure *) (*rpl_object).objet)).type = 'C'; \ for(i = 0; i < size; i++) \ { \ - ((complex16 *) (*((structure *) (*object).objet)).tableau)[i] \ + ((complex16 *) (*((structure *) (*rpl_object).objet)).tableau)[i] \ .partie_reelle = 0; \ - ((complex16 *) (*((structure *) (*object).objet)).tableau)[i] \ + ((complex16 *) (*((structure *) (*rpl_object).objet)).tableau)[i] \ .partie_imaginaire = 0; \ } \ } } while(0) // Integer vector -#define setIntegerIntoVector(object, value, position) do { \ +#define setIntegerIntoVector(rpl_object, value, position) do { \ typeof(position) __position = position; \ - ifIsIntegerVector(object) \ + ifIsIntegerVector(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ __position--; \ if ((__position < 0) || (__position >= (*((struct_vecteur *) \ - (*object).objet)).taille)) \ + (*rpl_object).objet)).taille)) \ { executionError("Element out of range"); } \ else \ - ((integer8 *) (*((struct_vecteur *) (*object).objet)).tableau) \ + ((integer8 *) (*((struct_vecteur *) (*rpl_object).objet)).tableau) \ [__position] = (integer8) value; \ } \ else executionError("Type mistmatch error"); } while(0) -#define isIntegerVector(object) \ - ((*object).type == VIN) +#define isIntegerVector(rpl_object) \ + ((*rpl_object).type == VIN) -#define ifIsIntegerVector(object) if (isIntegerVector(object)) -#define elseIfIsIntegerVector(object) } else ifIsIntegerVector(object) +#define ifIsIntegerVector(rpl_object) if (isIntegerVector(rpl_object)) +#define elseIfIsIntegerVector(rpl_object) } else ifIsIntegerVector(rpl_object) -#define getIntegerFromVector(object, value, position) do { \ +#define getIntegerFromVector(rpl_object, value, position) do { \ typeof(position) __position = position; \ value = 0; \ - ifIsIntegerVector(object) \ + ifIsIntegerVector(rpl_object) \ { \ __position--; \ if ((__position < 0) || (__position >= (*((struct_vecteur *) \ - (*object).objet)).taille)) \ + (*rpl_object).objet)).taille)) \ executionError("Element out of range"); \ else \ - value = ((integer8 *) (*((struct_vecteur *) (*object).objet)) \ + value = ((integer8 *) (*((struct_vecteur *) (*rpl_object).objet)) \ .tableau)[__position]; \ } \ else executionError("Type mismatch error"); } while(0) -#define createIntegerVectorObject(object, size) \ - createVectorObject(object, size, integer8, struct_vecteur, VIN) +#define createIntegerVectorObject(rpl_object, size) \ + createVectorObject(rpl_object, size, integer8, struct_vecteur, VIN) // Real vector -#define setRealIntoVector(object, value, position) do { \ +#define setRealIntoVector(rpl_object, value, position) do { \ typeof(position) __position = position; \ - ifIsRealVector(object) \ + ifIsRealVector(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ __position--; \ if ((__position < 0) || (__position >= (*((struct_vecteur *) \ - (*object).objet)).taille)) \ + (*rpl_object).objet)).taille)) \ { executionError("Element out of range"); } \ else \ - ((real8 *) (*((struct_vecteur *) (*object).objet)).tableau) \ + ((real8 *) (*((struct_vecteur *) (*rpl_object).objet)).tableau) \ [__position] = (real8) value; \ } \ else executionError("Type mistmatch error"); } while(0) -#define isRealVector(object) \ - ((*object).type == VRL) +#define isRealVector(rpl_object) \ + ((*rpl_object).type == VRL) -#define ifIsRealVector(object) if (isRealVector(object)) -#define elseIfIsRealVector(object) } else ifIsRealVector(object) +#define ifIsRealVector(rpl_object) if (isRealVector(rpl_object)) +#define elseIfIsRealVector(rpl_object) } else ifIsRealVector(rpl_object) -#define getRealFromVector(object, value, position) do { \ +#define getRealFromVector(rpl_object, value, position) do { \ typeof(position) __position = position; \ value = 0; \ - ifIsRealVector(object) \ + ifIsRealVector(rpl_object) \ { \ __position--; \ if ((__position < 0) || (__position >= (*((struct_vecteur *) \ - (*object).objet)).taille)) \ + (*rpl_object).objet)).taille)) \ executionError("Element out of range"); \ - value = ((real8 *) (*((struct_vecteur *) (*object).objet)).tableau) \ - [__position]; \ + value = ((real8 *) (*((struct_vecteur *) (*rpl_object).objet)) \ + .tableau)[__position]; \ } \ else executionError("Type mismatch error"); } while(0) -#define createRealVectorObject(object, size) \ +#define createRealVectorObject(rpl_object, size) \ createVectorObject(object, size, real8, struct_vecteur, VRL) // A FIXER @@ -913,153 +914,154 @@ // Binary integer -#define setBinaryInteger(object, value) do { \ - ifIsBinaryInteger(object) \ +#define setBinaryInteger(rpl_object, value) do { \ + ifIsBinaryInteger(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - (*((integer8 *) (*object).objet)) = (integer8) value; \ + (*((integer8 *) (*rpl_object).objet)) = (integer8) value; \ } \ else executionError("Type mistmatch error"); } while(0) -#define isBinaryInteger(object) \ - ((*object).type == BIN) +#define isBinaryInteger(rpl_object) \ + ((*rpl_object).type == BIN) -#define ifIsBinaryInteger(object) if (isBinaryInteger(object)) -#define elseIfIsBinaryInteger(object) } else ifIsBinaryInteger(object) +#define ifIsBinaryInteger(rpl_object) if (isBinaryInteger(rpl_object)) +#define elseIfIsBinaryInteger(rpl_object) } else ifIsBinaryInteger(rpl_object) -#define getBinaryInteger(object, value) do { \ +#define getBinaryInteger(rpl_object, value) do { \ value = 0; \ - ifIsBinaryInteger(object) value = (*((integer8 *) (*object).objet)); \ + ifIsBinaryInteger(rpl_object) value = \ + (*((integer8 *) (*rpl_object).objet)); \ else executionError("Type mismatch error"); } while(0) -#define createBinaryIntegerObject(object) do { \ - if (object != NULL) \ +#define createBinaryIntegerObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(BIN)) == NULL) \ + if ((rpl_object = allocation(BIN)) == NULL) \ systemError("Memory allocation error"); \ - setBinaryInteger(object, 0); } while(0) + setBinaryInteger(rpl_object, 0); } while(0) // Name -#define isName(object) \ - ((*object).type == NOM) +#define isName(rpl_object) \ + ((*rpl_object).type == NOM) -#define ifIsName(object) if (isName(object)) -#define elseIfIsName(object) } else if (isName(object)) +#define ifIsName(rpl_object) if (isName(rpl_object)) +#define elseIfIsName(rpl_object) } else if (isName(rpl_object)) -#define setName(object, value) do { \ - ifIsName(object) \ +#define setName(rpl_object, value) do { \ + ifIsName(rpl_object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - free((*((struct_nom *) (*object).objet)).nom); \ - (*((struct_nom *) (*object).objet)).symbole = d_faux; \ - if (((*((struct_nom *) (*object).objet)).nom = malloc( \ + free((*((struct_nom *) (*rpl_object).objet)).nom); \ + (*((struct_nom *) (*rpl_object).objet)).symbole = d_faux; \ + if (((*((struct_nom *) (*rpl_object).objet)).nom = malloc( \ (strlen(value) + 1) * sizeof(unsigned char))) == NULL) \ systemError("Memory allocation error"); \ - strcpy((char *) (*((struct_nom *) (*object).objet)).nom, \ + strcpy((char *) (*((struct_nom *) (*rpl_object).objet)).nom, \ (char *) value); \ } \ else executionError("Type mistmatch error"); } while(0) -#define createNameObject(object) do { \ - if (object != NULL) \ +#define createNameObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(NOM)) == NULL) \ + if ((rpl_object = allocation(NOM)) == NULL) \ systemError("Memory allocation error"); \ - (*((struct_nom *) (*object).objet)).symbole = d_faux; \ - if (((*((struct_nom *) (*object).objet)).nom = malloc( \ + (*((struct_nom *) (*rpl_object).objet)).symbole = d_faux; \ + if (((*((struct_nom *) (*rpl_object).objet)).nom = malloc( \ sizeof(unsigned char))) == NULL) \ systemError("Memory allocation error"); \ - strcpy((char *) (*((struct_nom *) (*object).objet)).nom, ""); } while(0) + strcpy((char *) (*((struct_nom *) (*rpl_object).objet)).nom, ""); } while(0) // String -#define isString(object) \ - ((*object).type == CHN) +#define isString(rpl_object) \ + ((*rpl_object).type == CHN) -#define ifIsString(object) if (isString(object)) -#define elseIfIsString(object) else if (isString(objet)) +#define ifIsString(rpl_object) if (isString(rpl_object)) +#define elseIfIsString(rpl_object) else if (isString(rpl_object)) -#define setString(object, string) do { \ - ifIsString(object) \ +#define setString(rpl_object, string) do { \ + ifIsString(rpl_object) \ { \ if (string == NULL) executionError("Nullified string"); else \ { \ - if ((*object).nombre_occurrences > 1) \ + if ((*rpl_object).nombre_occurrences > 1) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(rpl_object, 'O')) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + liberation(rpl_object); \ + rpl_object = __tmp_rpl_object; \ } \ - free((unsigned char *) (*object).objet); \ - if (((*object).objet = malloc((strlen(string) + 1) * \ + free((unsigned char *) (*rpl_object).objet); \ + if (((*rpl_object).objet = malloc((strlen(string) + 1) * \ sizeof(unsigned char))) == NULL) \ systemError("Memory allocation error"); \ - strcpy((char *) (*object).objet, string); \ + strcpy((char *) (*rpl_object).objet, string); \ } \ } \ else executionError("Type mistmatch error"); } while(0) -#define getString(object, string) do { \ +#define getString(rpl_object, string) do { \ string = NULL; \ - ifIsString(object) string = (char *) (*object).objet; \ + ifIsString(rpl_object) string = (char *) (*rpl_object).objet; \ else executionError("Type mismatch error"); } while(0) -#define createStringObject(object) do { \ - if (object != NULL) \ +#define createStringObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(CHN)) == NULL) \ + if ((rpl_object = allocation(CHN)) == NULL) \ systemError("Memory allocation error"); \ - if (((*object).objet = malloc(sizeof(unsigned char))) == NULL) \ + if (((*rpl_object).objet = malloc(sizeof(unsigned char))) == NULL) \ systemError("Memory allocation error"); \ - strcpy((char *) (*object).objet, ""); } while(0) + strcpy((char *) (*rpl_object).objet, ""); } while(0) // List -#define isList(object) \ - ((*object).type == LST) +#define isList(rpl_object) \ + ((*rpl_object).type == LST) -#define ifIsList(object) if (isList(object)) -#define elseIfIsList(object) else if (isList(object)) +#define ifIsList(rpl_object) if (isList(rpl_object)) +#define elseIfIsList(rpl_object) else if (isList(rpl_object)) -#define createListObject(object) do { \ - if (object != NULL) \ +#define createListObject(rpl_object) do { \ + if (rpl_object != NULL) \ systemError("Reallocated object"); \ - if ((object = allocation(LST)) == NULL) \ + if ((rpl_object = allocation(LST)) == NULL) \ systemError("Memory allocation error"); \ - (*object).objet = NULL; } while(0) + (*rpl_object).objet = NULL; } while(0) -#define addObjectToList(list, object) do { \ +#define addObjectToList(list, rpl_object) do { \ ifIsList(list) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(list, 'N')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(list, 'N')) == NULL) \ systemError("Memory allocation error"); \ liberation(list); \ - list = __tmp_object; \ + list = __tmp_rpl_object; \ if ((*list).objet == NULL) \ { \ if (((*list).objet = malloc(sizeof(struct_liste_chainee))) \ == NULL) \ systemError("Memory allocation error"); \ (*((struct_liste_chainee *) (*list).objet)).suivant = NULL; \ - (*((struct_liste_chainee *) (*list).objet)).donnee = object; \ + (*((struct_liste_chainee *) (*list).objet)).donnee = rpl_object; \ } \ else \ { \ @@ -1072,27 +1074,27 @@ systemError("Memory allocation error"); \ l_element_courant = (*l_element_courant).suivant; \ (*l_element_courant).suivant = NULL; \ - (*l_element_courant).donnee = object; \ + (*l_element_courant).donnee = rpl_object; \ } \ - object = NULL; \ + rpl_object = NULL; \ } \ else executionError("Type mistmatch error"); } while(0) -#define insertObjectIntoList(list, object) do { \ +#define insertObjectIntoList(list, rpl_object) do { \ ifIsList(list) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(list, 'N')) == NULL) \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = copie_objet(list, 'N')) == NULL) \ systemError("Memory allocation error"); \ liberation(list); \ - list = __tmp_object; \ + list = __tmp_rpl_object; \ if ((*list).objet == NULL) \ { \ if (((*list).objet = malloc(sizeof(struct_liste_chainee))) \ == NULL) \ systemError("Memory allocation error"); \ (*((struct_liste_chainee *) (*list).objet)).suivant = NULL; \ - (*((struct_liste_chainee *) (*list).objet)).donnee = object; \ + (*((struct_liste_chainee *) (*list).objet)).donnee = rpl_object; \ } \ else \ { \ @@ -1100,15 +1102,15 @@ if ((l_element_courant = \ malloc(sizeof(struct_liste_chainee))) == NULL) \ systemError("Memory allocation error"); \ - (*l_element_courant).donnee = object; \ + (*l_element_courant).donnee = rpl_object; \ (*l_element_courant).suivant = (*list).objet; \ (*list).objet = l_element_courant; \ } \ - object = NULL; \ + rpl_object = NULL; \ } \ else executionError("Type mistmatch error"); } while(0) -#define removeObjectFromList(list, object) do { \ +#define removeObjectFromList(list, rpl_object) do { \ ifIsList(list) \ { \ if ((*list).objet != NULL) \ @@ -1117,7 +1119,7 @@ struct_liste_chainee *__previous; \ __current = (*list).objet; \ __previous = NULL; \ - if ((*__current).donnee == object) \ + if ((*__current).donnee == rpl_object) \ { \ (*list).objet = (*__current).suivant; \ } \ @@ -1125,7 +1127,7 @@ { \ while(__current != NULL) \ { \ - if ((*__current).donnee == object) \ + if ((*__current).donnee == rpl_object) \ { \ (*__previous).suivant = (*__current).suivant; \ break; \ @@ -1140,11 +1142,11 @@ } \ else executionError("Type mistmatch error"); } while(0) -#define getObjectFromList(list, position, object) +#define getObjectFromList(list, position, rpl_object) -#define putObjectIntoList(list, position, object) +#define putObjectIntoList(list, position, rpl_object) -#define getListFromList(list, position1, position2, object) +#define getListFromList(list, position1, position2, rpl_object) #define listLength(list, length) do { \ if (list == NULL) executionError("Nullified object"); \