rpl/src/instructions_f1.c - diff

Return to instructions_f1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_f1.c between versions 1.55 and 1.73

version 1.55, 2013/03/22 10:20:35	version 1.73, 2015/11/26 11:44:35
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.13	RPL/2 (R) version 4.1.24
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2015 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 53 instruction_fleche(struct_processus *s_e	Line 53 instruction_fleche(struct_processus *s_e
logical1 fin_scrutation;	logical1 fin_scrutation;
logical1 presence_expression_algebrique;	logical1 presence_expression_algebrique;

	pthread_mutexattr_t attributs_mutex;

union_position_variable position_variable;	union_position_variable position_variable;

unsigned char instruction_valide;	unsigned char instruction_valide;
Line 108 instruction_fleche(struct_processus *s_e	Line 110 instruction_fleche(struct_processus *s_e

printf(" -> (variables) %s\n\n", d_RPN);	printf(" -> (variables) %s\n\n", d_RPN);

printf(" -> (variables) %s\n", d_ALG);	printf(" -> (variables) %s\n\n", d_ALG);

	printf(" -> (variables) %s\n", d_NOM);

return;	return;
}	}
Line 187 instruction_fleche(struct_processus *s_e	Line 191 instruction_fleche(struct_processus *s_e

if ((*s_etat_processus).instruction_valide == 'N')	if ((*s_etat_processus).instruction_valide == 'N')
{	{
	(*s_etat_processus).type_en_cours = NON;
recherche_type(s_etat_processus);	recherche_type(s_etat_processus);

if ((*s_etat_processus).erreur_execution != d_ex)	if ((*s_etat_processus).erreur_execution != d_ex)
Line 221 instruction_fleche(struct_processus *s_e	Line 226 instruction_fleche(struct_processus *s_e
else if ((((struct_nom ) (((*s_etat_processus).l_base_pile)	else if ((((struct_nom ) (((*s_etat_processus).l_base_pile)
.donnee).objet)).symbole == d_vrai)	.donnee).objet)).symbole == d_vrai)
{	{
(*s_etat_processus).erreur_execution = d_ex_nom_invalide;	(*s_etat_processus).niveau_courant++;
(*s_etat_processus).instruction_courante = tampon;	fin_scrutation = d_vrai;
return;	presence_expression_algebrique = d_vrai;

	if (depilement(s_etat_processus, &((*s_etat_processus)
	.l_base_pile), &s_expression_algebrique)
	== d_erreur)
	{
	(*s_etat_processus).erreur_execution =
	d_ex_manque_argument;
	(*s_etat_processus).instruction_courante = tampon;
	return;
	}
}	}
else	else
{	{
Line 290 instruction_fleche(struct_processus *s_e	Line 305 instruction_fleche(struct_processus *s_e
(*s_etat_processus).erreur_execution = d_ex_nom_invalide;	(*s_etat_processus).erreur_execution = d_ex_nom_invalide;
return;	return;
}	}
	else if ((((struct_nom ) ((l_element_courant).donnee).objet))
	.symbole == d_vrai)
	{
	(*s_etat_processus).niveau_courant++;
	fin_scrutation = d_vrai;
	presence_expression_algebrique = d_vrai;

	s_expression_algebrique = (*l_element_courant).donnee;
	}
else	else
{	{
if ((s_objet_elementaire = copie_objet(s_etat_processus,	if ((s_objet_elementaire = copie_objet(s_etat_processus,
Line 593 instruction_fleche(struct_processus *s_e	Line 617 instruction_fleche(struct_processus *s_e
}	}
else	else
{	{
// Variable partagee à créer	// Variable partagée à créer

(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;

if ((s_variable_partagee.nom = malloc((strlen(s_variable.nom)	if ((s_variable_partagee.nom = malloc((strlen(s_variable.nom)
+ 1) * sizeof(unsigned char))) == NULL)	+ 1) * sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)
.pointeur_variable_partagee_courante).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
return;	return;
Line 647 instruction_fleche(struct_processus *s_e	Line 664 instruction_fleche(struct_processus *s_e
(*s_etat_processus).objet_courant;	(*s_etat_processus).objet_courant;
}	}

	// Création du mutex

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex,
	PTHREAD_MUTEX_RECURSIVE);
	pthread_mutex_init(&(s_variable_partagee.mutex),
	&attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

s_variable_partagee.objet = (*l_emplacement_valeurs).donnee;	s_variable_partagee.objet = (*l_emplacement_valeurs).donnee;
(*l_emplacement_valeurs).donnee = NULL;	(*l_emplacement_valeurs).donnee = NULL;

Line 722 instruction_fleche(struct_processus *s_e	Line 748 instruction_fleche(struct_processus *s_e

if (presence_expression_algebrique == d_vrai)	if (presence_expression_algebrique == d_vrai)
{	{
	// Si l'expression algébrique est réduite à un simple nom, il
	// s'agit toujours d'un nom symbolique. Il faut alors lui retirer
	// son caractère de constante symbolique pour faire remonter les
	// erreurs de type 'variable indéfinie'.

	if ((*s_expression_algebrique).type == NOM)
	{
	(((struct_nom ) (*s_expression_algebrique).objet)).symbole =
	d_faux;
	}

evaluation(s_etat_processus, s_expression_algebrique, 'N');	evaluation(s_etat_processus, s_expression_algebrique, 'N');

	if ((*s_expression_algebrique).type == NOM)
	{
	(((struct_nom ) (*s_expression_algebrique).objet)).symbole =
	d_vrai;
	}

if ((*s_etat_processus).mode_execution_programme == 'Y')	if ((*s_etat_processus).mode_execution_programme == 'Y')
{	{
liberation(s_etat_processus, s_expression_algebrique);	liberation(s_etat_processus, s_expression_algebrique);
}	}

	(*s_etat_processus).autorisation_empilement_programme = 'Y';
(*s_etat_processus).niveau_courant--;	(*s_etat_processus).niveau_courant--;

if (retrait_variables_par_niveau(s_etat_processus) == d_erreur)	if (retrait_variables_par_niveau(s_etat_processus) == d_erreur)
{	{
return;	return;
}	}

(*s_etat_processus).autorisation_empilement_programme = 'Y';
}	}

return;	return;
Line 1004 instruction_for(struct_processus *s_etat	Line 1046 instruction_for(struct_processus *s_etat
return;	return;
}	}

if (((*s_objet_2).type != INT) &&	if (((s_objet_2).type != INT) && ((s_objet_2).type != REL))
((*s_objet_2).type != REL))
{	{
liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
Line 1014 instruction_for(struct_processus *s_etat	Line 1055 instruction_for(struct_processus *s_etat
return;	return;
}	}

tampon = (*s_etat_processus).instruction_courante;
test_instruction = (*s_etat_processus).test_instruction;
instruction_valide = (*s_etat_processus).instruction_valide;
(*s_etat_processus).test_instruction = 'Y';

empilement_pile_systeme(s_etat_processus);	empilement_pile_systeme(s_etat_processus);

if ((*s_etat_processus).erreur_systeme != d_es)	if ((*s_etat_processus).erreur_systeme != d_es)
Line 1028 instruction_for(struct_processus *s_etat	Line 1064 instruction_for(struct_processus *s_etat

if ((*s_etat_processus).mode_execution_programme == 'Y')	if ((*s_etat_processus).mode_execution_programme == 'Y')
{	{
	tampon = (*s_etat_processus).instruction_courante;
	test_instruction = (*s_etat_processus).test_instruction;
	instruction_valide = (*s_etat_processus).instruction_valide;
	(*s_etat_processus).test_instruction = 'Y';

if (recherche_instruction_suivante(s_etat_processus) == d_erreur)	if (recherche_instruction_suivante(s_etat_processus) == d_erreur)
{	{
return;	return;
Line 1042 instruction_for(struct_processus *s_etat	Line 1083 instruction_for(struct_processus *s_etat

free((*s_etat_processus).instruction_courante);	free((*s_etat_processus).instruction_courante);
(*s_etat_processus).instruction_courante = tampon;	(*s_etat_processus).instruction_courante = tampon;
	(*s_etat_processus).instruction_valide = instruction_valide;
	(*s_etat_processus).test_instruction = test_instruction;

depilement_pile_systeme(s_etat_processus);	depilement_pile_systeme(s_etat_processus);

Line 1049 instruction_for(struct_processus *s_etat	Line 1092 instruction_for(struct_processus *s_etat
return;	return;
}	}

	(*s_etat_processus).type_en_cours = NON;
recherche_type(s_etat_processus);	recherche_type(s_etat_processus);

free((*s_etat_processus).instruction_courante);	free((*s_etat_processus).instruction_courante);
(*s_etat_processus).instruction_courante = tampon;	(*s_etat_processus).instruction_courante = tampon;
	(*s_etat_processus).instruction_valide = instruction_valide;
	(*s_etat_processus).test_instruction = test_instruction;

if ((*s_etat_processus).erreur_execution != d_ex)	if ((*s_etat_processus).erreur_execution != d_ex)
{	{
Line 1144 instruction_for(struct_processus *s_etat	Line 1190 instruction_for(struct_processus *s_etat

liberation(s_etat_processus, s_objet_3);	liberation(s_etat_processus, s_objet_3);

(*s_etat_processus).test_instruction = test_instruction;
(*s_etat_processus).instruction_valide = instruction_valide;

((s_etat_processus).l_base_pile_systeme).limite_indice_boucle = s_objet_1;	((s_etat_processus).l_base_pile_systeme).limite_indice_boucle = s_objet_1;

if ((*s_etat_processus).mode_execution_programme == 'Y')	if ((*s_etat_processus).mode_execution_programme == 'Y')

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.55
changed lines
	Added in v.1.73