diff options
| -rw-r--r-- | include/fonctions.h | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/pile.c | 4 | ||||
| -rw-r--r-- | po/cat-id-tbl.c | 60 |
4 files changed, 35 insertions, 33 deletions
diff --git a/include/fonctions.h b/include/fonctions.h index 22e166d..bf2fddb 100644 --- a/include/fonctions.h +++ b/include/fonctions.h @@ -1,6 +1,6 @@ #ifndef __FONCTIONS_H__ #define __FONCTIONS_H__ -#include "polynome.h" +#include "polynom.h" void appel_fonction(char *nom, int arite, polynome p1, polynome p2, polynome p3); diff --git a/lib/Makefile.am b/lib/Makefile.am index c6651e2..f45d8a7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = -O3 -Wall -Wstrict-prototypes $(CFLAGS) INCLUDES = -I. -I.. -I$(includedir) -I../include lib_LTLIBRARIES = libPolynom.la -libPolynom_la_SOURCES = exceptions.c hash.c numbers.c parser.c pile.c polynom.c scalaires.c terminal.c interface.c +libPolynom_la_SOURCES = exceptions.c hash.c numbers.c parser.c pile.c polynom.c scalaires.c terminal.c interface.c fonctions.c libPolynom_la_LDFLAGS = -version-info $(Polynom_VERSION_INFO) @@ -392,7 +392,7 @@ void act_pile(int func) printf("----- OP_FUNC_CALL\n"); #endif for (i=0;i<3;i++) - operande[i].polyn=NULL; + operande[i].poly=NULL; operande1 = pop_pile(1); if (operande1.type == T_INT) { for(i=0;i<operande1.val;i++) { @@ -431,7 +431,7 @@ void act_pile(int func) } break; case T_STRING: - appel_fonction(operande2.label,operande1.val,operande[0].polyn, operande[1].polyn, operande[2].polyn); + appel_fonction(operande2.label,operande1.val,operande[0].poly, operande[1].poly, operande[2].poly); break; } diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 99a737e..3c3107b 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -33,40 +33,42 @@ const struct _msg_ent _msg_tbl[] = { {"move_to_resultat_pile()", 24}, {"move_to_resultat_pile: invalid argument type", 25}, {"move_to_resultat_pile: Stack Overflow", 26}, - {"move_to_resultat_pile: empty stack", 27}, - {"Calling act_pile(%i)", 28}, - {"act_pile: OP_PLUS invalid arguments", 29}, - {"act_pile: OP_MOINS invalid arguments", 30}, - {"act_pile: OP_MUL invalid arguments", 31}, - {"act_pile: OP_DIV invalid arguments", 32}, - {"act_pile: OP_MOD invalid arguments", 33}, - {"act_pile: OP_EXP invalid power", 34}, - {"act_pile: OP_EXP empty polynom", 35}, - {"act_pile: OP_EXP invalid arguments", 36}, - {"act_pile: OP_ASSIGN empty string", 37}, - {"act_pile: OP_ASSIGN invalid arguments", 38}, - {"act_pile: OP_MOINS_UNARY invalid argument", 39}, - {"act_pile: OP_FUNC_CALL incorrect value for 2nd arg", 40}, - {"act_pile: OP_FUNC_CALL arg2 is an empty polynom", 41}, - {"act_pile: OP_FUNC_CALL invalid arguments", 42}, - {"act_pile: OP_FUNC_CALL incorrect argument number", 43}, - {"act_pile: Unknown operator", 44}, - {"\t-- Printing Stack\n", 45}, - {"\t-- End Printing Stack\n", 46}, - {"ply_affichage: strcat error, not enough space in buffer", 47}, - {"rat_constr: division by zero", 48}, - {"division by zero", 49}, - {"Signal received: segfault", 50}, - {"Signal received: break", 51}, + {"pop_resultat()", 27}, + {"move_to_resultat_pile: empty stack", 28}, + {"Calling act_pile(%i)", 29}, + {"act_pile: OP_PLUS invalid arguments", 30}, + {"act_pile: OP_MOINS invalid arguments", 31}, + {"act_pile: OP_MUL invalid arguments", 32}, + {"act_pile: OP_DIV invalid arguments", 33}, + {"act_pile: OP_MOD invalid arguments", 34}, + {"act_pile: OP_EXP invalid power", 35}, + {"act_pile: OP_EXP empty polynom", 36}, + {"act_pile: OP_EXP invalid arguments", 37}, + {"act_pile: OP_ASSIGN empty string", 38}, + {"act_pile: OP_ASSIGN invalid arguments", 39}, + {"act_pile: OP_MOINS_UNARY invalid argument", 40}, + {"act_pile: OP_FUNC_CALL incorrect argument type", 41}, + {"act_pile: OP_FUNC_CALL invalid operand type", 42}, + {"act_pile: OP_FUNC_CALL incorrect value for 2nd arg", 43}, + {"act_pile: OP_FUNC_CALL arg2 is an empty polynom", 44}, + {"act_pile: OP_FUNC_CALL incorrect argument number", 45}, + {"act_pile: Unknown operator", 46}, + {"\t-- Printing Stack\n", 47}, + {"\t-- End Printing Stack\n", 48}, + {"ply_affichage: strcat error, not enough space in buffer", 49}, + {"rat_constr: division by zero", 50}, + {"division by zero", 51}, + {"Signal received: segfault", 52}, + {"Signal received: break", 53}, {"\ \n\ Performing initialisation...\n\ -\n", 52}, +\n", 54}, {"\ \n\ Performing shutdown...\n\ -\n", 53}, - {"Exitting, bye!\n", 54}, +\n", 55}, + {"Exitting, bye!\n", 56}, }; -int _msg_tbl_length = 54; +int _msg_tbl_length = 56; |