--- rpl/src/rpl.h	2014/06/09 08:26:29	1.244
+++ rpl/src/rpl.h	2014/10/13 07:12:54	1.252
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.18
+  RPL/2 (R) version 4.1.19
   Copyright (C) 1989-2014 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -377,16 +377,59 @@ union semun
 */
 
 #ifdef IPCS_SYSV
+#	ifdef DEBUG_SEMAPHORES
+#		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"waiting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) i\
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 1) BUG(1, uprintf("Value %d\n", value)); \
+				sem_wait_SysV(a); })
+#	define sem_post(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"posting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 0) BUG(1, uprintf("Value %d\n", value)); \
+				sem_post_SysV(a); })
+#	define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
+				sem_destroy_SysV(a); })
+#	else
+#		define sem_destroy(a)		sem_destroy_SysV(a)
+#		define sem_wait(a)			sem_wait_SysV(a)
+#		define sem_post(a)			sem_post_SysV(a)
+#	endif
+
 #	define sem_init(a, b, c)	sem_init_SysV(a, b, c)
-#	define sem_destroy(a)		sem_destroy_SysV(a)
-#	define sem_wait(a)			sem_wait_SysV(a)
 #	define sem_trywait(a)		sem_trywait_SysV(a)
 #	define sem_timedwait(a, b)	sem_timedwait_SysV(a, b)
-#	define sem_post(a)			sem_post_SysV(a)
 #	define sem_getvalue(a, b)	sem_getvalue_SysV(a, b)
 #	define sem_open(...)		sem_open_SysV(__VA_ARGS__)
 #	define sem_close(a)			sem_close_SysV(a)
 #	define sem_unlink(a)		sem_unlink_SysV(a)
+#else
+#	ifdef DEBUG_SEMAPHORES
+#		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"waiting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 1) BUG(1, uprintf("Value %d\n", value)); sem_wait(a); })
+#		define sem_post(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"posting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 0) BUG(1, uprintf("Value %d\n", value)); sem_post(a); })
+#		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
+				sem_destroy(a); })
+#	endif
 #endif
 
 
@@ -480,22 +523,20 @@ union semun
 	__EXTERN__ pthread_mutex_t		mutex_liste_variables_partagees;
 	__EXTERN__ pthread_mutex_t		mutex_sem __STATIC_MUTEX_INITIALIZATION__;
 
-	__EXTERN__ sem_t __PTR__		semaphore_gestionnaires_signaux;
-
 	__EXTERN__ volatile int			routine_recursive;
-#endif
 
-#define SEM_FORK				0
-#define	SEM_QUEUE				1
-#define	SEM_SIGNAUX				2
-#define SEM_SIGNALISATION		3
-#define SEM_ARRET_SIGNALISATION	4
-sem_t *sem_init2(unsigned int valeur, pid_t pid, int ordre);
-sem_t *sem_init3(unsigned int valeur, pid_t pid, pthread_t tid, int ordre);
-int sem_destroy2(sem_t *semaphore_p, pid_t pid, int ordre);
-int sem_destroy3(sem_t *semaphore_p, pid_t pid, pthread_t tid, int ordre);
-int sem_getvalue2(sem_t *semaphore, int *valeur);
-sem_t *sem_open2(pid_t pid, int ordre);
+#	define SEM_FORK				0
+#	define SEM_QUEUE				1
+#	define SEM_SIGNALISATION		2
+#	define SEM_ARRET_SIGNALISATION	3
+
+	sem_t *sem_init2(unsigned int valeur, pid_t pid, int ordre);
+	sem_t *sem_init3(unsigned int valeur, pid_t pid, pthread_t tid, int ordre);
+	int sem_destroy2(sem_t *semaphore_p, pid_t pid, int ordre);
+	int sem_destroy3(sem_t *semaphore_p, pid_t pid, pthread_t tid, int ordre);
+	int sem_getvalue2(sem_t *semaphore, int *valeur);
+	sem_t *sem_open2(pid_t pid, int ordre);
+#endif
 
 // Le mutex est là uniquement pour pouvoir émuler le comportement
 // de sem_getvalue() sur un système comme MacOS X qui ne possède pas
