--- rpl/src/rplexternals.h 2017/07/22 11:29:50 1.86 +++ rpl/src/rplexternals.h 2018/05/30 16:56:07 1.91 @@ -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.29 + Copyright (C) 1989-2018 Dr. BERTRAND Joël This file is part of RPL/2. @@ -105,7 +105,8 @@ #define initializeObject(a, b) do { \ (*a).descripteur_bibliotheque = (*b).descripteur_bibliotheque; \ (*a).extension_type = (*b).extension_type; } while(0) -#define objectContainer(a) ((*a).objet) +#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)) @@ -1104,6 +1105,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; \