--- rpl/src/rpl.h	2018/05/30 09:27:39	1.318
+++ rpl/src/rpl.h	2019/02/07 21:44:15	1.328
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.29
-  Copyright (C) 1989-2018 Dr. BERTRAND Joël
+  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__), fflush(stdout); \
-				if (value > 1) BUG(1, uprintf("Value %d\n", value)); sem_wait(a); })
+				#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__, 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
@@ -775,7 +798,7 @@ pid_t debug_fork();
 #define d_SPH					"Semaphore $n 'name'"
 #define d_TAB					"<[ table ]>"
 #define d_MTX					"Mutex $n"
-#define d_REC					"Record /'name_1', ..., 'name_n'/"
+#define d_REC					"|[ record ]|"
 
 /*
 --------------------------------------------------------------------------------
@@ -1137,6 +1160,8 @@ enum t_type		{ ADR = 0, ALG, BIN, CHN, C
 	PRC : processus (struct_processus_fils *)
 			Sans objet.
 
+	REC : enregistrement (struct_record *)
+
 	REL : reel sur 64 bits (real*8, real8 *)
 			Sans objet.
 
@@ -1582,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;
 
@@ -1762,6 +1788,19 @@ typedef struct tableau
 
 /*
 --------------------------------------------------------------------------------
+  Structure enregistrement
+--------------------------------------------------------------------------------
+*/
+
+typedef struct record
+{
+	struct_objet		*noms;
+	struct_objet		*donnees;
+} struct_record;
+
+
+/*
+--------------------------------------------------------------------------------
   Structure arbre
 --------------------------------------------------------------------------------
 */
@@ -1828,7 +1867,10 @@ typedef struct rpl_arguments
 	unsigned char				test_instruction;
 
 	integer8					nombre_arguments;
-	// Nombre d'arguments de la fonction, positif ou nul.
+	// Nombre d'arguments de la fonction
+	// 0       : instruction infixe
+	// positif : nombre d'arguments (notation algébrique possible)
+	// -1      : notation algrébrique non autorisée
 
 	void						*s_etat_processus;
 } struct_rpl_arguments;
@@ -2478,6 +2520,7 @@ typedef struct processus
 	CACHE(integer8, int)
 	CACHE(struct_matrice, mat)
 	CACHE(struct_nom, nom)
+	CACHE(struct_record, rec)
 	CACHE(real8, rel)
 	CACHE(struct_tableau, tab)
 	CACHE(struct_vecteur, vec)
@@ -2893,6 +2936,7 @@ void instruction_rdz(struct_processus *s
 void instruction_re(struct_processus *s_etat_processus);
 void instruction_read(struct_processus *s_etat_processus);
 void instruction_recode(struct_processus *s_etat_processus);
+void instruction_record(struct_processus *s_etat_processus);
 void instruction_recv(struct_processus *s_etat_processus);
 void instruction_redraw(struct_processus *s_etat_processus);
 void instruction_regex(struct_processus *s_etat_processus);
@@ -3347,8 +3391,10 @@ struct_liste_chainee *sauvegarde_argumen
 #ifndef RPLARGS
 unsigned char *analyse_algebrique(struct_processus *s_etat_processus,
 		unsigned char *chaine_algebrique, struct_liste_chainee **l_base_liste);
+#endif
 unsigned char *analyse_flux(struct_processus *s_etat_processus,
 		unsigned char *flux, integer8 longueur);
+#ifndef RPLARGS
 unsigned char *chiffrement(struct_processus *s_etat_processus,
 		const EVP_CIPHER *type_chiffrement,
 		logical1 encodage, unsigned char *message, integer8 longueur_message,
@@ -3371,8 +3417,10 @@ unsigned char *formateur_fichier(struct_
 		integer8 longueur, integer8 longueur_champ, unsigned char format,
 		unsigned char type, integer8 *longueur_effective, integer8 *recursivite,
 		logical1 export_fichier);
+#endif
 unsigned char *formateur_flux(struct_processus *s_etat_processus,
 		unsigned char *donnees, integer8 *longueur);
+#ifndef RPLARGS
 unsigned char *formateur_fichier_nombre(struct_processus *s_etat_processus,
 		void *valeur_numerique, unsigned char type,
 		integer8 longueur, integer8 longueur_champ, unsigned char format);