rpl/src/instructions_e2.c - diff

Return to instructions_e2.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_e2.c between versions 1.45 and 1.49

CVSweb interface <joel.bertrand@systella.fr>

version 1.45, 2013/02/27 17:11:42	version 1.49, 2013/04/01 15:29:35
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.13	RPL/2 (R) version 4.1.14
Copyright (C) 1989-2013 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 623 instruction_errm(struct_processus *s_eta	Line 623 instruction_errm(struct_processus *s_eta
{	{
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

unsigned int registre_erreur_execution;	int registre_erreur_execution;
unsigned int registre_erreur_systeme;	int registre_erreur_systeme;
unsigned int registre_exception;	int registre_exception;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;

Line 1018 instruction_externals(struct_processus *	Line 1018 instruction_externals(struct_processus *
{	{
logical1 ambiguite;	logical1 ambiguite;

unsigned long i;	integer8 i;

struct_liste_chainee *l_element_courant;	struct_liste_chainee *l_element_courant;

Line 1187 instruction_exit(struct_processus *s_eta	Line 1187 instruction_exit(struct_processus *s_eta
unsigned char *instruction_majuscule;	unsigned char *instruction_majuscule;
unsigned char *tampon;	unsigned char *tampon;

unsigned long niveau;	integer8 niveau;

void (*fonction)();	void (*fonction)();

Line 1323 instruction_exit(struct_processus *s_eta	Line 1323 instruction_exit(struct_processus *s_eta
(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 1336 instruction_exit(struct_processus *s_eta	Line 1337 instruction_exit(struct_processus *s_eta
else	else
{	{
if ((strcmp(instruction_majuscule, "FOR") == 0) \|\|	if ((strcmp(instruction_majuscule, "FOR") == 0) \|\|
(strcmp(instruction_majuscule, "START")	(strcmp(instruction_majuscule, "FORALL") == 0)
	\|\| (strcmp(instruction_majuscule, "START")
== 0))	== 0))
{	{
niveau++;	niveau++;
Line 1449 instruction_exit(struct_processus *s_eta	Line 1451 instruction_exit(struct_processus *s_eta
(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 1592 instruction_exit(struct_processus *s_eta	Line 1595 instruction_exit(struct_processus *s_eta
(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 1606 instruction_exit(struct_processus *s_eta	Line 1610 instruction_exit(struct_processus *s_eta
else	else
{	{
if ((fonction == instruction_for) \|\|	if ((fonction == instruction_for) \|\|
	(fonction == instruction_forall) \|\|
(fonction == instruction_start))	(fonction == instruction_start))
{	{
niveau++;	niveau++;
Line 1715 instruction_exit(struct_processus *s_eta	Line 1720 instruction_exit(struct_processus *s_eta
(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_critical) \|\|	(fonction == instruction_critical) \|\|
Line 1823 instruction_exit(struct_processus *s_eta	Line 1829 instruction_exit(struct_processus *s_eta
if ((drapeau_boucle_definie == d_vrai) &&	if ((drapeau_boucle_definie == d_vrai) &&
(drapeau_presence_fin_boucle == d_vrai))	(drapeau_presence_fin_boucle == d_vrai))
{	{
presence_compteur = (((s_etat_processus).l_base_pile_systeme)	presence_compteur = ((((s_etat_processus).l_base_pile_systeme)
.type_cloture == 'F') ? d_vrai : d_faux;	.type_cloture == 'F') \|\| (((s_etat_processus)
	.l_base_pile_systeme).type_cloture == 'A')) ? d_vrai : d_faux;

if ((((s_etat_processus).l_base_pile_systeme).type_cloture != 'S')	if ((((s_etat_processus).l_base_pile_systeme).type_cloture != 'S')
&& (presence_compteur == d_faux))	&& (presence_compteur == d_faux))

Removed from v.1.45
changed lines
	Added in v.1.49