--- rpl/src/instructions_f3.c 2017/01/18 15:44:20 1.74 +++ rpl/src/instructions_f3.c 2024/01/17 16:57:13 1.90 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.26 - Copyright (C) 1989-2017 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.36 + Copyright (C) 1989-2024 Dr. BERTRAND Joël This file is part of RPL/2. @@ -72,7 +72,7 @@ instruction_format(struct_processus *s_e } printf(" { \"STANDARD*(*)\" }\n"); - printf(" { { \"NAME\" \"lambda\" } \"SEQUENTIAL\" \"NEW\"" + printf(" { { \"NAME\" \"lambda\" } \"SEQUENTIAL\" \"NEW\" " "\"WRITEONLY\" \"FORMATTED\" } OPEN\n FORMAT\n\n"); if ((*s_etat_processus).langue == 'F') @@ -112,6 +112,7 @@ instruction_format(struct_processus *s_e printf(" FLOW\n"); printf(" { \"LENGTH*(*)\" }\n"); printf(" { \"LENGTH*(%s)\" }\n", d_INT); + printf(" { \"LINE*(*)\" }\n", d_INT); return; } @@ -1642,28 +1643,73 @@ instruction_fleche_num(struct_processus return; } - if ((s_objet_simplifie = simplification(s_etat_processus, s_objet)) == NULL) + if (test_cfsf(s_etat_processus, 46) == d_vrai) { - if (last_valide == d_vrai) + if (evaluation(s_etat_processus, s_objet, 'N') == d_erreur) { - sf(s_etat_processus, 31); + if (last_valide == d_vrai) + { + sf(s_etat_processus, 31); + } + + if (registre_type_evaluation == 'E') + { + sf(s_etat_processus, 35); + } + else + { + cf(s_etat_processus, 35); + } + + liberation(s_etat_processus, s_objet); + return; } - if (registre_type_evaluation == 'E') + if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile), + &s_objet) == d_erreur) { - sf(s_etat_processus, 35); + if (last_valide == d_vrai) + { + sf(s_etat_processus, 31); + } + + if (registre_type_evaluation == 'E') + { + sf(s_etat_processus, 35); + } + else + { + cf(s_etat_processus, 35); + } + + (*s_etat_processus).erreur_execution = d_ex_manque_argument; + return; } - else + + if ((s_objet_simplifie = simplification(s_etat_processus, s_objet)) + == NULL) { - cf(s_etat_processus, 35); + if (last_valide == d_vrai) + { + sf(s_etat_processus, 31); + } + + if (registre_type_evaluation == 'E') + { + sf(s_etat_processus, 35); + } + else + { + cf(s_etat_processus, 35); + } + + return; } - return; + liberation(s_etat_processus, s_objet); + s_objet = s_objet_simplifie; } - liberation(s_etat_processus, s_objet); - s_objet = s_objet_simplifie; - if (evaluation(s_etat_processus, s_objet, 'N') == d_erreur) { if (last_valide == d_vrai)