--- rpl/src/rpl.h	2010/08/15 14:46:25	1.56
+++ rpl/src/rpl.h	2011/04/13 19:28:01	1.79
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.18
-  Copyright (C) 1989-2010 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.0.prerelease.0
+  Copyright (C) 1989-2011 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -48,8 +48,6 @@
 #	include "getaddrinfo-conv.h"
 
 #	define sched_yield(arg)
-#else
-#	undef _BROKEN_SIGINFO
 #endif
 
 
@@ -95,9 +93,17 @@
 
 #	include <pwd.h>
 
-#	ifndef SEMAPHORES_SYSV
+#	ifdef _BROKEN_SIGINFO
+#		include <sys/ipc.h>
+#		include <sys/shm.h>
+#	endif
+
+#	ifndef IPCS_SYSV
 #		include <semaphore.h>
 #	else
+#		include <sys/ipc.h>
+#		include <sys/sem.h>
+
 #		ifdef OS2
 #			define INCL_DOSSEMAPHORES
 #			define INCL_DOSMEMMGR
@@ -114,7 +120,12 @@
 				ULONG	allocated;
 			} sem_t;
 #		else
-			typedef int sem_t;
+			typedef struct
+		   	{
+				int				sem;
+				unsigned char	*path;
+				pid_t			pid;
+			} sem_t;
 #		endif
 
 #		define SEM_FAILED	NULL
@@ -182,9 +193,65 @@
 
 #include "librplprototypes.h"
 
-#ifndef UNIX_PATH_MAX
-	struct sockaddr_un sizecheck;
-#	define UNIX_PATH_MAX sizeof(sizecheck.sun_path)
+#ifndef RPLARGS
+#	ifndef UNIX_PATH_MAX
+		struct sockaddr_un sizecheck;
+#		define UNIX_PATH_MAX sizeof(sizecheck.sun_path)
+#	endif
+#endif
+
+/*
+================================================================================
+  Bugs spécifiques
+================================================================================
+*/
+
+#ifdef _BROKEN_SIGINFO
+#	define SIGHANDLER_ARGS	int signal
+#	ifdef SA_SIGINFO
+#		undef SA_SIGINFO
+#	endif
+#	define SA_SIGINFO	0
+
+#	ifndef __BROKEN_SIGINFO_ROUTINES__
+
+// pthread_kill() est une macro sous OS/2.
+#		ifdef pthread_kill
+#			undef pthread_kill
+#		endif
+
+#		define kill(a, b)			kill_broken_siginfo(a, b)
+#		define pthread_kill(a, b)	pthread_kill_broken_siginfo(a, b)
+#	endif
+
+	int kill_broken_siginfo(pid_t pid, int signal);
+	int pthread_kill_broken_siginfo(pthread_t tid, int signal);
+	pid_t origine_signal(int signal);
+	int queue_in(pid_t pid, int signal);
+#else
+#	define SIGHANDLER_ARGS	int signal, siginfo_t *siginfo, void *context
+#endif
+
+#ifdef OpenBSD
+#	ifdef PTHREAD_SCOPE_SYSTEM
+#		undef PTHREAD_SCOPE_SYSTEM
+#	endif
+#	define PTHREAD_SCOPE_SYSTEM	0
+#endif
+
+#ifdef OS2
+#	define readline(s) readline_wrapper(s)
+	unsigned char *readline_wrapper(unsigned char *s);
+#endif
+
+#if ! defined(UNION_SEMUN) && defined(IPCS_SYSV)
+union semun
+{
+	int					val;
+	struct semid_ds		*buf;
+	unsigned short		*array;
+	struct seminfo		*__buf;
+};
 #endif
 
 
@@ -194,7 +261,7 @@
 ================================================================================
 */
 
-#ifdef SEMAPHORES_SYSV
+#ifdef IPCS_SYSV
 #	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)
@@ -214,9 +281,14 @@
 */
 
 #ifndef RPLARGS
-#	if defined(Darwin) || defined(OpenBSD)
-#		define SIGPOLL				SIGINFO
-#	endif
+
+// Signaux utilisés par défaut :
+//	SIGINT
+//	SIGTSTP
+//	SIGCONT
+//	SIGURG
+//	SIGPIPE
+//	SIGALRM
 
 //	Arrêt par STOP
 #	define SIGFSTOP					SIGUSR1
@@ -225,9 +297,19 @@
 //	Injection de données
 #	define SIGINJECT				SIGQUIT
 //	Arrêt général
-#	define SIGABORT					SIGPROF
+#	ifndef OpenBSD
+//	La libpthread d'OpenBSD utilise SIGPROF
+#		define SIGABORT				SIGPROF
+#	else
+#		define SIGABORT				SIGTHR
+#	endif
 //	Arrêt d'un processus fils depuis autre chose que STOP
