diff options
| -rw-r--r-- | aclocal.m4 | 58 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/scalaires.c | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/cat-id-tbl.c | 34 | ||||
| -rw-r--r-- | po/fr.po | 125 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
7 files changed, 184 insertions, 50 deletions
@@ -159,7 +159,7 @@ else fi]) -# serial 40 AC_PROG_LIBTOOL +# serial 39 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -172,7 +172,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || AC_MSG_ERROR([libtool configure failed]) # Reload cache, that may have been modified by ltconfig @@ -204,11 +204,6 @@ AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_LN_S])dnl dnl -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac - # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" @@ -227,7 +222,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" # Some flags need to be propagated to the compiler or linker for good # libtool support. -case "$lt_target" in +case "$host" in *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext @@ -443,6 +438,7 @@ else AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_SUBST(LD) AC_PROG_LD_GNU ]) @@ -488,13 +484,14 @@ else fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) +AC_SUBST(NM) ]) # AC_CHECK_LIBM - check for math library AC_DEFUN(AC_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= -case "$lt_target" in +case "$host" in *-*-beos* | *-*-cygwin*) # These system don't have libm ;; @@ -509,35 +506,30 @@ esac ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. +# the libltdl convenience library, adds --enable-ltdl-convenience to +# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor +# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed +# to be `${top_builddir}/libltdl'. Make sure you start DIR with +# '${top_builddir}/' (note the single quotes!) if your package is not +# flat, and, if you're not using automake, define top_builddir as +# appropriate in the Makefiles. AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed -# with '${top_srcdir}/' (note the single quotes!). If your package is -# not flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. +# the libltdl installable library, and adds --enable-ltdl-install to +# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor +# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed +# to be `${top_builddir}/libltdl'. Make sure you start DIR with +# '${top_builddir}/' (note the single quotes!) if your package is not +# flat, and, if you're not using automake, define top_builddir as +# appropriate in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_CHECK_LIB(ltdl, main, @@ -550,12 +542,10 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ]) if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" - INCLTDL= fi ]) @@ -568,8 +558,8 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to quiet aclocal about the macro not being used +if(a,b,[AC_DISABLE_FAST_INSTALL])dnl # Macro to add for using GNU gettext. # Ulrich Drepper <drepper@cygnus.com>, 1995. diff --git a/lib/Makefile.am b/lib/Makefile.am index 95713a0..a893ab5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -AM_CFLAGS = -O3 -Wall -Wstrict-prototypes $(CFLAGS) +AM_CFLAGS = -O3 -DDEBUG -Wall -Wstrict-prototypes $(CFLAGS) INCLUDES = -I. -I.. -I$(includedir) -I../include lib_LTLIBRARIES = libPolynom.la diff --git a/lib/scalaires.c b/lib/scalaires.c index c40760f..f94162a 100644 --- a/lib/scalaires.c +++ b/lib/scalaires.c @@ -10,11 +10,11 @@ #define PRECISION 1E6 static int pgcd(int a, int b) { - if (!a) - return b; if (a < b) return pgcd(b, a); - return pgcd(b, b % a); + if (!b) + return a; + return pgcd(b, a % b); } rationnel rat_constr_zero(void) diff --git a/po/POTFILES.in b/po/POTFILES.in index a818424..f41f122 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ lib/exceptions.c lib/hash.c -lib/main.c lib/numbers.c lib/parser.c lib/pile.c diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 4c0c5bd..85ff112 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -1,4 +1,4 @@ -/* Automatically generated by po2tbl.sed from Dumb.pot. */ +/* Automatically generated by po2tbl.sed from Polynom.pot. */ #if HAVE_CONFIG_H # include <config.h> @@ -8,7 +8,35 @@ const struct _msg_ent _msg_tbl[] = { {"", 1}, - {"Hello World!\n", 2}, + {"Out of memory.", 2}, + {"Too much error contexts during pushcontext().", 3}, + {"Error context empty, but popcontext() called.", 4}, + {"Internal error into hashing", 5}, + {"Too many nested operators in expression.\n", 6}, + {"Too many nested functions calls in expression.\n", 7}, + {"Invalid unary operator", 8}, + {"Invalid binary operator", 9}, + {"Parse error: too much left parenthesis", 10}, + {"Parse error: too much right parenthesis", 11}, + {"Parse error: enclosure mismatch", 12}, + {"Invalid character", 13}, + {"push_pile_poly: Stack Overflow", 14}, + {"push_pile_int: Stack Overflow", 15}, + {"push_pile_string: Stack Overflow", 16}, + {"pop_pile: Can't pop %u elements", 17}, + {"Calling act_pile(%i)\n", 18}, + {"act_pile: OP_PLUS invalid arguments", 19}, + {"act_pile: OP_MOINS invalid arguments", 20}, + {"act_pile: OP_MUL invalid arguments", 21}, + {"act_pile: OP_DIV invalid arguments", 22}, + {"act_pile: OP_MOD invalid arguments", 23}, + {"act_pile: OP_EXP invalid arguments", 24}, + {"act_pile: OP_ASSIGN empty string", 25}, + {"act_pile: OP_ASSIGN invalid arguments", 26}, + {"act_pile: OP_MOINS_UNARY invalid argument", 27}, + {"act_pile: OP_FUNC_CALL invalid arguments", 28}, + {"act_pile: OP_FUNC_CALL incorrect argument number", 29}, + {"act_pile: Unknown operator", 30}, }; -int _msg_tbl_length = 2; +int _msg_tbl_length = 30; @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-04 02:04+0100\n" +"POT-Creation-Date: 2001-04-29 00:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,6 +14,123 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: lib/Dumb.c:5 -msgid "Hello World!\n" -msgstr "Bonjour le monde!\n" +#: lib/exceptions.c:26 lib/exceptions.c:40 +msgid "Out of memory." +msgstr "" + +#: lib/exceptions.c:51 +msgid "Too much error contexts during pushcontext()." +msgstr "" + +#: lib/exceptions.c:62 +msgid "Error context empty, but popcontext() called." +msgstr "" + +#: lib/hash.c:26 +msgid "Internal error into hashing" +msgstr "" + +#: lib/parser.c:99 +msgid "Too many nested operators in expression.\n" +msgstr "" + +#: lib/parser.c:130 +msgid "Too many nested functions calls in expression.\n" +msgstr "" + +#: lib/parser.c:207 +msgid "Invalid unary operator" +msgstr "" + +#: lib/parser.c:209 +msgid "Invalid binary operator" +msgstr "" + +#: lib/parser.c:235 +msgid "Parse error: too much left parenthesis" +msgstr "" + +#: lib/parser.c:245 lib/parser.c:264 +msgid "Parse error: too much right parenthesis" +msgstr "" + +#: lib/parser.c:250 lib/parser.c:269 +msgid "Parse error: enclosure mismatch" +msgstr "" + +#: lib/parser.c:288 +msgid "Invalid character" +msgstr "" + +#: lib/pile.c:79 +msgid "push_pile_poly: Stack Overflow" +msgstr "" + +#: lib/pile.c:91 +msgid "push_pile_int: Stack Overflow" +msgstr "" + +#: lib/pile.c:103 +msgid "push_pile_string: Stack Overflow" +msgstr "" + +#: lib/pile.c:115 +#, c-format +msgid "pop_pile: Can't pop %u elements" +msgstr "" + +#: lib/pile.c:154 +#, c-format +msgid "Calling act_pile(%i)\n" +msgstr "" + +#: lib/pile.c:167 +msgid "act_pile: OP_PLUS invalid arguments" +msgstr "" + +#: lib/pile.c:180 +msgid "act_pile: OP_MOINS invalid arguments" +msgstr "" + +#: lib/pile.c:193 +msgid "act_pile: OP_MUL invalid arguments" +msgstr "" + +#: lib/pile.c:206 +msgid "act_pile: OP_DIV invalid arguments" +msgstr "" + +#: lib/pile.c:219 +msgid "act_pile: OP_MOD invalid arguments" +msgstr "" + +#: lib/pile.c:235 lib/pile.c:238 lib/pile.c:241 +msgid "act_pile: OP_EXP invalid arguments" +msgstr "" + +#: lib/pile.c:256 +msgid "act_pile: OP_ASSIGN empty string" +msgstr "" + +#: lib/pile.c:259 +msgid "act_pile: OP_ASSIGN invalid arguments" +msgstr "" + +#: lib/pile.c:272 +msgid "act_pile: OP_MOINS_UNARY invalid argument" +msgstr "" + +#: lib/pile.c:295 lib/pile.c:298 lib/pile.c:301 +msgid "act_pile: OP_FUNC_CALL invalid arguments" +msgstr "" + +#: lib/pile.c:304 +msgid "act_pile: OP_FUNC_CALL incorrect argument number" +msgstr "" + +#: lib/pile.c:308 +msgid "act_pile: Unknown operator" +msgstr "" + +#~ msgid "Hello World!\n" +#~ msgstr "Bonjour le monde!\n" diff --git a/src/Makefile.am b/src/Makefile.am index f69b766..7d5cb04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,10 +3,10 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ AM_CFLAGS = -O3 -Wall -Wstrict-prototypes $(CFLAGS) INCLUDES = -I. -I.. -I$(includedir) -I../include -bin_PROGRAMS = Dumb +bin_PROGRAMS = Polynom -Dumb_SOURCES = Dumb.c +Dumb_SOURCES = Polynom.c -LDADD = ../lib/libDumb.la +LDADD = ../lib/libPolynom.la -Dumb_LDADD = $(LDADD) +Polynom_LDADD = $(LDADD) |