--- rpl/src/rplexternals.h	2013/03/27 09:14:51	1.44
+++ rpl/src/rplexternals.h	2013/03/27 15:47:36	1.45
@@ -70,6 +70,7 @@
 #define replaceElementIntoDaisyChain(daisyChain, element) \
 	do { typeof(daisyChain) __daisyChain = daisyChain; \
 	if (__daisyChain == NULL) executionError("Nullified daisy chain"); \
+	freeObject((*__daisyChain).donnee); \
 	(*__daisyChain).donnee = element; } while(0)
 
 #define nextElementOfDaisyChain(daisyChain) \
@@ -104,11 +105,14 @@
 #define logical int
 #define string char *
 #define integer int
+#define object struct_objet *
 
 #define declareStructure typedef struct {
 #define declareUnion typedef union {
 #define as(name) } name;
 
+#define __RPL__		struct_rpl_arguments rpl_arguments
+
 #define target(a) (*a)
 #define address(a) (&a)
 
@@ -186,13 +190,55 @@
 
 /*
 --------------------------------------------------------------------------------
+  Destruction d'un objet
+--------------------------------------------------------------------------------
+*/
+
+#define freeObject(object) \
+	{ \
+		if (object == NULL) \
+			systemError("Nullified object"); \
+		liberation(object); \
+		object = NULL; \
+	} while(0)
+
+/*
+--------------------------------------------------------------------------------
+  Copie d'un objet
+--------------------------------------------------------------------------------
+*/
+
+#define dupObject(object) \
+	{ if (copie_objet(object, 'P') != object) \
+		systemError("Memory allocation error"); } while(0)
+
+/*
+--------------------------------------------------------------------------------
+  Déclaration des fonctions internes
+--------------------------------------------------------------------------------
+*/
+
+#define declareInternalFunction(name, ...) \
+	__internal_##name(struct_rpl_arguments *rpl_arguments, __VA_ARGS__) {
+
+#define endInternalFunction }
+
+#define useInternalFunction(name, ...) \
+	__internal_##name(struct_rpl_arguments *rpl_arguments, __VA_ARGS__)
+
+#define callInternalFunction(name, ...) \
+	__internal_##name(rpl_arguments, __VA_ARGS__)
+
+/*
+--------------------------------------------------------------------------------
   Déclaration des fonctions externes
 --------------------------------------------------------------------------------
 */
 
 #define declareExternalFunction(name) \
 	void __external_##name(struct_rpl_arguments *rpl_arguments) { \
-	char __function_name[] = "__external_"#name;
+	char __function_name[] = "__external_"#name; \
+	__static_rpl_arguments = (*rpl_arguments);
 
 #define useExternalFunction(function) \
 	void __external_##function(struct_rpl_arguments *rpl_arguments)
@@ -203,6 +249,7 @@
 #define __onClosing void __runOnClosing(struct_rpl_arguments *rpl_arguments)
 #define declareSubroutine(when) __##when { \
 	char __function_name[] = #when; \
+	__static_rpl_arguments = (*rpl_arguments); \
 	HEADER \
 		declareHelpString(""); \
 		numberOfArguments(0); \
@@ -373,6 +420,15 @@
 	(*rpl_arguments).type_erreur = 'E'; \
 	(*rpl_arguments).message_erreur = (unsigned char *) message; } while(0)
 
+#define onSystemError(...) { \
+	if ((*rpl_arguments).erreur != 0) \
+	{ \
+		__VA_ARGS__; \
+		blockSignals; \
+			kill(getpid(), SIGTERM); \
+		unblockSignals; \
+	} } while(0)
+
 #define onError(...) \
 	do { if (((*rpl_arguments).type_erreur == 'E') && \
 			((*rpl_arguments).erreur != 0)) { __VA_ARGS__; \
@@ -1015,31 +1071,6 @@
 		} \
 	} } while(0)
 
-
-/*
---------------------------------------------------------------------------------
-  Destruction d'un objet
---------------------------------------------------------------------------------
-*/
-
-#define freeObject(object) \
-	{ \
-		if (object == NULL) \
-			systemError("Nullified object"); \
-		liberation(object); \
-		object = NULL; \
-	} while(0)
-
-/*
---------------------------------------------------------------------------------
-  Copie d'un objet
---------------------------------------------------------------------------------
-*/
-
-#define dupObject(object) \
-	{ if (copie_objet(object, 'P') != object) \
-		systemError("Memory allocation error"); } while(0)
-
 /*
 --------------------------------------------------------------------------------
   Allocation mémoire
@@ -1079,4 +1110,8 @@
 
 #endif
 
+static struct_rpl_arguments __static_rpl_arguments;
+#define __RPL__ struct_rpl_arguments *rpl_arguments; \
+	rpl_arguments = &__static_rpl_arguments;
+
 // vim: ts=4