rpl/src/instructions_c2.c - diff

Return to instructions_c2.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_c2.c between versions 1.38 and 1.46

version 1.38, 2012/09/29 17:55:40	version 1.46, 2013/02/26 19:56:13
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.10	RPL/2 (R) version 4.1.12
Copyright (C) 1989-2012 Dr. BERTRAND Joël	Copyright (C) 1989-2013 Dr. BERTRAND Joël

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

Line 158 instruction_cycle(struct_processus *s_et	Line 158 instruction_cycle(struct_processus *s_et
(strcmp(instruction_majuscule, "DO") == 0) \|\|	(strcmp(instruction_majuscule, "DO") == 0) \|\|
(strcmp(instruction_majuscule, "WHILE") == 0) \|\|	(strcmp(instruction_majuscule, "WHILE") == 0) \|\|
(strcmp(instruction_majuscule, "FOR") == 0) \|\|	(strcmp(instruction_majuscule, "FOR") == 0) \|\|
	(strcmp(instruction_majuscule, "FORALL") == 0) \|\|
(strcmp(instruction_majuscule, "START") == 0) \|\|	(strcmp(instruction_majuscule, "START") == 0) \|\|
(strcmp(instruction_majuscule, "SELECT") == 0)	(strcmp(instruction_majuscule, "SELECT") == 0)
\|\| (strcmp(instruction_majuscule, "CRITICAL") == 0)	\|\| (strcmp(instruction_majuscule, "CRITICAL") == 0)
Line 171 instruction_cycle(struct_processus *s_et	Line 172 instruction_cycle(struct_processus *s_et
else	else
{	{
if ((strcmp(instruction_majuscule, "FOR") == 0) \|\|	if ((strcmp(instruction_majuscule, "FOR") == 0) \|\|
	(strcmp(instruction_majuscule, "FORALL") == 0) \|\|
(strcmp(instruction_majuscule, "START") == 0))	(strcmp(instruction_majuscule, "START") == 0))
{	{
niveau++;	niveau++;
Line 298 instruction_cycle(struct_processus *s_et	Line 300 instruction_cycle(struct_processus *s_et
(fonction == instruction_do) \|\|	(fonction == instruction_do) \|\|
(fonction == instruction_while) \|\|	(fonction == instruction_while) \|\|
(fonction == instruction_for) \|\|	(fonction == instruction_for) \|\|
	(fonction == instruction_forall) \|\|
(fonction == instruction_start) \|\|	(fonction == instruction_start) \|\|
(fonction == instruction_select) \|\|	(fonction == instruction_select) \|\|
(fonction == instruction_case) \|\|	(fonction == instruction_case) \|\|
Line 434 instruction_con(struct_processus *s_etat	Line 437 instruction_con(struct_processus *s_etat
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

logical1 argument_nom;	logical1 argument_nom;
	logical1 variable_partagee;

unsigned long i;	unsigned long i;
unsigned long j;	unsigned long j;
Line 551 instruction_con(struct_processus *s_etat	Line 555 instruction_con(struct_processus *s_etat
{	{
// Variable partagée	// Variable partagée

if (pthread_mutex_lock(&(((s_etat_processus)	variable_partagee = d_vrai;
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (recherche_variable_partagee(s_etat_processus,	if (recherche_variable_partagee(s_etat_processus,
((s_etat_processus).pointeur_variable_courante).nom,	((s_etat_processus).pointeur_variable_courante).nom,
((s_etat_processus).pointeur_variable_courante)	((s_etat_processus).pointeur_variable_courante)
.variable_partagee, ((s_etat_processus)	.variable_partagee, ((s_etat_processus)
.pointeur_variable_courante).origine)	.pointeur_variable_courante).origine)
== d_faux)	== NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
d_ex_variable_non_definie;	d_ex_variable_non_definie;

if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

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);

return;	return;
}	}

s_objet_2 = ((s_etat_processus).s_liste_variables_partagees)	s_objet_2 = ((s_etat_processus)
.table[((s_etat_processus).s_liste_variables_partagees)	.pointeur_variable_partagee_courante).objet;
.position_variable].objet;

if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}
else	else
{	{
// Variable privée	// Variable privée

s_objet_2 = ((s_etat_processus).pointeur_variable_courante).objet;	s_objet_2 = ((s_etat_processus).pointeur_variable_courante).objet;
	variable_partagee = d_faux;
}	}
}	}
else	else
{	{
argument_nom = d_faux;	argument_nom = d_faux;
	variable_partagee = d_faux;
}	}

/*	/*
Line 630 instruction_con(struct_processus *s_etat	Line 616 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	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_execution = d_ex_dimensions_invalides;	(*s_etat_processus).erreur_execution = d_ex_dimensions_invalides;
return;	return;
Line 650 instruction_con(struct_processus *s_etat	Line 648 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	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_execution =	(*s_etat_processus).erreur_execution =
d_ex_erreur_type_argument;	d_ex_erreur_type_argument;
Line 664 instruction_con(struct_processus *s_etat	Line 675 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	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_execution = d_ex_argument_invalide;	(*s_etat_processus).erreur_execution = d_ex_argument_invalide;
return;	return;
Line 721 instruction_con(struct_processus *s_etat	Line 745 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);

Line 742 instruction_con(struct_processus *s_etat	Line 778 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);

Line 987 instruction_con(struct_processus *s_etat	Line 1035 instruction_con(struct_processus *s_etat
}	}
else	else
{	{
((s_etat_processus).pointeur_variable_courante).objet =	if (variable_partagee == d_vrai)
s_objet_resultat;	{
	((s_etat_processus).pointeur_variable_partagee_courante).objet =
	s_objet_resultat;

	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	else
	{
	((s_etat_processus).pointeur_variable_courante).objet =
	s_objet_resultat;
	}
}	}

return;	return;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.38
changed lines
	Added in v.1.46