Changeset f92fa13 in git

Timestamp:

Mar 16, 1998, 3:56:48 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5c8eae0ee4adf297d4ee70c4eb367499625899d8

Parents:

057fd3b14dfe97c1070a5e6e9ea465fb317ae57f

Message:

1998-03-16  Olaf Bachmann  <obachman@mathematik.uni-kl.de>

	* polys-impl.h: #define COMP_FAST

	* configure.in,Makefile.in: check for flex -P; increased version
	number to 1.1.7

1998-03-04  Olaf Bachmann  <obachman@mathematik.uni-kl.de>

	* febase.h: added macro assume()

	* spSpolyLoop.cc: Automatic generation of SpolyLoops using
	spSpolyLoop.pl

	* kstd*.cc: New calling interface to get SpolyLoop

	* ring.h: Introduced rOrderType_t


git-svn-id: file:///usr/local/Singular/svn/trunk@1236 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• ChangeLog (modified) (2 diffs)
• Makefile.in (modified) (7 diffs)
• binom.cc (modified) (2 diffs)
• clapconv.cc (modified) (5 diffs)
• configure (modified) (148 diffs)
• configure.in (modified) (2 diffs)
• febase.h (modified) (2 diffs)
• kstd1.cc (modified) (8 diffs)
• kstd2.cc (modified) (4 diffs)
• kstdfac.cc (modified) (2 diffs)
• kutil.cc (modified) (3 diffs)
• kutil.h (modified) (3 diffs)
• mod2.h.in (modified) (1 diff)
• polys-comp.h (modified) (21 diffs)
• polys-impl.h (modified) (4 diffs)
• polys.cc (modified) (38 diffs)
• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)
• spSpolyLoop.cc (modified) (2 diffs)
• spSpolyLoop.h (modified) (1 diff)
• spolys.cc (modified) (19 diffs)
• spolys.h (modified) (1 diff)
• spolys0.cc (modified) (8 diffs)
• spolys0.h (modified) (3 diffs)
• structs.h (modified) (2 diffs)
• syz1.cc (modified) (14 diffs)

Singular/ChangeLog

@@ +1 @@
+1998-03-16  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
+
+        * polys-impl.h: #define COMP_FAST
+
+        * configure.in,Makefile.in: check for flex -P; increased version
+        number to 1.1.7
+
 Fri Mar 13 16:16:27 MET 1998 hannes
   * fixed: Singular crashed while changing the minpoly in GF(q)
@@ -16 +23 @@
           made fixes requested by libparse (s.a. brackets, ....)
         
+1998-03-04  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
+
+        * febase.h: added macro assume()
+
+        * spSpolyLoop.cc: Automatic generation of SpolyLoops using
+        spSpolyLoop.pl
+
+        * kstd*.cc: New calling interface to get SpolyLoop
+
+        * ring.h: Introduced rOrderType_t
+
 Mon Mar  2 16:18:25 MET 1998 hannes
    * changed handling of "echo" in examples: do not report file + lineno

Singular/Makefile.in

@@ -32 +32 @@
 CC              = @CC@
 CXX             = @CXX@
+LEXP            = @LEXP@
 BISON           = bison
-LEX             = flex
+PERL            = perl
 @SET_MAKE@
 INSTALL         = ./install-sh -c
@@ -46 +47 @@
 CXXFLAGS        = @CXXFLAGS@ -pipe 
 CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@
-CPPFLAGS        = -I${srcdir} @CPPFLAGS@ 
+CPPFLAGS        = -I${srcdir} @CPPFLAGS@
 DEFS            = @DEFS@ -DNDEBUG
 LDFLAGS         = @LDFLAGS@
@@ -100 +101 @@
 CSOURCES=mmalloc.c mmallocb.c mmallocs.c mmblock.c mmheap.c mmspec.c mmutil.c weight0.c
 
-SOURCES=${CSOURCES} ${CXXSOURCES} grammar.y scanner.l libparse.l
+SOURCES=${CSOURCES} ${CXXSOURCES} grammar.y scanner.l libparse.l spSpolyLoop.pl
 
 HEADERS=algmap.h hutil.h lists.h stairc.h attrib.h ideals.h \
@@ -150 +151 @@
 
 .l.cc:
-        ${LEX} -s -I -t $< > scanner.cc
-
+        @if test "${LEXP}" = touch; then \
+                touch scanner.cc; \
+                echo Warning: could not rebuilt scanner.cc;\
+        else \
+                echo "${LEXP} -s -I -t $< > scanner.cc"; \
+                ${LEXP} -s -I -t $< > scanner.cc; \
+        fi
 .y.cc:
         ${BISON} -d -t -o grammar.cc $<
@@ -175 +181 @@
         ${OBJS} ${STATIC_LDFLAGS} ${LDFLAGS} ${LIBS}
 
-libparse: libparse_main.o utils.o
-        ${CXX} -o libparse libparse_main.o utils.o
-
-libparse_main.o: libparse.cc
-        ${CXX} -c -o libparse_main.o libparse.cc -DSTANDALONE_PARSER
 
 iparith.o mpsr_Tok.o : iparith.inc mpsr_Tok.inc
@@ -204 +205 @@
         fi
 
-libparse.cc: libparse.l
-        ${LEX} -I -Pyylp -olibparse.cc libparse.l
 
 version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in configure.in
@@ -214 +213 @@
 stamp-h : config.status mod2.h.in 
         CONFIG_FILES= CONFIG_HEADERS=mod2.h ./config.status
+
+spSpolyLoop.cc spSpolyLoop.dd : spSpolyLoop.inc
+
+spSpolyLoop.inc: spSpolyLoop.pl
+        ${PERL} spSpolyLoop.pl > spSpolyLoop.inc
+
+libparse: libparse_main.o utils.o
+        ${CXX} -o libparse libparse_main.o utils.o
+
+libparse_main.o: libparse.cc
+        ${CXX} -c -o libparse_main.o libparse.cc -DSTANDALONE_PARSER
+
+libparse.cc: libparse.l
+        @if test "${LEXP}" = touch; then \
+                touch libparse.cc; \
+                echo Warning: could not rebuilt libparse.cc;\
+        else \
+                echo ${LEXP} -I -Pyylp -olibparse.cc libparse.l;\
+                ${LEXP} -I -Pyylp -olibparse.cc libparse.l;\
+        fi
 
 Makefile: Makefile.in config.status 

