--- rpl/src/instructions_f4.c 2013/06/21 14:15:54 1.47 +++ rpl/src/instructions_f4.c 2015/11/26 11:44:35 1.60 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.15 - Copyright (C) 1989-2013 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.24 + Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -520,11 +520,6 @@ instruction_forall(struct_processus *s_e 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); if ((*s_etat_processus).erreur_systeme != d_es) @@ -534,6 +529,11 @@ instruction_forall(struct_processus *s_e 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) { return; @@ -546,6 +546,8 @@ instruction_forall(struct_processus *s_e liberation(s_etat_processus, s_objet_1); free((*s_etat_processus).instruction_courante); (*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); @@ -553,10 +555,13 @@ instruction_forall(struct_processus *s_e return; } + (*s_etat_processus).type_en_cours = NON; recherche_type(s_etat_processus); free((*s_etat_processus).instruction_courante); (*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) { @@ -651,9 +656,6 @@ instruction_forall(struct_processus *s_e return; } - (*s_etat_processus).test_instruction = test_instruction; - (*s_etat_processus).instruction_valide = instruction_valide; - instruction_cycle(s_etat_processus); return; } @@ -695,9 +697,6 @@ instruction_forall(struct_processus *s_e return; } - (*s_etat_processus).test_instruction = test_instruction; - (*s_etat_processus).instruction_valide = instruction_valide; - instruction_cycle(s_etat_processus); return; } @@ -731,9 +730,6 @@ instruction_forall(struct_processus *s_e liberation(s_etat_processus, s_objet_2); - (*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; if ((*s_etat_processus).mode_execution_programme == 'Y')