--- rpl/src/rplexternals.h	2017/07/05 13:53:40	1.80
+++ rpl/src/rplexternals.h	2024/01/17 16:57:18	1.104
@@ -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.36
+  Copyright (C) 1989-2024 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -105,9 +105,14 @@
 #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))
 #define	subType(a) ((*a).extension_type)
 #define integerFormat(a) formateur_nombre(s_etat_processus, a, 'I')
+#define procStatus(a) (*a).s_etat_processus
 
 /*
 --------------------------------------------------------------------------------
@@ -145,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)
@@ -219,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; \
@@ -360,8 +371,7 @@
 #define endSubroutine END }
 
 #define notice(s, ...) __CATCH_SYSTEM_ERROR__; \
-		do { if (affichage_rplso == d_vrai) \
-			{ ufprintf(s, __VA_ARGS__); fflush(s); } } while(0)
+		do { ufprintf(s, __VA_ARGS__); fflush(s); } while(0)
 #define logger(...) __CATCH_SYSTEM_ERROR__; \
 		do { syslog(LOG_NOTICE, __VA_ARGS__); } while(0) 
 
@@ -582,22 +592,28 @@
 		else \
 		{ \
 			__type = 0; \
-			if (strstr(#__VA_ARGS__, "integer") != NULL) \
-				if ((*rpl_object).type == INT) __type = 1; \
-			if (strstr(#__VA_ARGS__, "real") != NULL) \
-				if ((*rpl_object).type == REL) __type = 1; \
-			if (strstr(#__VA_ARGS__, "complex") != NULL) \
-				if ((*rpl_object).type == CPL) __type = 1; \
-			if (strstr(#__VA_ARGS__, "string") != NULL) \
-				if ((*rpl_object).type == CHN) __type = 1; \
-			if (strstr(#__VA_ARGS__, "list") != NULL) \
-				if ((*rpl_object).type == LST) __type = 1; \
-			if (strstr(#__VA_ARGS__, "external") != NULL) \
+			if (strstr(#__VA_ARGS__, "integerVector") != NULL) { \
+				if ((*rpl_object).type == VIN) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "realVector") != NULL) { \
+				if ((*rpl_object).type == VRL) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "complexVector") != NULL) { \
+				if ((*rpl_object).type == VCX) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "integer") != NULL) { \
+				if ((*rpl_object).type == INT) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "real") != NULL) { \
+				if ((*rpl_object).type == REL) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "complex") != NULL) { \
+				if ((*rpl_object).type == CPL) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "string") != NULL) { \
+				if ((*rpl_object).type == CHN) __type = 1; } \
+			else if (strstr(#__VA_ARGS__, "list") != NULL) { \
+				if ((*rpl_object).type == LST) __type = 1; } \
+			else 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; \
+							__static_library_descriptor) __type = 1; } }\
+			else if (strstr(#__VA_ARGS__, "unknown") != NULL) { \
+				__type = 1; } \
 			if (__type == 0) \
 			{ \
 				executionError("Type not allowed"); \
@@ -868,6 +884,13 @@
 		} \
 	} } while(0)
 
+#define vectorSize(rpl_object) \
+	({ integer8 __size; if (((*rpl_object).type == VIN) || \
+		   	((*rpl_object).type == VRL) || \
+			((*rpl_object).type == VCX)) \
+		__size = (*((struct_vecteur *) (*rpl_object).objet)).taille; \
+	else executionError("Type mistmatch error"); __size; })
+
 // Integer vector
 
 #define setIntegerIntoVector(rpl_object, value, position) do { \
@@ -973,6 +996,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 { \
@@ -1063,7 +1134,7 @@
 	((*rpl_object).type == CHN)
 
 #define ifIsString(rpl_object) if (isString(rpl_object))
-#define elseIfIsString(rpl_object) else if (isString(rpl_object))
+#define elseIfIsString(rpl_object) } else if (isString(rpl_object))
 
 #define setString(rpl_object, string) do { \
 	struct_processus *s_etat_processus; \
@@ -1095,6 +1166,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; \
@@ -1243,6 +1330,15 @@
 		} \
 	} } 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) \