Changeset 7d27c2 in git

Timestamp:

Mar 15, 2016, 11:44:33 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7eb464ef99fa9bcf027942ff701df2156a895acf

Parents:

23812d3dd3a69ed0874b01c271d1908acd7f0f055656667e687146a40c18764c718fd74005adf0be

Message:

Merge pull request #752 from adipopescu/Dimension_Integers

fix: dim int crash

Files:

• Makefile.am (modified) (1 diff)
• Singular/LIB/help.cnf (modified) (1 diff)
• Singular/emacs.cc (modified) (1 diff)
• Singular/extra.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/maps_ip.cc (modified) (4 diffs)
• Singular/misc_ip.cc (modified) (3 diffs)
• Singular/subexpr.cc (modified) (1 diff)
• Tst/New/dim_integers.res.gz.uu (modified) (1 diff)
• Tst/New/dim_integers.stat (modified) (1 diff)
• Tst/New/dim_integers.tst (modified) (1 diff)
• Tst/Short/bug_tr753.res.gz.uu (added)
• Tst/Short/bug_tr753.stat (added)
• Tst/Short/bug_tr753.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/general.doc (modified) (previous)
• factory/cf_inline.cc (modified) (1 diff)
• kernel/GBEngine/kstd1.cc (modified) (1 diff)
• kernel/GBEngine/syz.h (modified) (1 diff)
• kernel/GBEngine/tgb_internal.h (modified) (4 diffs)
• kernel/combinatorics/hutil.h (modified) (1 diff)
• kernel/ideals.cc (modified) (1 diff)
• libpolys/coeffs/Makefile.am (modified) (2 diffs)
• libpolys/coeffs/flintcf_Q.cc (modified) (1 diff)
• libpolys/coeffs/flintcf_Zn.cc (added)
• libpolys/coeffs/flintcf_Zn.h (added)
• libpolys/coeffs/gnumpc.cc (modified) (3 diffs)
• libpolys/coeffs/longrat.cc (modified) (42 diffs)
• libpolys/coeffs/longrat0.cc (modified) (4 diffs)
• libpolys/coeffs/modulop.cc (modified) (8 diffs)
• libpolys/coeffs/rintegers.cc (modified) (2 diffs)
• libpolys/coeffs/rmodulon.cc (modified) (3 diffs)
• libpolys/polys/flintconv.cc (modified) (2 diffs)
• libpolys/polys/flintconv.h (modified) (3 diffs)
• libpolys/polys/mod_raw.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (3 diffs)
• libpolys/polys/simpleideals.cc (modified) (2 diffs)
• libpolys/polys/sparsmat.cc (modified) (1 diff)
• libpolys/polys/templates/p_Procs_Dynamic.cc (modified) (3 diffs)
• libpolys/polys/templates/p_Procs_Generate.cc (modified) (6 diffs)
• libpolys/polys/templates/p_Procs_Impl.h (modified) (15 diffs)
• libpolys/polys/templates/p_Procs_Set.h (modified) (5 diffs)
• omalloc/omallocClass.cc (modified) (2 diffs)
• omalloc/omallocClass.h (modified) (2 diffs)
• resources/feResource.cc (modified) (1 diff)
• resources/omFindExec.c (modified) (6 diffs)
• xalloc/Makefile.am (modified) (1 diff)
• xalloc/README (modified) (1 diff)
• xalloc/configure.ac (modified) (3 diffs)
• xalloc/omalloc.h (modified) (2 diffs)
• xalloc/omallocClass.cc (added)
• xalloc/omallocClass.h (added)

Makefile.am

@@ -5 +5 @@
 endif
 
-SUBDIRS = resources omalloc xalloc $(USE_FACTORY) \
+SUBDIRS = resources omalloc $(USE_FACTORY) \
 libpolys gfanlib IntegerProgramming \
 kernel Singular \

Singular/LIB/help.cnf

@@ -33 +33 @@
 galeon!xDhE:galeon:!galeon -n %h &
 netscape!xDhE:netscape:!(netscape -remote "openURL(%h)")||(netscape %h) &
-cygwin!xhE:cygstart:!cygstart "%h" &
+cygwin!xhE:cygstart:!cygstart "%f" &
 cygwin-www!E:cygstart:!cygstart "%H" &
 safari!xhE:/Applications/Safari.app:!open -a /Applications/Safari.app %h

Singular/emacs.cc

@@ -202 +202 @@
   if (emacs == NULL)
   {
-    error( "Error: Can't find emacs xterm program. \n Expected it at %s or %s\n Specify alternative with --xterm=PROGRAM option,\n or set ESINGULAR_EMACS environment variable to the name of the program to use as xterm.\n",
+  #ifdef __CYGWIN__
+    error( "Error: Can't find rxvt program. \n Expected it at %s or %s\n Specify alternative with --rxvt=PROGRAM option,\n or set RXVT environment variable to the name of the program to use as xterm.\n",
+  #else
+    error( "Error: Can't find xterm program. \n Expected it at %s or %s\n Specify alternative with --xterm=PROGRAM option,\n or set XTERM environment variable to the name of the program to use as xterm.\n",
+  #endif
            feResourceDefault('X'));
     mainUsage();

Singular/extra.cc

@@ -976 +976 @@
   /* =================== LLL via Flint ==============================*/
   #ifdef HAVE_FLINT
-  #ifdef FLINT_VER_2_4_5
+  #if __FLINT_RELEASE >= 20500
     if (strcmp(sys_cmd, "LLL_Flint") == 0)
     {

Singular/iparith.cc

@@ -4057 +4057 @@
     }
     ideal vv = id_Head(vid,currRing);
-    int j;
-    long d = 0;
+    idSkipZeroes(vv);
+    int j = idPosConstant(vv);
+    long d;
+    if(j == -1)
+    {
+      d = (long)scDimInt(vv, currRing->qideal);
+      if(rField_is_Ring_Z(currRing))
+        d++;
+    }
+    else
+    {
+      if(n_IsUnit(pGetCoeff(vv->m[j]),currRing->cf))
+        d = -1;
+      else
+        d = (long)scDimInt(vv, currRing->qideal);
+    }
     //Anne's Idea for std(4,2x) = 0 bug
     long dcurr = d;
     for(i=0;i<idSize(vv);i++)
     {
-      if(!n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf))
+      if(vv->m[i] != NULL && !n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf))
       {
         ideal vc = idCopy(vv);
@@ -4086 +4100 @@
           dcurr++;
         }
-        if(dcurr > d)
+        idDelete(&vc);
+      }
+      if(dcurr > d)
           d = dcurr;
-        idDelete(&vc);
-      }
-      else
-      {
-        if(idPosConstant(vv)!= -1)
-        {
-          dcurr = -1;
-        }
-      }
     }
     res->data = (char *)d;

Singular/maps_ip.cc

@@ -25 +25 @@
 // #include <kernel/longalg.h>
 
+#include <misc/options.h>
 #include <kernel/GBEngine/kstd1.h>
 #include <kernel/maps/gen_maps.h>
@@ -49 +50 @@
                      int *perm, int *par_perm, int P, nMapFunc nMap)
 {
+  BOOLEAN use_mult=FALSE;
+#ifdef HAVE_PLURAL
+  if ((what==IMAP_CMD)
+  && rIsPluralRing(currRing)
+  && rIsPluralRing(preimage_r))
+  {
+    assume(perm!=NULL);
+    int i=1;
+    while((i<currRing->N)&&(perm[i]==0)) i++;
+    if (i<currRing->N)
+    {
+      int prev_nonnull=i;
+      i++;
+      for(;i<=currRing->N;i++)
+      {
+        if (perm[prev_nonnull] > perm[i])
+        {
+          if (TEST_V_ALLWARN)
+          {
+            Warn("imap not usable for permuting variables, use map (%s <-> %s)",currRing->names[prev_nonnull-1],currRing->names[i-1]);
+          }
+          use_mult=TRUE;
+          break;
+        }
+        else
+          prev_nonnull=i;
+      }
+    }
+  }
+#endif
   int i;
   int N = preimage_r->N;
@@ -103 +134 @@
       else
         if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
-        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
+        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P,use_mult);
       else /*if (what==MAP_CMD)*/
       {
@@ -144 +175 @@
         {
           m->m[i]=p_PermPoly(((ideal)data)->m[i],perm,preimage_r,currRing,
-                          nMap,par_perm,P);
+                          nMap,par_perm,P,use_mult);
           pTest(m->m[i]);
         }

Singular/misc_ip.cc

@@ -28 +28 @@
 #include <coeffs/OPAEp.h>
 #include <coeffs/flintcf_Q.h>
+#include <coeffs/flintcf_Zn.h>
 
 #include <polys/ext_fields/algext.h>
@@ -1192 +1193 @@
   }
 }
