=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.65 retrieving revision 1.69 diff -u -p -r1.65 -r1.69 --- OpenXM_contrib2/asir2000/builtin/gr.c 2009/02/09 10:21:29 1.65 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2013/11/05 11:36:58 1.69 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.64 2007/09/19 05:56:01 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.68 2012/12/17 07:20:44 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -53,7 +53,7 @@ #include "ox.h" #if defined(__GNUC__) -#define INLINE inline +#define INLINE static inline #elif defined(VISUAL) #define INLINE __inline #else @@ -97,6 +97,7 @@ int NoGCD = 0; int GenTrace = 0; int GenSyz = 0; int OXCheck = -1; +int OneZeroHomo = 0; int NoSugar = 0; static int NoCriB = 0; @@ -910,8 +911,8 @@ NODE gb_f4_mod(NODE f,int m) /* XXX free redmat explicitly */ for ( k = 0; k < nred; k++ ) { - GC_free(BDY(redmat[k])); - GC_free(redmat[k]); + GCFREE(BDY(redmat[k])); + GCFREE(redmat[k]); } get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0); @@ -974,7 +975,7 @@ NODE gb_f4_mod(NODE f,int m) /* XXX free spmat[] explicitly */ for ( j = 0; j < nsp; j++ ) { - GC_free(spmat[j]); + GCFREE(spmat[j]); } } if ( DP_Print ) { @@ -1655,7 +1656,7 @@ void reducebase_dehomo(NODE f,NODE *g) NODE node; STOQ(r[i],q); - node = mknode(4,0,q,0,0); + node = mknode(4,NULLP,q,NULLP,NULLP); MKLIST(hist,node); MKNODE(TraceList,hist,0); } @@ -2323,6 +2324,8 @@ void dp_set_flag(Obj name,Obj value) OXCheck = v; else if ( !strcmp(n,"GenSyz") ) GenSyz = v; + else if ( !strcmp(n,"OneZeroHomo") ) + OneZeroHomo = v; } void dp_make_flaglist(LIST *list) @@ -2567,7 +2570,7 @@ void _dp_nf_z(NODE b,DP g,DP *ps,int full,int multiple if ( GenTrace ) { /* u = cr*rp + (-cred)*shift*red */ STOQ((int)BDY(l),cq); - node = mknode(4,cr,cq,0,0); + node = mknode(4,cr,cq,NULLP,NULLP); mulq(cred,rc,&rcred); chsgnnum((Num)rcred,(Num *)&mrcred); muldc(CO,shift,(P)mrcred,(DP *)&ARG2(node));