--- rpl/src/analyse.c	2010/03/04 10:17:47	1.5
+++ rpl/src/analyse.c	2010/09/06 16:50:16	1.31
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.12
+  RPL/2 (R) version 4.0.19
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -20,7 +20,7 @@
 */
 
 
-#include "rpl.conv.h"
+#include "rpl-conv.h"
 
 
 /*
@@ -46,6 +46,10 @@ creation_instruction(struct_processus *s
 
 	unsigned char			*ptr;
 
+	BUG(strlen(instruction) >= d_longueur_maximale_instruction,
+			printf("%s -> %d >= %d\n", instruction, (int) strlen(instruction),
+			d_longueur_maximale_instruction));
+
 	if ((*s_etat_processus).arbre_instructions == NULL)
 	{
 		if (((*s_etat_processus).arbre_instructions =
@@ -455,7 +459,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("INCR", instruction_incr);
 	//INSTRUCTION("ISOL");
 	INSTRUCTION("ISWI", instruction_iswi);
+#	ifndef OS2
 	INSTRUCTION("KILL", instruction_kill);
+#	endif
 	INSTRUCTION("KIND", instruction_kind);
 	INSTRUCTION("LAST", instruction_last);
 	INSTRUCTION("LEGV", instruction_legv);
@@ -482,7 +488,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("PLOT", instruction_plot);
 	INSTRUCTION("PMAX", instruction_pmax);
 	INSTRUCTION("PMIN", instruction_pmin);
+#	ifndef OS2
 	INSTRUCTION("POKE", instruction_poke);
+#	endif
 	INSTRUCTION("PPAR", instruction_ppar);
 	INSTRUCTION("PRMD", instruction_prmd);
 	INSTRUCTION("PRST", instruction_prst);
@@ -548,7 +556,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("STO-", instruction_sto_moins);
 	INSTRUCTION("STO/", instruction_sto_division);
 	INSTRUCTION("STOF", instruction_stof);
+#	ifndef OS2
 	INSTRUCTION("STOP", instruction_stop);
+#	endif
 	INSTRUCTION("STOS", instruction_stos);
 	INSTRUCTION("STWS", instruction_stws);
 	INSTRUCTION("SWAP", instruction_swap);
@@ -681,7 +691,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("SLICE", instruction_slice);
 	//INSTRUCTION("SLIST")
 	//Instruction HP48 (somme des termes d'une liste)
+#	ifndef OS2
 	INSTRUCTION("SPAWN", instruction_spawn);
+#	endif
 	INSTRUCTION("START", instruction_start);
 	INSTRUCTION("STORE", instruction_store);
 	INSTRUCTION("STR->", instruction_str_fleche);
@@ -710,13 +722,17 @@ initialisation_instructions(struct_proce
 
 	INSTRUCTION("APPEND", instruction_append);
 	INSTRUCTION("ARRY->", instruction_array_fleche);
+	INSTRUCTION("ATEXIT", instruction_atexit);
+	INSTRUCTION("ATPOKE", instruction_atpoke);
 	INSTRUCTION("BESSEL", instruction_bessel);
 	INSTRUCTION("CLRERR", instruction_clrerr);
 	INSTRUCTION("CLRMTX", instruction_clrmtx);
 	INSTRUCTION("CLRSWI", instruction_clrswi);
 	INSTRUCTION("CREATE", instruction_create);
 	INSTRUCTION("DELETE", instruction_delete);
+#	ifndef OS2
 	INSTRUCTION("DETACH", instruction_detach);
+#	endif
 	INSTRUCTION("DIAG->", instruction_diag_fleche);
 	//INSTRUCTION("DOLIST")
 	//Instruction HP48 (application d'une fonction à une liste)
@@ -736,6 +752,7 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("LOGGER", instruction_logger);
 	INSTRUCTION("MCLRIN", instruction_mclrin);
 	INSTRUCTION("NRPROC", instruction_nrproc);
+	INSTRUCTION("PROCID", instruction_procid);
 	INSTRUCTION("PROMPT", instruction_prompt);
 	INSTRUCTION("RCLSWI", instruction_rclswi);
 	INSTRUCTION("RECALL", instruction_recall);
@@ -788,6 +805,7 @@ initialisation_instructions(struct_proce
 	//f(x,y)=fnct complexe évaluée sur la grille (x,y) et affichée comme une
 	//fonction paramétrique.
 	INSTRUCTION("INQUIRE", instruction_inquire);
+	INSTRUCTION("MEMLOCK", instruction_memlock);
 	INSTRUCTION("MTXLOCK", instruction_mtxlock);
 	INSTRUCTION("PERSIST", instruction_persist);
 	INSTRUCTION("PLOTTER", instruction_plotter);
@@ -808,9 +826,12 @@ initialisation_instructions(struct_proce
 
 	INSTRUCTION("CLRCNTXT", instruction_clrcntxt);
 	INSTRUCTION("CLRSMPHR", instruction_clrsmphr);
+#	ifndef OS2
 	INSTRUCTION("CONTINUE", instruction_continue);
+#	endif
 	INSTRUCTION("DUPCNTXT", instruction_dupcntxt);
 	INSTRUCTION("FUNCTION", instruction_function);
+	INSTRUCTION("IMPLICIT", instruction_implicit);
 	INSTRUCTION("KEYLABEL", instruction_keylabel);
 	INSTRUCTION("KEYTITLE", instruction_keytitle);
 	INSTRUCTION("LOGSCALE", instruction_logscale);
@@ -826,12 +847,16 @@ initialisation_instructions(struct_proce
 
 	INSTRUCTION("AUTOSCALE", instruction_autoscale);
 	INSTRUCTION("BACKSPACE", instruction_backspace);
+	INSTRUCTION("BACKTRACE", instruction_backtrace);
+	INSTRUCTION("CLRATEXIT", instruction_clratexit);
+	INSTRUCTION("CLRATPOKE", instruction_clratpoke);
 	INSTRUCTION("COPYRIGHT", instruction_copyright);
 	//INSTRUCTION("CYLINDRIC");
 	INSTRUCTION("DAEMONIZE", instruction_daemonize);
 	INSTRUCTION("DROPCNTXT", instruction_dropcntxt);
 	INSTRUCTION("EXTERNALS", instruction_externals);
 	INSTRUCTION("HISTOGRAM", instruction_histogram);
+	INSTRUCTION("MEMUNLOCK", instruction_memunlock);
 	INSTRUCTION("MTXSTATUS", instruction_mtxstatus);
 	INSTRUCTION("MTXUNLOCK", instruction_mtxunlock);
 	INSTRUCTION("PARAMETER", instruction_parameter);
@@ -871,7 +896,10 @@ initialisation_instructions(struct_proce
 }
 
 
-inline void *
+#ifndef OS2
+extern inline
+#endif
+void *
 analyse_instruction(struct_processus *s_etat_processus, unsigned char *ptr)
 {
 	int								pointeur;
@@ -938,7 +966,8 @@ analyse(struct_processus *s_etat_process
 
 	unsigned char					*position;
 	unsigned char					*bibliotheque_candidate;
-	unsigned char					*instruction_majuscule;
+	unsigned char					instruction_majuscule
+											[d_longueur_maximale_instruction];
 	unsigned char					registre_instruction_valide;
 
 	void							(*instruction)();
@@ -955,6 +984,7 @@ analyse(struct_processus *s_etat_process
 	 * On autorise l'exécution d'un fork() dans un thread concurrent.
 	 */
 
