--- rpl/src/rplexternals.h 2017/07/30 21:59:41 1.87 +++ rpl/src/rplexternals.h 2020/01/10 11:15:51 1.97 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.27 - Copyright (C) 1989-2017 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. @@ -983,6 +983,54 @@ #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(rpl_object, value) do { \ @@ -1105,6 +1153,22 @@ ifIsString(rpl_object) string = (char *) (*rpl_object).objet; \ else executionError("Type mismatch error"); } while(0) +#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; \