-#	define SIGFABORT				SIGPOLL
+#	if defined(Darwin) || defined(OpenBSD)
+#		define SIGFABORT			SIGINFO
+#	else
+#		define SIGFABORT			SIGPOLL
+#	endif
+
 //	Nombre d'interruptions disponibles
 #	define d_NOMBRE_INTERRUPTIONS	64
 #endif
@@ -292,7 +374,12 @@ typedef unsigned char			t_8_bits;
 #	ifdef SEMAPHORES_NOMMES
 #		define LONGUEUR_NOM_SEMAPHORE	64
 #	endif
+
 #	ifndef MAIN_RPL
+#		ifdef _BROKEN_SIGINFO
+			extern int				*fifos_signaux;
+#		endif
+
 		extern jmp_buf				contexte;
 		extern jmp_buf				contexte_initial;
 
@@ -329,6 +416,10 @@ typedef unsigned char			t_8_bits;
 			extern sem_t			*semaphores_nommes[4];
 #		endif
 #	else
+#		ifdef _BROKEN_SIGINFO
+			int						*fifos_signaux;
+#		endif
+
 		jmp_buf						contexte;
 		jmp_buf						contexte_initial;
 
@@ -411,6 +502,9 @@ int sem_getvalue2(sem_t *semaphore, int
 #	define fopen(...) ({ FILE *desc; \
 	        while((desc = fopen(__VA_ARGS__)) == NULL) \
 	        { if ((errno != EINTR) && (errno != 0)) break; } desc; })
+#	define freopen(...) ({ FILE *desc; \
+	        while((desc = freopen(__VA_ARGS__)) == NULL) \
+	        { if ((errno != EINTR) && (errno != 0)) break; } desc; })
 #	define fclose(...) ({ int ios; \
 	        while((ios = fclose(__VA_ARGS__)) != 0) \
 	        { if ((errno != EINTR) && (errno != 0)) break; } ios; })
@@ -655,13 +749,22 @@ pid_t debug_fork();
 #ifdef DEBUG_ERREURS
 #	ifdef MESSAGES
 #		define __erreur(i)	i
+#		define __erreur_(i)	i
 #	else
+#		undef _ERREURS_VARIABLES
+#		ifdef _ERREURS_VARIABLES
+#			define __erreur_(i)	__erreur(i)
+#		else
+#			define __erreur_(i)	i
+#		endif
 #		define __erreur(i)	({ if (strstr(__FUNCTION__, "recherche_variable") \
-				== NULL) fprintf(stderr, "ERROR %d AT %s() LINE %d\n", \
-				i, __FUNCTION__, __LINE__); i; })
+				== NULL) ufprintf(stderr, \
+				"ERROR %d AT %s() FROM %s LINE %d\n", \
+				i, __FUNCTION__, __FILE__, __LINE__); i; })
 #	endif
 #else
 #	define __erreur(i)	i
+#	define __erreur_(i)	i
 #endif
 
 
@@ -669,7 +772,7 @@ pid_t debug_fork();
 #ifndef RPLARGS
 #	define d_es									2000
 #	define d_es_allocation_memoire				__erreur(2001)
-#	define d_es_variable_introuvable			__erreur(2002)
+#	define d_es_variable_introuvable			__erreur_(2002)
 #	define d_es_pile_vide						__erreur(2003)
 #	define d_es_end_incoherent					__erreur(2004)
 #	define d_es_peripherique_stdin				__erreur(2005)
@@ -682,6 +785,7 @@ pid_t debug_fork();
 #	define d_es_interruption_invalide			__erreur(2012)
 #	define d_es_contexte						__erreur(2013)
 #	define d_es_somme_controle					__erreur(2014)