Singular/binom.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: binom.cc,v 1.12 1998-01-28 22:11:19 Singular Exp $ */
+/* $Id: binom.cc,v 1.13 1998-03-16 14:56:25 obachman Exp $ */
 
 /*
@@ -186 +186 @@
   #endif
   }
-  //o1=pGetComp(p1)-pGetComp(p2);
-  //if (o1 == 0) return 0;
-  //if (o1 > 0) return -pComponentOrder;
-  //return pComponentOrder;
+  o1=pGetComp(p1)-pGetComp(p2);
+  if (o1 == 0) return 0;
+  if (o1 > 0) return -pComponentOrder;
+  return pComponentOrder;
   return 0;
 }

Singular/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.14 1998-02-09 11:29:00 Singular Exp $
+// $Id: clapconv.cc,v 1.15 1998-03-16 14:56:25 obachman Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -126 +126 @@
   else
   {
-    poly term = pNew();
+    poly term = pInit();
     pNext( term ) = NULL;
     for ( int i = 1; i <= pVariables; i++ )
@@ -346 +346 @@
     if (z!=NULL)
     {
-      poly term = pNew();
+      poly term = pInit();
       pNext( term ) = NULL;
       for ( int i = 1; i <= pVariables; i++ )
@@ -513 +513 @@
   else
   {
-    poly term = pNew();
+    poly term = pInit();
     pNext( term ) = NULL;
     for ( int i = 1; i <= pVariables; i++ )
@@ -577 +577 @@
   else
   {
-    poly term = pNew();
+    poly term = pInit();
     pNext( term ) = NULL;
     for ( int i = 1; i <= pVariables; i++ )

Singular/configure

@@ -611 +611 @@
 fi
 
+# Extract the first word of "flex", so it can be a program name with args.
+set dummy flex; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:617: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_LEX="flex"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+fi
+fi
+LEX="$ac_cv_prog_LEX"
+if test -n "$LEX"; then
+  echo "$ac_t""$LEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$LEXLIB"
+then
+  case "$LEX" in
+  flex*) ac_lib=fl ;;
+  *) ac_lib=l ;;
+  esac
+  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+echo "configure:650: checking for yywrap in -l$ac_lib" >&5
+ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$ac_lib  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 658 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char yywrap();
+
+int main() {
+yywrap()
+; return 0; }
+EOF
+if { (eval echo configure:669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LEXLIB="-l$ac_lib"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+# make sure lex accepts -P option
+if test "${ac_cv_prog_LEX+set}" = set; then
+  echo $ac_n "checking whether ${ac_cv_prog_LEX} accepts -P""... $ac_c" 1>&6
+echo "configure:694: checking whether ${ac_cv_prog_LEX} accepts -P" >&5
+  if ${ac_cv_prog_LEX} -P < /dev/null 2>&1| grep flag > /dev/null 2>&1; then
+    echo "$ac_t""no" 1>&6
+    echo "configure: warning: Can not run ${ac_cv_prog_LEX} with -P; make might fail" 1>&2
+    LEXP=touch
+  else
+    echo "$ac_t""yes" 1>&6
+    LEXP=${ac_cv_prog_LEX}
+  fi
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:617: checking for $ac_word" >&5
+echo "configure:708: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -643 +734 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:646: checking for $ac_word" >&5
+echo "configure:737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -691 +782 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:694: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -701 +792 @@
 
 cat > conftest.$ac_ext <<EOF
-#line 704 "configure"
+#line 795 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -725 +816 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:819: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:733: checking whether we are using GNU C" >&5
+echo "configure:824: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -739 +830 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -754 +845 @@
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:757: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:848: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -782 +873 @@
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:785: checking how to run the C preprocessor" >&5
+echo "configure:876: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -797 +888 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 800 "configure"
+#line 891 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -803 +894 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -814 +905 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 817 "configure"
+#line 908 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -820 +911 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -847 +938 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:850: checking for $ac_word" >&5
+echo "configure:941: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -878 +969 @@
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:881: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:972: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
@@ -888 +979 @@
 
 cat > conftest.$ac_ext <<EOF
-#line 891 "configure"
+#line 982 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -918 +1009 @@
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:921: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1012: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:926: checking whether we are using GNU C++" >&5
+echo "configure:1017: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -932 +1023 @@
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
@@ -947 +1038 @@
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:950: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1041: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -975 +1066 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:978: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1069: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -1066 +1157 @@
 set dummy info; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1069: checking for $ac_word" >&5
+echo "configure:1160: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1161 +1252 @@
   
 echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
-echo "configure:1164: checking for atof in -lm" >&5
+echo "configure:1255: checking for atof in -lm" >&5
 ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1169 +1260 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1172 "configure"
+#line 1263 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1180 +1271 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1208 +1299 @@
 
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:1211: checking for socket in -lbsd" >&5
+echo "configure:1302: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1216 +1307 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1219 "configure"
+#line 1310 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1227 +1318 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1255 +1346 @@
 
 echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
-echo "configure:1258: checking for listen in -lsocket" >&5
+echo "configure:1349: checking for listen in -lsocket" >&5
 ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1263 +1354 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1266 "configure"
+#line 1357 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1274 +1365 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1302 +1393 @@
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1305: checking for gethostbyname in -lnsl" >&5
+echo "configure:1396: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1310 +1401 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1313 "configure"
+#line 1404 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1321 +1412 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1349 +1440 @@
 
 echo $ac_n "checking for index in -lucb""... $ac_c" 1>&6
-echo "configure:1352: checking for index in -lucb" >&5
+echo "configure:1443: checking for index in -lucb" >&5
 ac_lib_var=`echo ucb'_'index | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1357 +1448 @@
 LIBS="-lucb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1451 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1368 +1459 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1398 +1489 @@
 if test "$with_readline" != no; then
   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:1401: checking for tgetent in -lncurses" >&5
+echo "configure:1492: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1406 +1497 @@
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1409 "configure"
+#line 1500 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1417 +1508 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1444 +1535 @@
 \
    echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:1447: checking for tgetent in -lcurses" >&5
+echo "configure:1538: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1452 +1543 @@
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1455 "configure"
+#line 1546 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1463 +1554 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1490 +1581 @@
 \
    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:1493: checking for tgetent in -ltermcap" >&5
+echo "configure:1584: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1498 +1589 @@
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1501 "configure"
+#line 1592 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1509 +1600 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1541 +1632 @@
 
   echo $ac_n "checking for rl_abort in -lreadline""... $ac_c" 1>&6
-echo "configure:1544: checking for rl_abort in -lreadline" >&5
+echo "configure:1635: checking for rl_abort in -lreadline" >&5
 ac_lib_var=`echo readline'_'rl_abort | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1549 +1640 @@
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1552 "configure"
+#line 1643 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1560 +1651 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1592 +1683 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1595: checking for $ac_hdr" >&5
+echo "configure:1686: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1600 "configure"
+#line 1691 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1651 +1742 @@
 if test "$with_dld" = yes; then
   echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:1654: checking for dld_init in -ldld" >&5
+echo "configure:1745: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1659 +1750 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1662 "configure"
+#line 1753 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1670 +1761 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1696 +1787 @@
 
 echo $ac_n "checking for mpq_init in -lgmp""... $ac_c" 1>&6
-echo "configure:1699: checking for mpq_init in -lgmp" >&5
+echo "configure:1790: checking for mpq_init in -lgmp" >&5
 ac_lib_var=`echo gmp'_'mpq_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1704 +1795 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1707 "configure"
+#line 1798 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1715 +1806 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1746 +1837 @@
 fi
 echo $ac_n "checking for mpz_init in -lsmallgmp""... $ac_c" 1>&6
-echo "configure:1749: checking for mpz_init in -lsmallgmp" >&5
+echo "configure:1840: checking for mpz_init in -lsmallgmp" >&5
 ac_lib_var=`echo smallgmp'_'mpz_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1754 +1845 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
+#line 1848 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1765 +1856 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1793 +1884 @@
 
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:1796: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:1887: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1801 +1892 @@
 LIBS="-lMP  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1804 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1812 +1903 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1840 +1931 @@
 
 echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
-echo "configure:1843: checking for MPT_GetTree in -lMPT" >&5
+echo "configure:1934: checking for MPT_GetTree in -lMPT" >&5
 ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1848 +1939 @@
 LIBS="-lMPT  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1851 "configure"
+#line 1942 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1859 +1950 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1887 +1978 @@
 
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:1890: checking for atof in -lsingcf" >&5
+echo "configure:1981: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1895 +1986 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1898 "configure"
+#line 1989 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1906 +1997 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1934 +2025 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:1937: checking for atof in -lsingfac" >&5
+echo "configure:2028: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1942 +2033 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1945 "configure"
+#line 2036 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1953 +2044 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1985 +2076 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1988: checking for $ac_hdr" >&5
+echo "configure:2079: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1993 "configure"
+#line 2084 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2081 +2172 @@
 fi
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:2084: checking which apint package to use" >&5
+echo "configure:2175: checking which apint package to use" >&5
 if test "$ac_will_have_gmp" = yes; then
   cat >> confdefs.h <<\EOF
@@ -2118 +2209 @@
 fi
 echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
-echo "configure:2121: checking whether to use with MP" >&5
+echo "configure:2212: checking whether to use with MP" >&5
 
 if test "$WITH_MP" = yes; then
@@ -2147 +2238 @@
 fi
 echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
-echo "configure:2150: checking whether to use with factory" >&5
+echo "configure:2241: checking whether to use with factory" >&5
 
 if test "$WITH_FACTORY" = yes; then
@@ -2176 +2267 @@
 fi
 echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
-echo "configure:2179: checking whether to use with libfac" >&5
+echo "configure:2270: checking whether to use with libfac" >&5
 
 if test "$WITH_LIBFAC" = yes; then
@@ -2192 +2283 @@
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2195: checking for ANSI C header files" >&5
+echo "configure:2286: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2200 "configure"
+#line 2291 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2205 +2296 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2222 +2313 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2225 "configure"
+#line 2316 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -2240 +2331 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2243 "configure"
+#line 2334 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2261 +2352 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2264 "configure"
+#line 2355 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -2272 +2363 @@
 
 EOF
-if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
@@ -2300 +2391 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2303: checking for $ac_hdr" >&5
+echo "configure:2394: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2399 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2342 +2433 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2345: checking for $ac_hdr" >&5
+echo "configure:2436: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2350 "configure"
+#line 2441 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2381 +2472 @@
 WITH_DBM=no
 echo $ac_n "checking whether to build with dbm links""... $ac_c" 1>&6
-echo "configure:2384: checking whether to build with dbm links" >&5
+echo "configure:2475: checking whether to build with dbm links" >&5
 if test "$with_dbm" != no; then
   cat >> confdefs.h <<\EOF
@@ -2395 +2486 @@
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2398: checking for working const" >&5
+echo "configure:2489: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2403 "configure"
+#line 2494 "configure"
 #include "confdefs.h"
 
@@ -2449 +2540 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2470 +2561 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2473: checking for inline" >&5
+echo "configure:2564: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2477 +2568 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2480 "configure"
+#line 2571 "configure"
 #include "confdefs.h"
 
@@ -2484 +2575 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2510 +2601 @@
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2513: checking for size_t" >&5
+echo "configure:2604: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2518 "configure"
+#line 2609 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2543 +2634 @@
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2546: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2637: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2551 "configure"
+#line 2642 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2557 +2648 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -2578 +2669 @@
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2581: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2672: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2586 "configure"
+#line 2677 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2591 +2682 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -2615 +2706 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2618: checking for working alloca.h" >&5
+echo "configure:2709: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2623 "configure"
+#line 2714 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2627 +2718 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2648 +2739 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2651: checking for alloca" >&5
+echo "configure:2742: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2656 "configure"
+#line 2747 "configure"
 #include "confdefs.h"
 
@@ -2676 +2767 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2708 +2799 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2711: checking whether alloca needs Cray hooks" >&5
+echo "configure:2802: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2716 "configure"
+#line 2807 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2738 +2829 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2741: checking for $ac_func" >&5
+echo "configure:2832: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2746 "configure"
+#line 2837 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2766 +2857 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2793 +2884 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2796: checking stack direction for C alloca" >&5
+echo "configure:2887: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2801 +2892 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2804 "configure"
+#line 2895 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2820 +2911 @@
 }
 EOF
-if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
@@ -2843 +2934 @@
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2846: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2937: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2849 +2940 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2852 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -2867 +2958 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2961 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -2892 +2983 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2895: checking for $ac_hdr" >&5
+echo "configure:2986: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2900 "configure"
+#line 2991 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2931 +3022 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2934: checking for $ac_func" >&5
+echo "configure:3025: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2939 "configure"
+#line 3030 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2959 +3050 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2984 +3075 @@
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2987: checking for working mmap" >&5
+echo "configure:3078: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2992 +3083 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2995 "configure"
+#line 3086 "configure"
 #include "confdefs.h"
 
@@ -3132 +3223 @@
 
 EOF
-if { (eval echo configure:3135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
@@ -3155 +3246 @@
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3158: checking return type of signal handlers" >&5
+echo "configure:3249: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3163 "configure"
+#line 3254 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3177 +3268 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -3196 +3287 @@
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:3199: checking for vprintf" >&5
+echo "configure:3290: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3204 "configure"
+#line 3295 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3224 +3315 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -3248 +3339 @@
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:3251: checking for _doprnt" >&5
+echo "configure:3342: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3256 "configure"
+#line 3347 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3276 +3367 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -3303 +3394 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3306: checking for $ac_func" >&5
+echo "configure:3397: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3311 "configure"
+#line 3402 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3331 +3422 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3358 +3449 @@
 
 echo $ac_n "checking whether your machine has correct arithmetic shifts""... $ac_c" 1>&6
-echo "configure:3361: checking whether your machine has correct arithmetic shifts" >&5
+echo "configure:3452: checking whether your machine has correct arithmetic shifts" >&5
 if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3371 +3462 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3374 "configure"
+#line 3465 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_shift=yes
@@ -3398 +3489 @@
 
 echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
-echo "configure:3401: checking whether vsprintf returns number of printed chars" >&5
+echo "configure:3492: checking whether vsprintf returns number of printed chars" >&5
 if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3406 +3497 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3409 "configure"
+#line 3500 "configure"
 #include "confdefs.h"
 #include <stdio.h> 
  main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
 EOF
-if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_returns_n_of_chars=yes
@@ -3437 +3528 @@
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:3440: checking size of char" >&5
+echo "configure:3531: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3445 +3536 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3448 "configure"
+#line 3539 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3456 +3547 @@
 }
 EOF
-if { (eval echo configure:3459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
@@ -3476 +3567 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3479: checking size of short" >&5
+echo "configure:3570: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3484 +3575 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3487 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3495 +3586 @@
 }
 EOF
-if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
@@ -3515 +3606 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3518: checking size of int" >&5
+echo "configure:3609: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3523 +3614 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3526 "configure"
+#line 3617 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3534 +3625 @@
 }
 EOF
-if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
@@ -3554 +3645 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3557: checking size of long" >&5
+echo "configure:3648: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3562 +3653 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3565 "configure"
+#line 3656 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3573 +3664 @@
 }
 EOF
-if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
@@ -3593 +3684 @@
 
 echo $ac_n "checking size of void*""... $ac_c" 1>&6
-echo "configure:3596: checking size of void*" >&5
+echo "configure:3687: checking size of void*" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3601 +3692 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3604 "configure"
+#line 3695 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3612 +3703 @@
 }
 EOF
-if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3632 +3723 @@
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3635: checking whether byte ordering is bigendian" >&5
+echo "configure:3726: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3639 +3730 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3733 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3650 +3741 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3657 "configure"
+#line 3748 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3665 +3756 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
@@ -3685 +3776 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3688 "configure"
+#line 3779 "configure"
 #include "confdefs.h"
 main () {
@@ -3698 +3789 @@
 }
 EOF
-if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
@@ -3731 +3822 @@
 
 echo $ac_n "checking which exponent types to use""... $ac_c" 1>&6
-echo "configure:3734: checking which exponent types to use" >&5
+echo "configure:3825: checking which exponent types to use" >&5
 if test "$with_exp_type" = "char"; then
   echo "$ac_t""char" 1>&6
@@ -3765 +3856 @@
 
 echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
-echo "configure:3768: checking whether _AIX is defined" >&5
+echo "configure:3859: checking whether _AIX is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3773 "configure"
+#line 3864 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -3952 +4043 @@
 s%@SINGULAR_MINOR_VERSION@%$SINGULAR_MINOR_VERSION%g
 s%@SINGULAR_SUB_VERSION@%$SINGULAR_SUB_VERSION%g
+s%@LEX@%$LEX%g
+s%@LEXLIB@%$LEXLIB%g
+s%@LEXP@%$LEXP%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g

Singular/configure.in

@@ -8 +8 @@
 SINGULAR_MAJOR_VERSION=1
 SINGULAR_MINOR_VERSION=1
-SINGULAR_SUB_VERSION=6
+SINGULAR_SUB_VERSION=7
 VERSION_DATE="March 1998"
 AC_SUBST(SINGULAR_MAJOR_VERSION)
@@ -67 +67 @@
 fi
 
+AC_PROG_LEX
+# make sure lex accepts -P option
+if test "${ac_cv_prog_LEX+set}" = set; then
+  AC_MSG_CHECKING(whether ${ac_cv_prog_LEX} accepts -P)
+  if ${ac_cv_prog_LEX} -P < /dev/null 2>&1| grep flag > /dev/null 2>&1; then
+    AC_MSG_RESULT(no)
+    AC_MSG_WARN(Can not run ${ac_cv_prog_LEX} with -P; make might fail)
+    LEXP=touch
+  else
+    AC_MSG_RESULT(yes)
+    LEXP=${ac_cv_prog_LEX}
+  fi
+fi
+AC_SUBST(LEXP)
 AC_PROG_CC
 AC_PROG_CPP

Singular/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.7 1998-02-27 16:27:56 Singular Exp $ */
+/* $Id: febase.h,v 1.8 1998-03-16 14:56:30 obachman Exp $ */
 /*
 * ABSTRACT
@@ -100 +100 @@
 void    myyoldbuffer(void * oldb);
 
+/* assume(x) -- a handy macro for assumptions */
+#ifdef NDEBUG
+/* empty macro, if NDEBUG */
+#define assume(x) ((void*) 0)
+#else /* ! NDEBUG */
+#define assume(x) _assume(x, __FILE__, __LINE__)
+#define _assume(x, f, l)                                        \
+do                                                              \
+{                                                               \
+  if (! (x))                                                    \
+  {                                                             \
+    Warn("Internal assume violation: file %s line %d\n", f, l); \
+  }                                                             \
+}                                                               \
+while (0)
+#endif /* NDEBUG */
 
 class Voice

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.14 1998-01-17 18:07:57 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.15 1998-03-16 14:56:31 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -1644 +1644 @@
   initMora(F,strat);
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   strat->enterS = enterSMoraNF;
@@ -1739 +1739 @@
   /*- set T -*/
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   strat->tl = -1;
@@ -1877 +1877 @@
   spSet(currRing);
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   if (pOrdSgn==-1)
@@ -2078 +2078 @@
   spSet(currRing);
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif
   if (pOrdSgn==-1)