@@ -686,23 +727,6 @@ pid_t debug_fork();
 		pthread_mutex_unlock(mutex)
 #endif
 
-#ifdef DEBUG_SEMAPHORES
-#define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
-		uprintf("[%d-%llu] Semaphore %s (%p) "\
-		"waiting at %s() " \
-		"line #%d\n", (int) getpid(), (unsigned long long) pthread_self(), \
-		#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-		if (value > 1) BUG(1, uprintf("Value %d\n", value)); sem_wait(a); })
-#define sem_post(a) ({ int value; sem_getvalue(a, &value); \
-		uprintf("[%d-%llu] Semaphore %s (%p) "\
-		"posting at %s() " \
-		"line #%d\n", (int) getpid(), (unsigned long long) pthread_self(), \
-		#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-		if (value > 0) BUG(1, uprintf("Value %d\n", value)); sem_post(a); })
-#define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
-		if (value == 0) BUG(1, uprintf("Value %d\n", value)); sem_destroy(a); })
-#endif
-
 
 /*
 ================================================================================
@@ -1682,10 +1706,11 @@ typedef struct tableau
 
 typedef struct arbre
 {
-	struct_objet		*objet;
+	struct_objet		*feuille;
+	logical1			inversion;
 
-	unsigned long		nombre_feuilles;
-	struct arbre		**feuilles;
+	integer8			nombre_branches;
+	struct arbre		**branches;
 } struct_arbre;
 
 
@@ -2292,6 +2317,8 @@ typedef struct processus
 
 	logical1					processus_detache;
 
+	enum t_type					type_en_cours;
+
 /* Profilage											*/
 
 	logical1					profilage;
@@ -2553,6 +2580,7 @@ void instruction_elseif(struct_processus
 void instruction_end(struct_processus *s_etat_processus);
 void instruction_eng(struct_processus *s_etat_processus);
 void instruction_epsilon(struct_processus *s_etat_processus);
+void instruction_eqv(struct_processus *s_etat_processus);
 void instruction_erase(struct_processus *s_etat_processus);
 void instruction_errm(struct_processus *s_etat_processus);
 void instruction_errn(struct_processus *s_etat_processus);
@@ -3312,6 +3340,8 @@ logical1 initialisation_fichier_acces_in
 		sqlite3 *sqlite, integer8 position_clef, logical1 binaire);
 logical1 lancement_thread_signaux(struct_processus *s_etat_processus);
 logical1 recherche_instruction_suivante(struct_processus *s_etat_processus);
+logical1 recherche_instruction_suivante_recursive(
+		struct_processus *s_etat_processus, integer8 recursivite);
 logical1 retrait_variable(struct_processus *s_etat_processus,
 		unsigned char *nom_variable, unsigned char type);
 logical1 retrait_variables_par_niveau(struct_processus *s_etat_processus);
@@ -3497,22 +3527,6 @@ struct_liste_variables_partagees *recher
 #endif
 
 /*
---------------------------------------------------------------------------------
-  Fonctions gérant les arbres de simplification
---------------------------------------------------------------------------------
-*/
-
-#ifndef RPLARGS
-struct_arbre *creation_arbre(struct_processus *s_etat_processus,
-		struct_objet **t_objets, integer8 indice, integer8 indice_maximal);
-void liberation_arbre(struct_processus *s_etat_processus,
-		struct_arbre *s_noeud);
-void parcours_arbre(struct_processus *s_etat_processus, struct_arbre *s_noeud);
-void simplification_arbre(struct_processus *s_etat_processus,
-		struct_arbre *s_noeud);
-#endif
-
-/*
 --------------------------------------------------------------------------------
   Fonctions gérant la complétion automatique
 --------------------------------------------------------------------------------