+#ifdef HAVE_FLINT
+static n_coeffType n_FlintZn=n_unknown;
+static BOOLEAN ii_FlintZn_init(leftv res,leftv a)
+{
+  if ((a->Typ()!=INT_CMD)
+  ||(a->next==NULL)
+  ||(a->next->Typ()!=STRING_CMD))
+  {
+    WerrorS("`int`i,`string` expected");
+    return TRUE;
+  }
+  else
+  {
+    flintZn_struct p;
+    p.ch=(int)(long)a->Data();
+    p.name=(char*)a->next->Data();
+    res->rtyp=CRING_CMD;
+    res->data=(void*)nInitChar(n_FlintZn,(void*)&p);
+    return FALSE;
+  }
+}
+#endif
 #endif
 /*2
@@ -1316 +1339 @@
       IDDATA(h)=(char*)nInitChar(t,NULL);
     }
+    n_FlintZn=nRegister(n_unknown,flintZn_InitChar);
+    if (n_FlintZn!=n_unknown)
+    {
+      iiAddCproc("kernel","flintZ",FALSE,ii_FlintZn_init);
+    }
     #endif
   }

Singular/subexpr.cc

@@ -787 +787 @@
         case CNUMBER_CMD:
           return n2String((number2)d,typed);
+        case CRING_CMD:
+          return nCoeffString((coeffs)d);
+        case CMATRIX_CMD:
+          {
+            bigintmat *b=(bigintmat*)d;
+            return b->String();
+          }
         #endif
 

Tst/New/dim_integers.res.gz.uu

@@ -1 +1 @@
 begin 664 dim_integers.res.gz
-M'XL("&,DX%8``V1I;5]I;G1E9V5R<RYR97,`E97/;YLP%(#O^2M>JQT2!='X
-M9T#1.$S;H5JU2ZL==JE(<3(K!"K;9)"_?J8;X!2G34\\/3\]?W[^+.X?OM[^
-M``"4P-WM%[@VVH2Y7%^OP$:/LI!F.EM-VB\D"61R;W-&;(7282'^A-JD9G+_
-MOP=.H(])"#<W\/!;:`&I$J#+O0`CM-&P*14\E?OGRLAB"]]5E>=M8U%H618:
-MR@W(3*2YC0Y"0;==WYEVG6$CE390%@*D!F,3I9);6:0YK*NMW:8J,E@W\%/N
-MC-WR3AS2(BL/>M<T8"/X=DCAEU#'OC,+!WX>@FKQ%'SN$((ZR)Y7?<4R^<<)
-MTI;0`-?#4I2\)+7)IG(VI..7`;8IF*`NBQ9)>QY+?'5EQZ*4>#*@A*YR8UL,
-M92B$G;234GT_Y,P;$0_OM`Z:F<N,J,O,ZX`VPQKS0B/N0.,^:P__FB9R:.)+
-M:/#BE`8MYG5CD?`<#U@8>;$P]LT2DQ$6I@,69F>P@N,I&'?!HCI`N`E0=!P*
-MEGZHR($B?38>09'%`$7095`$GT+A>=-RD3G"Q\!._TCG<8V'<N)%)-1WG82-
-M$;F#N'00IQTCIK/3%T&BLR^"Q%X:NO#=(D4C&NJH3LDYFI%A]`W?J=]WZO6=
-MCGVGCN\TOAB)72(]\TO/O-*SL?3,D9ZQM]A>2<;>,Y_YS6=>\]G8?.Z8S]$'
-GR/C'].=^_;E7?S[6GSOZ<ZM_^S-L_W65GJ+9ZM/D+^%-K`PW!P``
+M'XL("(S<YU8``V1I;5]I;G1E9V5R<RYR97,`G9;/3]LP%(#O_!5O:(>61B7^
+MF5@5/4S;`0WM`MIA%Q2HZ2Q*@N*T:_K7S^E([&"7-CO5<OS\OO?\)>[MW=?K
+M'P"`YG!S_07.*UU-5^KA?`9F=*]R58W&L[/F%^9S6*@7,U?)I2SU-)=_IKK*
+MJK/;MSWP'+HQF<+E)=S]EEI"5DK0Q8N$2NI*PU-1PF/Q\KJN5+Z$[^5ZM6HV
+MEKE61:ZA>`*UD-G*C#:RA#9=MS-M=X8G5>H*BER"TE"9B:)42Y5G*WA8+TV:
+M=;Z`AQI^JN?*I+R1FRQ?%!O]7-=@1O!MD\$O6>ZZG=G4\O,IE`U>"5<M0K2-
+M%J^S;D4R_\<)RBRA$=[:1^E\/ZFKQ4B-[;38-W`_A=I)%,^;<@SPIT^F*V4I
+M'RLHI5ZO*K.#78:F\*Q,H\IN.^2T&Y$`[F@;U6,7&5$7F6\C6MMG+,B,N&7&
+MW:0I_3U,ZL"(4V!PW(=!\61;&R(\P98*HR`5QH%.8N)186JI,#M`%>WZ7-SE
+M2K<1PG6$TIU=D(294LM$NDGA,9'8,A%T&A/!?28\J1LL,D%X%YG>[^A$;+%=
+M3H*$A`;.DC"?D#N$B4,X:A$Q'?=?!I(>?!F(",+0.'"$%'DPU+&<DD,PGEWT
+M`]5I6'4:4IWZJE-'=2I.)F*G^,["OK.0[\SWG3F^,_81VCO!V#'I65AZ%I*>
+M^=)S1WJ.!H#Q8>;SL/D\9#[WS>>.^3QD?L/8YVL;T#":9R:!^9I?7,!]<R?E
+MA2$Q5TU6FHLHTTK;T^/"#<0#(I.X'QG%`V*1&QM'@_)B-Y8/B23]K$-"J7=(
+M";.'E'37])4U*0J]?DGRGP>5I#Z!L`1I?("@]WU,W_J^][(E,`AQMP![65+B
+M9*%^%A0'RDQ9.%%73LK]1(F3*/VH'+M,'*E'Q%X:@6P:@4^L1Y`C]0A?$.$(
+M(@X)TCL>T9?C!$%MH0,_`#;P2`M1[+40Q;:%*#8M;/ZB-__`UWJ$QK//9W\!
+(B3=:A,T+````
 `
 end

Tst/New/dim_integers.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:122040
-1 >> tst_memory_1 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
-1 >> tst_memory_2 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
-1 >> tst_timer_1 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:4
+1 >> tst_memory_0 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:122432
+1 >> tst_memory_1 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
+1 >> tst_memory_2 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
+1 >> tst_timer_1 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:4

Tst/New/dim_integers.tst

@@ -65 +65 @@
 kill r;
 
+ring r = (integer),(x),dp;
+dim(ideal(x));
+dim(ideal(2x));
+dim(ideal(2x,0));
+dim(ideal(0,2x));
+dim(ideal(6x));
+dim(ideal(0,x));
+kill r;
+
+ring r=(integer,2,4),(x,y),dp;
+dim(ideal(x));
+kill r;
+
+ring r=(integer,2,4),x,dp;
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,10),(x,y),dp;
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,2,4),x,dp; 
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,10),(x,y),dp;
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,2,4),x,dp;
+dim(ideal(x,x));
+dim(ideal(x));
+dim(std(ideal(x)));
+kill r;
+
 tst_status(1);$

Tst/Short/ok_s.lst

@@ -57 +57 @@
 bug_tr739
 bug_tr745
+bug_tr753
 bug_genus_etc
 conv_bi

configure.ac

@@ -227 +227 @@
 
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([xalloc/Makefile])
 AC_CONFIG_FILES([kernel/Makefile])
 AC_CONFIG_FILES([kernel/numeric/Makefile])

factory/cf_inline.cc

@@ -125 +125 @@
 CF_INLINE
 CanonicalForm::CanonicalForm ()
-    : value( CFFactory::basic( (long)0 ) )
+    : value( CFFactory::basic( 0L ) )
 {
 }

kernel/GBEngine/kstd1.cc

@@ -3370 +3370 @@
   else
   {
+    #ifdef HAVE_RINGS
     assume(strat->red == redEcart || strat->red == redRiloc);
+    #else
+    assume(strat->red == redEcart);
+    #endif
     if (strat->honey && (strat->syzComp==0))
       return TRUE;

kernel/GBEngine/syz.h

@@ -16 +16 @@
 // Logarithm of "distance" between a new component and prev component
 #define SYZ_SHIFT_BASE_LOG (BIT_SIZEOF_LONG - 1 - SYZ_SHIFT_MAX_NEW_COMP_ESTIMATE)
-#define SYZ_SHIFT_BASE (((long)1) << SYZ_SHIFT_BASE_LOG)
+#define SYZ_SHIFT_BASE (1L << SYZ_SHIFT_BASE_LOG)
 struct sSObject{
                  poly  p;

kernel/GBEngine/tgb_internal.h

@@ -1102 +1102 @@
          if (row->idx_array)
          {
-           if (!((coef==(number)(long) 1)||(coef==minus_one)))
+           if (!((coef==(number)1L)||(coef==minus_one)))
            {
              add_coef_times_sparse(temp_array,temp_size,row,coef);
@@ -1108 +1108 @@
            else
            {
-             if (coef==(number)(long) 1)
+             if (coef==(number)1L)
              {
                add_sparse(temp_array,temp_size,row);
@@ -1120 +1120 @@
          else
          //TODO: treat, 1,-1
-         if (!((coef==(number)(long) 1)||(coef==minus_one)))
+         if (!((coef==(number)1L)||(coef==minus_one)))
          {
           add_coef_times_dense(temp_array,temp_size,row->coef_array,row->len,coef);
@@ -1126 +1126 @@
          else
          {
-           if (coef==(number)(long)1)
+           if (coef==(number)1L)
              add_dense(temp_array,temp_size,row->coef_array,row->len);
            else

kernel/combinatorics/hutil.h

@@ -9 +9 @@
 
 class intvec;
-
-struct omBin_s   ; typedef struct omBin_s omBin_t ; typedef omBin_t * omBin;
 
 struct ip_sring  ; typedef struct ip_sring                          * ring;

kernel/ideals.cc

@@ -769 +769 @@
   SI_SAVE_OPT2(save2);
 
-  k=si_max((long)1,id_RankFreeModule(h1,currRing));
+  k=si_max(1L,id_RankFreeModule(h1,currRing));
 
   if ((k==1) && (!lift3)) si_opt_2 |=Sy_bit(V_IDLIFT);

libpolys/coeffs/Makefile.am

@@ -18 +18 @@
   modulop.cc mpr_complex.cc \
   bigintmat.cc  AE.cc OPAE.cc AEp.cc OPAEp.cc AEQ.cc OPAEQ.cc \
-  flintcf_Q.cc
+  flintcf_Q.cc flintcf_Zn.cc
 
 libcoeffs_la_SOURCES   = $(SOURCES)
@@ -27 +27 @@
   shortfl.h mpr_complex.h mpr_global.h numstats.h \
   bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h \
-  flintcf_Q.h
+  flintcf_Q.h flintcf_Zn.h
 
 libcoeffs_la_LIBADD = ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \

libpolys/coeffs/flintcf_Q.cc

@@ -71 +71 @@
 static void CoeffWrite(const coeffs r, BOOLEAN details)
 {
-  Print("// flint fmpq_poly\n");
-}
-BOOLEAN CoeffIsEqual(const coeffs r, n_coeffType n, void * parameter)
+  Print("// coefficients: flint fmpq_poly\n");
+}
+static BOOLEAN CoeffIsEqual(const coeffs r, n_coeffType n, void * parameter)
 {
   return (r->type==n);

libpolys/coeffs/gnumpc.cc

@@ -88 +88 @@
 
   if( i == 1 )
-    return (number)(new gmp_complex( (long)0, (long)1 ));
+    return (number)(new gmp_complex( 0L, 1L ));
 
   return NULL; // new gmp_complex( )  // 0?
@@ -100 +100 @@
   assume( getCoeffType(r) == ID );
 
-  gmp_complex* n= new gmp_complex( (long)i, (long)0 );
+  gmp_complex* n= new gmp_complex( (long)i, 0L );
 
   return (number)n;
@@ -388 +388 @@
   {
     s += N;
-    gmp_complex *aa=new gmp_complex((long)0,(long)1);
+    gmp_complex *aa=new gmp_complex(0L,1L);
     *a=(number)aa;
   }
   else
   {
-    *a=(number) new gmp_complex((long)1);
+    *a=(number) new gmp_complex(1L);
   }
   return s;

libpolys/coeffs/longrat.cc

@@ -113 +113 @@
 {
   assume(x->s==3);
-  if (mpz_cmp_si(x->z,(long)0)==0)
+  if (mpz_cmp_ui(x->z,0L)==0)
   {
     mpz_clear(x->z);
@@ -156 +156 @@
 
 #define MP_SMALL 1
-//#define mpz_isNeg(A) (mpz_cmp_si(A,(long)0)<0)
+//#define mpz_isNeg(A) (mpz_cmp_si(A,0L)<0)
 #define mpz_isNeg(A) ((A)->_mp_size<0)
 #define mpz_limb_size(A) ((A)->_mp_size)
@@ -306 +306 @@
     if (a->z[0]._mp_alloc==0)
       Print("!!longrat:n->alloc=0 in %s:%d\n",f,l);
-    if ((mpz_size1(a->n) ==1) && (mpz_cmp_si(a->n,(long)1)==0))
+    if ((mpz_size1(a->n) ==1) && (mpz_cmp_si(a->n,1L)==0))
     {
       Print("!!longrat:integer as rational in %s:%d\n",f,l);
@@ -477 +477 @@
     for (i=0;i<size;i++) dd[i] = qp[i];
     bl = 1-e;
-    nn = (mp_ptr)omAlloc(sizeof(mp_limb_t)*bl);
+    nn = (mp_ptr)omAlloc0(sizeof(mp_limb_t)*bl);
     nn[bl-1] = 1;
-    for (i=bl-2;i>=0;i--) nn[i] = 0;
     ndest = res->n;
     ndest->_mp_d = nn;
@@ -497 +496 @@
   dest->_mp_d = dd;
   dest->_mp_alloc = al;
-  if (negative) dest->_mp_size = -dest->_mp_size;
+  if (negative) mpz_neg(dest,dest);
 
   if (res->s==0)
@@ -674 +673 @@
 #endif
     n->s=1;
-    if ((long)a>0L)
-    {
-      mpz_init_set_si(n->z,(long)1);
+    if (((long)a)>0L)
+    {
+      mpz_init_set_si(n->z,1L);
       mpz_init_set_si(n->n,(long)SR_TO_INT(a));
     }
     else
     {
-      mpz_init_set_si(n->z,(long)-1);
+      mpz_init_set_si(n->z,-1L);
       mpz_init_set_si(n->n,(long)-SR_TO_INT(a));
     }
@@ -692 +691 @@
 #endif
   {
-    n->s=a->s;
     mpz_init_set(n->n,a->z);
     switch (a->s)
@@ -698 +696 @@
       case 0:
       case 1:
+              n->s=a->s;
               mpz_init_set(n->z,a->n);
               if (mpz_isNeg(n->n)) /* && n->s<2*/
@@ -704 +703 @@
                 mpz_neg(n->n,n->n);
               }
-              if (mpz_cmp_si(n->n,(long)1)==0)
+              if (mpz_cmp_ui(n->n,1L)==0)
               {
                 mpz_clear(n->n);
@@ -712 +711 @@
               break;
       case 3:
+              // i.e. |a| > 2^...
               n->s=1;
               if (mpz_isNeg(n->n)) /* && n->s<2*/
               {
                 mpz_neg(n->n,n->n);
-                mpz_init_set_si(n->z,(long)-1);
+                mpz_init_set_si(n->z,-1L);
               }
               else
               {
-                mpz_init_set_si(n->z,(long)1);
+                mpz_init_set_si(n->z,1L);
               }
               break;
@@ -961 +961 @@
   int p=IsPrime(ch);
   coeffs rr=NULL;
-  if ((long)p==ch)
+  if (((long)p)==ch)
   {
     rr = nInitChar(n_Zp,(void*)ch);
@@ -1058 +1058 @@
       {
         mpz_init_set(u->n,a->n);
-        if ((long)b>0L)
+        if (((long)b)>0L)
           mpz_mul_ui(u->n,u->n,SR_TO_INT(b));
         else
@@ -1087 +1087 @@
     mpz_neg(u->n,u->n);
   }
-  if (mpz_cmp_si(u->n,(long)1)==0)
+  if (mpz_cmp_si(u->n,1L)==0)
   {
     mpz_clear(u->n);
@@ -1124 +1124 @@
     if (x->s<2)
     {
-      if (mpz_cmp_si(x->n,(long)1)==0)
+      if (mpz_cmp_si(x->n,1L)==0)
       {
         x->s=3;
@@ -1314 +1314 @@
 {
   assume(x->s<2);
-  if (mpz_cmp_ui(x->z,(long)0)==0)
+  if (mpz_cmp_ui(x->z,0L)==0)
   {
     _nlDelete_NoImm(&x);
@@ -1344 +1344 @@
   else if (x->s==0)
   {
-    if (mpz_cmp_si(x->n,(long)1)==0)
+    if (mpz_cmp_si(x->n,1L)==0)
     {
       mpz_clear(x->n);
@@ -1356 +1356 @@
       mpz_gcd(gcd,x->z,x->n);
       x->s=1;
-      if (mpz_cmp_si(gcd,(long)1)!=0)
+      if (mpz_cmp_si(gcd,1L)!=0)
       {
         mpz_divexact(x->z,x->z,gcd);
         mpz_divexact(x->n,x->n,gcd);
-        if (mpz_cmp_si(x->n,(long)1)==0)
+        if (mpz_cmp_si(x->n,1L)==0)
         {
           mpz_clear(x->n);
@@ -1399 +1399 @@
   else
     mpz_gcd(gcd,a->z,b->n);
-  if (mpz_cmp_si(gcd,(long)1)!=0)
+  if (mpz_cmp_si(gcd,1L)!=0)
   {
     mpz_t bt;
@@ -1561 +1561 @@
     if (b->s!=0)
       return FALSE;
-    if (((long)a > 0L) && (mpz_isNeg(b->z)))
+    if ((((long)a) > 0L) && (mpz_isNeg(b->z)))
       return FALSE;
-    if (((long)a < 0L) && (!mpz_isNeg(b->z)))
+    if ((((long)a) < 0L) && (!mpz_isNeg(b->z)))
       return FALSE;
     mpz_t  bb;
@@ -1653 +1653 @@
   mpz_gcd(gcd,x->z,x->n);
   x->s=1;
-  if (mpz_cmp_si(gcd,(long)1)!=0)
+  if (mpz_cmp_si(gcd,1L)!=0)
   {
     mpz_divexact(x->z,x->z,gcd);
     mpz_divexact(x->n,x->n,gcd);
-    if (mpz_cmp_si(x->n,(long)1)==0)
+    if (mpz_cmp_si(x->n,1L)==0)
     {
       mpz_clear(x->n);
@@ -1692 +1692 @@
         mpz_add(u->z,b->z,x);
         mpz_clear(x);
-        if (mpz_cmp_ui(u->z,(long)0)==0)
+        if (mpz_cmp_ui(u->z,0L)==0)
         {
           mpz_clear(u->z);
@@ -1711 +1711 @@
       case 3:
       {
-        if ((long)a>0L)
+        if (((long)a)>0L)
           mpz_add_ui(u->z,b->z,SR_TO_INT(a));
         else
           mpz_sub_ui(u->z,b->z,-SR_TO_INT(a));
-        if (mpz_cmp_ui(u->z,(long)0)==0)
-        {
-          mpz_clear(u->z);
-          FREE_RNUMBER(u);
-          return INT_TO_SR(0);
-        }
         u->s = 3;
         u=nlShort3(u);
@@ -1747 +1741 @@
             mpz_clear(x);
 
-            if (mpz_cmp_ui(u->z,(long)0)==0)
+            if (mpz_cmp_ui(u->z,0L)==0)
             {
               mpz_clear(u->z);
@@ -1770 +1764 @@
             mpz_mul(u->z,b->z,a->n);
             mpz_add(u->z,u->z,a->z);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
+            if (mpz_cmp_ui(u->z,0L)==0)
             {
               mpz_clear(u->z);
@@ -1799 +1793 @@
             mpz_mul(u->z,a->z,b->n);
             mpz_add(u->z,u->z,b->z);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
+            if (mpz_cmp_ui(u->z,0L)==0)
             {
               mpz_clear(u->z);
@@ -1819 +1813 @@
           {
             mpz_add(u->z,a->z,b->z);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
-            {
-              mpz_clear(u->z);
-              FREE_RNUMBER(u);
-              return INT_TO_SR(0);
-            }
             u->s = 3;
             u=nlShort3(u);
@@ -1856 +1844 @@
       case 3:
       {
-        if ((long)b>0L)
+        if (((long)b)>0L)
           mpz_add_ui(a->z,a->z,SR_TO_INT(b));
         else
@@ -1893 +1881 @@
       case 3:
       {
-        if ((long)a>0L)
+        if (((long)a)>0L)
           mpz_add_ui(u->z,b->z,SR_TO_INT(a));
         else
@@ -1995 +1983 @@
         mpz_sub(u->z,x,b->z);
         mpz_clear(x);
-        if (mpz_cmp_ui(u->z,(long)0)==0)
+        if (mpz_cmp_ui(u->z,0L)==0)
         {
           mpz_clear(u->z);
@@ -2014 +2002 @@
       case 3:
       {
-        if ((long)a>0L)
+        if (((long)a)>0L)
         {
           mpz_sub_ui(u->z,b->z,SR_TO_INT(a));
@@ -2024 +2012 @@
           mpz_neg(u->z,u->z);
         }
-        if (mpz_cmp_ui(u->z,(long)0)==0)
-        {
-          mpz_clear(u->z);
-          FREE_RNUMBER(u);
-          return INT_TO_SR(0);
-        }
         u->s = 3;
         u=nlShort3(u);
@@ -2048 +2030 @@
         mpz_sub(u->z,a->z,x);
         mpz_clear(x);
-        if (mpz_cmp_ui(u->z,(long)0)==0)
+        if (mpz_cmp_ui(u->z,0L)==0)
         {
           mpz_clear(u->z);
@@ -2067 +2049 @@
       case 3:
       {
-        if ((long)b>0L)
+        if (((long)b)>0L)
         {
           mpz_sub_ui(u->z,a->z,SR_TO_INT(b));
@@ -2074 +2056 @@
         {
           mpz_add_ui(u->z,a->z,-SR_TO_INT(b));
-        }
-        if (mpz_cmp_ui(u->z,(long)0)==0)
-        {
-          mpz_clear(u->z);
-          FREE_RNUMBER(u);
-          return INT_TO_SR(0);
         }
         u->s = 3;
@@ -2108 +2084 @@
             mpz_clear(x);
             mpz_clear(y);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
+            if (mpz_cmp_ui(u->z,0L)==0)
             {
               mpz_clear(u->z);
@@ -2134 +2110 @@
             mpz_sub(u->z,a->z,x);
             mpz_clear(x);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
+            if (mpz_cmp_ui(u->z,0L)==0)
             {
               mpz_clear(u->z);
@@ -2166 +2142 @@
             mpz_sub(u->z,x,b->z);
             mpz_clear(x);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
+            if (mpz_cmp_ui(u->z,0L)==0)
             {
               mpz_clear(u->z);
@@ -2186 +2162 @@
           {
             mpz_sub(u->z,a->z,b->z);
-            if (mpz_cmp_ui(u->z,(long)0)==0)
-            {
-              mpz_clear(u->z);
-              FREE_RNUMBER(u);
-              return INT_TO_SR(0);
-            }
             u->s = 3;
             u=nlShort3(u);
@@ -2236 +2206 @@
     u->s=b->s;
     if (u->s==1) u->s=0;
-    if ((long)a>0L)
+    if (((long)a)>0L)
     {
       mpz_mul_ui(u->z,b->z,(unsigned long)SR_TO_INT(a));
@@ -2456 +2426 @@
   #else
   LONG ii=(LONG)i;
-  if ( (((long)ii==i) && ((ii << 3) >> 3) == ii )) n=INT_TO_SR(ii);
+  if ( ((((long)ii)==i) && ((ii << 3) >> 3) == ii )) n=INT_TO_SR(ii);
   else                                             n=nlRInit(i);
   #endif
@@ -2480 +2450 @@
   if (a==INT_TO_SR(0)) return TRUE;
   if ((SR_HDL(a) & SR_INT)||(a==NULL)) return FALSE;
-  if (mpz_cmp_si(a->z,(long)0)==0)
+  if (mpz_cmp_si(a->z,0L)==0)
   {
     printf("gmp-0 in nlIsZero\n");
@@ -2830 +2800 @@
   assume(!mpz_isNeg(P));
   if (mpz_isNeg(N))  mpz_add(N,N,P);
-  mpz_init_set_si(A,(long)0);
+  mpz_init_set_si(A,0L);
   mpz_init_set_ui(B,(unsigned long)1);
-  mpz_init_set_si(C,(long)0);
+  mpz_init_set_si(C,0L);
   mpz_init(D);
   mpz_init_set(E,P);
   number z=INT_TO_SR(0);
-  while(mpz_cmp_si(N,(long)0)!=0)
+  while(mpz_cmp_si(N,0L)!=0)
   {
     mpz_mul(tmp,N,N);

libpolys/coeffs/longrat0.cc

@@ -78 +78 @@
       s++;
       s = nlEatLong((char *)s, n);
-      if (mpz_cmp_si(n,(long)0)==0)
+      if (mpz_cmp_si(n,0L)==0)
       {
         WerrorS(nDivBy0);
@@ -84 +84 @@
         (*a)->s = 3;
       }
-      else if (mpz_cmp_si(n,(long)1)==0)
+      else if (mpz_cmp_si(n,1L)==0)
       {
         mpz_clear(n);
@@ -90 +90 @@
       }
     }
-    if (mpz_cmp_si(z,(long)0)==0)
+    if (mpz_cmp_si(z,0L)==0)
     {
       mpz_clear(z);
@@ -96 +96 @@
       *a=INT_TO_SR(0);
     }
-    else
-    if ((*a)->s==3)
+    else if ((*a)->s==3)
     {
       number nlShort3_noinline(number x);

libpolys/coeffs/modulop.cc

@@ -191 +191 @@
   n_Test(a, r);
 
-  return ((r->npPminus1M == (long)a)&&((long)1!=(long)a));
+  return ((r->npPminus1M == (long)a)&&(1L!=(long)a));
 }
 
@@ -270 +270 @@
 //    return nvDiv(a,b);
 //#endif
-  if ((long)a==0)
-    return (number)0;
+  if ((long)a==0L)
+    return (number)0L;
   number d;
 
 #ifndef HAVE_DIV_MOD
-  if ((long)b==0)
+  if ((long)b==0L)
   {
     WerrorS(nDivBy0);
-    return (number)0;
+    return (number)0L;
   }
 
@@ -298 +298 @@
   n_Test(c, r);
 
-  if ((long)c==0)
+  if ((long)c==0L)
   {
     WerrorS("1/0");
-    return (number)0;
+    return (number)0L;
   }
   number d = npInversM(c,r);
@@ -314 +314 @@
   n_Test(c, r);
 
-  if ((long)c==0) return c;
+  if ((long)c==0L) return c;
 
 #if 0
@@ -333 +333 @@
 
   //return (long)a != (long)b;
-  return (long)a > (long)b;
+  return ((long)a) > ((long)b);
 }
 
@@ -632 +632 @@
 BOOLEAN npDBTest (number a, const char *f, const int l, const coeffs r)
 {
-  if (((long)a<0) || ((long)a>r->ch))
+  if (((long)a<0L) || ((long)a>(long)r->ch))
   {
     Print("wrong mod p number %ld at %s,%d\n",(long)a,f,l);
@@ -879 +879 @@
 number nvDiv (number a,number b, const coeffs r)
 {
-  if ((long)a==0)
-    return (number)0;
-  else if ((long)b==0)
+  if ((long)a==0L)
+    return (number)0L;
+  else if ((long)b==0L)
   {
     WerrorS(nDivBy0);
-    return (number)0;
+    return (number)0L;
   }
   else
@@ -894 +894 @@
 number  nvInvers (number c, const coeffs r)
 {
-  if ((long)c==0)
+  if ((long)c==0L)
   {
     WerrorS(nDivBy0);
-    return (number)0;
+    return (number)0L;
   }
   return nvInversM(c,r);

libpolys/coeffs/rintegers.cc

@@ -567 +567 @@
   nrzWrite(x, NULL);
 #endif
-  if (mpz_cmp_ui((mpz_ptr) x,(long)0)==0)
+  if (mpz_cmp_ui((mpz_ptr) x,0L)==0)
   {
     mpz_clear((mpz_ptr)x);
@@ -1552 +1552 @@
 {
   if (SR_HDL(x) & SR_INT) return TRUE;
-  if (mpz_cmp_ui((mpz_ptr) x,(long)0)==0)
+  if (mpz_cmp_ui((mpz_ptr) x,0L)==0)
   {
     Print("gmp-0 %s:%d\n",f,l);

libpolys/coeffs/rmodulon.cc

@@ -81 +81 @@
 void    nrnCoeffWrite  (const coeffs r, BOOLEAN /*details*/)
 {
-  long l = (long)mpz_sizeinbase(r->modBase, 10) + 2;
+  size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) + 2;
   char* s = (char*) omAlloc(l);
   s= mpz_get_str (s, 10, r->modBase);
@@ -97 +97 @@
 static char* nrnCoeffString(const coeffs r)
 {
-  long l = (long)mpz_sizeinbase(r->modBase, 10) +2;
+  size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) +2;
   char* b = (char*) omAlloc(l);
   b= mpz_get_str (b, 10, r->modBase);
@@ -668 +668 @@
   mpz_init_set_si(rr, 0);
   mpz_gcd(g, (mpz_ptr)r->modNumber, (mpz_ptr)b); // g is now as above
-  if (mpz_cmp_si(g, (long)1) != 0) mpz_mod(rr, (mpz_ptr)a, g); // the case g <> 1
+  if (mpz_cmp_si(g, 1L) != 0) mpz_mod(rr, (mpz_ptr)a, g); // the case g <> 1
   mpz_clear(g);
   omFreeBin(g, gmp_nrz_bin);

libpolys/polys/flintconv.cc

@@ -12 +12 @@
 #include "flintconv.h"
 
-#ifdef FLINT_VER_2_4_5
+#ifdef HAVE_FLINT
+#if __FLINT_RELEASE >= 20500
 #include <coeffs/coeffs.h>
 #include <polys/monomials/p_polys.h>
@@ -25 +26 @@
 
 
-#ifdef HAVE_FLINT
 int convFlintISingI (fmpz_t f)
 {

libpolys/polys/flintconv.h

@@ -12 +12 @@
  * This file is work in progress and currently not part of the official Singular
  *
- * @note the code is garded by the undefined macro FLINT_VER_2_4_5
+ * @note the code is garded by the version test __FLINT_RELEASE >= 20500 (>=2.5)
  * In its current form it will never become an official part.
  * (conversion routines may be moved to other files/directories, etc.)
@@ -26 +26 @@
  **/
 
-//  Have to define this when this code shall be used:
-//#define FLINT_VER_2_4_5
-#ifdef FLINT_VER_2_4_5
+#ifdef HAVE_FLINT
+#include <flint/flint.h>
+
+#if __FLINT_RELEASE >= 20500
 #include <polys/matpol.h>
 #include <coeffs/bigintmat.h>
-// #include <polys/monomials/ring.h>
-
-
-#ifdef HAVE_FLINT
-#include <flint/flint.h>
 #include <flint/fmpz.h>
 #include <flint/fmpq.h>
@@ -49 +45 @@
 intvec* singflint_LLL(intvec* A, intvec* T);
 #endif
-
 #endif
 #endif

libpolys/polys/mod_raw.cc

@@ -50 +50 @@
 static BOOLEAN warn_proc = FALSE;
 #ifndef DL_TAIL
-#ifdef SING_NDEBUG
-#define DL_TAIL ".so"
-#else
 #define DL_TAIL ".so"
 //#define DL_TAIL "_g.so"
-#endif
 #endif
 

libpolys/polys/monomials/p_polys.cc

@@ -3925 +3925 @@
 */
 poly p_PermPoly (poly p, const int * perm, const ring oldRing, const ring dst,
-       nMapFunc nMap, const int *par_perm, int OldPar)
+       nMapFunc nMap, const int *par_perm, int OldPar, BOOLEAN use_mult)
 {
 #if 0
@@ -3938 +3938 @@
   assume(dst != NULL);
   assume(dst->cf != NULL);
+  #ifdef HAVE_PLURAL
+  poly tmp_mm=p_One(dst);
+  #endif
   while (p != NULL)
   {
@@ -3983 +3986 @@
             p_SetExp(qq, i, e, dst);
           else if (perm[i]>0)
+          {
+            #ifdef HAVE_PLURAL
+            if(use_mult)
+            {
+              p_SetExp(tmp_mm,perm[i],e,dst);
+              p_Setm(tmp_mm,dst);
+              qq=p_Mult_mm(qq,tmp_mm,dst);
+              p_SetExp(tmp_mm,perm[i],0,dst);
+
+            }
+            else
+            #endif
             p_AddExp(qq,perm[i], e/*p_GetExp( p,i,oldRing)*/, dst);
+          }
           else if (perm[i]<0)
           {
@@ -4124 +4140 @@
   PrintS("result: "); p_Write(result,dst,dst);
 #endif
+  #ifdef HAVE_PLURAL
+  p_LmDelete(&tmp_mm,dst);
+  #endif
   return result;
 }

libpolys/polys/monomials/p_polys.h

@@ -1915 +1915 @@
 
 poly p_PermPoly (poly p, const int * perm,const ring OldRing, const ring dst,
-                     nMapFunc nMap, const int *par_perm=NULL, int OldPar=0);
+                     nMapFunc nMap, const int *par_perm=NULL, int OldPar=0,
+                     BOOLEAN use_mult=FALSE);
 
 /*----------------------------------------------------*/

libpolys/polys/monomials/ring.h

@@ -359 +359 @@
 
 /// we must always have this test!
-static inline bool rIsPluralRing(const ring r)
+static inline BOOLEAN rIsPluralRing(const ring r)
 {
   assume(r != NULL); assume(r->cf != NULL);
@@ -366 +366 @@
   return (r != NULL) && ((n=r->GetNC()) != NULL) /*&& (n->type != nc_error)*/;
 #else
-  return false;
-#endif
-}
-
-static inline bool rIsRatGRing(const ring r)
+  return FALSE;
+#endif
+}
+
+static inline BOOLEAN rIsRatGRing(const ring r)
 {
   assume(r != NULL);
@@ -378 +378 @@
           && (r->real_var_start>1);
 #else
-  return false;
-#endif
-}
-
-
-
+  return FALSE;
+#endif
+}
 
 // The following are for LaScala3 only!

libpolys/polys/simpleideals.cc

@@ -1174 +1174 @@
       pIter(p);
       pNext(h)=NULL;
-      cp = si_max((long)1,p_GetComp(h, R));     // if used for ideals too
+      cp = si_max(1L,p_GetComp(h, R));     // if used for ideals too
       //cp = p_GetComp(h,R);
       p_SetComp(h,0,R);
@@ -1281 +1281 @@
   {
     p=F[i]=P[i];
-    cmax=si_max(cmax,(long)p_MaxComp(p,R));
+    cmax=si_max(cmax,p_MaxComp(p,R));
   }
   cmax++;

libpolys/polys/sparsmat.cc

@@ -511 +511 @@
   {
     res->m[i-1] = sm_Smpoly2Poly(m_res[i],_R);
-    res->rank=si_max(res->rank, (long)p_MaxComp(res->m[i-1],_R));
+    res->rank=si_max(res->rank, p_MaxComp(res->m[i-1],_R));
   }
   return res;

libpolys/polys/templates/p_Procs_Dynamic.cc

@@ -95 +95 @@
       case p_ShallowCopyDelete_Proc:
         return cast_A_to_vptr(p_ShallowCopyDelete__FieldGeneral_LengthGeneral_OrdGeneral);
-      case p_Mult_nn_Proc:
-        return cast_A_to_vptr(p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral);
-      case pp_Mult_nn_Proc:
-        return cast_A_to_vptr(pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral);
-      case pp_Mult_mm_Proc:
-        return cast_A_to_vptr(pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral);
-      case pp_Mult_mm_Noether_Proc:
-        return cast_A_to_vptr(pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral);
-      case p_Mult_mm_Proc:
-        return cast_A_to_vptr(p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Add_q_Proc:
         return cast_A_to_vptr(p_Add_q__FieldGeneral_LengthGeneral_OrdGeneral);
-      case p_Minus_mm_Mult_qq_Proc:
-        return cast_A_to_vptr(p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Neg_Proc:
         return cast_A_to_vptr(p_Neg__FieldGeneral_LengthGeneral_OrdGeneral);
-      case pp_Mult_Coeff_mm_DivSelect_Proc:
-        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral);
-      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
-        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Merge_q_Proc:
         return cast_A_to_vptr(p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_kBucketSetLm_Proc:
         return cast_A_to_vptr(p_kBucketSetLm__FieldGeneral_LengthGeneral_OrdGeneral);
+#ifdef HAVE_RINGS
+      case p_Mult_nn_Proc:
+        return cast_A_to_vptr(p_Mult_nn__RingGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_nn_Proc:
+        return cast_A_to_vptr(pp_Mult_nn__RingGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_mm_Proc:
+        return cast_A_to_vptr(pp_Mult_mm__RingGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_mm_Noether_Proc:
+        return cast_A_to_vptr(pp_Mult_mm_Noether__RingGeneral_LengthGeneral_OrdGeneral);
+      case p_Mult_mm_Proc:
+        return cast_A_to_vptr(p_Mult_mm__RingGeneral_LengthGeneral_OrdGeneral);
+      case p_Minus_mm_Mult_qq_Proc:
+        return cast_A_to_vptr(p_Minus_mm_Mult_qq__RingGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_Coeff_mm_DivSelect_Proc:
+        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelect__RingGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
+        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelectMult__RingGeneral_LengthGeneral_OrdGeneral);
+#else
+      case p_Mult_nn_Proc:
+        return cast_A_to_vptr(p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_nn_Proc:
+        return cast_A_to_vptr(pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_mm_Proc:
+        return cast_A_to_vptr(pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_mm_Noether_Proc:
+        return cast_A_to_vptr(pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral);
+      case p_Mult_mm_Proc:
+        return cast_A_to_vptr(p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral);
+      case p_Minus_mm_Mult_qq_Proc:
+        return cast_A_to_vptr(p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_Coeff_mm_DivSelect_Proc:
+        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral);
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
+        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral);
+#endif
       case p_Unknown_Proc:
         break;
@@ -139 +158 @@
       case p_ShallowCopyDelete_Proc:
         return "p_ShallowCopyDelete__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Mult_nn_Proc:
-        return "p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_nn_Proc:
-        return "pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_mm_Proc:
-        return "pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_mm_Noether_Proc:
-        return "pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Mult_mm_Proc:
-        return "p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral";
       case p_Add_q_Proc:
         return "p_Add_q__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Minus_mm_Mult_qq_Proc:
-        return "p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral";
       case p_Neg_Proc:
         return "p_Neg__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_Coeff_mm_DivSelect_Proc:
-        return "pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
-        return "pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral";
       case p_Merge_q_Proc:
         return "p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral";
@@ -165 +168 @@
       case p_Unknown_Proc:
         break;
+#ifdef HAVE_RINGS
+      case p_Mult_nn_Proc:
+        return "p_Mult_nn__RingGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_nn_Proc:
+        return "pp_Mult_nn__RingGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_mm_Proc:
+        return "pp_Mult_mm__RingGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_mm_Noether_Proc:
+        return "pp_Mult_mm_Noether__RingGeneral_LengthGeneral_OrdGeneral";
+      case p_Mult_mm_Proc:
+        return "p_Mult_mm__RingGeneral_LengthGeneral_OrdGeneral";
+      case p_Minus_mm_Mult_qq_Proc:
+        return "p_Minus_mm_Mult_qq__RingGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_Coeff_mm_DivSelect_Proc:
+        return "pp_Mult_Coeff_mm_DivSelect__RingGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
+        return "pp_Mult_Coeff_mm_DivSelectMult__RingGeneral_LengthGeneral_OrdGeneral";
+#else
+      case p_Mult_nn_Proc:
+        return "p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_nn_Proc:
+        return "pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_mm_Proc:
+        return "pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_mm_Noether_Proc:
+        return "pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral";
+      case p_Mult_mm_Proc:
+        return "p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral";
+      case p_Minus_mm_Mult_qq_Proc:
+        return "p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_Coeff_mm_DivSelect_Proc:
+        return "pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
+        return "pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral";
+#endif
   }
   return "p_Unknown_Proc";

libpolys/polys/templates/p_Procs_Generate.cc

@@ -34 +34 @@
   FieldZpProcs = 0,
   FieldQProcs = 0,
-#ifdef HAVE_RINGS
   RingGeneralProcs = 0,
-#endif
   KernelProcs = 0,
   UnknownProcs = 0;
@@ -45 +43 @@
   // general procs go into kernel
   if (field == FieldGeneral && length == LengthGeneral && ord == OrdGeneral)
+    return 1;
+
+  if (field == RingGeneral && length == LengthGeneral && ord == OrdGeneral)
     return 1;
 
@@ -112 +113 @@
     else if (strcmp(module, "FieldQ") == 0)
       FieldQProcs++;
-#ifdef HAVE_RINGS
-    else if (strcmp(module, "RingGeneral") == 0)
-      RingGeneralProcs++;
-#endif
     else
       UnknownProcs++;
+    if (field==RingGeneral)
+      RingGeneralProcs++;
 
     printf("#ifdef p_Procs_%s\n", module);
   }
 #endif
+  if (strcmp(s_field, "RingGeneral") == 0)
+  {
 #ifdef HAVE_RINGS
-  if (strcmp(s_field, "RingGeneral") == 0)
+    printf("#define HAVE_RINGS\n");
     printf("#define HAVE_ZERODIVISORS\n");
-#endif
+#else
+    printf("#if 0\n");
+#endif
+  }
+  else
+  {
+    printf("#undef HAVE_RINGS\n");
+    printf("#undef HAVE_ZERODIVISORS\n");
+  }
   i = 0;
   while (macros_field[i] != NULL)
@@ -189 +198 @@
       printf("#define p_MemCmp_Bitmask_2 p_MemCmp_Bitmask_LengthGeneral\n");
     }
-
-
     printf("#undef p_MemAddAdjust__T\n");
     printf("#define p_MemAddAdjust__T(p, r) do {} while (0)\n");
@@ -198 +205 @@
   printf("#include \"polys/templates/%s__T.cc\"\n", s_what);
   printf("#undef %s\n", s_what);
+  if (strcmp(s_field, "RingGeneral") == 0)
+  {
 #ifdef HAVE_RINGS
-  if (strcmp(s_field, "RingGeneral") == 0)
+    printf("#undef HAVE_RINGS\n");
     printf("#undef HAVE_ZERODIVISORS\n");
-#endif
+#else
+    printf("#endif\n");
+#endif
+  }
 #ifndef p_Procs_Static
   printf("#endif // p_Procs_[Kernel|Field*]\n");
@@ -318 +330 @@
   printf("* FieldZpProcs         = %d\n",FieldZpProcs);
   printf("* FieldQProcs          = %d\n",FieldQProcs);
-  printf("* FieldGeneralProcs    = %d\n",FieldGeneralProcs);
+  printf("* FieldGeneralProcs    = %d\n",FieldGeneralProcs-RingGeneralProcs);
+  printf("* RingGeneralProcs     = %d (in FieldGeneral module)\n",RingGeneralProcs);
   printf("* FieldUnknownProcs    = %d\n",UnknownProcs);
 #endif

libpolys/polys/templates/p_Procs_Impl.h

@@ -11 +11 @@
 #define P_PROCS_IMPL_H
 
+#include <misc/auxiliary.h>
+
 /***************************************************************
  *
@@ -89 +91 @@
 // Predicate which returns true if alloc/copy/free of numbers is
 // like that of Zp (rings should use GMP in future)
-#ifdef HAVE_RINGS
 #define ZP_COPY_FIELD(field) \
   (field == FieldZp || field == FieldGF || field == FieldR)
-#else
-#define ZP_COPY_FIELD(field) \
-  (field == FieldZp || field == FieldGF || field == FieldR)
-#endif
 
 /***************************************************************
@@ -120 +117 @@
   FieldQ_a,
 #endif
-#ifdef HAVE_RINGS
   RingGeneral,
-#endif
   FieldUnknown
 } p_Field;
@@ -216 +211 @@
       case FieldQ_a: return "FieldQ_a";
 #endif
-#ifdef HAVE_RINGS
       case RingGeneral: return "RingGeneral";
-#endif
       case FieldUnknown: return "FieldUnknown";
   }
@@ -405 +398 @@
   // simply exclude some things
   if ((proc == pp_Mult_mm_Noether_Proc || proc == p_kBucketSetLm_Proc) &&
-#ifdef HAVE_RINGS
       (field != RingGeneral) &&
-#endif
       (field != FieldZp))
   {
@@ -428 +419 @@
        proc != p_Merge_q_Proc))
   {
-#ifdef HAVE_RINGS
-    if (field != RingGeneral)
-#endif
-    field = FieldGeneral;
+    if (field != RingGeneral) field = FieldGeneral;
     length = LengthGeneral;
     ord = OrdGeneral;
@@ -446 +434 @@
       (HAVE_FAST_FIELD == 1 && field != FieldZp) ||
       (field != FieldZp && field != FieldQ))
-#ifdef HAVE_RINGS
-    if (field != RingGeneral)
-#endif
-    field = FieldGeneral;
+    if (field != RingGeneral) field = FieldGeneral;
 }
 
@@ -487 +472 @@
 {
   if (ZP_COPY_FIELD(field)) field = FieldZp;
+  else if (field == RingGeneral) field = FieldGeneral;
 }
 
 // in p_Add_q, p_MemCmp works with CompLSize,
 // hence, we do not need to consider ZeroOrds
-static inline void p_Add_q__Filter(p_Length &length, p_Ord &ord)
+static inline void p_Add_q__Filter(p_Field &field,p_Length &length, p_Ord &ord)
 {
   if (IsZeroOrd(ord))
@@ -501 +487 @@
     }
   }
+  if (field == RingGeneral) field = FieldGeneral;
+}
+
+static inline void p_Neg__Filter(p_Field &field,p_Length &length, p_Ord &ord)
+{
+  if (field == RingGeneral) field = FieldGeneral;
+  length =LengthGeneral;
+  ord =OrdGeneral;
 }
 
@@ -516 +510 @@
   {
     // all the other orderings might occur (remember Mixed Orderings!)
-#ifdef HAVE_RINGS
-    if (field != RingGeneral)
-#endif
-    field = FieldGeneral;
+    if (field != RingGeneral) field = FieldGeneral;
     ord = OrdGeneral;
     length = LengthGeneral;
@@ -532 +523 @@
       case p_Add_q_Proc:
       case p_Merge_q_Proc:
-        p_Add_q__Filter(length, ord);
+        p_Add_q__Filter(field, length, ord);
+        break;
+
+      case p_Neg_Proc:
+        p_Neg__Filter(field, length, ord);
         break;
 
@@ -547 +542 @@
           if (length == LengthOne || length == LengthTwo)
           {
-#ifdef HAVE_RINGS
-            if (field != RingGeneral)
-#endif
-            field = FieldGeneral;
+            if (field != RingGeneral) field = FieldGeneral;
             length = LengthGeneral;
             ord = OrdGeneral;
@@ -570 +562 @@
 }
 
-// returns 1 if combination of field/length/ord is invalid
+// returns 0 if combination of field/length/ord is invalid
 static inline int IsValidSpec(p_Field field, p_Length length, p_Ord ord)
 {
@@ -589 +581 @@
 
   // we cover everything for length <= two
-  if (ord == OrdGeneral && length >= LengthTwo)
+  if (ord == OrdGeneral && length > LengthTwo)
     return 0;
+#ifndef HAVE_RINGS
+  if (field == RingGeneral) return 0;
+#endif
   return 1;
 }
@@ -701 +696 @@
 #endif
 
+#define SetProcs_ring(field, length, ord)                               \
+do                                                                      \
+{                                                                       \
+  SetProc(p_Copy, FieldGeneral, length, OrdGeneral);                    \
+  SetProc(p_Delete, FieldGeneral, LengthGeneral, OrdGeneral);           \
+  SetProc(p_ShallowCopyDelete, FieldGeneral, length, OrdGeneral);       \
+  SetProc(p_Add_q, FieldGeneral, length, ord);                          \
+  SetProc(p_Neg, FieldGeneral, LengthGeneral, OrdGeneral);              \
+  SetProc(p_Merge_q, FieldGeneral, length, ord);                        \
+  SetProc(p_Mult_nn, field, LengthGeneral, OrdGeneral);                 \
+  SetProc(pp_Mult_nn, field, LengthGeneral, OrdGeneral);                \
+  SetProc(pp_Mult_mm, field, length, OrdGeneral);                       \
+  SetProc(p_Mult_mm, field, length, OrdGeneral);                        \
+  SetProc(p_Minus_mm_Mult_qq, field, length, ord);                      \
+  SetProc(pp_Mult_mm_Noether, field, length, ord);                      \
+  SetProc(pp_Mult_Coeff_mm_DivSelect, field, length, OrdGeneral);       \
+  SetProc(pp_Mult_Coeff_mm_DivSelectMult, field, length, OrdGeneral);   \
+}                                                                       \
+while (0)
+
 #endif // P_PROCS_IMPL_H
 

libpolys/polys/templates/p_Procs_Set.h

@@ -15 +15 @@
 
 #include <reporter/reporter.h>
+#include <libpolys/libpolysconfig.h>
 
 // extract p_Procs properties from a ring
@@ -30 +31 @@
   if (rField_is_Q_a(r)) return FieldQ_a;
 #endif
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r)) return RingGeneral;
-#endif
   return FieldGeneral;
 }
@@ -129 +128 @@
     WarnS("If you chose a coef ring, it may not work at all");\
     p_Procs->which =                 (which##_Proc_Ptr)(    \
-      which##__FieldGeneral_LengthGeneral_OrdGeneral);       \
+      which##__FieldGeneral_LengthGeneral_OrdGeneral);      \
   }                                                         \
 }                                                           \
@@ -146 +145 @@
   memset(p_Procs, 0, sizeof(p_Procs_s));
   _p_procs = p_Procs;
-  assume(IsValidSpec(field, length, ord));
 
   SetProcs(field, length, ord);
@@ -157 +155 @@
     // set all non-mult/div. routines to FieldZp-variants
     SetProcs_nv(FieldZp, length,ord); // p_Delete, p_ShallowCopyDelete...
+  }
+  if (field==RingGeneral)
+  {
+    if (nCoeff_is_Domain(r->cf))
+      SetProcs_ring(FieldGeneral,length,ord);
+      // FieldGeneral vs. RingGeneral: HAVE_ZERODIVISORS
+    else
+      SetProcs_ring(RingGeneral,length,ord);
   }
   #endif

omalloc/omallocClass.cc

@@ -6 +6 @@
 */
 
-#include <omalloc/omalloc.h>
-
 #ifdef __cplusplus
 
@@ -13 +11 @@
 #include <stdlib.h>
 #include <omalloc/omallocClass.h>
-
-void*  omallocClass::operator new[] ( size_t size )
-#ifndef __GNUC__
-throw (std::bad_alloc)
-#endif
-{
-  void* addr;
-  if (size==(size_t)0) size = (size_t)1;
-  omTypeAlloc(void*, addr, size);
-  return addr;
-}
-
-void  omallocClass::operator delete[] ( void* block )
-#ifndef __GNUC__
-throw ()
-#endif
-{
-  omfree( block );
-}
 
 // The C++ standard has ratified a change to the new operator.

omalloc/omallocClass.h

@@ -43 +43 @@
 throw (std::bad_alloc)
 #endif
-;
+{
+  void* addr;
+  if (size==(size_t)0) size = (size_t)1;
+  omTypeAlloc(void*, addr, size);
+  return addr;
+}
 
 void operator delete[] ( void* block )
@@ -49 +54 @@
 throw ()
 #endif
-;
+{
+  omfree( block );
+}
+
 
 // The C++ standard has ratified a change to the new operator.

resources/feResource.cc

@@ -91 +91 @@
   {"Path",      'p',    feResPath,  NULL,                   "%b;%P;$PATH",             (char *)""},
 
+#ifdef __CYGWIN__
+  {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs.exe",             (char *)""},
+  {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs.exe",            (char *)""},
+  {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular.exe",          (char *)""},
+#else
   {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
   {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
   {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
+#endif
   {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%D/singular/emacs",             (char *)""},

resources/omFindExec.c

@@ -39 +39 @@
   char *search;
   char *p;
-#ifdef WINNT
-  char *extra = NULL;
-#endif
   char tbuf[MAXPATHLEN];
 
@@ -50 +47 @@
       {
         strcpy(executable, name);
-#ifdef __CYGWIN__
-        strcat(executable, ".exe");
-#endif
         return executable;
       }
@@ -75 +69 @@
       {
         strcpy(executable, tbuf);
-#ifdef __CYGWIN__
-        strcat(executable, ".exe");
-#endif
         return executable;
       }
@@ -85 +76 @@
     search = getenv("PATH");
 /* for winnt under msdos, cwd is implictly in the path */
-#ifdef WINNT
-    p = getenv("SHELL");
-    if (p == NULL || strlen(p) < 2)
-    {
-      char *extra = NULL;
-      /* we are under msdos display */
-      extra = (char*) malloc((search != NULL ? strlen(search) : 0) + 3);
-      strcpy(extra, ".:");
-      if (search != NULL) strcat(extra, search);
-      search = extra;
-    }
-#endif
     p = search;
 
@@ -129 +108 @@
         if (! access (tbuf, F_OK))
         {
-#ifdef WINNT
-          if (extra != NULL)
-            free(extra);
-#endif
           strcpy(executable, tbuf);
-#ifdef __CYGWIN__
-          strcat(executable, ".exe");
-#endif
           return executable;
         }
@@ -219 +191 @@
 }
 
-#ifdef WINNT
+#ifdef __CYGWIN__
+/* for windows, serch first for .exe */
 char * _omFindExec (const char *name, char* exec);
-/* for windows, serch first for .exe */
 char* omFindExec(const char *name, char* exec)
 {

xalloc/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-noinst_LTLIBRARIES=libomalloc.la
+lib_LTLIBRARIES=libomalloc.la
 
-# lib_LTLIBRARIES=libomalloc.la
-# lib_LIBRARIES=libomalloc.a
+libomalloc_includedir=$(includedir)/omalloc
 
-# libomallocdir = $(libdir)/
+libomalloc_include_HEADERS = omalloc.h omallocClass.h
 
-# libomalloc_includedir=$(includedir)/omalloc
-# libomalloc_include_HEADERS = omalloc.h
+SOURCES=dummy.c omallocClass.cc
 
-SOURCES = dummy.c omalloc.h
+AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
 
-libomalloc_la_SOURCES  =$(SOURCES)
+libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
 
-libomalloc_la_LDFLAGS  = -release ${PACKAGE_VERSION}
+libomalloc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 
+libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS}
 
+omTables_CPPFLAGS = ${AM_CPPFLAGS}
+
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = omConfig.h
+

xalloc/README

@@ +1 @@
+README for xalloc: a debug helper and alternative to omalloc
+
+- substitute in <topdir>/configure.ac and <topdir>/Makefile.am
+   omalloc by xalloc
+- in <topdir> run ./autogen.sh
+- run <topdir>/configure .....   in <builddir>
+- in <builddir> and <topdir>: save omalloc to omalloc.org, ln -s xalloc omalloc
+- run make in <builddir>

xalloc/configure.ac

@@ -1 @@
-AC_INIT([xalloc], [3.1.2.sw])
-AC_CONFIG_SRCDIR(dummy.c)
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl File: configure.ac
+dnl Purpose: Process this file with autoconf to produce configure
+dnl Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
+dnl Created: 11/99
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+
+AC_INIT([xmalloc],[4.0])
+
 AC_CONFIG_MACRO_DIR([../m4])
 AC_CONFIG_AUX_DIR([../build-aux])
+AC_CONFIG_SRCDIR(dummy.c)
+AC_CONFIG_HEADER([_config.h])
+
+AC_PROG_CC
+AC_PROG_CXX
+
+SING_RESET_FLAGS()
 
 AM_MAINTAINER_MODE([enable])
@@ -9 +23 @@
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
+AM_SANITY_CHECK
 
+# Add pre'prefixed config
+AX_PREFIX_CONFIG_H([omConfig.h],[],[_config.h])
+
+# SING_CHECK_SET_ARGS()
+
+AC_SUBST(VERSION)
+
+CPPFLAGS="-I.. -I. $CPPFLAGS"
 AC_PROG_MAKE_SET
-# AC_PROG_CC
-# AC_PROG_CPP
+AC_PROG_CC
+AC_PROG_CPP
 
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AM_PROG_CC_C_O
-
+# AM_PROG_AR
 AC_C_CONST
 AC_C_INLINE
@@ -23 +46 @@
 LT_INIT
 
-SING_RESET_FLAGS()
-SING_CHECK_SET_ARGS()
 
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl check for programs
+dnl
+AC_CHECK_PROG(AR, ar, ar, :)
+if test "$ac_cv_prog_AR" = no; then
+  AC_MSG_ERROR(*** ar program not found)
+fi
 
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl header file checks
+dnl
+AC_HEADER_STDC
+AC_CHECK_HEADERS(limits.h,,
+  AC_MSG_ERROR(Can not compile without limits.h))
+
+AC_CHECK_HEADERS(unistd.h sys/mman.h fcntl.h /usr/include/malloc.h)
+
+AC_CHECK_FUNCS(popen mmap sbrk random)
+
+dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl Find out more about particularity of the system
+dnl
+
+# sizes
+AC_CHECK_SIZEOF(long,4)
+AC_CHECK_SIZEOF(void*,4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(size_t, 4)
+
+if test "$ac_cv_sizeof_long" != "$ac_cv_sizeof_voidp"; then
+  AC_MSG_ERROR(need equal sizes for long and void*)
+fi
+if test "$ac_cv_sizeof_voidp" != 4 && test "$ac_cv_sizeof_voidp" != 8; then
+  AC_MSG_ERROR(need void* to be 4 or 8 bytes long)
+fi
+if test "$ac_cv_sizeof_double" != 4 && test "$ac_cv_sizeof_double" != 8; then
+  AC_MSG_ERROR(need double to be 4 or 8 bytes long)
+fi
+
+dnl Set compiler, linker flags so that we can work with omalloc
+BACKUP_CFLAGS=$CFLAGS
+BACKUP_CXXFLAGS=$CXXFLAGS
+BACKUP_LDFLAGS=$LDFLAGS
+
+CFLAGS="$CFLAGS -I$srcdir"
+CXXFLAGS="$CXXFLAGS -I$srcdir"
+
+AC_SUBST(OM_MALLOC_HEADER)
+AC_SUBST(OM_MALLOC_SOURCE)
+
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl wrap it up
+dnl
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

xalloc/omalloc.h

@@ -9 +9 @@
 #include <stdlib.h>
 #include <string.h>
+#include <omalloc/omConfig.h>
 
 #ifdef __cplusplus
@@ -82 +83 @@
   }
 }
+#define omReallocAligned(A,B) omRealloc(A,B)
 static inline void *omReallocSize(void *d, size_t os, size_t ns)
 { if (d==NULL) return omAlloc(ns);