--- rpl/src/rplexternals.h 2013/12/03 09:36:16 1.55 +++ rpl/src/rplexternals.h 2020/01/10 11:15:51 1.97 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.17 - Copyright (C) 1989-2013 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.32 + Copyright (C) 1989-2020 Dr. BERTRAND Joël This file is part of RPL/2. @@ -29,8 +29,13 @@ ================================================================================ */ -# define RPLARGS -# define struct_processus void +// Si TYPE_DECLARATION est défini, toutes les structures internes du RPL/2 +// sont exposés pour travailler sur des nouveaux types de données. +# ifndef TYPE_DECLARATION +# define RPLARGS +# define struct_processus void +# endif + # include "rpl.h" /* @@ -40,39 +45,82 @@ */ #define __RPL__ struct_rpl_arguments *rpl_arguments; \ - rpl_arguments = &__static_rpl_arguments; + rpl_arguments = &__static_rpl_arguments; \ #define __CATCH_SYSTEM_ERROR__ \ do { if (((*rpl_arguments).erreur != 0) && \ ((*rpl_arguments).type_erreur == 'S')) \ return 0; } while(0) #define leave do { return(0); } while(0) -#define allocation(a) librpl_allocation((*rpl_arguments).s_etat_processus, a) -#define copie_objet(a, b) librpl_copie_objet( \ +#define _allocation(a) librpl_allocation((*rpl_arguments).s_etat_processus, a) +#define _copie_objet(a, b) librpl_copie_objet( \ (*rpl_arguments).s_etat_processus, a, b) -#define liberation(a) librpl_liberation((*rpl_arguments).s_etat_processus, a) +#define _liberation(a) librpl_liberation((*rpl_arguments).s_etat_processus, a) #ifdef __RPLC_MAIN struct_rpl_arguments __static_rpl_arguments; + void *__static_library_descriptor; # 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; + extern void *__static_library_descriptor; # 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 /* -------------------------------------------------------------------------------- + Gestion des objets +-------------------------------------------------------------------------------- +*/ + +// new, dup, drop, disp, parse +// __type_new(struct_rpl_arguments *rpl_arguments) +#define declareTypeExtension(fct) \ + 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; \ + 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 typeSystemError { (*s_etat_processus).erreur_systeme = \ + d_es_execution_bibliotheque; return(0); } while(0) +#define typeSuccess { return(1); } 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)) \ + { __VA_ARGS__; return(0); } } while(0) +#define structObject struct_objet +#define initializeObject(a, b) do { \ + (*a).descripteur_bibliotheque = (*b).descripteur_bibliotheque; \ + (*a).extension_type = (*b).extension_type; } while(0) +#define objectContainer(type, a) ((type *) ((*a).objet)) +#define objectOf(a) ((*a).objet) +#define ifIsExternal(a, b) if (((*a).type == EXT) && ((*a).extension_type == b)) +#define elseIfIsExternal(a, b) } else if (((*a).type == EXT) && \ + ((*a).extension_type == b)) +#define subType(a) ((*a).extension_type) +#define integerFormat(a) formateur_nombre(s_etat_processus, a, 'I') +#define procStatus(a) (*a).s_etat_processus + +/* +-------------------------------------------------------------------------------- Types -------------------------------------------------------------------------------- */ -#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 @@ -102,6 +150,10 @@ ({ __CATCH_SYSTEM_ERROR__; typeof(daisyChain) __daisyChain = daisyChain; \ if (__daisyChain == NULL) executionError("End of daisy chain"); \ (__daisyChain == NULL) ? NULL : (*__daisyChain).suivant; }) + +#define next suivant +#define data donnee +#define daisyChain struct_liste_chainee #define null NULL #define nullify(ptr) __CATCH_SYSTEM_ERROR__; do { ptr = NULL; } while(0) @@ -130,21 +182,21 @@ #define logical int #define string char * #define integer int -#define object struct_objet * #define declareStructure typedef struct { #define declareUnion typedef union { #define as(name) } name; -#define target(a) (*a) -#define address(a) (&a) +#define target(a) (*(a)) +#define address(a) (&(a)) +#define subroutine(name) int name() #define beginGroup { __CATCH_SYSTEM_ERROR__; #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); }) /* -------------------------------------------------------------------------------- @@ -176,6 +228,8 @@ unsigned char __taille_bloc; \ unsigned char __type; \ t_8_bits __masque; \ + void *s_etat_processus = (*rpl_arguments).s_etat_processus; \ + DISABLE_SET_BUT_NOT_USED_WARNING(s_etat_processus); \ { \ (*rpl_arguments).instruction_valide = 'Y'; \ (*rpl_arguments).erreur = 0; \ @@ -219,13 +273,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 +288,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) /* @@ -245,8 +299,8 @@ -------------------------------------------------------------------------------- */ -#define CONCAT(a, b) __CONCAT(a, b) -#define __CONCAT(a, b) a##b +#define CONCAT(a, b) __RPL_CONCAT(a, b) +#define __RPL_CONCAT(a, b) a##b #define FIRST(...) FIRST_HELPER(__VA_ARGS__, throwaway) #define FIRST_HELPER(first, ...) first #define REST(...) REST_HELPER(NUM(__VA_ARGS__), __VA_ARGS__) @@ -302,11 +356,14 @@ #define libraryName(name) char __library_name[] = #name; -#define __onLoading int __runOnLoading(struct_rpl_arguments *rpl_arguments) -#define __onClosing int __runOnClosing(struct_rpl_arguments *rpl_arguments) +#define __onLoading int __runOnLoading(struct_rpl_arguments *rpl_arguments, \ + void *descriptor) +#define __onClosing int __runOnClosing(struct_rpl_arguments *rpl_arguments, \ + void *descriptor) #define declareSubroutine(when) __##when { \ char __function_name[] = #when; \ __static_rpl_arguments = (*rpl_arguments); \ + __static_library_descriptor = descriptor; \ HEADER \ declareHelpString(""); \ numberOfArguments(0); \ @@ -319,7 +376,7 @@ do { syslog(LOG_NOTICE, __VA_ARGS__); } while(0) #define exportExternalFunctions(...) \ - char **__external_symbols(struct_rpl_arguments *rpl_arguments, \ + char **___external_symbols(struct_rpl_arguments *rpl_arguments, \ integer8 *nb_symbols, \ const char *version) { \ char arguments[] = #__VA_ARGS__; \ @@ -327,6 +384,8 @@ char *ptr1, *ptr2; \ int drapeau; \ unsigned long i; \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ if (strcmp(version, _d_version_rpl) != 0) \ { \ notice(stdout, "Versions mismatch : library %s, expected %s\n", \ @@ -508,18 +567,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 +593,19 @@ { \ __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__, "external") != NULL) \ + if ((*rpl_object).type == EXT) { \ + if ((*rpl_object).descripteur_bibliotheque == \ + __static_library_descriptor) __type = 1; }\ if (strstr(#__VA_ARGS__, "unknown") != NULL) \ __type = 1; \ if (__type == 0) \ @@ -551,6 +615,8 @@ } \ } } while(0) +#define objectSubtype(a) (*a).extension_type + /* -------------------------------------------------------------------------------- Gestion des objets @@ -564,7 +630,9 @@ // Constantes symboliques -#define createSymbolicConstant(object, type, value) do { \ +#define createSymbolicConstant(rpl_object, type, value) do { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ 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 +641,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 +650,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 +658,30 @@ { \ 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 { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ __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,286 +690,288 @@ 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) \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + 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) \ - createVectorObject(object, size, real8, struct_vecteur, VRL) +#define createRealVectorObject(rpl_object, size) \ + createVectorObject(rpl_object, size, real8, struct_vecteur, VRL) // A FIXER @@ -911,155 +983,235 @@ #define createComplexMatrixObject +// Array + +#define isArray(rpl_object) \ + ((*rpl_object).type == TBL) + +#define ifIsArray(rpl_object) if (isArray(rpl_object)) +#define elseIfIsArray(rpl_object) } else if (isArray(rpl_object)) + +#define createArray(rpl_object, size) do { \ + int __i; \ + if (rpl_object != NULL) systemError("Reallocated object"); \ + if ((rpl_object = _allocation(TBL)) == NULL) \ + systemError("Memory allocation error"); \ + (*((struct_tableau *) (*rpl_object).objet)).nombre_elements = size; \ + if (((*((struct_tableau *) (*rpl_object).objet)).elements = malloc( \ + size * sizeof(struct_objet *))) == NULL) \ + systemError("Memory allocation error"); \ + for(__i = 0; __i < size; __i++) { \ + nullify((*((struct_tableau *) (*rpl_object).objet)).elements[__i]); \ + createIntegerObject((*((struct_tableau *) (*rpl_object).objet)) \ + .elements[__i]); } \ + } while(0) + +#define setObjectIntoArray(rpl_array, pos, rpl_object) do { \ + typeof(pos) __position = pos; __position--; \ + ifIsArray(rpl_array) { \ + if ((__position < 0) || (__position >= (*((struct_tableau *) \ + (*rpl_array).objet)).nombre_elements)) \ + executionError("Element out of range"); \ + if ((*rpl_array).nombre_occurrences > 1) \ + { \ + struct_objet *__tmp_rpl_object; \ + if ((__tmp_rpl_object = _copie_objet(rpl_array, 'O')) == NULL) \ + systemError("Memory allocation error"); \ + _liberation(rpl_array); \ + rpl_array = __tmp_rpl_object; \ + } \ + _liberation((*((struct_tableau *) (*rpl_array).objet)) \ + .elements[__position]); \ + (*((struct_tableau *) (*rpl_array).objet)).elements[__position] = \ + rpl_object; \ + } \ + else executionError("Type mistmatch error"); \ + nullify(rpl_object); \ + } while(0) + +#define getObjectFromArray() + // 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 { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + 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 setSymbolicName(rpl_object, value) do { \ + setName(rpl_object, value); \ + (*((struct_nom *) (*rpl_object).objet)).symbole = d_vrai; } while(0) + +#define createNameObject(rpl_object) do { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + 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 { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + 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 unEscString(s) ({ \ + unsigned char *__a; integer8 __l; \ + __a = formateur_flux((*rpl_arguments).s_etat_processus, \ + (unsigned char *) s, &__l); \ + if (nullified(__a)) systemError("Memory allocation error"); \ + (string) __a; \ + }) + +#define escString(rpl_object) ({ \ + unsigned char *__a; integer8 __l; \ + __a = analyse_flux((*rpl_arguments).s_etat_processus, \ + (unsigned char *) s, strlen(s)); \ + if (nullified(__a)) systemError("Memory allocation error"); \ + (string) __a; \ + }) + +#define createStringObject(rpl_object) do { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + 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 { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ 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; \ + _liberation(list); \ + 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 +1224,29 @@ 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 { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ 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; \ + _liberation(list); \ + 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 +1254,17 @@ 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 { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ ifIsList(list) \ { \ if ((*list).objet != NULL) \ @@ -1117,7 +1273,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 +1281,7 @@ { \ while(__current != NULL) \ { \ - if ((*__current).donnee == object) \ + if ((*__current).donnee == rpl_object) \ { \ (*__previous).suivant = (*__current).suivant; \ break; \ @@ -1134,17 +1290,17 @@ __current = (*__current).suivant; \ } \ } \ - liberation((*__current).donnee); \ + _liberation((*__current).donnee); \ free(__current); \ } \ } \ 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"); \ @@ -1161,6 +1317,26 @@ } \ } } while(0) +// NON +#define createObject(rpl_object) do { \ + if (rpl_object != NULL) \ + systemError("Reallocated object"); \ + if ((rpl_object = _allocation(NON)) == NULL) \ + systemError("Memory allocation error"); \ + (*rpl_object).objet = NULL; \ + } while(0) + +// EXT +#define createExternalObject(rpl_object, subtype) do { \ + if (rpl_object != NULL) \ + systemError("Reallocated object"); \ + if ((rpl_object = _allocation(EXT)) == NULL) \ + systemError("Memory allocation error"); \ + (*rpl_object).objet = NULL; \ + (*rpl_object).extension_type = subtype; \ + (*rpl_object).descripteur_bibliotheque = __static_library_descriptor; \ + } while(0) + /* -------------------------------------------------------------------------------- Allocation mémoire @@ -1170,10 +1346,23 @@ #define size(a) sizeof(a) #define allocate(a) ({ void *ptr; \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ if ((ptr = malloc(a)) == NULL) \ - systemError("Memory allocation error"); ptr; }) + { systemError("Memory allocation error"); \ + __CATCH_SYSTEM_ERROR__; } ptr; }) \ -#define deallocate(a) free(a) +#define reallocate(a, s) ({ void *ptr; \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + if ((ptr = realloc(a, s)) == NULL) \ + { systemError("Memory allocation error"); \ + __CATCH_SYSTEM_ERROR__; } ptr; }) \ + +#define deallocate(a) do { \ + struct_processus *s_etat_processus; \ + s_etat_processus = (*rpl_arguments).s_etat_processus; \ + free(a); } while(0) /* --------------------------------------------------------------------------------