rpl/src/instructions_r1.c - diff

Return to instructions_r1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_r1.c between versions 1.7 and 1.23

version 1.7, 2010/04/21 13:45:48	version 1.23, 2011/06/22 13:27:02
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.15	RPL/2 (R) version 4.1.0.prerelease.3
Copyright (C) 1989-2010 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 20	Line 20
*/	*/


#include "rpl.conv.h"	#include "rpl-conv.h"


/*	/*
Line 905 instruction_rclf(struct_processus *s_eta	Line 905 instruction_rclf(struct_processus *s_eta
void	void
instruction_rcl(struct_processus *s_etat_processus)	instruction_rcl(struct_processus *s_etat_processus)
{	{
logical1 presence_variable;

long i;

struct_objet *s_objet;	struct_objet *s_objet;
struct_objet *s_objet_variable;	struct_objet *s_objet_variable;

Line 968 instruction_rcl(struct_processus *s_etat	Line 964 instruction_rcl(struct_processus *s_etat
return;	return;
}	}

if (recherche_variable(s_etat_processus, (((struct_nom )	if (recherche_variable_globale(s_etat_processus, (((struct_nom )
(*s_objet).objet)).nom) == d_faux)	(*s_objet).objet)).nom) == d_faux)
{	{
liberation(s_etat_processus, s_objet);	liberation(s_etat_processus, s_objet);

(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
return;
}

i = (*s_etat_processus).position_variable_courante;
presence_variable = d_faux;

while(i >= 0)	if ((*s_etat_processus).erreur_execution == d_ex)
{
if ((strcmp((*s_etat_processus).s_liste_variables[i].nom,
(((struct_nom ) (*s_objet).objet)).nom) == 0) &&
((*s_etat_processus).s_liste_variables[i].niveau == 1))
{	{
presence_variable = d_vrai;	(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
break;
}	}

i--;
}

(*s_etat_processus).position_variable_courante = i;

if (presence_variable == d_faux)
{
liberation(s_etat_processus, s_objet);

(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
return;
}

if ((s_etat_processus).s_liste_variables[(s_etat_processus)
.position_variable_courante].objet == NULL)
{
liberation(s_etat_processus, s_objet);

(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex_variable_partagee;
return;	return;
}	}

if ((s_objet_variable = copie_objet(s_etat_processus,	if ((s_objet_variable = copie_objet(s_etat_processus,
((*s_etat_processus).s_liste_variables)	((s_etat_processus).pointeur_variable_courante).objet, 'P'))
[(*s_etat_processus).position_variable_courante].objet, 'P'))
== NULL)	== NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.7
changed lines
	Added in v.1.23