--- rpl/src/rpl.h	2019/01/01 09:03:15	1.324
+++ rpl/src/rpl.h	2019/02/07 21:44:15	1.328
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.30
+  RPL/2 (R) version 4.1.31
   Copyright (C) 1989-2019 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -18,7 +18,8 @@
   along with RPL/2. If not, write to info@cecill.info.
 ================================================================================
 */
-
+#define DEBUG_ERREURS
+#define DEBUG_SEMAPHORES
 
 #ifndef INCLUSION_RPL
 #define INCLUSION_RPL
@@ -397,20 +398,30 @@ union semun
 #		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\
+				"line #%d <%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)); \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_wait_SysV(a); })
-#	define sem_post(a) ({ int value; sem_getvalue(a, &value); \
+#		define sem_trywait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"trywaiting at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) i\
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_trywait_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) \
+				"line #%d <%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)); \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_post_SysV(a); })
-#	define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+#		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"destroying at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
 				sem_destroy_SysV(a); })
 #	else
@@ -431,18 +442,30 @@ union semun
 #		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) \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_wait(a); })
+#		define sem_trywait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"trywaiting at %s() " \
+				"line #%d <%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); })
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_trywait(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) \
+				"line #%d <%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); })
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_post(a); })
 #		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"destroying at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
 				sem_destroy(a); })
 #	endif
@@ -1584,6 +1607,7 @@ typedef struct liste_pile_systeme
 	logical1					creation_variables_statiques;
 	logical1					creation_variables_partagees;
 	logical1					evaluation_expression;
+	logical1					debug_programme;
 
 	unsigned char				clause;