@@ -2154 +2154 @@
   spSet(currRing);
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   if (pOrdSgn==-1)
@@ -2175 +2175 @@
   strat->syzComp = syzComp;
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   if (pOrdSgn==-1)
@@ -2218 +2218 @@
   strat->T           = initT();
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   if (pOrdSgn == -1)   strat->honey = TRUE;

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.11 1998-01-27 18:51:19 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.12 1998-03-16 14:56:32 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1548 +1548 @@
   strat->sl = -1;
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif
   /*- init local data struct.---------------------------------------- -*/
@@ -1593 +1593 @@
   strat->sl = -1;
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif
   /*- init local data struct.---------------------------------------- -*/
@@ -1685 +1685 @@
   spSet(currRing);
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.11 1998-02-17 17:53:01 Singular Exp $ */
+/* $Id: kstdfac.cc,v 1.12 1998-03-16 14:56:34 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -754 +754 @@
   spSet(currRing);
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif  
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.11 1998-01-05 16:39:23 Singular Exp $ */
+/* $Id: kutil.cc,v 1.12 1998-03-16 14:56:34 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for std
@@ -3633 +3633 @@
   strat->noTailReduction = !TEST_OPT_REDTAIL;
 #ifdef COMP_FAST
-  strat->spSpolyLoop = spSetSpolyLoop(currRing, strat->syzComp, strat->ak, strat->homog);
+  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
 #endif
   if(!TEST_OPT_SB_1)
@@ -3807 +3807 @@
   return FALSE;
 }
+
+rOrderType_t spGetOrderType(ring r, kStrategy strat)
+{
+  if (strat->syzComp > 0)
+    return rOrderType_Syz;
+  else
+  {
+    rOrderType_t rot = rGetOrderType(r);
+  
+    if ((rot == rOrderType_CompExp || rot == rOrderType_ExpComp) &&
+        (strat->ak == 0))
+      return rOrderType_Exp;
+    else
+      return rot;
+  }
+}
+
+  

Singular/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.4 1997-12-03 16:58:50 obachman Exp $ */
+/* $Id: kutil.h,v 1.5 1998-03-16 14:56:35 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for std
@@ -10 +10 @@
 #include "structs.h"
 #include "mmemory.h"
+#include "ring.h"
 #include <string.h>
 
@@ -172 +173 @@
 BOOLEAN homogTest(polyset F, int Fmax);
 BOOLEAN newHEdge(polyset S, int ak,kStrategy strat);
+rOrderType_t spGetOrderType(ring r, kStrategy strat);
 
 inline TSet initT () { return (TSet)Alloc0(setmax*sizeof(TObject)); }

Singular/mod2.h.in

@@ -233 +233 @@
 
 #ifdef DO_PROFILE
-/* define to enable explicit profiling of some crucial inline routines and defines */
+/* define to enable explicit profiling of some crucial inline 
+ * routines and defines  */
 #define DO_DEEP_PROFILE
 #endif
+
 /*******************************************************************
  * DEBUG OPTIONS

Singular/polys-comp.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-comp.h,v 1.4 1998-01-17 17:49:24 obachman Exp $ */
+/* $Id: polys-comp.h,v 1.5 1998-03-16 14:56:38 obachman Exp $ */
 
 /***************************************************************
@@ -21 +21 @@
 #ifdef WORDS_BIGENDIAN
 #ifndef COMP_NO_EXP_VECTOR_OPS
-#define _pMonCmp_1(p1, p2, d, actionD, actionE)              \
+#define _pMonComp_otEXP_nwONE(p1, p2, d, actionD, actionE)              \
 do                                                          \
 {                                                           \
@@ -30 +30 @@
 while(0)
   
-#define _pMonCmp_1_c(p1, p2, d, actionD, actionE)            \
+#define _pMonComp_otEXPCOMP_nwONE(p1, p2, d, actionD, actionE)            \
 do                                                          \
 {                                                           \
@@ -44 +44 @@
 while(0)
 
-#define _pMonCmp_2(p1, p2, d, actionD, actionE)  \
+#define _pMonComp_otEXP_nwTWO(p1, p2, d, actionD, actionE)  \
 do                                              \
 {                                               \
@@ -57 +57 @@
 while(0)
   
-#define _pMonCmp_2_c(p1, p2, d, actionD, actionE)        \
+#define _pMonComp_otEXPCOMP_nwTWO(p1, p2, d, actionD, actionE)        \
 do                                                      \
 {                                                       \
@@ -75 +75 @@
 while(0)
   
-#define _pMonCmp_2i(p1, p2, length, d, actionD, actionE) \
+#define _pMonComp_otEXP_nwEVEN(p1, p2, length, d, actionD, actionE) \
 do                                                      \
 {                                                       \
@@ -97 +97 @@
 while(0)
 
-#define _pMonCmp_2i_1(p1, p2, length, d, actionD, actionE)   \
+#define _pMonComp_otEXP_nwODD(p1, p2, length, d, actionD, actionE)   \
 do                                                          \
 {                                                           \
@@ -119 +119 @@
 while(0)
   
-#define _pMonCmp_2i_c(p1, p2, length, d, actionD, actionE)  \
+#define _pMonComp_otEXPCOMP_nwEVEN(p1, p2, length, d, actionD, actionE)  \
 do                                                          \
 {                                                           \
@@ -150 +150 @@
 while(0)
   
-#define _pMonCmp_2i_1_c(p1, p2, length, d, actionD, actionE)    \
+#define _pMonComp_otEXPCOMP_nwODD(p1, p2, length, d, actionD, actionE)    \
 do                                                              \
 {                                                               \
@@ -206 +206 @@
 while(0)
 
-#define _pMonCmp_c(p1, p2, d, actionD, actionE) \
+#define _pMonComp_otEXP_c(p1, p2, d, actionD, actionE) \
 do                                              \
 {                                               \
@@ -229 +229 @@
 while(0)
 
-#define _pMonCmp_1(p1, p2, d, actionD, actionE)  \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_1_c(p1, p2, d, actionD, actionE)  \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
-  
-#define _pMonCmp_2(p1, p2, d, actionD, actionE)  \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2_c(p1, p2, d, actionD, actionE)  \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
-  
-#define _pMonCmp_2i(p1, p2, length, d, actionD, actionE) \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2i_1(p1, p2, length, d, actionD, actionE) \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2i_c(p1, p2, length, d, actionD, actionE)   \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2i_1_c(p1, p2, length, d, actionD, actionE) \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
+#define _pMonComp_otEXP_nwONE(p1, p2, d, actionD, actionE)  \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwONE(p1, p2, d, actionD, actionE)  \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
+  
+#define _pMonComp_otEXP_nwTWO(p1, p2, d, actionD, actionE)  \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwTWO(p1, p2, d, actionD, actionE)  \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
+  
+#define _pMonComp_otEXP_nwEVEN(p1, p2, length, d, actionD, actionE) \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXP_nwODD(p1, p2, length, d, actionD, actionE) \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwEVEN(p1, p2, length, d, actionD, actionE)   \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwODD(p1, p2, length, d, actionD, actionE) \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
 
 #endif // COMP_NO_EXP_VECTOR_OPS 
@@ -258 +258 @@
 
 #ifndef COMP_NO_EXP_VECTOR_OPS  
-#define _pMonCmp_1(p1, p2, d, actionD, actionE)                              \
+#define _pMonComp_otEXP_nwONE(p1, p2, d, actionD, actionE)                              \
 do                                                                          \
 {                                                                           \
@@ -267 +267 @@
 while(0)
   
-#define _pMonCmp_1_c(p1, p2, d, actionD, actionE)                            \
+#define _pMonComp_otEXPCOMP_nwONE(p1, p2, d, actionD, actionE)                            \
 do                                                                          \
 {                                                                           \
@@ -281 +281 @@
 while(0)
 
-#define _pMonCmp_2(p1, p2, d, actionD, actionE)  \
+#define _pMonComp_otEXP_nwTWO(p1, p2, d, actionD, actionE)  \
 do                                              \
 {                                               \
@@ -294 +294 @@
 while(0)
   
-#define _pMonCmp_2_c(p1, p2, d, actionD, actionE)        \
+#define _pMonComp_otEXPCOMP_nwTWO(p1, p2, d, actionD, actionE)        \
 do                                                      \
 {                                                       \
@@ -314 +314 @@
 while(0)
   
-#define _pMonCmp_2i(p1, p2, length, d, actionD, actionE) \
+#define _pMonComp_otEXP_nwEVEN(p1, p2, length, d, actionD, actionE) \
 do                                                      \
 {                                                       \
@@ -335 +335 @@
 while(0)
 
-#define _pMonCmp_2i_1(p1, p2, length, d, actionD, actionE)   \
+#define _pMonComp_otEXP_nwODD(p1, p2, length, d, actionD, actionE)   \
 do                                                          \
 {                                                           \
@@ -357 +357 @@
 while(0)
   
-#define _pMonCmp_2i_c(p1, p2, length, d, actionD, actionE)   \
+#define _pMonComp_otEXPCOMP_nwEVEN(p1, p2, length, d, actionD, actionE)   \
 do                                                          \
 {                                                           \
@@ -388 +388 @@
 while(0)
   
-#define _pMonCmp_2i_1_c(p1, p2, length, d, actionD, actionE) \
+#define _pMonComp_otEXPCOMP_nwODD(p1, p2, length, d, actionD, actionE) \
 do                                                          \
 {                                                           \
@@ -444 +444 @@
 while(0)
 
-#define _pMonCmp_c(p1, p2, d, actionD, actionE) \
+#define _pMonComp_otEXP_c(p1, p2, d, actionD, actionE) \
 do                                              \
 {                                               \
@@ -467 +467 @@
 while(0)
 
-#define _pMonCmp_1(p1, p2, d, actionD, actionE)  \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_1_c(p1, p2, d, actionD, actionE)  \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
-  
-#define _pMonCmp_2(p1, p2, d, actionD, actionE)  \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2_c(p1, p2, d, actionD, actionE)  \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
-  
-#define _pMonCmp_2i(p1, p2, length, d, actionD, actionE) \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2i_1(p1, p2, length, d, actionD, actionE) \
-  _pMonCmp(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2i_c(p1, p2, length, d, actionD, actionE)   \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
-
-#define _pMonCmp_2i_1_c(p1, p2, length, d, actionD, actionE) \
-  _pMonCmp_c(p1, p2, d, actionD, actionE)
+#define _pMonComp_otEXP_nwONE(p1, p2, d, actionD, actionE)  \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwONE(p1, p2, d, actionD, actionE)  \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
+  
+#define _pMonComp_otEXP_nwTWO(p1, p2, d, actionD, actionE)  \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwTWO(p1, p2, d, actionD, actionE)  \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
+  
+#define _pMonComp_otEXP_nwEVEN(p1, p2, length, d, actionD, actionE) \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXP_nwODD(p1, p2, length, d, actionD, actionE) \
+  _pMonCmp(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwEVEN(p1, p2, length, d, actionD, actionE)   \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
+
+#define _pMonComp_otEXPCOMP_nwODD(p1, p2, length, d, actionD, actionE) \
+  _pMonComp_otEXP_c(p1, p2, d, actionD, actionE)
   
 #endif // COMP_NO_EXP_VECTOR_OPS 

Singular/polys-impl.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.h,v 1.17 1998-01-28 22:11:22 Singular Exp $ */
+/* $Id: polys-impl.h,v 1.18 1998-03-16 14:56:38 obachman Exp $ */
 
 /***************************************************************
@@ -74 +74 @@
     monomial operations, i.e. does everything exponent-wise.
  ***************************************************************/
