rpl/src/types.c - diff

Return to types.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/types.c between versions 1.15 and 1.45

version 1.15, 2010/06/02 10:28:45	version 1.45, 2012/01/17 14:44:13
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.16	RPL/2 (R) version 4.1.6
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2012 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 75 recherche_type(struct_processus *s_etat_	Line 75 recherche_type(struct_processus *s_etat_
unsigned char registre_instruction_valide;	unsigned char registre_instruction_valide;
unsigned char registre_interruption;	unsigned char registre_interruption;
unsigned char registre_mode_execution_programme;	unsigned char registre_mode_execution_programme;
	unsigned char registre_recherche_type;
unsigned char registre_test;	unsigned char registre_test;
unsigned char registre_test_bis;	unsigned char registre_test_bis;
unsigned char *tampon;	unsigned char *tampon;
	unsigned char variable_implicite;

unsigned long i;	unsigned long i;
unsigned long j;	unsigned long j;
Line 370 recherche_type(struct_processus *s_etat_	Line 372 recherche_type(struct_processus *s_etat_
}	}
}	}

	registre_recherche_type = (*s_etat_processus).recherche_type;
	(*s_etat_processus).recherche_type = 'Y';

if (sequenceur(s_etat_processus) == d_erreur)	if (sequenceur(s_etat_processus) == d_erreur)
{	{
	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	(*s_etat_processus).recherche_type = registre_recherche_type;
(*s_etat_processus).instruction_courante = tampon;	(*s_etat_processus).instruction_courante = tampon;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;
Line 397 recherche_type(struct_processus *s_etat_	Line 404 recherche_type(struct_processus *s_etat_
return;	return;
}	}

	(*s_etat_processus).recherche_type = registre_recherche_type;
(*s_etat_processus).instruction_courante = tampon;	(*s_etat_processus).instruction_courante = tampon;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;
Line 1162 recherche_type(struct_processus *s_etat_	Line 1170 recherche_type(struct_processus *s_etat_
}	}
}	}

	registre_recherche_type =
	(*s_etat_processus).recherche_type;
	(*s_etat_processus).recherche_type = 'Y';

if (sequenceur(s_etat_processus) == d_erreur)	if (sequenceur(s_etat_processus) == d_erreur)
{	{
	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	(*s_etat_processus).recherche_type =
	registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;
nombre_lignes_a_supprimer =	nombre_lignes_a_supprimer =
Line 1210 recherche_type(struct_processus *s_etat_	Line 1225 recherche_type(struct_processus *s_etat_
return;	return;
}	}

	(*s_etat_processus).recherche_type =
	registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;

Line 1570 recherche_type(struct_processus *s_etat_	Line 1587 recherche_type(struct_processus *s_etat_
return;	return;
}	}
}	}

	registre_recherche_type = (*s_etat_processus)
	.recherche_type;
	(*s_etat_processus).recherche_type = 'Y';

if (sequenceur(s_etat_processus) == d_erreur)	if (sequenceur(s_etat_processus) == d_erreur)
{	{
	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	(*s_etat_processus).recherche_type =
	registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;
nombre_lignes_a_supprimer =	nombre_lignes_a_supprimer =
Line 1620 recherche_type(struct_processus *s_etat_	Line 1644 recherche_type(struct_processus *s_etat_
return;	return;
}	}

	(*s_etat_processus).recherche_type =
	registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;

Line 2293 recherche_type(struct_processus *s_etat_	Line 2319 recherche_type(struct_processus *s_etat_
}	}
}	}

	variable_implicite = (*s_etat_processus).autorisation_nom_implicite;
	registre_recherche_type = (*s_etat_processus).recherche_type;
	(*s_etat_processus).recherche_type = 'Y';
	(*s_etat_processus).autorisation_nom_implicite = 'Y';

