rpl/src/rpl.c - diff

Return to rpl.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.c between versions 1.64 and 1.80

version 1.64, 2011/06/10 11:35:14	version 1.80, 2011/09/03 10:31:50
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.0.prerelease.0	RPL/2 (R) version 4.1.3
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2011 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 46 rplinit(int argc, char *argv[], unsigned	Line 46 rplinit(int argc, char *argv[], unsigned

int erreur_historique;	int erreur_historique;
int option_P;	int option_P;
int status;

logical1 core;	logical1 core;
logical1 debug;	logical1 debug;
Line 183 rplinit(int argc, char *argv[], unsigned	Line 182 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).langue = 'E';	(*s_etat_processus).langue = 'E';
}	}

	initialisation_contexte_cas(s_etat_processus);

(*s_etat_processus).exception = d_ep;	(*s_etat_processus).exception = d_ep;
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
	(*s_etat_processus).compteur_violation_d_acces = 0;

(*s_etat_processus).rpl_home = rpl_home;	(*s_etat_processus).rpl_home = rpl_home;

Line 1859 rplinit(int argc, char *argv[], unsigned	Line 1861 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).l_base_pile_last = NULL;	(*s_etat_processus).l_base_pile_last = NULL;

(*s_etat_processus).s_arbre_variables = NULL;	(*s_etat_processus).s_arbre_variables = NULL;
	(*s_etat_processus).l_liste_variables_par_niveau = NULL;
(*s_etat_processus).gel_liste_variables = d_faux;	(*s_etat_processus).gel_liste_variables = d_faux;
(*s_etat_processus).pointeur_variable_courante = NULL;	(*s_etat_processus).pointeur_variable_courante = NULL;
(*s_etat_processus).s_liste_variables_statiques = NULL;	(*s_etat_processus).s_liste_variables_statiques = NULL;
Line 2013 rplinit(int argc, char *argv[], unsigned	Line 2016 rplinit(int argc, char *argv[], unsigned

initialisation_allocateur(s_etat_processus);	initialisation_allocateur(s_etat_processus);
initialisation_drapeaux(s_etat_processus);	initialisation_drapeaux(s_etat_processus);
	initialisation_variables(s_etat_processus);
	initialisation_instructions(s_etat_processus);

if ((*s_etat_processus).erreur_systeme != d_es)	if ((*s_etat_processus).erreur_systeme != d_es)
{	{
Line 2545 rplinit(int argc, char *argv[], unsigned	Line 2550 rplinit(int argc, char *argv[], unsigned

fflush(stdout);	fflush(stdout);

initialisation_instructions(s_etat_processus);
initialisation_variables(s_etat_processus);

if (arguments != NULL)	if (arguments != NULL)
{	{
tampon = (*s_etat_processus).definitions_chainees;	tampon = (*s_etat_processus).definitions_chainees;
Line 2764 rplinit(int argc, char *argv[], unsigned	Line 2766 rplinit(int argc, char *argv[], unsigned
if (setjmp(contexte_initial) == 0)	if (setjmp(contexte_initial) == 0)
{	{
erreur = sequenceur(s_etat_processus);	erreur = sequenceur(s_etat_processus);

	if (erreur == d_absence_erreur)
	{
	if (((*s_etat_processus).var_volatile_alarme
	== 0) && ((*s_etat_processus)
	.arret_depuis_abort == 0) &&
	((*s_etat_processus).at_exit
	!= NULL))
	{
	erreur = evaluation(s_etat_processus,
	(*s_etat_processus).at_exit,
	'E');
	}
	}
}	}
}	}
else	else
Line 2771 rplinit(int argc, char *argv[], unsigned	Line 2787 rplinit(int argc, char *argv[], unsigned
if (setjmp(contexte_initial) == 0)	if (setjmp(contexte_initial) == 0)
{	{
erreur = sequenceur_optimise(s_etat_processus);	erreur = sequenceur_optimise(s_etat_processus);
}
}

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme == 0)	if (((*s_etat_processus).var_volatile_alarme
&& ((*s_etat_processus).arret_depuis_abort	== 0) && ((*s_etat_processus)
== 0) && ((*s_etat_processus).at_exit	.arret_depuis_abort == 0) &&
!= NULL))	((*s_etat_processus).at_exit
{	!= NULL))
erreur = evaluation(s_etat_processus,	{
(*s_etat_processus).at_exit, 'E');	erreur = evaluation(s_etat_processus,
	(*s_etat_processus).at_exit,
	'E');
	}
	}
}	}
}	}
}	}
Line 2991 rplinit(int argc, char *argv[], unsigned	Line 3009 rplinit(int argc, char *argv[], unsigned

while((*s_etat_processus).l_base_pile_processus != NULL)	while((*s_etat_processus).l_base_pile_processus != NULL)
{	{
status = 0;

l_element_courant = (void *)	l_element_courant = (void *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;

Line 3216 rplinit(int argc, char *argv[], unsigned	Line 3232 rplinit(int argc, char *argv[], unsigned
* le libérer...	* le libérer...
*/	*/

#if 0	liberation_arbre_variables(s_etat_processus,
for(i = 0; i < (*s_etat_processus).nombre_variables; i++)	(*s_etat_processus).s_arbre_variables, d_vrai);
{	free((*s_etat_processus).pointeurs_caracteres_variables);
liberation(s_etat_processus,
(*s_etat_processus).s_liste_variables[i].objet);
free((*s_etat_processus).s_liste_variables[i].nom);
}

free((*s_etat_processus).s_liste_variables);
#endif

for(i = 0; i < (*s_etat_processus)	for(i = 0; i < (*s_etat_processus)
.nombre_variables_statiques; i++)	.nombre_variables_statiques; i++)
Line 3626 rplinit(int argc, char *argv[], unsigned	Line 3635 rplinit(int argc, char *argv[], unsigned
# undef return	# undef return
# endif	# endif

	liberation_contexte_cas(s_etat_processus);

free((*s_etat_processus).chemin_fichiers_temporaires);	free((*s_etat_processus).chemin_fichiers_temporaires);
free(s_etat_processus);	free(s_etat_processus);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.64
changed lines
	Added in v.1.80