--- rpl/src/analyse_notation_algebrique.c 2014/07/17 08:07:15 1.54 +++ rpl/src/analyse_notation_algebrique.c 2015/01/05 13:12:28 1.55 @@ -1,7 +1,7 @@ /* ================================================================================ RPL/2 (R) version 4.1.19 - Copyright (C) 1989-2014 Dr. BERTRAND Joël + Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -241,8 +241,12 @@ analyse_algebrique(struct_processus *s_e for(i = 0; i < 4; (*(ptr2++)) = (*(ptr1++)), i++); (*(ptr2++)) = (*ptr1); } - else if ((strncmp(instruction_majuscule, " OR ", 4) == 0) && - (strlen(instruction_majuscule) == 4)) + else if (strcmp(instruction_majuscule, " EQV ") == 0) + { + for(i = 0; i < 4; (*(ptr2++)) = (*(ptr1++)), i++); + (*(ptr2++)) = (*ptr1); + } + else if ((strcmp(instruction_majuscule, " OR ") == 0)) { for(i = 0; i < 3; (*(ptr2++)) = (*(ptr1++)), i++); (*(ptr2++)) = (*ptr1); @@ -1029,8 +1033,10 @@ analyse_algebrique(struct_processus *s_e drapeau_modification = d_vrai; } else if (((priorite == 1) && (t4 == ' ') && - (t3 == 'X') && (t2 == 'O') && (t1 == 'R') - && (t0 == ' ')) || ((priorite == 2) && + (((t3 == 'X') && (t2 == 'O') && (t1 == 'R')) + || ((t3 == 'E') && (t2 == 'Q') && + (t1 == 'V'))) && (t0 == ' ')) + || ((priorite == 2) && (t4 == ' ') && (t3 == 'A') && (t2 == 'N') && (t1 == 'D') && (t0 == ' '))) { @@ -1273,6 +1279,9 @@ test_expression_rpn(unsigned char *chain || ((t0 == ' ') && ((t1 == 'A') || (t1 == 'a')) && ((t2 == 'N') || (t2 == 'n')) && ((t3 == 'D') || (t3 == 'd')) && (t4 == ' ')) || + ((t0 == ' ') && ((t1 == 'E') || (t1 == 'e')) && + ((t2 == 'Q') || (t2 == 'q')) && ((t3 == 'V') || (t3 == 'v')) + && (t4 == ' ')) || ((t0 == ' ') && ((t1 == 'O') || (t1 == 'o')) && ((t2 == 'R') || (t2 == 'r')) && (t3 == ' ')) || ((t0 == ' ') && ((t1 == 'X') || (t1 == 'x')) &&