if (sequenceur(s_etat_processus) == d_erreur)	if (sequenceur(s_etat_processus) == d_erreur)
{	{
	(*s_etat_processus).autorisation_nom_implicite =
	variable_implicite;
	(*s_etat_processus).recherche_type = registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;
(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	if ((*s_etat_processus).erreur_execution !=
	d_ex_nom_implicite)
	{
	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	}

nombre_lignes_a_supprimer =	nombre_lignes_a_supprimer =
(*s_etat_processus).hauteur_pile_operationnelle	(*s_etat_processus).hauteur_pile_operationnelle
Line 2343 recherche_type(struct_processus *s_etat_	Line 2382 recherche_type(struct_processus *s_etat_
return;	return;
}	}

	(*s_etat_processus).autorisation_nom_implicite = variable_implicite;
	(*s_etat_processus).recherche_type = registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;

Line 2827 recherche_type(struct_processus *s_etat_	Line 2868 recherche_type(struct_processus *s_etat_

(*(--ptr_ecriture)) = d_code_fin_chaine;	(*(--ptr_ecriture)) = d_code_fin_chaine;

	if (validation_chaine((unsigned char *) element) == d_faux)
	{
	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	(*s_etat_processus).traitement_interruptible =
	registre_interruption;

	free(element);
	return;
	}

break;	break;
}	}

Line 2923 recherche_type(struct_processus *s_etat_	Line 2974 recherche_type(struct_processus *s_etat_
}	}
}	}

	registre_recherche_type = (*s_etat_processus).recherche_type;
	(*s_etat_processus).recherche_type = 'Y';

	variable_implicite =
	(*s_etat_processus).autorisation_nom_implicite;
	(*s_etat_processus).autorisation_nom_implicite = 'Y';

if (sequenceur(s_etat_processus) == d_erreur)	if (sequenceur(s_etat_processus) == d_erreur)
{	{
	(*s_etat_processus).autorisation_nom_implicite =
	variable_implicite;
	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	(*s_etat_processus).recherche_type =
	registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;
nombre_lignes_a_supprimer =	nombre_lignes_a_supprimer =
Line 2972 recherche_type(struct_processus *s_etat_	Line 3035 recherche_type(struct_processus *s_etat_
return;	return;
}	}

	(*s_etat_processus).autorisation_nom_implicite =
	variable_implicite;
	(*s_etat_processus).recherche_type = registre_recherche_type;
(*s_etat_processus).mode_execution_programme =	(*s_etat_processus).mode_execution_programme =
registre_mode_execution_programme;	registre_mode_execution_programme;

Line 3377 recherche_type(struct_processus *s_etat_	Line 3443 recherche_type(struct_processus *s_etat_
if ((drapeau_valeur_reelle == d_faux) &&	if ((drapeau_valeur_reelle == d_faux) &&
(drapeau_valeur_entiere == d_faux))	(drapeau_valeur_entiere == d_faux))
{	{
	ptr = (*s_etat_processus).instruction_courante;

	while((*ptr) != d_code_fin_chaine)
	{
	if ((isalnum((*ptr)) == 0) &&
	((*ptr) != '_') &&
	((*ptr) != '$'))
	{
	free(s_objet);

	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
	(*s_etat_processus).traitement_interruptible =
	registre_interruption;

	return;
	}

	ptr++;
	}

(*s_objet).type = NOM;	(*s_objet).type = NOM;

element = malloc(sizeof(struct_nom));	element = malloc(sizeof(struct_nom));
Line 3436 recherche_type(struct_processus *s_etat_	Line 3522 recherche_type(struct_processus *s_etat_
}	}
else	else
{	{
(*s_objet).type = INT;	// Le format ressemble à un entier mais il peut y avoir
	// un dépassement de capacité lors de la conversion.
	// On convertit donc en entier et en réel. Si les
	// deux conversions donnent le même résultat, on
	// considère que la conversion en entier est bonne. Dans
	// le cas contraire, on garde la conversion en réel.

element = (void ) ((integer8 ) malloc(	integer8 conversion_entiere;
sizeof(integer8)));	real8 conversion_reelle;

if (element == NULL)	if (sscanf((*s_etat_processus).instruction_courante, "%lg",
	&conversion_reelle) != 1)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
d_es_allocation_memoire;
(*s_etat_processus).traitement_interruptible =
registre_interruption;
return;
}	}

nombre_elements_convertis = sscanf(	if (sscanf((*s_etat_processus).instruction_courante, "%lld",
(*s_etat_processus).instruction_courante, "%lld",	&conversion_entiere) != 1)
(integer8 *) element);

if (nombre_elements_convertis != 1)
{	{
(*s_etat_processus).erreur_execution = d_ex_syntaxe;	(*s_etat_processus).erreur_execution = d_ex_syntaxe;
}	}

	if (abs(nextafter(conversion_reelle, conversion_entiere)
	- conversion_reelle) >= abs(conversion_reelle
	- conversion_entiere))
	{
	(*s_objet).type = INT;

	element = malloc(sizeof(integer8));

	if (element == NULL)
	{
	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
	(*s_etat_processus).traitement_interruptible =
	registre_interruption;
	return;
	}

	(((integer8 ) element)) = conversion_entiere;
	}
	else
	{
	(*s_objet).type = REL;

	element = malloc(sizeof(real8));

	if (element == NULL)
	{
	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
	(*s_etat_processus).traitement_interruptible =
	registre_interruption;
	return;
	}

	(((real8 ) element)) = conversion_reelle;
	}
}	}
}	}

CVSweb interface <joel.bertrand@systella.fr>

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