--- rpl/src/rplexternals.h 2013/03/28 16:15:09 1.46 +++ rpl/src/rplexternals.h 2013/12/03 09:36:16 1.55 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.1.13 + RPL/2 (R) version 4.1.17 Copyright (C) 1989-2013 Dr. BERTRAND Joël This file is part of RPL/2. @@ -39,11 +39,33 @@ ================================================================================ */ +#define __RPL__ struct_rpl_arguments *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( \ (*rpl_arguments).s_etat_processus, a, b) #define liberation(a) librpl_liberation((*rpl_arguments).s_etat_processus, a) +#ifdef __RPLC_MAIN + struct_rpl_arguments __static_rpl_arguments; +# define global +# define initialize(a, b) a = b +# define declarePersistantObject(object) declareObject(object) +#else + extern struct_rpl_arguments __static_rpl_arguments; +# define global extern +# define initialize(a, b) a; +# define declarePersistantObject(object) extern struct_objet *object; +#endif + +#define empty int + /* -------------------------------------------------------------------------------- Types @@ -56,30 +78,33 @@ #define declareComplex(complex) complex16 complex #define declareDaisyChain(daisyChain) struct_liste_chainee *daisyChain = NULL -#define getDaisyChainFromList(list, daisyChain) do { \ +#define getDaisyChainFromList(list, daisyChain) \ + __CATCH_SYSTEM_ERROR__; \ + do { \ typeof(list) __list = list; \ daisyChain = NULL; \ ifIsList(__list) { daisyChain = (*__list).objet; } \ else executionError("Type mistmatch error"); } while(0) #define fetchElementFromDaisyChain(daisyChain) \ - ({ typeof(daisyChain) __daisyChain = daisyChain; \ + ({ __CATCH_SYSTEM_ERROR__; typeof(daisyChain) __daisyChain = daisyChain; \ if (__daisyChain == NULL) executionError("End of daisy chain"); \ (__daisyChain == NULL) ? NULL : (*__daisyChain).donnee; }) #define replaceElementIntoDaisyChain(daisyChain, element) \ + __CATCH_SYSTEM_ERROR__; \ do { typeof(daisyChain) __daisyChain = daisyChain; \ if (__daisyChain == NULL) executionError("Nullified daisy chain"); \ freeObject((*__daisyChain).donnee); \ (*__daisyChain).donnee = element; } while(0) #define nextElementOfDaisyChain(daisyChain) \ - ({ typeof(daisyChain) __daisyChain = daisyChain; \ + ({ __CATCH_SYSTEM_ERROR__; typeof(daisyChain) __daisyChain = daisyChain; \ if (__daisyChain == NULL) executionError("End of daisy chain"); \ (__daisyChain == NULL) ? NULL : (*__daisyChain).suivant; }) #define null NULL -#define nullify(ptr) do { ptr = NULL; } while(0) +#define nullify(ptr) __CATCH_SYSTEM_ERROR__; do { ptr = NULL; } while(0) #define nullified(ptr) ((ptr) == NULL) #define postIncr(x) (x++) @@ -111,16 +136,15 @@ #define declareUnion typedef union { #define as(name) } name; -#define __RPL__ struct_rpl_arguments rpl_arguments - #define target(a) (*a) #define address(a) (&a) -#define beginGroup { -#define endGroup } +#define beginGroup { __CATCH_SYSTEM_ERROR__; +#define endGroup __CATCH_SYSTEM_ERROR__; } #define beginMacro do beginGroup #define endMacro endGroup while(0) -#define stopRequest test_arret((*rpl_arguments).s_etat_processus) +#define stopRequest __CATCH_SYSTEM_ERROR__; \ + test_arret((*rpl_arguments).s_etat_processus) /* -------------------------------------------------------------------------------- @@ -128,10 +152,10 @@ --------------------------------------------------------------------------------*/ #define blockSignals \ - { sigset_t set, oldset; sigfillset(&set); \ + { __CATCH_SYSTEM_ERROR__; sigset_t set, oldset; sigfillset(&set); \ pthread_sigmask(SIG_BLOCK, &set, &oldset); #define unblockSignals \ - pthread_sigmask(SIG_SETMASK, &oldset, NULL); } + pthread_sigmask(SIG_SETMASK, &oldset, NULL); __CATCH_SYSTEM_ERROR__; } /* -------------------------------------------------------------------------------- @@ -165,7 +189,7 @@ DISABLE_SET_BUT_NOT_USED_WARNING(__masque); #define FUNCTION \ - if (__validation_instruction == d_vrai) return; \ + if (__validation_instruction == d_vrai) return 0; \ if (__presence_aide == d_faux) \ { \ systemError("Help string not defined"); \ @@ -185,8 +209,9 @@ strcpy((char *) __function_name, ""); \ if (__constante != 0) \ systemError("Constant definition error"); \ + __CATCH_SYSTEM_ERROR__; \ } } \ - return; + leave; /* -------------------------------------------------------------------------------- @@ -195,6 +220,7 @@ */ #define freeObject(object) \ + __CATCH_SYSTEM_ERROR__; \ do { \ if (object == NULL) \ systemError("Nullified object"); \ @@ -209,6 +235,7 @@ */ #define dupObject(object) \ + __CATCH_SYSTEM_ERROR__; \ do { if (copie_objet(object, 'P') != object) \ systemError("Memory allocation error"); } while(0) @@ -218,16 +245,46 @@ -------------------------------------------------------------------------------- */ -#define declareInternalFunction(name, ...) \ - __internal_##name(struct_rpl_arguments *rpl_arguments, __VA_ARGS__) { +#define CONCAT(a, b) __CONCAT(a, b) +#define __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__) +#define REST_HELPER(qty, ...) REST_HELPER2(qty, __VA_ARGS__) +#define REST_HELPER2(qty, ...) REST_HELPER_##qty(__VA_ARGS__) +#define REST_HELPER_ONE(first) +#define REST_HELPER_TWOORMORE(first, ...) , __VA_ARGS__ +#define NUM(...) \ + SELECT_10TH(__VA_ARGS__, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\ + TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway) +#define SELECT_10TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, ...) a10 + +#define declareInternalFunction(type, ...) \ + type CONCAT(__internal_, FIRST(__VA_ARGS__)) \ + (struct_rpl_arguments *rpl_arguments REST(__VA_ARGS__)) { \ + type __internal_return; __internal_return = 0; int __type; \ + DISABLE_SET_BUT_NOT_USED_WARNING(__type); + +#define endInternalFunction return(__internal_return); } + +#define useInternalFunction(type, ...) \ + type CONCAT(__internal_, FIRST(__VA_ARGS__)) \ + (struct_rpl_arguments *rpl_arguments REST(__VA_ARGS__)) -#define endInternalFunction } +#define callInternalFunction(...) \ + CONCAT(__internal_, FIRST(__VA_ARGS__))(rpl_arguments REST(__VA_ARGS__)) -#define useInternalFunction(name, ...) \ - __internal_##name(struct_rpl_arguments *rpl_arguments, __VA_ARGS__) +/* +-------------------------------------------------------------------------------- + Déclaration des fonctions C +-------------------------------------------------------------------------------- +*/ + +#define declareCFunction(type, name, ...) \ + type name(__VA_ARGS__) { __RPL__ type __c_return; +#define endCFunction return(__c_return); } -#define callInternalFunction(name, ...) \ - __internal_##name(rpl_arguments, __VA_ARGS__) +#define useCFunction(type, name, ...) type name(__VA_ARGS__) /* -------------------------------------------------------------------------------- @@ -236,17 +293,17 @@ */ #define declareExternalFunction(name) \ - void __external_##name(struct_rpl_arguments *rpl_arguments) { \ + int __external_##name(struct_rpl_arguments *rpl_arguments) { \ char __function_name[] = "__external_"#name; \ __static_rpl_arguments = (*rpl_arguments); #define useExternalFunction(function) \ - void __external_##function(struct_rpl_arguments *rpl_arguments) + int __external_##function(struct_rpl_arguments *rpl_arguments) #define libraryName(name) char __library_name[] = #name; -#define __onLoading void __runOnLoading(struct_rpl_arguments *rpl_arguments) -#define __onClosing void __runOnClosing(struct_rpl_arguments *rpl_arguments) +#define __onLoading int __runOnLoading(struct_rpl_arguments *rpl_arguments) +#define __onClosing int __runOnClosing(struct_rpl_arguments *rpl_arguments) #define declareSubroutine(when) __##when { \ char __function_name[] = #when; \ __static_rpl_arguments = (*rpl_arguments); \ @@ -256,11 +313,14 @@ FUNCTION #define endSubroutine END } -#define notice(s, ...) do { ufprintf(s, __VA_ARGS__); fflush(s); } while(0) -#define logger(...) do { syslog(LOG_NOTICE, __VA_ARGS__); } while(0) +#define notice(s, ...) __CATCH_SYSTEM_ERROR__; \ + do { ufprintf(s, __VA_ARGS__); fflush(s); } while(0) +#define logger(...) __CATCH_SYSTEM_ERROR__; \ + do { syslog(LOG_NOTICE, __VA_ARGS__); } while(0) #define exportExternalFunctions(...) \ - char **__external_symbols(unsigned long *nb_symbols, \ + char **__external_symbols(struct_rpl_arguments *rpl_arguments, \ + integer8 *nb_symbols, \ const char *version) { \ char arguments[] = #__VA_ARGS__; \ char **tableau; \ @@ -308,9 +368,10 @@ return(tableau); \ } -#define endExternalFunction return; } +#define endExternalFunction leave; } #define callExternalFunction(function) do { \ + __CATCH_SYSTEM_ERROR__; \ __taille_bloc = sizeof(t_8_bits) * 8; \ __indice_bloc = (35 - 1) / __taille_bloc; \ __indice_bit = (35 - 1) % __taille_bloc; \ @@ -342,7 +403,7 @@ if ((*rpl_arguments).affichage_arguments == 'Y') \ { \ uprintf("%s\n", h); \ - return; \ + return 0; \ } } while(0) #define declareSymbolicConstant do { \ @@ -379,22 +440,22 @@ */ #define loop(b, e, s) for(b; e; s) { -#define endLoop } +#define endLoop __CATCH_SYSTEM_ERROR__; } #define repeatWhile(c) while(c) { -#define endWhile } +#define endWhile __CATCH_SYSTEM_ERROR__; } #define doUntil do { -#define repeatUntil(c) } while(!(c)); +#define repeatUntil(c) __CATCH_SYSTEM_ERROR__; } while(!(c)); #define select(s) switch(s) { -#define endSelect } +#define endSelect __CATCH_SYSTEM_ERROR__; } #define nonExclusiveCase(c) case c: { -#define endNonExclusiveCase } +#define endNonExclusiveCase __CATCH_SYSTEM_ERROR__; } #define exclusiveCase(c) case c: { -#define endExclusiveCase break; } +#define endExclusiveCase break; __CATCH_SYSTEM_ERROR__; } #define defaultCase default: -#define endDefaultCase break; } +#define endDefaultCase break; __CATCH_SYSTEM_ERROR__; } /* -------------------------------------------------------------------------------- @@ -406,14 +467,14 @@ if ((*rpl_arguments).erreur != 0) \ { \ __VA_ARGS__; \ - return; \ + return 0; \ } } while(0) #define systemError(message) do { \ (*rpl_arguments).erreur = __LINE__; \ (*rpl_arguments).type_erreur = 'S'; \ (*rpl_arguments).message_erreur = (unsigned char *) message; \ - return; } while(0) + return 0; } while(0) #define executionError(message) do { \ (*rpl_arguments).erreur = __LINE__; \ @@ -421,20 +482,23 @@ (*rpl_arguments).message_erreur = (unsigned char *) message; } while(0) #define onSystemError(...) do { \ - if ((*rpl_arguments).erreur != 0) \ + if (((*rpl_arguments).erreur != 0) && \ + ((*rpl_arguments).type_erreur == 'S')) \ { \ - __VA_ARGS__; \ blockSignals; \ kill(getpid(), SIGTERM); \ unblockSignals; \ + __VA_ARGS__; \ } } while(0) #define onError(...) \ + __CATCH_SYSTEM_ERROR__; \ do { if (((*rpl_arguments).type_erreur == 'E') && \ ((*rpl_arguments).erreur != 0)) { __VA_ARGS__; \ (*rpl_arguments).erreur = 0; } } while(0) #define onExecution(...) \ + __CATCH_SYSTEM_ERROR__; \ do { if (((*rpl_arguments).type_erreur == 'E') && \ ((*rpl_arguments).erreur == 0)) { __VA_ARGS__; } } while(0) @@ -445,12 +509,14 @@ */ #define pushOnStack(object) do { \ + __CATCH_SYSTEM_ERROR__; \ if (((*rpl_arguments).l_base_pile = \ empilement_pile_operationnelle(rpl_arguments, object)) == NULL) \ systemError("Memory allocation error"); \ if ((*object).nombre_occurrences == 1) object = NULL; } while(0) #define pullFromStack(object, ...) do { \ + __CATCH_SYSTEM_ERROR__; \ (*rpl_arguments).l_base_pile = \ depilement_pile_operationnelle(rpl_arguments, &object); \ if (object == NULL) \ @@ -492,9 +558,9 @@ */ #define then { -#define endIf } -#define elseIf } else if -#define orElse } else { +#define endIf __CATCH_SYSTEM_ERROR__; } +#define elseIf __CATCH_SYSTEM_ERROR__; } else if +#define orElse __CATCH_SYSTEM_ERROR__; } else { // Constantes symboliques @@ -508,6 +574,7 @@ if (((*rpl_arguments).drapeaux_etat[__indice_bloc] & __masque) != 0) \ { \ createNameObject(object); \ + __CATCH_SYSTEM_ERROR__; \ { \ char *__constant_name; \ if ((__constant_name = malloc((strlen(__library_name) + \ @@ -524,14 +591,17 @@ if (strcmp(#type, "integer") == 0) \ { \ createIntegerObject(object); \ + __CATCH_SYSTEM_ERROR__; \ setInteger(object, value); \ } \ else if (strcmp(#type, "real") == 0) \ { \ createRealObject(object); \ + __CATCH_SYSTEM_ERROR__; \ setReal(object, value); \ } \ } \ + __CATCH_SYSTEM_ERROR__; \ __constante--; } while(0) #define createSymbolicComplexConstant(object, rp, ip) do { \ @@ -542,6 +612,7 @@ if (((*rpl_arguments).drapeaux_etat[__indice_bloc] & __masque) != 0) \ { \ createNameObject(object); \ + __CATCH_SYSTEM_ERROR__; \ { \ char *__constant_name; \ if ((__constant_name = malloc((strlen(__library_name) + \ @@ -556,8 +627,10 @@ else \ { \ createComplexObject(object); \ + __CATCH_SYSTEM_ERROR__; \ setComplex(object, rp, im); \ } \ + __CATCH_SYSTEM_ERROR__; \ __constante--; } while(0) // Integer @@ -924,19 +997,22 @@ #define setString(object, string) do { \ ifIsString(object) \ { \ - if ((*object).nombre_occurrences > 1) \ + if (string == NULL) executionError("Nullified string"); else \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + if ((*object).nombre_occurrences > 1) \ + { \ + struct_objet *__tmp_object; \ + if ((__tmp_object = copie_objet(object, 'O')) == NULL) \ + systemError("Memory allocation error"); \ + liberation(object); \ + object = __tmp_object; \ + } \ + free((unsigned char *) (*object).objet); \ + if (((*object).objet = malloc((strlen(string) + 1) * \ + sizeof(unsigned char))) == NULL) \ systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ + strcpy((char *) (*object).objet, string); \ } \ - free((unsigned char *) (*object).objet); \ - if (((*object).objet = malloc((strlen(string) + 1) * \ - sizeof(unsigned char))) == NULL) \ - systemError("Memory allocation error"); \ - strcpy((char *) (*object).objet, string); \ } \ else executionError("Type mistmatch error"); } while(0) @@ -1035,18 +1111,32 @@ #define removeObjectFromList(list, object) do { \ ifIsList(list) \ { \ - if ((*object).objet == NULL) \ + if ((*list).objet != NULL) \ { \ - struct_objet *__tmp_object; \ - if ((__tmp_object = copie_objet(list, 'N')) == NULL) \ - systemError("Memory allocation error"); \ - liberation(object); \ - object = __tmp_object; \ - \ - \ - \ - \ - } \ + struct_liste_chainee *__current; \ + struct_liste_chainee *__previous; \ + __current = (*list).objet; \ + __previous = NULL; \ + if ((*__current).donnee == object) \ + { \ + (*list).objet = (*__current).suivant; \ + } \ + else \ + { \ + while(__current != NULL) \ + { \ + if ((*__current).donnee == object) \ + { \ + (*__previous).suivant = (*__current).suivant; \ + break; \ + } \ + __previous = __current; \ + __current = (*__current).suivant; \ + } \ + } \ + liberation((*__current).donnee); \ + free(__current); \ + } \ } \ else executionError("Type mistmatch error"); } while(0) @@ -1092,6 +1182,7 @@ */ #define pollSignalsAndInterrupts() \ + __CATCH_SYSTEM_ERROR__; \ do { scrutation_injection((*rpl_arguments).s_etat_processus); } while(0) /* @@ -1102,6 +1193,7 @@ #define intrinsic(function) do { \ int __status; \ + __CATCH_SYSTEM_ERROR__; \ __status = wrapper_instruction_intrinseque( \ instruction_##function, rpl_arguments); \ if (__status == 1) executionError(#function); \ @@ -1110,8 +1202,4 @@ #endif -static struct_rpl_arguments __static_rpl_arguments; -#define __RPL__ struct_rpl_arguments *rpl_arguments; \ - rpl_arguments = &__static_rpl_arguments; - // vim: ts=4