-// #define COMP_FAST
+#define COMP_FAST
 // #define COMP_DEBUG
 // #define COMP_NO_EXP_VECTOR_OPS
@@ -400 +400 @@
 #else
 #define _pNew()         (poly) mmAllocSpecialized()
-#endif
 // #define _pNew() _pInit()
+#endif
 
 #include <string.h>
@@ -624 +624 @@
 DECLARE(BOOLEAN, __pDivisibleBy(poly a, poly b))
 {
-  const unsigned long* s1;
-  const unsigned long* s2;
-  const unsigned long* lb;
-
 #ifdef WORDS_BIGENDIAN
-  lb = (unsigned long*) &(a->exp[0]);
-  if (pVariables & ((SIZEOF_LONG / SIZEOF_EXPONENT) - 1))
-  {
-    // now pVariables == pVariables1W, i.e. there are exponents in the
-    // "first" word of exponentvector
-    s1 = ((unsigned long*) a) + pMonomSizeW -1;
-    s2 = ((unsigned long*) b) + pMonomSizeW -1;
-  }
-  else
-  {
-    // first exponent word has only component as significant field --
-    // Hence, do not bother
-    s1 = ((unsigned long*) a) + pMonomSizeW -2;
-    s2 = ((unsigned long*) b) + pMonomSizeW -2;
-  }
-#else // !WORDS_BIGENDIAN
-  lb = ((unsigned long*) a) + pMonomSizeW;
-  if (pVariables & ((SIZEOF_LONG / SIZEOF_EXPONENT) - 1))
-  {
-    s1 = (unsigned long*) &(a->exp[0]);
-    s2 = (unsigned long*) &(b->exp[0]);
-  }
-  else
-  {
-    s1 = (unsigned long*) &(a->exp[0]) + 1;
-    s2 = (unsigned long*) &(b->exp[0]) + 1;
-  }
-#endif
+  const unsigned long* const lb = (unsigned long*) &(a->exp[0]);;
+  const unsigned long* s1 = ((unsigned long*) a) + pMonomSizeW -1;
+  const unsigned long* s2 = ((unsigned long*) b) + pMonomSizeW -1;
+#else
+  const unsigned long* const lb = ((unsigned long*) a) + pMonomSizeW;
+  const unsigned long* s1 = (unsigned long*) &(a->exp[0]);
+  const unsigned long* s2 = (unsigned long*) &(b->exp[0]);
+#endif
+  
   for (;;)
   {
-// O.K. -- and now comes a bit of magic. The following _really_
-// works. Think about it! If you can prove it, please tell me, for I
-// did not bother to prove it formally (Hint: We can assume that our
-// exponents are always positive).
+    // Yes, the following is correct, provided that the exponents do
+    // not have their first bit set
     if ((*s2 - *s1) & P_DIV_MASK) return FALSE;
 #ifdef WORDS_BIGENDIAN

Singular/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.15 1998-01-27 16:20:42 pohl Exp $ */
+/* $Id: polys.cc,v 1.16 1998-03-16 14:56:39 obachman Exp $ */
 
 /*
@@ -226 +226 @@
 #ifdef COMP_FAST
 static pCompProc f_pComp0 = NULL;
-static int f_comp_1(poly p1, poly p2);
-static int f_comp_c_1(poly p1, poly p2);
-static int f_comp_1_c(poly p1, poly p2);
-static int f_comp_2(poly p1, poly p2);
-static int f_comp_c_2(poly p1, poly p2);
-static int f_comp_2_c(poly p1, poly p2);
-static int f_comp_2i(poly p1, poly p2);
-static int f_comp_c_2i(poly p1, poly p2);
-static int f_comp_2i_c(poly p1, poly p2);
-static int f_comp_2i_1(poly p1, poly p2);
-static int f_comp_c_2i_1(poly p1, poly p2);
-static int f_comp_2i_1_c(poly p1, poly p2);
+static int f_comp_otEXP_nwONE(poly p1, poly p2);
+static int f_comp_otCOMPEXP_nwONE(poly p1, poly p2);
+static int f_comp_otEXPCOMP_nwONE(poly p1, poly p2);
+static int f_comp_otEXP_nwTWO(poly p1, poly p2);
+static int f_comp_otCOMPEXP_nwTWO(poly p1, poly p2);
+static int f_comp_otEXPCOMP_nwTWO(poly p1, poly p2);
+static int f_comp_otEXP_nwEVEN(poly p1, poly p2);
+static int f_comp_otCOMPEXP_nwEVEN(poly p1, poly p2);
+static int f_comp_otEXPCOMP_nwEVEN(poly p1, poly p2);
+static int f_comp_otEXP_nwODD(poly p1, poly p2);
+static int f_comp_otCOMPEXP_nwODD(poly p1, poly p2);
+static int f_comp_otEXPCOMP_nwODD(poly p1, poly p2);
 
 #define Mreturn(d, multiplier)                      \
@@ -245 +245 @@
 }                                               
   
-// comp_1 is used if pVariables1W == 1 and component is compatible with ordering
-static int f_comp_1(poly p1, poly p2)  
+// comp_nwONE is used if pVariables1W == 1 and component is compatible with ordering
+static int f_comp_otEXP_nwONE(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_1(p1, p2, d, goto NotEqual, return 0);
+  _pMonComp_otEXP_nwONE(p1, p2, d, goto NotEqual, return 0);
 
   NotEqual:
@@ -257 +257 @@
 }
 
-// comp_1_c is used if pVariables1W == 1, priority is given to exponents,
+// comp_otEXPCOMP_nwONE is used if pVariables1W == 1, priority is given to exponents,
 // component is incompatible with ordering
-static int f_comp_1_c(poly p1, poly p2)  
+static int f_comp_otEXPCOMP_nwONE(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_1_c(p1, p2, d, goto NotEqual , return 0);
+  _pMonComp_otEXPCOMP_nwONE(p1, p2, d, goto NotEqual , return 0);
 
   NotEqual:
@@ -270 +270 @@
 }
 
-// comp_1_c is used if pVariables1W == 1, priority is given to component,
+// comp_otEXPCOMP_nwONE is used if pVariables1W == 1, priority is given to component,
 // component is incompatible with ordering
-static int f_comp_c_1(poly p1, poly p2)  
+static int f_comp_otCOMPEXP_nwONE(poly p1, poly p2)  
 {
   register long d = pGetComp(p2) - pGetComp(p1);
@@ -278 +278 @@
   d = pGetOrder(p1) - pGetOrder(p2);
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_1(p1, p2, d, goto NotEqual , return 0);
+  _pMonComp_otEXP_nwONE(p1, p2, d, goto NotEqual , return 0);
   
   NotEqual:
@@ -284 +284 @@
 }
 
-// comp_2 is used if pVariables1W == 2 and component is compatible with ordering
-static int f_comp_2(poly p1, poly p2)  
+// comp_nwTWO is used if pVariables1W == 2 and component is compatible with ordering
+static int f_comp_otEXP_nwTWO(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2(p1, p2, d, goto NotEqual , return 0);
+  _pMonComp_otEXP_nwTWO(p1, p2, d, goto NotEqual , return 0);
 
   NotEqual:
@@ -296 +296 @@
 }
 
-// comp_2_c is used if pVariables1W == 2, priority is given to exponents,
+// comp_otEXPCOMP_nwTWO is used if pVariables1W == 2, priority is given to exponents,
 // component is incompatible with ordering
-static int f_comp_2_c(poly p1, poly p2)  
+static int f_comp_otEXPCOMP_nwTWO(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2_c(p1, p2, d, goto NotEqual, return 0);
+  _pMonComp_otEXPCOMP_nwTWO(p1, p2, d, goto NotEqual, return 0);
 
   NotEqual:
@@ -309 +309 @@
 }
 
-// comp_2_c is used if pVariables1W == 2, priority is given to component,
+// comp_otEXPCOMP_nwTWO is used if pVariables1W == 2, priority is given to component,
 // component is incompatible with ordering
-static int f_comp_c_2(poly p1, poly p2)  
+static int f_comp_otCOMPEXP_nwTWO(poly p1, poly p2)  
 {
   register long d = pGetComp(p2) - pGetComp(p1);
@@ -317 +317 @@
   d = pGetOrder(p1) - pGetOrder(p2);
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2(p1, p2, d, goto NotEqual , return 0);
+  _pMonComp_otEXP_nwTWO(p1, p2, d, goto NotEqual , return 0);
   
   NotEqual:
@@ -323 +323 @@
 }
 
-// comp_2i is used if pVariables1W == 2*i and component is compatible
+// comp_nwEVEN is used if pVariables1W == 2*i and component is compatible
 // with ordering
-static int f_comp_2i(poly p1, poly p2)  
+static int f_comp_otEXP_nwEVEN(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2i(p1, p2, pVariables1W, d, goto NotEqual , return 0);
+  _pMonComp_otEXP_nwEVEN(p1, p2, pVariables1W, d, goto NotEqual , return 0);
 
   NotEqual:
@@ -336 +336 @@
 }
 
-// comp_2i_c is used if pVariables1W == 2*i, priority is given to exponents,
+// comp_otEXPCOMP_nwEVEN is used if pVariables1W == 2*i, priority is given to exponents,
 // component is incompatible with ordering
-static int f_comp_2i_c(poly p1, poly p2)  
+static int f_comp_otEXPCOMP_nwEVEN(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2i_c(p1, p2, pVariables1W, d, goto NotEqual , return 0);
+  _pMonComp_otEXPCOMP_nwEVEN(p1, p2, pVariables1W, d, goto NotEqual , return 0);
 
   NotEqual:
@@ -349 +349 @@
 }
 
-// comp_2i_c is used if pVariables1W == 2*i, priority is given to component,
+// comp_otEXPCOMP_nwEVEN is used if pVariables1W == 2*i, priority is given to component,
 // component is incompatible with ordering
-static int f_comp_c_2i(poly p1, poly p2)  
+static int f_comp_otCOMPEXP_nwEVEN(poly p1, poly p2)  
 {
   register long d = pGetComp(p2) - pGetComp(p1);
@@ -357 +357 @@
   d = pGetOrder(p1) - pGetOrder(p2);
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2i(p1, p2, pVariablesW, d, goto NotEqual, return 0);
+  _pMonComp_otEXP_nwEVEN(p1, p2, pVariablesW, d, goto NotEqual, return 0);
   
   NotEqual:
@@ -363 +363 @@
 }
 
-// comp_2i_1 is used if pVariables1W == 2*i and component is compatible
+// comp_nwODD is used if pVariables1W == 2*i and component is compatible
 // with ordering
-static int f_comp_2i_1(poly p1, poly p2)  
+static int f_comp_otEXP_nwODD(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
 
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2i_1(p1, p2, pVariables1W, d, goto NotEqual, return 0);
+  _pMonComp_otEXP_nwODD(p1, p2, pVariables1W, d, goto NotEqual, return 0);
 
   NotEqual:
@@ -376 +376 @@
 }
 
-// comp_2i_1_c is used if pVariables1W == 2*i, priority is given to exponents,
+// comp_otEXPCOMP_nwODD is used if pVariables1W == 2*i, priority is given to exponents,
 // component is incompatible with ordering
-static int f_comp_2i_1_c(poly p1, poly p2)  
+static int f_comp_otEXPCOMP_nwODD(poly p1, poly p2)  
 {
   register long d = pGetOrder(p1) - pGetOrder(p2);
@@ -387 +387 @@
   }
   
-  _pMonCmp_2i_1_c(p1, p2, pVariables1W, d, goto NotEqual , return 0);
+  _pMonComp_otEXPCOMP_nwODD(p1, p2, pVariables1W, d, goto NotEqual , return 0);
   
   NotEqual:
@@ -393 +393 @@
 }
 
-// comp_c_2i_1 is used if pVariables1W == 2*i, priority is given to component,
+// comp_otCOMPEXP_nwODD is used if pVariables1W == 2*i, priority is given to component,
 // component is incompatible with ordering
-static int f_comp_c_2i_1(poly p1, poly p2)  
+static int f_comp_otCOMPEXP_nwODD(poly p1, poly p2)  
 {
   register long d = pGetComp(p2) - pGetComp(p1);
@@ -401 +401 @@
   d = pGetOrder(p1) - pGetOrder(p2);
   if (d) Mreturn(d, pOrdSgn);
-  _pMonCmp_2i_1(p1, p2, pVariablesW, d, goto NotEqual, return 0);
+  _pMonComp_otEXP_nwODD(p1, p2, pVariablesW, d, goto NotEqual, return 0);
   
   NotEqual:
@@ -417 +417 @@
 pCompProc t_pComp0;
 
-static int t_comp_c_1(poly p1, poly p2);
-static int t_comp_1_c(poly p1, poly p2);
-static int t_comp_lex_c_i(poly p1, poly p2);
-static int t_comp_c_lex_i(poly p1, poly p2);
-static int t_comp_revlex_c_i(poly p1, poly p2);
-static int t_comp_c_revlex_i(poly p1, poly p2);
+static int t_comp_otCOMPEXP_nwONE(poly p1, poly p2);
+static int t_comp_otEXPCOMP_nwONE(poly p1, poly p2);
+static int t_comp_lex_otCOMPEXP_i(poly p1, poly p2);
+static int t_comp_otCOMPEXP_lex_i(poly p1, poly p2);
+static int t_comp_revlex_otCOMPEXP_i(poly p1, poly p2);
+static int t_comp_otCOMPEXP_revlex_i(poly p1, poly p2);
 
 inline long LexComp(poly p1, poly p2)
@@ -446 +446 @@
 }
 
-static int t_comp_c_1(poly p1, poly p2)
+static int t_comp_otCOMPEXP_nwONE(poly p1, poly p2)
 {
   NonZeroR(pGetComp(p1) - pGetComp(p2),
@@ -454 +454 @@
 }
 
-static int t_comp_1_c(poly p1, poly p2)
+static int t_comp_otEXPCOMP_nwONE(poly p1, poly p2)
 {
   NonZeroR(pGetOrder(p1) - pGetOrder(p2), return pOrdSgn, return -pOrdSgn);
@@ -462 +462 @@
 }
 
-static int t_comp_lex_c_i(poly p1, poly p2)
+static int t_comp_lex_otCOMPEXP_i(poly p1, poly p2)
 {
   NonZeroR(pGetComp(p1) - pGetComp(p2),
@@ -471 +471 @@
 }
 
-static int t_comp_lex_i_c(poly p1, poly p2)
+static int t_comp_otEXPCOMP_lex_i(poly p1, poly p2)
 {
   NonZeroR(pGetOrder(p1) - pGetOrder(p2), return pOrdSgn, return -pOrdSgn);
@@ -480 +480 @@
 }
 
-static int t_comp_revlex_c_i(poly p1, poly p2)
+static int t_comp_revlex_otCOMPEXP_i(poly p1, poly p2)
 {
   NonZeroR(pGetComp(p1) - pGetComp(p2),
@@ -489 +489 @@
 }
 
-static int t_comp_revlex_i_c(poly p1, poly p2)
+static int t_comp_otEXPCOMP_revlex_i(poly p1, poly p2)
 {
   NonZeroR(pGetOrder(p1) - pGetOrder(p2), return pOrdSgn, return -pOrdSgn);
@@ -1297 +1297 @@
   if (pVariables <= 1)
   {
-    t_pComp0 = t_comp_1_c;
+    t_pComp0 = t_comp_otEXPCOMP_nwONE;
   }
   else
@@ -1309 +1309 @@
         case ringorder_Ws:
         case ringorder_ls:
-          t_pComp0 = t_comp_lex_i_c;
+          t_pComp0 = t_comp_otEXPCOMP_lex_i;
           pLexSgn = 1;
           break;
@@ -1322 +1322 @@
         default:
 #endif      
-          t_pComp0 = t_comp_revlex_i_c;
+          t_pComp0 = t_comp_otEXPCOMP_revlex_i;
           pLexSgn = -1;
           break;
@@ -1355 +1355 @@
         {
           if (pVariables1W == 1)
-            f_pComp0 = f_comp_1_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwONE;
           else if (pVariables1W == 2)
-            f_pComp0 = f_comp_2_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwTWO;
           else if (pVariables1W & 1)
-            f_pComp0 = f_comp_2i_1_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwODD;
           else
-            f_pComp0 = f_comp_2i_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwEVEN;
         }
         else
         {
           if (pVariables1W == 1)
-            f_pComp0 = f_comp_1;
+            f_pComp0 = f_comp_otEXP_nwONE;
           else if (pVariables1W == 2)
-            f_pComp0 = f_comp_2;
+            f_pComp0 = f_comp_otEXP_nwTWO;
           else if (pVariables1W & 1)
-            f_pComp0 = f_comp_2i_1;
+            f_pComp0 = f_comp_otEXP_nwODD;
           else
-            f_pComp0 = f_comp_2i;
+            f_pComp0 = f_comp_otEXP_nwEVEN;
         }
         break;
@@ -1390 +1390 @@
         {
           if (pVariables1W == 1)
-            f_pComp0 = f_comp_1_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwONE;
           else if (pVariables1W == 2)
-            f_pComp0 = f_comp_2_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwTWO;
           else if (pVariables1W & 1)
-            f_pComp0 = f_comp_2i_1_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwODD;
           else
-            f_pComp0 = f_comp_2i_c;
+            f_pComp0 = f_comp_otEXPCOMP_nwEVEN;
         }
         else
         {
           if (pVariables1W == 1)
-            f_pComp0 = f_comp_1;
+            f_pComp0 = f_comp_otEXP_nwONE;
           else if (pVariables1W == 2)
-            f_pComp0 = f_comp_2;
+            f_pComp0 = f_comp_otEXP_nwTWO;
           else if (pVariables1W & 1)
-            f_pComp0 = f_comp_2i_1;
+            f_pComp0 = f_comp_otEXP_nwODD;
           else
-            f_pComp0 = f_comp_2i;
+            f_pComp0 = f_comp_otEXP_nwEVEN;
         }
 #ifdef PDEBUG
@@ -1488 +1488 @@
   if (pVariables <= 1)
   {
-    t_pComp0 = t_comp_c_1;
+    t_pComp0 = t_comp_otCOMPEXP_nwONE;
   }
   else
@@ -1500 +1500 @@
         case ringorder_Ws:
         case ringorder_ls:
-          t_pComp0 = t_comp_lex_c_i;
+          t_pComp0 = t_comp_lex_otCOMPEXP_i;
           pLexSgn = 1;
           break;
@@ -1513 +1513 @@
         default:
 #endif      
-          t_pComp0 = t_comp_revlex_c_i;
+          t_pComp0 = t_comp_revlex_otCOMPEXP_i;
           pLexSgn = -1;
           break;
@@ -1543 +1543 @@
         pLexSgn = -1;
         if (pVariablesW == 1)
-          f_pComp0 = f_comp_c_1;
+          f_pComp0 = f_comp_otCOMPEXP_nwONE;
         else if (pVariablesW == 2)
-          f_pComp0 = f_comp_c_2;
+          f_pComp0 = f_comp_otCOMPEXP_nwTWO;
         else if (pVariablesW & 1)
-          f_pComp0 = f_comp_c_2i_1;
+          f_pComp0 = f_comp_otCOMPEXP_nwODD;
         else
-          f_pComp0 = f_comp_c_2i;
+          f_pComp0 = f_comp_otCOMPEXP_nwEVEN;
         break;
         
@@ -1564 +1564 @@
         pLexSgn = 1;
         if (pVariablesW == 1)
-          f_pComp0 = f_comp_c_1;
+          f_pComp0 = f_comp_otCOMPEXP_nwONE;
         else if (pVariablesW == 2)
-          f_pComp0 = f_comp_c_2;
+          f_pComp0 = f_comp_otCOMPEXP_nwTWO;
         else if (pVariablesW & 1)
-          f_pComp0 = f_comp_c_2i_1;
+          f_pComp0 = f_comp_otCOMPEXP_nwODD;
         else
-          f_pComp0 = f_comp_c_2i;
+          f_pComp0 = f_comp_otCOMPEXP_nwEVEN;
 #ifdef PDEBUG
         break;
@@ -3141 +3141 @@
 
 #ifdef COMP_STATISTICS
-static int s_comp_lp_c_1(poly p1, poly p2)  
+static int s_comp_lp_otCOMPEXP_1(poly p1, poly p2)  
 {
   MonomCountTotal++;
@@ -3159 +3159 @@
 
 #ifdef COMP_STATISTICS
-static int s_comp_lp_c_i(poly p1, poly p2)  
+static int s_comp_lp_otCOMPEXP_i(poly p1, poly p2)  
 {
   MonomCountTotal++;

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.15 1998-02-16 09:46:55 Singular Exp $ */
+/* $Id: ring.cc,v 1.16 1998-03-16 14:56:40 obachman Exp $ */
 
 /*
@@ -1665 +1665 @@
   return res;
 }
+
+rOrderType_t rGetOrderType(ring r)
+{
+  // check for simple ordering
+  if ((r->order[0] == ringorder_unspec) ||
+      ((r->order[2] == 0) &&
+       (r->order[1] != ringorder_M &&
+        r->order[0] != ringorder_M)))
+  {
+    if ((r->order[1]==ringorder_c)||(r->order[1]==ringorder_C))
+    {
+      return rOrderType_ExpComp;
+    }
+    else
+    {
+      assume((r->order[0]==ringorder_c)||(r->order[0]==ringorder_C));
+      return rOrderType_CompExp;
+    }
+  }
+  else 
+    return rOrderType_General;
+}

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.8 1998-01-12 18:59:58 obachman Exp $ */
+/* $Id: ring.h,v 1.9 1998-03-16 14:56:41 obachman Exp $ */
 
 /* includes */
@@ -67 +67 @@
 };
 
+typedef enum rOrderType_t
+{
+  rOrderType_General = 0, // non-simple ordering as specified by currRing
+  rOrderType_CompExp,     // simple ordering, component has priority 
+  rOrderType_ExpComp,     // simple ordering, exponent vector has priority
+  rOrderType_Exp,         // simple ordering, no components involved
+  rOrderType_Syz,         // syzygy ordering
+  rOrderType_Schreyer     // Schreyer ordering
+} rOrderType_t;
+
+rOrderType_t rGetOrderType(ring r);
+
 #ifdef RDEBUG
 extern short rNumber;

Singular/spSpolyLoop.cc

@@ -16 +16 @@
 #include "spSpolyLoop.h"
 
-// used in routines where component is not handled as a special case
-static int LoopVariablesW;
-
-static void spPSpolyLoop_1(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_1(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_1_c(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2_c(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_c(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_1_c(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_1(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_2(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_2i(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_2i_1(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_1_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_1_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_2_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_2i_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_c_2i_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_1_homog(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2_homog(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_homog(poly p1, poly p2, poly m, poly spNoether);
-static void spPSpolyLoop_2i_1_homog(poly p1, poly p2, poly m, poly spNoether);
-#ifdef TEST_MAC_ORDER
-static void spLoop_mac_1(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_1(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_1_c(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_1_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2_c(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_c(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_1_c(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_2i_1_c_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_1(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_1_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_2(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_2_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_2i(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_2i_Syz(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_2i_1(poly p1, poly p2, poly m, poly spNoether);
-static void spLoop_mac_c_2i_1_Syz(poly p1, poly p2, poly m, poly spNoether);
+
+#ifndef DO_DEEP_PROFILE
+// undefine to disable fast spoly loops
+#define FAST_SPOLY_LOOP 
 #endif
 
-extern int maxBound;
-
 /***************************************************************
  *
- * Sets the used spoly loop in the strategy
+ * General spoly loop which always works
+ *
+ * assume monom = L(monom)
+ * pNext(monom) = result = a2-a1*monom
+ * do not destroy a1, but a2
  *
  ***************************************************************/
-#ifndef DO_DEEP_PROFILE
-#define FAST_SPOLY_LOOP
+#if 1
+void spSpolyLoop_General 
+(poly a1, poly a2, poly monom, poly spNoether)
+{ 
+  poly a = monom,                         // collects the result
+       b = pNew(),                        // stores a1*monom
+       c;                                 // used for temporary storage
+  number tm   = pGetCoeff(monom),         // coefficient of monom
+         tneg = nNeg(nCopy(tm)), // - (coefficient of monom)
+         tb;                              // used for tm*coeff(a1)
+
+  
+  if (a2==NULL) goto Finish; // we are done if a2 is 0
+
+  pCopyAddFast(b, a1, monom);  // now a2 != NULL -- set up b
+
+  // MAIN LOOP:
+  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
+    register long d;
+    if ((d = pComp0(b, a2))) goto NotEqual; else goto Equal;;
+
+  Equal:   // b equals a2
+    tb = nMult(pGetCoeff(a1), tm);
+    if (!nEqual(pGetCoeff(a2), tb))
+    {
+      pSetCoeff0(a2,nSub(pGetCoeff(a2), tb)); // adjust coeff of a2
+      a = pNext(a) = a2; // append a2 to result and advance a2
+      pIter(a2);
+    }
+    else
+    { // coeffs are equal, so their difference is 0: 
+      c = a2;  // do not append anything to result: Delete a2 and advance
+      pIter(a2);
+      nDelete(&pGetCoeff(c));
+      pFree1(c);
+    }
+    nDelete(&tb);
+    pIter(a1);
+    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
+    pCopyAddFast(b, a1, monom); // No! So, get new b = a1*monom
+    goto Top;
+
+  NotEqual:     // b != a2 
+    if (d < 0)  // b < a2: 
+    {
+      a = pNext(a) = a2;// append a2 to result and advance a2
+      pIter(a2);
+      if (a2==NULL) goto Finish;;
+      goto Top;
+    }
+    else // now d >= 0, i.e., b > a2
+    {
+      pSetCoeff0(b,nMult(pGetCoeff(a1), tneg));
+      a = pNext(a) = b;       // append b to result and advance a1
+      pIter(a1);
+      b = pNew();
+      if (a1 == NULL) goto Finish; // are we done?
+      pCopyAddFast(b, a1, monom); // No! So, update b = a1*monom
+      goto Top;
+    }
+ 
+ Finish: // a1 or a2 is NULL: Clean-up time
+   if (a1 == NULL) // append rest of a2 to result
+     pNext(a) = a2;
+   else  // append (- a1*monom) to result 
+     spGMultCopyX(a1, monom, a, tneg, spNoether);
+   nDelete(&tneg);
+   pFree1(b);
+} 
+#else
+extern void spGSpolyLoop(poly a1, poly a2, poly m,poly spNoether);
+void spSpolyLoop_General 
+(poly a1, poly a2, poly m,poly spNoether)
+{
+  spGSpolyLoop(a1, a2, m, spNoether);
+}
 #endif
 
-spSpolyLoopProc spSetPSpolyLoop(ring r, int syzComp, int ak, BOOLEAN homog)
-{
+
+/***************************************************************
+ *
+ * Fst spoly loops 
+ *
+ ***************************************************************/
 #ifdef FAST_SPOLY_LOOP
-  // check for oredering with one real block only
-  if ((r->order[0] == ringorder_unspec)  ||
-      (r->order[2] == 0 &&
-       r->order[0] != ringorder_M && r->order[1] != ringorder_M))
-  {
-    // check whether components play a role
-    if (ak == 0 && syzComp == 0)
-    {
-      int or;
-      if (r->order[0] != ringorder_C && r->order[0] != ringorder_c)
-        or = r->order[0];
-      else
-        or = r->order[1];
-
-      LoopVariablesW = pVariablesW;
-      if (homog || or == ringorder_lp || or == ringorder_ls)
-      {
-        // wee do not need to compare the order field for the
-        // omogenous case and for non-degree orderings
-        if (LoopVariablesW == 1)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_1_homog;
-            //else
-              return spLoop_mac_1;
-          }
-          #endif
-          return spPSpolyLoop_1_homog;
-        }
-        else if (LoopVariablesW == 2)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_2_homog;
-            //else
-              return spLoop_mac_2;
-          }
-          #endif
-          return spPSpolyLoop_2_homog;
-        }
-        else if (LoopVariablesW & 1)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_2i_1_homog;
-            //else
-              return spLoop_mac_2i_1;
-          }
-          #endif
-          return spPSpolyLoop_2i_1_homog;
-        }
-        else
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_2i_homog;
-            //else
-              return spLoop_mac_2i;
-          }
-          #endif
-          return spPSpolyLoop_2i_homog;
-        }
-      }
-      else
-      {
-        // no, components are not involved
-        if (LoopVariablesW == 1)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_1_homog;
-            //else
-              return spLoop_mac_1;
-          }
-          #endif
-          return spPSpolyLoop_1;
-        }
-        else if (LoopVariablesW == 2)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_2_homog;
-            //else
-              return spLoop_mac_2;
-          }
-          #endif
-          return spPSpolyLoop_2;
-        }
-        else if (LoopVariablesW & 1)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_2i_1_homog;
-            //else
-              return spLoop_mac_2i_1;
-          }
-          #endif
-          return spPSpolyLoop_2i_1;
-        }
-        else
-        {
-          #ifdef TEST_MAC_ORDER
-          if (or==ringorder_dp)
-          {
-            //if (homog)
-            //  return spLoop_mac_2i_homog;
-            //else
-              return spLoop_mac_2i;
-          }
-          #endif
-          return spPSpolyLoop_2i;
-        }
-      }
-    }
-    else
-    {
-      // components are invloved
-      // check for priority to exponents
-      LoopVariablesW = pVariables1W;
-      if ((r->order[1]==ringorder_c)||(r->order[1]==ringorder_C) ||
-          (r->order[0] == ringorder_unspec))
-      {
-        switch(r->order[0])
-        {
-            case ringorder_dp:
-              #ifdef TEST_MAC_ORDER
-              //LoopVariablesW = pVariables1W;
-              if (r->order[1] == ringorder_C)
-              {
-                if (LoopVariablesW == 1)
-                  return (syzComp ?
-                          spLoop_mac_1_c_Syz :
-                          spLoop_mac_1_c);
-                else if (LoopVariablesW == 2)
-                  return (syzComp ?
-                          spLoop_mac_2_c_Syz :
-                          spLoop_mac_2_c);
-                else if (LoopVariablesW & 1)
-                  return (syzComp ?
-                          spLoop_mac_2i_1_c_Syz :
-                          spLoop_mac_2i_1_c);
-                else
-                  return (syzComp ?
-                          spLoop_mac_2i_c_Syz :
-                          spLoop_mac_2i_c);
-              }
-              else
-              {
-                if (LoopVariablesW == 1)
-                  return (syzComp ?
-                          spLoop_mac_1_Syz :
-                          spLoop_mac_1);
-                else if (LoopVariablesW == 2)
-                  return (syzComp ?
-                          spLoop_mac_2_Syz :
-                          spLoop_mac_2);
-                else if (LoopVariablesW & 1)
-                  return (syzComp ?
-                          spLoop_mac_2i_1_Syz :
-                          spLoop_mac_2i_1);
-                else
-                  return (syzComp ?
-                          spLoop_mac_2i_Syz :
-                          spLoop_mac_2i);
-              }
-              #endif
-            case ringorder_wp:
-            case ringorder_ds:
-            case ringorder_ws:
-            case ringorder_ls:
-            case ringorder_unspec:
-
-              if (r->order[1] == ringorder_C ||
-                  r->order[0] == ringorder_unspec)
-              {
-                if (LoopVariablesW == 1)
-                  return (syzComp ?
-                          spPSpolyLoop_1_c_Syz :
-                          spPSpolyLoop_1_c);
-                else if (LoopVariablesW == 2)
-                  return (syzComp ?
-                          spPSpolyLoop_2_c_Syz :
-                          spPSpolyLoop_2_c);
-                else if (LoopVariablesW & 1)
-                  return (syzComp ?
-                          spPSpolyLoop_2i_1_c_Syz :
-                          spPSpolyLoop_2i_1_c);
-                else
-                  return (syzComp ?
-                          spPSpolyLoop_2i_c_Syz :
-                          spPSpolyLoop_2i_c);
-              }
-              else
-              {
-                //LoopVariablesW = pVariables1W;
-                if (LoopVariablesW == 1)
-                  return (syzComp ?
-                          spPSpolyLoop_1_Syz :
-                          spPSpolyLoop_1);
-                else if (LoopVariablesW == 2)
-                  return (syzComp ?
-                          spPSpolyLoop_2_Syz :
-                          spPSpolyLoop_2);
-                else if (LoopVariablesW & 1)
-                  return (syzComp ?
-                          spPSpolyLoop_2i_1_Syz :
-                          spPSpolyLoop_2i_1);
-                else
-                  return (syzComp ?
-                          spPSpolyLoop_2i_Syz :
-                          spPSpolyLoop_2i);
-              }
-#ifdef PDEBUG
-            case ringorder_lp:
-            case ringorder_Dp:
-            case ringorder_Wp:
-            case ringorder_Ds:
-            case ringorder_Ws:
-#else
-            default:
-#endif
-              if (r->order[1] == ringorder_c)
-              {
-                if (LoopVariablesW == 1)
-                  return (syzComp ?
-                          spPSpolyLoop_1_c_Syz :
-                          spPSpolyLoop_1_c);
-                else if (LoopVariablesW == 2)
-                  return (syzComp ?
-                          spPSpolyLoop_2_c_Syz :
-                          spPSpolyLoop_2_c);
-                else if (LoopVariablesW & 1)
-                  return (syzComp ?
-                          spPSpolyLoop_2i_1_c_Syz :
-                          spPSpolyLoop_2i_1_c);
-                else
-                  return (syzComp ?
-                          spPSpolyLoop_2i_c_Syz :
-                          spPSpolyLoop_2i_c);
-              }
-              else
-              {
-                //LoopVariablesW = pVariables1W;
-                if (LoopVariablesW == 1)
-                  return (syzComp ?
-                          spPSpolyLoop_1_Syz : spPSpolyLoop_1);
-                else if (LoopVariablesW == 2)
-                  return (syzComp ?
-                          spPSpolyLoop_2_Syz : spPSpolyLoop_2);
-                else if (LoopVariablesW & 1)
-                  return (syzComp ?
-                          spPSpolyLoop_2i_1_Syz :
-                          spPSpolyLoop_2i_1);
-                else
-                  return (syzComp ?
-                          spPSpolyLoop_2i_Syz :
-                          spPSpolyLoop_2i);
-              }
-#ifdef PDEBUG
-            default:
-              Werror("wrong internal ordering:%d at %s, l:%d\n",r->order[0],__FILE__,__LINE__);
-              return NULL;
-#endif
-        }
-      }
-      else if (r->order[0] == ringorder_c || r->order[0] == ringorder_C)
-      {
-        if (LoopVariablesW == 1)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (r->order[1] == ringorder_dp)
-          {
-            return (syzComp ?
-                  spLoop_mac_c_1_Syz : spLoop_mac_c_1);
-          }
-          #endif
-          return (syzComp ?
-                  spPSpolyLoop_c_1_Syz : spPSpolyLoop_c_1);
-        }
-        else if (LoopVariablesW == 2)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (r->order[1] == ringorder_dp)
-          {
-            return (syzComp ?
-                  spLoop_mac_c_2_Syz : spLoop_mac_c_2);
-          }
-          #endif
-          return (syzComp ?
-                  spPSpolyLoop_c_2_Syz : spPSpolyLoop_c_2);
-        }
-        else if (LoopVariablesW & 1)
-        {
-          #ifdef TEST_MAC_ORDER
-          if (r->order[1] == ringorder_dp)
-          {
-            return (syzComp ?
-                  spLoop_mac_c_2i_1_Syz : spLoop_mac_c_2i_1);
-          }
-          #endif
-          return (syzComp ?
-                  spPSpolyLoop_c_2i_1_Syz : spPSpolyLoop_c_2i_1);
-        }
-        else
-        {
-          #ifdef TEST_MAC_ORDER
-          if (r->order[1] == ringorder_dp)
-          {
-            return (syzComp ?
-                  spLoop_mac_c_2i_Syz : spLoop_mac_c_2i);
-          }
-          #endif
-          return (syzComp ?
-                  spPSpolyLoop_c_2i_Syz : spPSpolyLoop_c_2i);
-        }
-      }
-      else
-        return spPSpolyLoop_General;
-    }
-  }
-  else
-#endif // FAST_SPOLY_LOOP
-    return spPSpolyLoop_General;
-}
-
-spSpolyLoopProc spSetSpolyLoop(ring r, int syzComp, int ak, BOOLEAN homog)
-{
-  if (r->ch > 0)
-  {
-    return spSetPSpolyLoop(r, syzComp, ak, homog);
-  }
-  else return NULL;
-}
-
-/***************************************************************
- *
- * The general case
- *
- ***************************************************************/
-void spPSpolyLoop_General(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-  loop
-  {
-    c = pComp0(b, a2);
-    if (c == -1)
-    {
-      a = pNext(a) = a2;
-      pIter(a2);
-      if (a2==NULL)
-      {
-        pFree1(b);
-        spMultCopyX(a1, m, a, tneg,spNoether);
-        return;
-      }
-    }
-    else if (c == 1)
-    {
-      pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-      a = pNext(a) = b;
-      pIter(a1);
-      if (a1!=NULL)
-      {
-        b = pNew();
-        pCopyAddFast(b, a1, m);
-      }
-      else
-      {
-        pNext(a) = a2;
-        return;
-      }
-    }
-    else
-    {
-      tb = npMultM(pGetCoeff(a1),tm);
-      if (!npEqualM(pGetCoeff(a2),tb))
-      {
-        pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-        a = pNext(a) = a2;
-        pIter(a2);
-      }
-      else
-      {
-        s = a2;
-        pIter(a2);
-        pFree1(s);
-      }
-      pIter(a1);
-      if (a1==NULL)
-      {
-        pFree1(b);
-        pNext(a) = a2;
-        return;
-      }
-      if (a2==NULL)
-      {
-        pFree1(b);
-        spMultCopyX(a1, m, a, tneg,spNoether);
-        return;
-      }
-      pCopyAddFast(b, a1, m);
-    }
-  }
-}
-
-/***************************************************************
- *
- * comp != 0 cases
- *
- ***************************************************************/
+
 #define NonZeroA(d, multiplier, actionE)        \
 {                                               \
@@ -542 +133 @@
 }                                               \
 while(0)
-
-static void spPSpolyLoop_1(poly a1, poly a2, poly m,poly spNoether)
+#include "spSpolyLoop.inc" // the loops and spGetSpolyLoop
+
+#endif // FAST_SPOLY_LOOP
+
+
+spSpolyLoopProc spGetSpolyLoop(ring r, rOrderType_t rot, BOOLEAN homog)
 {
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
+#ifdef FAST_SPOLY_LOOP
+  Characteristics ch = chGEN;
+  OrderingTypes ot = otGEN;
+  Homogs hom = homGEN;
+  NumWords nw = nwGEN;
+  spSpolyLoopProc spolyloop;
+  int Variables1W;
+
+  // set characterisic
+  if (r->ch > 0) ch = chMODP;
+  
+  // set Ordering Type
+  switch (rot)
+  {   
+    rOrderType_Exp:
+    ot = otEXP;
+    break;
+    
+    rOrderType_CompExp:
+    ot = otCOMPEXP;
+    break;
+    
+    rOrderType_ExpComp:
+    ot = otEXPCOMP;
+    break;
+
+      default:
+        ot = otGEN;
+        break;
+  }
+  
+  // set homogenous
+  if (homog) hom = homYES;
+  
+  // set NumWords
+  if ((((r->N+1)*sizeof(Exponent_t)) % sizeof(void*)) == 0)
+    Variables1W = (r->N+1)*sizeof(Exponent_t) / sizeof(void*);
+  else
+    Variables1W = ((r->N+1)*sizeof(Exponent_t) / sizeof(void*)) + 1;
+  if (Variables1W > 2)
   {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
+    if (Variables1W & 1)
+      nw = nwODD;
+    else
+      nw = nwEVEN;
   }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_1(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
+  else 
   {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
+    if (Variables1W == 2)
+      nw = nwTWO;
+    else
+      nw = nwONE;
   }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
+  
+  // GetSpolyLoop   
+  spolyloop = spGetSpolyLoop(ch, ot, hom, nw);
+  if (spolyloop != NULL) return  spolyloop;
+  // still here? -- no special spolyloop found, return the general loop
+#endif // FAST_SPOLY_LOOP
+  return spSpolyLoop_General;
 }
 
-static void spPSpolyLoop_1_c(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_1_c(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-   NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_1(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetComp(a2) - pGetComp(b);
-  NonZeroTestA(d, pComponentOrder, goto NotEqual);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_1(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-  a = pNext(a) = a2;
-  pIter(a2);
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  goto Top;
-  }
-
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-   NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2_c(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2_c(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-   NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_2(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetComp(a2) - pGetComp(b);
-  NonZeroTestA(d, pComponentOrder, goto NotEqual);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-  a = pNext(a) = a2;
-  pIter(a2);
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  goto Top;
-  }
-
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i(b, a2, LoopVariablesW, d,
-             NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-   NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_c(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_c(b, a2, pVariables1W, d,
-               NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-   NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_2i(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetComp(a2) - pGetComp(b);
-  NonZeroTestA(d, pComponentOrder, goto NotEqual);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i(b, a2, pVariablesW,
-             d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-  a = pNext(a) = a2;
-  pIter(a2);
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  goto Top;
-  }
-
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_1(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_1(b, a2, LoopVariablesW, d,
-               NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_1_c(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_1_c(b, a2, pVariables1W,
-                 d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-   NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_2i_1(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  d = pGetComp(a2) - pGetComp(b);
-  NonZeroTestA(d, pComponentOrder, goto NotEqual);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_1(b, a2, pVariablesW,
-               d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-  a = pNext(a) = a2;
-  pIter(a2);
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  goto Top;
-  }
-
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-
-/***************************************************************
- *
- * Syzygies orderings
- *
- ***************************************************************/
-#define _SyzComp(p1, p2, actionG, actionS)      \
-do                                              \
-{                                               \
-  if (pGetComp(p1) <= maxBound)                 \
-  {                                             \
-    if (pGetComp(p2) > maxBound) actionG;       \
-  }                                             \
-  else if (pGetComp(p2)<=maxBound) actionS;     \
-}                                               \
-while(0)
-
-#define _SyzComp_d(p1, p2, d, actionG, actionS) \
-do                                              \
-{                                               \
-  Exponent_t c1 = pGetComp(p1);                 \
-  Exponent_t c2 = pGetComp(p2);                 \
-  d = c2 -c1;                                   \
-  if (d)                                        \
-  {                                             \
-    if (c1 <= maxBound)                         \
-    {                                           \
-      if (c2 > maxBound) actionG;               \
-    }                                           \
-    else                                        \
-    {                                           \
-      if (c2 <= maxBound) actionS;              \
-    }                                           \
-    d ^= pComponentOrder;                       \
-    if (d < 0) actionS;                         \
-    actionG;                                    \
-  }                                             \
-}                                               \
-while(0)
-
-static void spPSpolyLoop_1_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_1(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-     }
-     goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-
-}
-
-static void spPSpolyLoop_1_c_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_1_c(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-     }
-     goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-
-}
-
-static void spPSpolyLoop_c_1_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-
-  _SyzComp_d(b, a2, d, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_1(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-     }
-     goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2_c_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2_c(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_2_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp_d(b, a2, d, goto Greater, goto Smaller);
-
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-     }
-     goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i(b, a2, LoopVariablesW, d,
-             NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_c_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_c(b, a2, pVariables1W, d,
-               NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_2i_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp_d(b, a2, d, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i(b, a2, pVariablesW,
-             d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-     }
-     goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_1_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b, a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_1(b, a2, LoopVariablesW, d,
-             NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_1_c_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp(b,a2, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_1_c(b, a2, pVariables1W, d,
-               NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_c_2i_1_Syz(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-  _SyzComp_d(b, a2, d, goto Greater, goto Smaller);
-  d = pGetOrder(b) - pGetOrder(a2);
-  NonZeroTestA(d, pOrdSgn, goto NotEqual);
-  _pMonCmp_2i_1(b, a2, pVariablesW,
-             d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d < 0)
-  {
-    Smaller:
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >=  0
-  Greater:
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-/***************************************************************
- *
- * Comp == 0, homogenous case (i.e. no order comparisons)
- *
- ***************************************************************/
-
-static void spPSpolyLoop_1_homog(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast1(b, a1, m);
-
-  Top:
-  register long d;
-
-  _pMonCmp_1(b, a2, d, goto NotEqual, goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast1(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  d ^= pLexSgn;
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast1(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2_homog(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast1(b, a1, m);
-
-  Top:
-  register long d;
-
-  _pMonCmp_2(b, a2, d, goto NotEqual, goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast1(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  d ^= pLexSgn;
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast1(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_homog(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast1(b, a1, m);
-
-  Top:
-  register long d;
-
-  _pMonCmp_2i(b, a2, pVariablesW, d,
-             goto NotEqual, goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast1(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  d ^= pLexSgn;
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast1(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-static void spPSpolyLoop_2i_1_homog(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    spMultCopyX(a1, m, m, tneg,spNoether);
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast1(b, a1, m);
-
-  Top:
-  register long d;
-  _pMonCmp_2i_1(b, a2, pVariablesW, d, goto NotEqual, goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    spMultCopyX(a1, m, a, tneg,spNoether);
-    return;
-  }
-  pCopyAddFast1(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  d ^= pLexSgn;
-  if (d < 0)
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      spMultCopyX(a1, m, a, tneg,spNoether);
-      return;
-    }
-    goto Top;
-  }
-
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast1(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    return;
-  }
-  goto Top;
-}
-
-/***************************************************************
- *
- * The Macaulay-order case
- *
- ***************************************************************/
-#ifdef TEST_MAC_ORDER
-/*2
-* assume m = L(m) and Lc(m) = exp
-* pNext(n) = result = p*m
-* do not destroy p
-*/
-inline void bMultCopyX(poly p, poly m, poly n, number exp)
-{
-#ifdef PDEBUG
-  poly pp=n;
-#endif
-  poly a = n;
-  do
-  {
-    pNext(a) = pNew();
-    a = pNext(a);
-    spMemcpy(a,p);
-    pbMonAddFast(a,m);
-    pSetCoeff0(a,npMultM(pGetCoeff(p),exp));
-    pIter(p);
-  }
-  while (p!=NULL);
-  pNext(a) = NULL;
-  pTest(pp);
-}
-
-/*2
-* assume m = L(m) and Lc(m) = exp
-* pNext(n) = result = p*m
-* do not destroy p
-*/
-inline void bMultCopyX0(poly p, poly m, poly n, number exp)
-{
-  poly a = n;
-  do
-  {
-    pNext(a) = pNew();
-    a = pNext(a);
-    spMemcpy(a,p);
-    pbMonAddFast0(a,m);
-    pSetCoeff0(a,npMultM(pGetCoeff(p),exp));
-    pIter(p);
-  }
-  while (p!=NULL);
-  pNext(a) = NULL;
-}
-
-
-// no components involved
-void spLoop_mac_1(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    //bMultCopyX(a1, m, m, tneg);
-    spMultCopyX(a1, m, m, tneg,NULL);
-    pTest(pNext(m));
-    return;
-  }
-  a = m;
-  b = pNew();
-  pCopyAddFast(b, a1, m);
-
-  Top:
-  register long d;
-
-
-  if ((pGetOrder(b)<0) && (pGetOrder(a2)<0)) goto Top0;
-
-  //d = (long long)pGetOrder(b) - (long long)pGetOrder(a2);
-  //NonZeroTestA(d, 1 /*pOrdSgn*/, goto NotEqual);
-  if (pGetOrder(b) > pGetOrder(a2)) { goto C_1; /*d=1; goto NotEqual;*/ }
-  else if (pGetOrder(b) < pGetOrder(a2)) { goto C_M1; /*d=-1; goto NotEqual;*/ }
-
-  // now pGetOrder(b)==pGetOrder(a2):
-  _pMonCmp_1(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);
-
-  Equal:
-  tb = npMultM(pGetCoeff(a1),tm);
-  if (!npEqualM(pGetCoeff(a2),tb))
-  {
-    pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-    a = pNext(a) = a2;
-    pIter(a2);
-  }
-  else
-  {
-    s = a2;
-    pIter(a2);
-    pFree1(s);
-  }
-  pIter(a1);
-  if (a1==NULL)
-  {
-    pFree1(b);
-    pNext(a) = a2;
-    pTest(pNext(m));
-    return;
-  }
-  if (a2==NULL)
-  {
-    pFree1(b);
-    //bMultCopyX(a1, m, a, tneg);
-    spMultCopyX(a1, m, a, tneg,NULL);
-    pTest(pNext(m));
-    return;
-  }
-  pCopyAddFast(b, a1, m);
-  goto Top;
-
-  NotEqual: // i.e., b smaller than a2
-  if (d >= 0) goto C_1;
-  C_M1:
-  {
-    a = pNext(a) = a2;
-    pIter(a2);
-    if (a2==NULL)
-    {
-      pFree1(b);
-      //bMultCopyX(a1, m, a, tneg);
-      spMultCopyX(a1, m, a, tneg,NULL);
-    pTest(pNext(m));
-      return;
-    }
-    goto Top;
-  }
-
-  C_1:
-  // now d >= 0, i.e., b greater than a2
-  pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-  a = pNext(a) = b;
-  pIter(a1);
-  if (a1!=NULL)
-  {
-    b = pNew();
-    pCopyAddFast(b, a1, m);
-  }
-  else
-  {
-    pNext(a) = a2;
-    pTest(pNext(m));
-    return;
-  }
-  goto Top;
-
-
-  // below degree limit =================================================
-  Top0:
-  if (pGetOrder(b) > pGetOrder(a2))      { goto C_1_0; }
-  else if (pGetOrder(b) < pGetOrder(a2)) { goto C_M1_0; }
-
-
-  //Equal0:
-    {
-      tb = npMultM(pGetCoeff(a1),tm);
-      if (!npEqualM(pGetCoeff(a2),tb))
-      {
-        pSetCoeff0(a2,npSubM(pGetCoeff(a2),tb));
-        a = pNext(a) = a2;
-        pIter(a2);
-      }
-      else
-      {
-        s = a2;
-        pIter(a2);
-        pFree1(s);
-      }
-      pIter(a1);
-      if (a1==NULL)
-      {
-        pFree1(b);
-        pNext(a) = a2;
-        return;
-      }
-      if (a2==NULL)
-      {
-        pFree1(b);
-        bMultCopyX(a1, m, a, tneg);
-        return;
-      }
-      pbCopyAddFast0(b, a1, m);
-    }
-    goto Top0;
-
-  C_M1_0:  // b < a2
-    {
-      a = pNext(a) = a2;
-      pIter(a2);
-      if (a2==NULL)
-      {
-        pFree1(b);
-        bMultCopyX(a1, m, a, tneg);
-        return;
-      }
-    }
-    goto Top0;
-
-  C_1_0:  // b >a2
-    {
-      pSetCoeff0(b,npMultM(pGetCoeff(a1),tneg));
-      a = pNext(a) = b;
-      pIter(a1);
-      if (a1!=NULL)
-      {
-        b = pNew();
-        pbCopyAddFast0(b, a1, m);
-      }
-      else
-      {
-        pNext(a) = a2;
-        return;
-      }
-    }
-  goto Top0;
-}
-void spLoop_mac_2(poly a1, poly a2, poly m,poly spNoether)
-{
-  poly a, b, s;
-  number tm = pGetCoeff(m);
-  number tneg,tb;
-  int c;
-
-  tneg = npNegM(tm);
-  if (a2==NULL)
-  {
-    bMultCopyX(a1, m, m, tneg);
-    //spMultCopyX(a1, m, m, tneg,NULL);
-    pTest(pNext(m));
-    return;
-  }