From abd0d6dc5a56768f30232a0588b0c663f2acbe4f Mon Sep 17 00:00:00 2001 From: Pixel Date: Sat, 28 Apr 2001 22:28:23 +0000 Subject: Pouet --- lib/Makefile.am | 2 +- lib/main.c | 38 -------------------------------------- src/Polynom.c | 42 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 44 deletions(-) delete mode 100644 lib/main.c diff --git a/lib/Makefile.am b/lib/Makefile.am index e1d12c2..95713a0 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 main.c numbers.c parser.c pile.c polynom.c scalaires.c +libPolynom_la_SOURCES = exceptions.c hash.c numbers.c parser.c pile.c polynom.c scalaires.c libPolynom_la_LDFLAGS = -version-info $(Polynom_VERSION_INFO) diff --git a/lib/main.c b/lib/main.c deleted file mode 100644 index 702dfee..0000000 --- a/lib/main.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * Programme principal - * - */ - -#include -#include "main.h" -#include "hash.h" -#include "parser.h" -#include "polynom.h" -#include "pile.h" -#include "exceptions.h" -#ifdef HAVE_CONFIG_H -#include "config.h" -#else -#define _(x) x -#endif - -_TableauVariable variables; -char *mute; - -int main(void) -{ - - Initialise(&variables); - mute = Estrdup("x"); - /* nom de la variable utilisee pour la saisie des polynomes, a recuperer en argv eventuellt */ - parse_line("(x^2) + x + 1;"); - //parse_line("P(2);"); - //printf("%s\n", affichage_level_1()); - return 0; - - -/* destruction de ts les polynomes stockes dans la table de hh */ -/* appel a la fonction de vidage de pile */ -/* vraiment utile? on quitte le prog, ttes les donnes dynamiques seront detruites ... */ -} diff --git a/src/Polynom.c b/src/Polynom.c index f87fac6..beebbb6 100644 --- a/src/Polynom.c +++ b/src/Polynom.c @@ -1,9 +1,41 @@ +/* + * + * Programme principal + * + */ + +#include +#include "main.h" +#include "hash.h" +#include "parser.h" +#include "polynom.h" +#include "pile.h" +#include "exceptions.h" +#ifdef HAVE_CONFIG_H #include "config.h" +#else +#define _(x) x +#endif + +_TableauVariable variables; +char *mute; + +int main(void) +{ + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + Initialise(&variables); + mute = Estrdup("x"); + /* nom de la variable utilisee pour la saisie des polynomes, a recuperer en argv eventuellt */ + parse_line("(x^2) + x + 1;"); + //parse_line("P(2);"); + //printf("%s\n", affichage_level_1()); + return 0; -int main(int argc, char ** argv) { - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - exit(0); +/* destruction de ts les polynomes stockes dans la table de hh */ +/* appel a la fonction de vidage de pile */ +/* vraiment utile? on quitte le prog, ttes les donnes dynamiques seront detruites ... */ } -- cgit v1.2.3