--- rpl/src/rplexternals.h	2017/06/30 13:11:26	1.76
+++ rpl/src/rplexternals.h	2017/07/22 11:29:50	1.86
@@ -45,7 +45,7 @@
 */
 
 #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) && \
@@ -59,11 +59,13 @@
 
 #ifdef __RPLC_MAIN
 	struct_rpl_arguments __static_rpl_arguments;
+	void *__static_library_descriptor;
 #	define global
 #	define initialize(a, b) a = b
 #	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(rpl_object) extern struct_objet *rpl_object
@@ -89,6 +91,8 @@
 			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); }
@@ -97,6 +101,17 @@
 			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(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
 
 /*
 --------------------------------------------------------------------------------
@@ -134,6 +149,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)
@@ -167,8 +186,8 @@
 #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__;
@@ -208,6 +227,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; \
@@ -334,11 +355,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); \
@@ -351,7 +375,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__; \
@@ -577,6 +601,10 @@
 				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 ((*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) \
@@ -586,6 +614,8 @@
 		} \
 	} } while(0)
 
+#define objectSubtype(a) (*a).extension_type
+
 /*
 --------------------------------------------------------------------------------
   Gestion des objets
@@ -1042,7 +1072,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; \
@@ -1222,6 +1252,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
@@ -1234,13 +1284,15 @@
 	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 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"); ptr; })
+		{ systemError("Memory allocation error"); \
+		__CATCH_SYSTEM_ERROR__; } ptr; }) \
 
 #define deallocate(a) do { \
 	struct_processus *s_etat_processus; \