+#	define d_es_semaphore						__erreur(2015)
 #endif
 
 /*
@@ -747,7 +851,7 @@ pid_t debug_fork();
 #	define d_ex_absence_graphique_courant		__erreur(9)
 #	define d_ex_erreur_traitement_condition		__erreur(10)
 #	define d_ex_erreur_traitement_boucle		__erreur(11)
-#	define d_ex_variable_non_definie			__erreur(12)
+#	define d_ex_variable_non_definie			__erreur_(12)
 #	define d_ex_drapeau_inexistant				__erreur(13)
 #	define d_ex_nom_invalide					__erreur(14)
 #	define d_ex_element_inexistant				__erreur(15)
@@ -841,8 +945,8 @@ pid_t debug_fork();
 #	undef MAX
 #endif
 
-#define	ADR	__RPL_ADR
-#define	ALG	__RPL_ALG
+#define ADR	__RPL_ADR
+#define ALG	__RPL_ALG
 #define BIN	__RPL_BIN
 #define CHN	__RPL_CHN
 #define CPL	__RPL_CPL
@@ -861,9 +965,9 @@ pid_t debug_fork();
 #define RPN	__RPL_RPN
 #define SCK	__RPL_SCK
 #define SLB	__RPL_SLB
-#define SPH __RPL_SPH
+#define SPH	__RPL_SPH
 #define SQL	__RPL_SQL
-#define TBL __RPL_TBL
+#define TBL	__RPL_TBL
 #define VCX	__RPL_VCX
 #define VIN	__RPL_VIN
 #define VRL	__RPL_VRL
@@ -1255,6 +1359,7 @@ typedef struct descripteur_thread
 	pthread_t					thread_pere;
 
 	pthread_mutex_t				mutex;
+	pthread_mutex_t				mutex_nombre_references;
 
 	volatile logical1			thread_actif;
 
@@ -1565,6 +1670,33 @@ typedef struct rpl_arguments
 	void						*s_etat_processus;
 } struct_rpl_arguments;
 
+/*
+--------------------------------------------------------------------------------
+  Structure d'arbre des instructions intrinsèques
+--------------------------------------------------------------------------------
+*/
+
+#ifndef RPLARGS
+typedef struct instruction
+{
+	struct instruction		**noeud;
+	void					(*feuille)(struct processus *);
+} struct_instruction;
+#endif
+
+/*
+--------------------------------------------------------------------------------
+  Structure d'arbre des variables variable globales et locales
+--------------------------------------------------------------------------------
+*/
+
+#ifndef RPLARGS
+typedef struct arbre_variables
+{
+	struct arbre_variables	**noeud;
+	struct_liste_chainee	*l_variable;
+} struct_arbre_variables;
+#endif
 
 /*
 --------------------------------------------------------------------------------
@@ -1602,6 +1734,7 @@ typedef struct processus
 	unsigned char				mode_interactif;					/*Y/N*/
 	unsigned char				mode_evaluation_expression;			/*Y/N*/
 	unsigned char				traitement_cycle_exit;				/*N/E/C*/
+	unsigned char				recherche_type;						/*Y/N*/
 
 	unsigned long				position_courante;
 	unsigned long				longueur_definitions_chainees;
@@ -1610,7 +1743,7 @@ typedef struct processus
 
 	int							*pointeurs_caracteres;
 	int							nombre_caracteres;
-	struct instruction			*arbre_instructions;
+	struct_instruction			*arbre_instructions;
 
 /* Requetes												*/
 
@@ -1655,7 +1788,7 @@ typedef struct processus
 
 #	if !defined(Cygwin)
 #		if !(OpenBSD)
-	stack_t						pile_signal;
+			stack_t				pile_signal;
 #		else
 #			ifdef SA_ONSTACK
 #				undef SA_ONSTACK
@@ -1663,8 +1796,8 @@ typedef struct processus
 #			define SA_ONSTACK	0
 #		endif
 #	else
-#	define SA_ONSTACK			0
-#	define RTLD_LOCAL			0
+#		define SA_ONSTACK		0
+#		define RTLD_LOCAL		0
 #	endif
 
 /* Contextes											*/
@@ -1674,9 +1807,8 @@ typedef struct processus
 
 /* Variables											*/
 
-	struct_variable				*s_liste_variables;
-	unsigned long				nombre_variables;
-	unsigned long				nombre_variables_allouees;
+	struct_arbre_variables		*s_arbre_variables;
+	struct_liste_chainee		*l_liste_variables_par_niveau;
 
 	struct_variable_statique	*s_liste_variables_statiques;
 	unsigned long				nombre_variables_statiques;
@@ -1687,7 +1819,7 @@ typedef struct processus
 
 	unsigned long				niveau_courant;
 	unsigned long				niveau_initial;
-	unsigned long				position_variable_courante;
+	struct_variable				pointeur_variable_courante;
 	unsigned long				position_variable_statique_courante;
 
 	logical1					creation_variables_statiques;
@@ -1938,6 +2070,7 @@ typedef struct processus
 	volatile sig_atomic_t		var_volatile_traitement_retarde_stop;
 	volatile sig_atomic_t		var_volatile_traitement_sigint;
 
+	volatile sig_atomic_t		var_volatile_processus_racine;
 	volatile sig_atomic_t		var_volatile_processus_pere;
 	volatile sig_atomic_t		var_volatile_recursivite;
 
@@ -2014,11 +2147,7 @@ typedef struct processus
 	unsigned long				taille_pile_objets;
 	struct_objet				*pile_objets;
 