+#	ifndef SEMAPHORES_NOMMES
 	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 	{
 		(*s_etat_processus).erreur_systeme = d_es_processus;
@@ -969,18 +999,29 @@ analyse(struct_processus *s_etat_process
 			return;
 		}
 	}
+#	else
+	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+	{
+		(*s_etat_processus).erreur_systeme = d_es_processus;
+		return;
+	}
 
-	scrutation_injection(s_etat_processus);
-
-	if (fonction == NULL)
+	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
 	{
-		if ((instruction_majuscule = conversion_majuscule(
-				(*s_etat_processus).instruction_courante)) == NULL)
+		if (errno != EINTR)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
+	}
+#	endif
 
+	scrutation_injection(s_etat_processus);
+
+	if (fonction == NULL)
+	{
+		conversion_majuscule_limitee((*s_etat_processus).instruction_courante,
+				instruction_majuscule, d_longueur_maximale_instruction);
 		instruction = analyse_instruction(s_etat_processus,
 				instruction_majuscule);
 
@@ -1009,8 +1050,6 @@ analyse(struct_processus *s_etat_process
 				profilage(s_etat_processus, NULL);
 			}
 		}
-
-		free(instruction_majuscule);
 	}
 	else
 	{
@@ -1120,6 +1159,7 @@ analyse(struct_processus *s_etat_process
 --------------------------------------------------------------------------------
 */
 
+#	ifndef OS2
 	if ((*s_etat_processus).pourcentage_maximal_cpu < 100)
 	{
 		getrusage(RUSAGE_SELF, &usage_final);
@@ -1175,6 +1215,7 @@ analyse(struct_processus *s_etat_process
 			usage_initial = usage_final;
 		}
 	}
+#	endif
 
 /*
 --------------------------------------------------------------------------------
@@ -1211,17 +1252,17 @@ analyse(struct_processus *s_etat_process
 				((*s_etat_processus).erreur_systeme != d_es) ||
 				((*s_etat_processus).exception != d_ep))
 		{
-			if ((*s_etat_processus).instruction_derniere_erreur != NULL)
-			{
-				free((*s_etat_processus).instruction_derniere_erreur);
-				(*s_etat_processus).instruction_derniere_erreur = NULL;
-			}
-
 			(*s_etat_processus).niveau_derniere_erreur =
 					(*s_etat_processus).niveau_courant;
 
 			if ((*s_etat_processus).mode_execution_programme == 'Y')
 			{
+				if ((*s_etat_processus).instruction_derniere_erreur != NULL)
+				{
+					free((*s_etat_processus).instruction_derniere_erreur);
+					(*s_etat_processus).instruction_derniere_erreur = NULL;
+				}
+
 				if ((*s_etat_processus).instruction_courante == NULL)
 				{
 					if (((*s_etat_processus).instruction_derniere_erreur =
@@ -1253,11 +1294,22 @@ analyse(struct_processus *s_etat_process
 			}
 			else
 			{
-				if (((*s_etat_processus).instruction_derniere_erreur =
-						formateur(s_etat_processus, 0,
-						(*s_etat_processus).objet_courant)) == NULL)
+				if ((*s_etat_processus).objet_courant != NULL)
 				{
-					return;
+					if ((*s_etat_processus).instruction_derniere_erreur != NULL)
+					{
+						free((*s_etat_processus).instruction_derniere_erreur);
+						(*s_etat_processus).instruction_derniere_erreur = NULL;
+					}
+
+					if (((*s_etat_processus).instruction_derniere_erreur =
+							formateur(s_etat_processus, 0,
+							(*s_etat_processus).objet_courant)) == NULL)
+					{
+						return;
+					}
+
+					(*s_etat_processus).objet_courant = NULL;
 				}
 			}
 		}