-#	ifndef DEBUG_MALLOC
-#		define TAILLE_CACHE 16384
-#	else
-#		define TAILLE_CACHE 4
-#	endif
+#	define TAILLE_CACHE 16384
 
 	unsigned long				*objets_adr[TAILLE_CACHE];
 	int							pointeur_adr;
@@ -2057,21 +2186,6 @@ typedef struct processus
 
 /*
 --------------------------------------------------------------------------------
-  Structures instruction intrinsèque
---------------------------------------------------------------------------------
-*/
-
-#ifndef RPLARGS
-typedef struct instruction
-{
-	struct instruction		**noeud;
-	void					(*feuille)(struct_processus *);
-} struct_instruction;
-#endif
-
-
-/*
---------------------------------------------------------------------------------
   Structure fonction
 --------------------------------------------------------------------------------
 */
@@ -2337,6 +2451,7 @@ void instruction_lq(struct_processus *s_
 void instruction_lsq(struct_processus *s_etat_processus);
 void instruction_lt(struct_processus *s_etat_processus);
 void instruction_lu(struct_processus *s_etat_processus);
+void instruction_l_vers_t(struct_processus *s_etat_processus);
 
 void instruction_mant(struct_processus *s_etat_processus);
 void instruction_mark(struct_processus *s_etat_processus);
@@ -2572,6 +2687,7 @@ void instruction_trn(struct_processus *s
 void instruction_trnc(struct_processus *s_etat_processus);
 void instruction_true(struct_processus *s_etat_processus);
 void instruction_type(struct_processus *s_etat_processus);
+void instruction_t_vers_l(struct_processus *s_etat_processus);
 
 void instruction_ucase(struct_processus *s_etat_processus);
 void instruction_uchol(struct_processus *s_etat_processus);
@@ -2706,17 +2822,17 @@ void insertion_thread_surveillance(struc
 void integrale_romberg(struct_processus *s_etat_processus,
 		struct_objet *s_expression, unsigned char *variable,
 		real8 a, real8 b, real8 precision);
-void interruption1(int signal, siginfo_t *siginfo, void *context);
-void interruption2(int signal, siginfo_t *siginfo, void *context);
-void interruption3(int signal, siginfo_t *siginfo, void *context);
-void interruption4(int signal, siginfo_t *siginfo, void *context);
-void interruption5(int signal, siginfo_t *siginfo, void *context);
-void interruption6(int signal, siginfo_t *siginfo, void *context);
-void interruption7(int signal, siginfo_t *siginfo, void *context);
-void interruption8(int signal, siginfo_t *siginfo, void *context);
-void interruption9(int signal, siginfo_t *siginfo, void *context);
-void interruption10(int signal, siginfo_t *siginfo, void *context);
-void interruption11(int signal, siginfo_t *siginfo, void *context);
+void interruption1(SIGHANDLER_ARGS);
+void interruption2(SIGHANDLER_ARGS);
+void interruption3(SIGHANDLER_ARGS);
+void interruption4(SIGHANDLER_ARGS);
+void interruption5(SIGHANDLER_ARGS);
+void interruption6(SIGHANDLER_ARGS);
+void interruption7(SIGHANDLER_ARGS);
+void interruption8(SIGHANDLER_ARGS);
+void interruption9(SIGHANDLER_ARGS);
+void interruption10(SIGHANDLER_ARGS);
+void interruption11(SIGHANDLER_ARGS);
 void inversion_matrice(struct_processus *s_etat_processus,
 		struct_matrice *s_matrice);
 void lancement_daemon(struct_processus *s_etat_processus);
@@ -2775,6 +2891,14 @@ void valeurs_singulieres(struct_processu
 void verrouillage_threads_concurrents(struct_processus *s_etat_processus);
 #endif
 
+#ifndef RPLARGS
+#ifdef _BROKEN_SIGINFO
+void creation_fifos_signaux(struct_processus *s_etat_processus);
+void destruction_fifos_signaux(struct_processus *s_etat_processus);
+void liberation_fifos_signaux(struct_processus *s_etat_processus);
+#endif
+#endif
+
 /*
 --------------------------------------------------------------------------------
   Fonctions de sommation de vecteur dans perte de précision
@@ -2865,6 +2989,8 @@ unsigned char *formateur_fichier(struct_
 		struct_objet *s_objet, struct_objet *s_format,
 		long longueur, long longueur_champ, unsigned char format,
 		unsigned char type, long *longueur_effective, long *recursivite);
+unsigned char *formateur_flux(struct_processus *s_etat_processus,
+		unsigned char *donnees, long *longueur);
 unsigned char *formateur_fichier_nombre(struct_processus *s_etat_processus,
 		void *valeur_numerique, unsigned char type,
 		long longueur, long longueur_champ, unsigned char format);