From 91dd25b6a60ebc5629e743785b7e351fd9e6f79f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 29 Aug 2018 20:27:13 -0600 Subject: [PATCH] New upstream version. Updated URLs. --- .gitignore | 2 +- qepcad-B-attr.patch | 262 ++-- qepcad-B-destructor.patch | 28 +- qepcad-B-env.patch | 6 +- qepcad-B-gcc6.patch | 4 +- qepcad-B-parens.patch | 72 +- qepcad-B-return.patch | 34 +- qepcad-B-signed.patch | 12 +- qepcad-B-syntax.patch | 12 +- qepcad-B-tty.patch | 8 +- qepcad-B-uninit.patch | 348 ++--- qepcad-B-unused.patch | 2574 ++++++++++++++++++------------------- qepcad-B.spec | 16 +- sources | 2 +- 14 files changed, 1692 insertions(+), 1688 deletions(-) diff --git a/.gitignore b/.gitignore index 1ce00a0..9f61ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/qepcad-B.1.69.tar.gz +/qepcad-B.*.tar.gz diff --git a/qepcad-B-attr.patch b/qepcad-B-attr.patch index f0cc22d..2001403 100644 --- a/qepcad-B-attr.patch +++ b/qepcad-B-attr.patch @@ -1,47 +1,5 @@ ---- ./extensions/rend/rend.h.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/rend.h 2013-08-28 11:34:57.057516390 -0600 -@@ -34,7 +34,7 @@ extern "C" { - - #include - #include --istream& qein(); // fetches the current qepcad istream object -+istream& qein() __pure; // fetches the current qepcad istream object - - class singlelinestream : public istringstream - { ---- ./extensions/rend/Rend_Cell.h.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/Rend_Cell.h 2013-08-30 14:37:28.376780785 -0600 -@@ -49,8 +49,8 @@ public: - Rend_Cell& operator[](int i); /* gives child from index */ - Rend_Cell* neighbor_l(); /* returns left neighbor cell */ - Rend_Cell* neighbor_r(); /* returns right neighbor cell */ -- int array_index(); /* returns i such that -- parent->child[i] is the cell */ -+ int array_index() __pure; /* returns i such that -+ parent->child[i] is the cell */ - void set_extents(Word J); - void out_descrip(Rend_Win &W, ostream &out, Mapper &M); - void out_descrip_ps(Rend_Win &W, ostream &out, Mapper &M); ---- ./extensions/adj2d/truthbytop/truthbytop.h.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/truthbytop/truthbytop.h 2013-08-30 09:41:55.321108153 -0600 -@@ -4,13 +4,13 @@ - #include "adj2D.h" - - void GADDVERTEX(Word v, Word l, Word *G_); --Word GSTACKHANDLE(Word i, Word G_); -+Word GSTACKHANDLE(Word i, Word G_) __pure; - Word GVERTEXHANDLE(Word v, Word G_); - Word GVERTEXLABEL(Word v, Word G_); - void GNEWLABEL(Word v, Word l, Word G_); - void GADDEDGE(Word e, Word G_); - Word GSUCCLIST(Word v, Word G_); --Word vert2dim(Word v); -+Word vert2dim(Word v) __pure; - Word GPREDLIST(Word v, Word G_); - - #endif ---- ./extensions/adj2d/adj2D.h.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/adj2D.h 2013-08-30 14:35:45.336575945 -0600 +--- extensions/adj2d/adj2D.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/adj2D.h 2018-08-29 20:03:25.109519358 -0600 @@ -25,7 +25,7 @@ Word ADJ_2D1P2(Word U, Word V, Word w_l, Word ADJ_2D1P3(Word U, Word w_l, Word B); Word ADJ_2D1_COMPLETE(Word c, Word c_l, Word c_r, Word P, Word J); @@ -78,19 +36,70 @@ void CTVPROPUP(Word C, Word t, Word N, Word by); void TVCLOSURE1D(Word D, Word P, Word J, Word k, Word t); void TVCLOSURE1DS(Word D, Word P, Word J, Word k, Word t); ---- ./extensions/sfext/minhit/MINHITSETSRDR.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/minhit/MINHITSETSRDR.c 2013-08-30 09:28:39.624633978 -0600 -@@ -24,6 +24,8 @@ Note: The point is that not only sortin - #define BDCOMP(a,b) ((a) > (b) ? 1 : ((a) < (b) ? -1 : 0)) - #define MC_FAIL 0 +--- extensions/adj2d/truthbytop/truthbytop.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/truthbytop/truthbytop.h 2018-08-29 20:03:25.109519358 -0600 +@@ -4,13 +4,13 @@ + #include "adj2D.h" -+static Word comp(Word a, Word b) __pure; + void GADDVERTEX(Word v, Word l, Word *G_); +-Word GSTACKHANDLE(Word i, Word G_); ++Word GSTACKHANDLE(Word i, Word G_) __pure; + Word GVERTEXHANDLE(Word v, Word G_); + Word GVERTEXLABEL(Word v, Word G_); + void GNEWLABEL(Word v, Word l, Word G_); + void GADDEDGE(Word e, Word G_); + Word GSUCCLIST(Word v, Word G_); +-Word vert2dim(Word v); ++Word vert2dim(Word v) __pure; + Word GPREDLIST(Word v, Word G_); + + #endif +--- extensions/newadj/HATEST.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/newadj/HATEST.c 2018-08-29 20:03:25.111519356 -0600 +@@ -1,5 +1,5 @@ + #include "newadj2D.h" +-Word ISSECTOR(Word C) { return LAST(LELTI(C,INDX)) % 2; } ++static Word __pure ISSECTOR(Word C) { return LAST(LELTI(C,INDX)) % 2; } + void SAMPLECWR(Word c); + void strippedAFLWR(Word M,Word I,Word N,Word a,Word A); + void ANDWRITExx(Word M,Word I,Word n); +--- extensions/rend/Rend_Cell.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/Rend_Cell.h 2018-08-29 20:03:25.108519359 -0600 +@@ -49,8 +49,8 @@ public: + Rend_Cell& operator[](int i); /* gives child from index */ + Rend_Cell* neighbor_l(); /* returns left neighbor cell */ + Rend_Cell* neighbor_r(); /* returns right neighbor cell */ +- int array_index(); /* returns i such that +- parent->child[i] is the cell */ ++ int array_index() __pure; /* returns i such that ++ parent->child[i] is the cell */ + void set_extents(Word J); + void out_descrip(Rend_Win &W, ostream &out, Mapper &M); + void out_descrip_ps(Rend_Win &W, ostream &out, Mapper &M); +--- extensions/rend/rend.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/rend.h 2018-08-29 20:03:25.108519359 -0600 +@@ -34,7 +34,7 @@ extern "C" { + + #include + #include +-istream& qein(); // fetches the current qepcad istream object ++istream& qein() __pure; // fetches the current qepcad istream object + + class singlelinestream : public istringstream + { +--- extensions/sfext/addpol/MINPFSETNSC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/addpol/MINPFSETNSC.c 2018-08-29 20:03:25.110519357 -0600 +@@ -25,6 +25,8 @@ outputs + #define BDCOMP(a,b) ((a) > (b) ? 1 : ((a) < (b) ? -1 : 0)) + #define CFLCT 5 + ++static Word comp1(Word a, Word b) __pure; + - static Word comp(Word a, Word b) { - Word ap,bp,t,q; - ap = a; bp = b; ---- ./extensions/sfext/extlang/CLOSESTINDEX.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/extlang/CLOSESTINDEX.c 2013-08-30 09:20:44.193946578 -0600 + static Word comp1(Word a,Word b) { + Word A,B,t; + A = RED(a); B = RED(b); t = 0; +--- extensions/sfext/extlang/CLOSESTINDEX.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/extlang/CLOSESTINDEX.c 2018-08-29 20:03:25.109519358 -0600 @@ -10,6 +10,8 @@ cp: the ESCAD cell in L with index close #include "extlang.h" @@ -100,8 +109,31 @@ static Word comp(Word u, Word v) { Word r,t,U,V,A,B,a,b; ---- ./extensions/sfext/sfcons/ESPCADDOPFSUFF.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/ESPCADDOPFSUFF.c 2013-08-30 09:32:29.048483014 -0600 +--- extensions/sfext/minhit/MINHITSETSRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/minhit/MINHITSETSRDR.c 2018-08-29 20:03:25.109519358 -0600 +@@ -24,6 +24,8 @@ Note: The point is that not only sortin + #define BDCOMP(a,b) ((a) > (b) ? 1 : ((a) < (b) ? -1 : 0)) + #define MC_FAIL 0 + ++static Word comp(Word a, Word b) __pure; ++ + static Word comp(Word a, Word b) { + Word ap,bp,t,q; + ap = a; bp = b; +--- extensions/sfext/mysort.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/mysort.h 2018-08-29 20:03:25.110519357 -0600 +@@ -52,7 +52,7 @@ Side Effects + Word GMSDS(Word *A, Word m, Word (*C)(Word,Word)); + + +-extern Word BVC(Word *u_,Word *v_,Word n); ++extern Word BVC(const Word *u_,const Word *v_,Word n) __pure; + extern void BVIS(Word **A,Word m,Word n); +-extern Word BVCI1(Word *u_,Word *v_,Word n); ++extern Word BVCI1(const Word *u_,const Word *v_,Word n) __pure; + extern void BVISI1(Word **A,Word m,Word n); +--- extensions/sfext/sfcons/ESPCADDOPFSUFF.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/ESPCADDOPFSUFF.c 2018-08-29 20:03:25.110519357 -0600 @@ -17,7 +17,7 @@ outputs #include "qepcad.h" #include "espcad.h" @@ -111,22 +143,8 @@ #define BDCOMP(a,b) ((a) > (b) ? 1 : ((a) < (b) ? -1 : 0)) Word ESPCADDOPFSUFF(Word P, Word K) ---- ./extensions/sfext/sort/BVCI1.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sort/BVCI1.c 2013-08-28 13:12:30.385244306 -0600 -@@ -12,9 +12,9 @@ b : -1 if u < v in lex order, 0 if u = v - ======================================================================*/ - #include "qepcad.h" - --Word BVCI1(Word *u_, Word *v_, Word n) -+Word BVCI1(const Word *u_, const Word *v_, Word n) - { -- Word *w,*u,*v; -+ const Word *w,*u,*v; - u = u_+1; - v = v_+1; - w = u + n; ---- ./extensions/sfext/sort/BVC.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sort/BVC.c 2013-08-28 13:12:21.033150320 -0600 +--- extensions/sfext/sort/BVC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sort/BVC.c 2018-08-29 20:03:25.110519357 -0600 @@ -12,9 +12,9 @@ b : -1 if u < v in lex order, 0 if u = v ======================================================================*/ #include "mysort.h" @@ -139,40 +157,33 @@ u = u_; v = v_; w = u + n; ---- ./extensions/sfext/addpol/MINPFSETNSC.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/addpol/MINPFSETNSC.c 2013-08-28 16:29:15.985921210 -0600 -@@ -25,6 +25,8 @@ outputs - #define BDCOMP(a,b) ((a) > (b) ? 1 : ((a) < (b) ? -1 : 0)) - #define CFLCT 5 +--- extensions/sfext/sort/BVCI1.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sort/BVCI1.c 2018-08-29 20:03:25.110519357 -0600 +@@ -12,9 +12,9 @@ b : -1 if u < v in lex order, 0 if u = v + ======================================================================*/ + #include "qepcad.h" -+static Word comp1(Word a, Word b) __pure; -+ - static Word comp1(Word a,Word b) { - Word A,B,t; - A = RED(a); B = RED(b); t = 0; ---- ./extensions/sfext/mysort.h.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/mysort.h 2013-08-28 11:29:59.907828961 -0600 -@@ -52,7 +52,7 @@ Side Effects - Word GMSDS(Word *A, Word m, Word (*C)(Word,Word)); - - --extern Word BVC(Word *u_,Word *v_,Word n); -+extern Word BVC(const Word *u_,const Word *v_,Word n) __pure; - extern void BVIS(Word **A,Word m,Word n); --extern Word BVCI1(Word *u_,Word *v_,Word n); -+extern Word BVCI1(const Word *u_,const Word *v_,Word n) __pure; - extern void BVISI1(Word **A,Word m,Word n); ---- ./extensions/newadj/HATEST.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/newadj/HATEST.c 2013-08-30 13:26:52.518542789 -0600 -@@ -1,5 +1,5 @@ - #include "newadj2D.h" --Word ISSECTOR(Word C) { return LAST(LELTI(C,INDX)) % 2; } -+static Word __pure ISSECTOR(Word C) { return LAST(LELTI(C,INDX)) % 2; } - void SAMPLECWR(Word c); - void strippedAFLWR(Word M,Word I,Word N,Word a,Word A); - void ANDWRITExx(Word M,Word I,Word n); ---- ./source/qepcad.h.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/qepcad.h 2013-08-30 14:39:10.225632400 -0600 +-Word BVCI1(Word *u_, Word *v_, Word n) ++Word BVCI1(const Word *u_, const Word *v_, Word n) + { +- Word *w,*u,*v; ++ const Word *w,*u,*v; + u = u_+1; + v = v_+1; + w = u + n; +--- source/main/qepcadcls.h.orig 2018-03-16 14:22:00.000000000 -0600 ++++ source/main/qepcadcls.h 2018-08-29 20:03:25.111519356 -0600 +@@ -221,7 +221,7 @@ UnsatCore UNSATCORE; + void CHCELL(Word cs, Word *c_, Word *t_); + void ECLI(Word D, Word *c_, Word *t_); + BDigit SCREEN(Word c); +- BDigit SCREENBYQUANTIFIER(Word c); ++ BDigit SCREENBYQUANTIFIER(Word c) __pure; + Word ISFECLI(Word D); + Word INITPCAD(); + void EVALUATE(Word c, Word k, Word F, Word A); +--- source/qepcad.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/qepcad.h 2018-08-29 20:04:27.596451754 -0600 @@ -134,10 +134,10 @@ void IPLLDWRMOD(Word V, Word A); void IPLSRP(Word A, Word *s_, Word *P_); Word IPRESPRS(Word r, Word A, Word B); @@ -231,7 +242,7 @@ @@ -209,7 +209,7 @@ void PRLDB(); void PRODWR(Word v); void PROMPT(); - void PROPAGATE(Word D, Word c, Word k, Word f, Word Q); + //void PROPAGATE(Word D, Word c, Word k, Word f, Word Q); -void PRQUIT(); +void PRQUIT() __noreturn; void PRTRACEA(); @@ -264,7 +275,7 @@ Word STACKMULT(Word C); void STACKMWR(Word M); Word STFSOP(Word H); -@@ -630,9 +630,9 @@ Word NEWDERIV(Word KT, Word P, Word Pb, +@@ -631,9 +631,9 @@ Word NEWDERIV(Word KT, Word P, Word Pb, void STRIPPED_BIGLOOP(Word Jb, Word Pb, Word P0, Word D0, Word N, Word *P_, Word *D_); Word CADSCL(Word C, Word i); Word CELLFINDEX(Word D, Word I); @@ -276,7 +287,7 @@ void LISTOFCWTV(Word C, Word *Lt_, Word *Lf_); BDigit NUMSOLPOINTS(Word D, BDigit k); Word LPFOWCS(Word C, Word B, Word P); -@@ -669,7 +669,7 @@ void LTFOCWTVMARK(Word C, Word *Lt_, Wor +@@ -670,7 +670,7 @@ void LTFOCWTVMARK(Word C, Word *Lt_, Wor Word OPARTLIST(Word n); Word PARTLIST(Word n); Word SCAD2ESCAD(Word P, Word Ps, Word Ds, Word A); @@ -285,7 +296,7 @@ Word SCFILTER(Word c, Word d); void SETCADTV2MARK(Word D); void SETMARK2FMA(Word D, Word F, Word P); -@@ -693,7 +693,7 @@ void CSORTSS(Word **A, Word a, Word L); +@@ -694,7 +694,7 @@ void CSORTSS(Word **A, Word a, Word L); Word ICSIGDIFFL(Word **A, Word a, Word k); Word MINPFSET(Word P, Word S, Word D, Word N); Word PWUDSCWCP(Word D, Word P, Word N); @@ -294,7 +305,7 @@ void TDTOD(Word P, Word N, Word ***P2_, Word *P1_, Word *k_); Word FMA2DNF(Word F); Word FMA2QUNF(Word F, Word P); -@@ -705,8 +705,8 @@ Word FMADMQ(Word F,Word C,Word k,Word P) +@@ -706,8 +706,8 @@ Word FMADMQ(Word F,Word C,Word k,Word P) Word singleFMADMQ(Word F,Word C,Word k,Word P); void FMAIWRITE(Word F); Word FMALEVEL(Word F); @@ -305,7 +316,7 @@ Word FMAPOLLIST(Word F, Word P); void FMAREAD(Word P,Word V, Word *F_,Word *t_); Word FMASMOOTH(Word F); -@@ -723,9 +723,9 @@ void FMAWRITENEWLINEp(Word F, Word P, Wo +@@ -724,9 +724,9 @@ void FMAWRITENEWLINEp(Word F, Word P, Wo void FMAWRITEQEIN(Word F, Word P, Word V); void FMAWRITEp(Word F, Word P, Word V, Word flag); Word FMA_REMCONST(Word F); @@ -317,7 +328,7 @@ void SETTV2FMA(Word D, Word P, Word F, Word k); void SETORDERfromFMA(Word D,Word P,Word F,Word o); void SETORDER(Word D,Word P,Word V); -@@ -739,7 +739,7 @@ Word RSFHSP(Word A, Word *Ab_); +@@ -740,7 +740,7 @@ Word RSFHSP(Word A, Word *Ab_); Word CADCL(Word C, Word i); Word CADFPCAD(Word D, Word P, Word S, Word I, Word Pb); Word CADFPCADWI(Word D, Word P, Word S, Word I, Word Pb); @@ -326,7 +337,7 @@ void CCADCON(Word n, Word P, Word C, Word *Ps_, Word *Cs_); void CCADCONEXT(Word n, Word P, Word C, Word *Ps_, Word *Cs_, Word *N_); void CCADCONFPFS(Word n, Word P, Word C, Word N, Word *Ps_, Word *Cs_); -@@ -749,7 +749,7 @@ Word CHTVQ(Word cs, Word b); +@@ -750,7 +750,7 @@ Word CHTVQ(Word cs, Word b); Word CTSEQ(Word as, Word bs); void LTFOCALWTV(Word C, Word n, Word *Lt_, Word *Lf_); void LTFOCWTV(Word C, Word *Lt_, Word *Lf_); @@ -335,7 +346,7 @@ Word PCADCINDEX(Word c); Word PCADCL(Word Cs, Word i); Word PCADCSV(Word cs, Word Ps); -@@ -792,7 +792,7 @@ Word DOPFSUFF(Word P, Word K); +@@ -793,7 +793,7 @@ Word DOPFSUFF(Word P, Word K); Word ESPCADDOPFSUFF(Word P, Word K); Word GEOPARTII(Word F, Word S, Word P, Word Fs); Word GEODATA(Word c, Word A, Word P); @@ -344,7 +355,7 @@ Word GEOMERGE(Word c,Word G,Word P); Word GEOFIT(Word c,Word G,Word P); Word ATOMFILTER(Word L_A,Word L_C,Word P); -@@ -820,7 +820,7 @@ Word NECCONDS(Word L_T, Word L_F, Word L +@@ -821,7 +821,7 @@ Word NECCONDS(Word L_T, Word L_F, Word L Word DOPFSUFF_FULLD(Word P, Word K); Word ESPCADDOPFSUFF_FULLD(Word P, Word K); Word BVC(Word *u_, Word *v_, Word n); @@ -353,19 +364,8 @@ void BVIS(Word **A, Word m, Word n); void BVISI1(Word **A, Word m, Word n); void GIS(Word *A, Word m, Word (*C)(Word,Word)); ---- ./source/main/qepcadcls.h.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/qepcadcls.h 2013-08-30 13:29:46.950334457 -0600 -@@ -213,7 +213,7 @@ Word NMATOM; /* Number of atom - void CHCELL(Word cs, Word *c_, Word *t_); - void ECLI(Word D, Word *c_, Word *t_); - BDigit SCREEN(Word c); -- BDigit SCREENBYQUANTIFIER(Word c); -+ BDigit SCREENBYQUANTIFIER(Word c) __pure; - Word ISFECLI(Word D); - Word INITPCAD(); - void EVALUATE(Word c, Word k, Word F, Word A); ---- ./source/ticad/QFFTEV.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/QFFTEV.c 2013-08-30 13:34:05.245953999 -0600 +--- source/ticad/QFFTEV.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/QFFTEV.c 2018-08-29 20:03:25.112519355 -0600 @@ -12,7 +12,7 @@ Quantifier-Free Formula Trial Evaluation \parm{t} is the trial truth value of $F$ on the cell $c$. ======================================================================*/ @@ -375,8 +375,8 @@ static Word ATOMETFEVAL(Word Q, Word D, Word c, Word F); Word QepcadCls::QFFTEV(Word F, Word c, Word k) ---- ./source/userint/PRQUIT.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/PRQUIT.c 2013-08-30 14:40:03.857550869 -0600 +--- source/userint/PRQUIT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/userint/PRQUIT.c 2018-08-29 20:03:25.112519355 -0600 @@ -13,7 +13,4 @@ Step1: /* Process. */ ENDQEPCAD(); ENDSACLIB(SAC_FREEMEM); diff --git a/qepcad-B-destructor.patch b/qepcad-B-destructor.patch index e1633b4..0829a54 100644 --- a/qepcad-B-destructor.patch +++ b/qepcad-B-destructor.patch @@ -1,15 +1,5 @@ ---- ./plot2d/plot.cc.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./plot2d/plot.cc 2013-08-30 16:51:16.409298807 -0600 -@@ -37,6 +37,7 @@ class CADELT - public: - virtual bool read(istream &in) = 0; - virtual void glRend(const CADColors &C) = 0; -+ virtual ~CADELT() {} - }; - - class SNoverSR : public CADELT ---- ./extensions/rend/Rend_Sample.cc.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/Rend_Sample.cc 2013-08-30 16:59:11.255885740 -0600 +--- extensions/rend/Rend_Sample.cc.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/Rend_Sample.cc 2018-08-29 20:07:27.087257552 -0600 @@ -40,11 +40,6 @@ Rend_Sample_1DS::Rend_Sample_1DS(Word C, } @@ -72,8 +62,8 @@ Word Rend_Sample_BR::coordinate(int k) { return N.W; ---- ./extensions/rend/Rend_Sample.h.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/Rend_Sample.h 2013-08-30 16:58:37.015983821 -0600 +--- extensions/rend/Rend_Sample.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/Rend_Sample.h 2018-08-29 20:07:27.087257552 -0600 @@ -32,7 +32,7 @@ class Rend_Sample virtual Word coordinate(int k) = 0; virtual Word round(int k,int roundup) @@ -123,3 +113,13 @@ virtual Word coordinate(int k); }; +--- plot2d/plot.cc.orig 2018-01-25 14:25:22.000000000 -0700 ++++ plot2d/plot.cc 2018-08-29 20:07:27.086257553 -0600 +@@ -37,6 +37,7 @@ class CADELT + public: + virtual bool read(istream &in) = 0; + virtual void glRend(const CADColors &C) = 0; ++ virtual ~CADELT() {} + }; + + class SNoverSR : public CADELT diff --git a/qepcad-B-env.patch b/qepcad-B-env.patch index e582b98..2404c78 100644 --- a/qepcad-B-env.patch +++ b/qepcad-B-env.patch @@ -1,6 +1,6 @@ ---- ./source/main/BEGINQEPCAD.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/BEGINQEPCAD.c 2015-09-03 19:50:14.594696632 -0600 -@@ -98,7 +98,8 @@ void BEGINQEPCAD(int &argc, char**& argv +--- source/main/BEGINQEPCAD.c.orig 2018-01-30 14:04:58.000000000 -0700 ++++ source/main/BEGINQEPCAD.c 2018-08-29 20:03:05.718540333 -0600 +@@ -127,7 +127,8 @@ void BEGINQEPCAD(int &argc, char**& argv void QEPCAD_ProcessRC(int argc, char **argv) { char *qepath = getenv("qe"); diff --git a/qepcad-B-gcc6.patch b/qepcad-B-gcc6.patch index daebc84..fc4c9ce 100644 --- a/qepcad-B-gcc6.patch +++ b/qepcad-B-gcc6.patch @@ -1,5 +1,5 @@ ---- plot2d/plot.cc.orig 2012-03-16 06:49:32.000000000 -0600 -+++ plot2d/plot.cc 2016-02-06 09:55:01.131415087 -0700 +--- plot2d/plot.cc.orig 2018-08-29 20:10:06.396075816 -0600 ++++ plot2d/plot.cc 2018-08-29 20:11:48.982924732 -0600 @@ -276,7 +276,7 @@ bool SNoverSR::read(istream &in) V.resize(N); for(int i = 0; i < N; i++) diff --git a/qepcad-B-parens.patch b/qepcad-B-parens.patch index dc4b514..766c1a3 100644 --- a/qepcad-B-parens.patch +++ b/qepcad-B-parens.patch @@ -1,5 +1,16 @@ ---- ./extensions/lift2D/IBPRRIOAP.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/IBPRRIOAP.c 2013-08-30 16:03:12.403968400 -0600 +--- extensions/adj2d/truthbytop/BOUNDARY2D.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/truthbytop/BOUNDARY2D.c 2018-08-29 20:07:50.511232206 -0600 +@@ -106,7 +106,7 @@ Step6: /* Split cell list by dimension. + tc++; + else + fc++; } +- if (tc > 0 && fc > 0 || GVERTEXLABEL(v,G) == TRUE && tc == 0) ++ if ((tc > 0 && fc > 0) || (GVERTEXLABEL(v,G) == TRUE && tc == 0)) + GNEWLABEL(v,TRUE,G); + else + GNEWLABEL(v,FALSE,G); } +--- extensions/lift2D/IBPRRIOAP.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/IBPRRIOAP.c 2018-08-29 20:07:50.510232207 -0600 @@ -95,7 +95,7 @@ Step3: /* Isolate the roots of B(alpha,y goto Return; } @@ -9,8 +20,8 @@ t1 = -1; else t1 = 1; ---- ./extensions/lift2D/modIBPRRIOAP.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/modIBPRRIOAP.c 2013-08-30 16:02:49.164007931 -0600 +--- extensions/lift2D/modIBPRRIOAP.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/modIBPRRIOAP.c 2018-08-29 20:07:50.510232207 -0600 @@ -97,7 +97,7 @@ Step3: /* Isolate the roots of B(alpha,y goto Return; } @@ -20,30 +31,8 @@ t1 = -1; else t1 = 1; ---- ./extensions/adj2d/truthbytop/BOUNDARY2D.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/truthbytop/BOUNDARY2D.c 2013-08-30 16:14:29.779797280 -0600 -@@ -80,7 +80,7 @@ Step6: /* Split cell list by dimension. - tc++; - else - fc++; } -- if (tc > 0 && fc > 0 || GVERTEXLABEL(v,G) == TRUE && tc == 0) -+ if ((tc > 0 && fc > 0) || (GVERTEXLABEL(v,G) == TRUE && tc == 0)) - GNEWLABEL(v,TRUE,G); - else - GNEWLABEL(v,FALSE,G); } ---- ./source/db/SINGULAR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/db/SINGULAR.c 2013-08-30 16:04:35.516826349 -0600 -@@ -58,7 +58,7 @@ void SingularServer::reportStats(ostream - - char peekNonWS(istream &in) - { -- char c; while((c = in.peek()) && c == ' ' || c == '\t' || c == '\n') in.get(); return c; -+ char c; while(c = in.peek() && (c == ' ' || c == '\t' || c == '\n')) in.get(); return c; - } - - ---- ./source/db/convenientstreams.h.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/db/convenientstreams.h 2013-08-30 16:05:34.707724662 -0600 +--- source/db/convenientstreams.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/db/convenientstreams.h 2018-08-29 20:07:50.511232206 -0600 @@ -31,7 +31,7 @@ public: string s = ""; char c = in.get(); @@ -53,8 +42,19 @@ // States : 0 = normal, 1 = in comment, 2 = just read a backslash int state = 0; do { ---- ./source/proj/GROUPSAMEPJ.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/GROUPSAMEPJ.c 2013-08-30 16:10:24.459222092 -0600 +--- source/db/SINGULAR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/db/SINGULAR.c 2018-08-29 20:07:50.511232206 -0600 +@@ -58,7 +58,7 @@ void SingularServer::reportStats(ostream + + char peekNonWS(istream &in) + { +- char c; while((c = in.peek()) && c == ' ' || c == '\t' || c == '\n') in.get(); return c; ++ char c; while(c = in.peek() && (c == ' ' || c == '\t' || c == '\n')) in.get(); return c; + } + + +--- source/proj/GROUPSAMEPJ.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/GROUPSAMEPJ.c 2018-08-29 20:07:50.511232206 -0600 @@ -46,7 +46,7 @@ BDigit PRJPNTEQUAL(Word A, Word B) Word KR = LIST2(SECOND(aK),LIST2(1,1)); Word sL = AFSIGN(aM,aI,AFPEMV(1,aM,G,KL)); @@ -79,8 +79,8 @@ { SLELTI(J2,PO_PARENT,CONC(LELTI(J2,PO_PARENT),LELTI(J1,PO_PARENT))); t = 1; ---- ./source/proj/PROJMCECmod.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/PROJMCECmod.c 2013-08-30 16:12:22.235018024 -0600 +--- source/proj/PROJMCECmod.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/PROJMCECmod.c 2018-08-29 20:07:50.511232206 -0600 @@ -67,7 +67,7 @@ Step1: /* Obtain coefficients. */ t = 1; } @@ -99,8 +99,8 @@ /* Test 4: has no common zero with the system of all other coefficients */ if (!tf) ---- ./source/proj/PROJMCmod.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/PROJMCmod.c 2013-08-30 16:11:49.731074222 -0600 +--- source/proj/PROJMCmod.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/PROJMCmod.c 2018-08-29 20:07:50.511232206 -0600 @@ -57,7 +57,7 @@ Step1: /* Obtain coefficients. */ t = 1; } @@ -119,8 +119,8 @@ /* Test 4: has no common zero with the system of all other coefficients */ if (!tf) ---- ./source/ticad/INITPCAD.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/INITPCAD.c 2013-08-30 16:13:07.946938949 -0600 +--- source/ticad/INITPCAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/INITPCAD.c 2018-08-29 20:07:50.511232206 -0600 @@ -14,7 +14,7 @@ Word QepcadCls::INITPCAD() Word D, tv; diff --git a/qepcad-B-return.patch b/qepcad-B-return.patch index f25b1e1..f31ad32 100644 --- a/qepcad-B-return.patch +++ b/qepcad-B-return.patch @@ -1,5 +1,5 @@ ---- ./extensions/sfext/formula/FTYPEINFO.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FTYPEINFO.c 2013-08-30 15:48:28.420527430 -0600 +--- extensions/sfext/formula/FTYPEINFO.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FTYPEINFO.c 2018-08-29 20:06:48.870298902 -0600 @@ -23,6 +23,6 @@ Word FTYPEINFO(Word A) return TRUE; if (FIRST(A) == FALSE) @@ -8,19 +8,8 @@ + FAIL("FTYPEINFO","Unknown formula type!"); } ---- ./source/qepcad.h.orig 2013-08-30 14:39:10.225632400 -0600 -+++ ./source/qepcad.h 2013-08-30 16:17:46.258481805 -0600 -@@ -34,7 +34,7 @@ Word AFPNIPDB(Word Mb, Word B); - void AFUPGCDB(Word M, Word A, Word B, Word *C_, Word *Ab_, Word *Bb_); - void AFUPLM(Word M, Word A, Word *L_, Word *P_); - void AFUPRWR(Word a, Word v, Word A, Word I); --Word AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_); -+void AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_); - Word APPEND(Word P, Word k, Word R); - void APPENDEC(Word P, Word k, Word R, Word *Ps_, Word *F_); - void ATOMFLWR(Word N, Word V, Word A); ---- ./source/db/AFUPSFNDB.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/db/AFUPSFNDB.c 2013-08-30 16:18:05.419450506 -0600 +--- source/db/AFUPSFNDB.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/db/AFUPSFNDB.c 2018-08-29 20:06:48.871298901 -0600 @@ -5,7 +5,7 @@ AFUPSFN with Database. ======================================================================*/ #include "qepcad.h" @@ -30,8 +19,8 @@ { Word t,Bt,F; ---- ./source/db/SingSacPolicy.h.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/db/SingSacPolicy.h 2013-08-30 16:20:40.923189610 -0600 +--- source/db/SingSacPolicy.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/db/SingSacPolicy.h 2018-08-29 20:06:48.872298900 -0600 @@ -28,17 +28,17 @@ public: Word IPRES(Word r, Word A, Word B) { @@ -54,3 +43,14 @@ } Word IPFACTGB(Word r, Word I, Word N) +--- source/qepcad.h.orig 2018-08-29 20:04:27.596451754 -0600 ++++ source/qepcad.h 2018-08-29 20:06:48.871298901 -0600 +@@ -34,7 +34,7 @@ Word AFPNIPDB(Word Mb, Word B); + void AFUPGCDB(Word M, Word A, Word B, Word *C_, Word *Ab_, Word *Bb_); + void AFUPLM(Word M, Word A, Word *L_, Word *P_); + void AFUPRWR(Word a, Word v, Word A, Word I); +-Word AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_); ++void AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_); + Word APPEND(Word P, Word k, Word R); + void APPENDEC(Word P, Word k, Word R, Word *Ps_, Word *F_); + void ATOMFLWR(Word N, Word V, Word A); diff --git a/qepcad-B-signed.patch b/qepcad-B-signed.patch index ec42881..685effe 100644 --- a/qepcad-B-signed.patch +++ b/qepcad-B-signed.patch @@ -1,5 +1,5 @@ ---- ./plot2d/plot.cc.orig 2013-08-30 16:51:16.409298807 -0600 -+++ ./plot2d/plot.cc 2013-08-30 16:55:10.593713039 -0600 +--- plot2d/plot.cc.orig 2018-08-29 20:07:27.086257553 -0600 ++++ plot2d/plot.cc 2018-08-29 20:08:10.014211101 -0600 @@ -134,7 +134,7 @@ void* readdata(void *x) pthread_mutex_lock(&M); swap(CE,E); @@ -36,8 +36,8 @@ cerr << V[i] << endl; exit(1); } ---- ./source/db/SINGULAR.c.orig 2013-08-30 16:04:35.516826349 -0600 -+++ ./source/db/SINGULAR.c 2013-08-30 16:22:52.913963575 -0600 +--- source/db/SINGULAR.c.orig 2018-08-29 20:07:50.511232206 -0600 ++++ source/db/SINGULAR.c 2018-08-29 20:08:10.015211100 -0600 @@ -67,7 +67,7 @@ Word readSingularPoly(Word r, Word V, is Word A, t; string s; @@ -56,8 +56,8 @@ if (out[i] == ' ' && out[i+1] != '+' && out[i+1] != '-' && out[i-1] != '+' && out[i-1] != '-' ) ---- ./source/saclib/gcword.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/saclib/gcword.c 2013-08-30 16:24:04.393840511 -0600 +--- source/saclib/gcword.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/saclib/gcword.c 2018-08-29 20:08:10.015211100 -0600 @@ -30,7 +30,7 @@ void gcw_MARK(); } diff --git a/qepcad-B-syntax.patch b/qepcad-B-syntax.patch index 446f3ab..c57a8fa 100644 --- a/qepcad-B-syntax.patch +++ b/qepcad-B-syntax.patch @@ -1,6 +1,6 @@ ---- ./source/main/BEGINQEPCAD.c.orig 2013-07-18 16:57:34.694879193 -0600 -+++ ./source/main/BEGINQEPCAD.c 2013-08-30 16:28:15.882368349 -0600 -@@ -49,7 +49,7 @@ void BEGINQEPCAD(int &argc, char**& argv +--- source/main/BEGINQEPCAD.c.orig 2018-08-29 20:03:05.718540333 -0600 ++++ source/main/BEGINQEPCAD.c 2018-08-29 20:09:45.542106837 -0600 +@@ -53,7 +53,7 @@ void BEGINQEPCAD(int &argc, char**& argv { int tmp = system("bash -c 'exit $(stty size | cut -d\" \" -f2)'"); tmp = WEXITSTATUS(tmp); @@ -9,9 +9,9 @@ cols = tmp; } ---- ./source/userint/USERINT.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/USERINT.c 2013-08-30 16:30:52.370086235 -0600 -@@ -446,7 +446,7 @@ void VERTFILL2D(Word D) +--- source/userint/USERINT.c.orig 2018-03-16 14:22:00.000000000 -0600 ++++ source/userint/USERINT.c 2018-08-29 20:09:45.543106835 -0600 +@@ -492,7 +492,7 @@ void VERTFILL2D(Word D) Word L, S, T, CB; /* GET 1D CAD STACK */ diff --git a/qepcad-B-tty.patch b/qepcad-B-tty.patch index f30733b..d5b04c9 100644 --- a/qepcad-B-tty.patch +++ b/qepcad-B-tty.patch @@ -1,5 +1,5 @@ ---- ./source/db/SINGULAR.c.orig 2013-11-21 15:54:01.972430325 -0700 -+++ ./source/db/SINGULAR.c 2015-09-03 19:42:46.612130230 -0600 +--- source/db/SINGULAR.c.orig 2018-08-29 20:10:06.406075801 -0600 ++++ source/db/SINGULAR.c 2018-08-29 20:11:02.229992773 -0600 @@ -1,6 +1,7 @@ #include "SINGULAR.h" #include @@ -33,8 +33,8 @@ } SingularServer::~SingularServer() ---- ./source/db/unnamedpipe.h.orig 2015-09-03 19:51:49.424196005 -0600 -+++ ./source/db/unnamedpipe.h 2015-09-03 19:51:55.462718382 -0600 +--- source/db/unnamedpipe.h.orig 2018-08-29 20:10:06.406075801 -0600 ++++ source/db/unnamedpipe.h 2018-08-29 20:11:02.229992773 -0600 @@ -113,6 +113,7 @@ public: int fdout() { return fd[1]; } int setStdinToPipe() { return dup2(fdin(),fileno(stdin)); } diff --git a/qepcad-B-uninit.patch b/qepcad-B-uninit.patch index 4201b0a..3be1f67 100644 --- a/qepcad-B-uninit.patch +++ b/qepcad-B-uninit.patch @@ -1,5 +1,5 @@ ---- ./cad2d/src/TICAD.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./cad2d/src/TICAD.c 2013-08-30 15:42:57.518153269 -0600 +--- cad2d/src/TICAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ cad2d/src/TICAD.c 2018-08-29 20:05:52.862359504 -0600 @@ -43,6 +43,8 @@ Step2: /* Choose. */ if (L == 0) { /* Init for 1D Sectors */ L = LELTI(D,CHILD); @@ -17,8 +17,38 @@ d = 0; L = RED(LELTI(D,CHILD)); } ---- ./extensions/rend/WRITE_PS_INTERACTIVE.cc.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/WRITE_PS_INTERACTIVE.cc 2013-08-28 15:31:47.564213356 -0600 +--- extensions/adj2d/oldadj/ACMADJ2D.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/oldadj/ACMADJ2D.c 2018-08-29 20:05:52.864359502 -0600 +@@ -29,6 +29,7 @@ Step1: /* Get (A,I) defining c. */ + FIRST2(Ip,&ip1,&ip2); + i1 = RNLBRN(ip1); + i2 = RNLBRN(ip2); ++ t = 0; + + Step2: /* Get sample points for c_l and c_r. */ + i_l = RNLBRN(SPRLC(c_l)); +--- extensions/lift2D/modHIPRRID.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/modHIPRRID.c 2018-08-29 20:05:52.864359502 -0600 +@@ -28,6 +28,7 @@ Step1: /* Compute a bound for the positi + k = HIPPRB(n,A); + + Step2: /* Isolate the positive roots. */ ++ L = NIL; + if (k == NIL) { + L1 = NIL; + goto Step3; } +--- extensions/lift2D/modIBPRRIOAPSF.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/modIBPRRIOAPSF.c 2018-08-29 20:05:52.863359503 -0600 +@@ -77,6 +77,7 @@ Step4: /* Isolate the real roots of eac + Step5: /* Refine roots? */ + if (k == NIL) + goto Return; ++ Js = NIL; + Ls = NIL; + for(Lp = L; Lp != NIL; Lp = RED(Lp)) + { +--- extensions/rend/WRITE_PS_INTERACTIVE.cc.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/WRITE_PS_INTERACTIVE.cc 2018-08-29 20:05:52.863359503 -0600 @@ -262,6 +262,8 @@ void WRITE_PS_INTERACTIVE(Rend_Cell &M, if (t == 'p') { SWRITE("Enter projetion factor by (level,index): "); @@ -28,38 +58,30 @@ switch(c) { case 'x': // 1D Sectors ---- ./extensions/lift2D/modIBPRRIOAPSF.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/modIBPRRIOAPSF.c 2013-08-28 15:36:30.044273572 -0600 -@@ -77,6 +77,7 @@ Step4: /* Isolate the real roots of eac - Step5: /* Refine roots? */ - if (k == NIL) - goto Return; -+ Js = NIL; - Ls = NIL; - for(Lp = L; Lp != NIL; Lp = RED(Lp)) - { ---- ./extensions/lift2D/modHIPRRID.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/modHIPRRID.c 2013-08-28 15:34:25.468248208 -0600 -@@ -28,6 +28,7 @@ Step1: /* Compute a bound for the positi - k = HIPPRB(n,A); +--- extensions/sfext/addpol/MINPFSETNSC.c.orig 2018-08-29 20:03:25.110519357 -0600 ++++ extensions/sfext/addpol/MINPFSETNSC.c 2018-08-29 20:05:52.865359501 -0600 +@@ -42,7 +42,7 @@ Word MINPFSETNSC(Word P,Word S,Word D,Wo + Word x_s,js,Ls,O,Q,Q_i,Sp,Pp,i,Cp,*V,*Vp,**A,a,N,k,S_r,I,j,p; - Step2: /* Isolate the positive roots. */ -+ L = NIL; - if (k == NIL) { - L1 = NIL; - goto Step3; } ---- ./extensions/adj2d/oldadj/ACMADJ2D.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/adj2d/oldadj/ACMADJ2D.c 2013-08-28 15:27:00.100211471 -0600 -@@ -29,6 +29,7 @@ Step1: /* Get (A,I) defining c. */ - FIRST2(Ip,&ip1,&ip2); - i1 = RNLBRN(ip1); - i2 = RNLBRN(ip2); -+ t = 0; + Step1: /* Initialization. */ +- C = NIL; Sltr = NIL; Pltr = NIL; N = LENGTH(K); ++ C = NIL; Sltr = NIL; S_r = NIL; Pltr = NIL; N = LENGTH(K); - Step2: /* Get sample points for c_l and c_r. */ - i_l = RNLBRN(SPRLC(c_l)); ---- ./extensions/sfext/extlang/SCAD2ESCAD.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/extlang/SCAD2ESCAD.c 2013-08-28 14:48:30.455672479 -0600 + Step2: /* Loop over each level in D. */ + for(r = 1; r <= N; r++) { +--- extensions/sfext/espcad/PCAD2ESPCAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/espcad/PCAD2ESPCAD.c 2018-08-29 20:05:52.866359500 -0600 +@@ -44,6 +44,8 @@ Step2: /* Generate correct i-level signi + P_i = RED(P_i); + s = RED(s); } + s = INV(ss); } ++ else ++ s = NIL; + + Step3: /* Construct extended Sub-CAD cell structure. */ + EDs = LIST8(C,A,LELTI(Ds,SC_INX),NIL,s,NIL,UNDET,UNDET); +--- extensions/sfext/extlang/SCAD2ESCAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/extlang/SCAD2ESCAD.c 2018-08-29 20:05:52.864359502 -0600 @@ -27,6 +27,8 @@ Step2: /* Generate correct i-level signi P_i = RED(P_i); s = RED(s); } @@ -69,50 +91,8 @@ Step3: /* Construct extended Sub-CAD cell structure. */ EDs = LIST7(C,A,LELTI(Ds,SC_INX),NIL,s,NIL,UNDET); ---- ./extensions/sfext/sfcons/SFCFULLDf.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SFCFULLDf.c 2013-08-28 15:14:42.812090282 -0600 -@@ -52,6 +52,7 @@ Step2: /* Extended language. */ - - if (Lt == NIL && Lf == NIL) { - SWRITE("No cells have truth values!\n"); -+ SF = NIL; - goto Return; } - t = ESPCADDOPFSUFF(Pp,LIST1(Dp)); - LA = LISTOETAmod(Pp,n,t==NIL); ---- ./extensions/sfext/sfcons/SFC4.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SFC4.c 2013-08-30 15:15:10.647569953 -0600 -@@ -31,6 +31,7 @@ void QepcadCls::SFC4(Word D, Word P, Wor - { - Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag; - char e,s,m,c; -+ e = s = m = c = '\0'; - T1 = T2 = T3 = T4 = 0; - F1 = 0; - ---- ./extensions/sfext/sfcons/SFC3.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SFC3.c 2013-08-28 15:16:00.827160334 -0600 -@@ -90,7 +90,7 @@ Step3: /* The normal language. */ - switch(m) { - case (0) : SF = NECCONDS(Lt,Lf,LA,Pp); break; - case (1) : SF = NAIVESF(Lt,Lf,LA,Pp); break; -- case (2) : SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } -+ case (2) : SF = NIL; SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } - - Step4: /* Massage the formula. */ - pflag = 1; ---- ./extensions/sfext/sfcons/SFC3f.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SFC3f.c 2013-08-28 15:15:36.243138257 -0600 -@@ -88,7 +88,7 @@ Step3: /* The normal language. */ - switch(m) { - case (0) : SF = NECCONDS(Lt,Lf,LA,Pp); break; - case (1) : SF = NAIVESF(Lt,Lf,LA,Pp); break; -- case (2) : SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } -+ case (2) : SF = NIL; SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } - - Step4: /* Massage the formula. */ - pflag = 1; ---- ./extensions/sfext/formula/FMAATOMREAD.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAATOMREAD.c 2013-08-28 14:56:16.650119530 -0600 +--- extensions/sfext/formula/FMAATOMREAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAATOMREAD.c 2018-08-29 20:05:52.865359501 -0600 @@ -18,7 +18,7 @@ void FMAATOMREAD(Word Q, Word V, Word *F /* hide r,s,t; */ @@ -130,8 +110,8 @@ P_r = LELTI(P,r); *t = 0; for(Pp = P_r; Pp != NIL; Pp = RED(Pp)) { pp = FIRST(Pp); ---- ./extensions/sfext/formula/FMASMOOTH.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMASMOOTH.c 2013-08-28 14:50:13.736716426 -0600 +--- extensions/sfext/formula/FMASMOOTH.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMASMOOTH.c 2018-08-29 20:05:52.865359501 -0600 @@ -16,6 +16,7 @@ Step1: /* Atoms and Constants. */ if (ISLIST(F1) || F1 == TRUE || F1 == FALSE) { G = F; @@ -140,52 +120,50 @@ Step2: /* AND's */ if (F1 == ANDOP) { ---- ./extensions/sfext/addpol/MINPFSETNSC.c.orig 2013-08-28 16:29:15.985921210 -0600 -+++ ./extensions/sfext/addpol/MINPFSETNSC.c 2013-08-30 15:07:56.269063272 -0600 -@@ -42,7 +42,7 @@ Word MINPFSETNSC(Word P,Word S,Word D,Wo - Word x_s,js,Ls,O,Q,Q_i,Sp,Pp,i,Cp,*V,*Vp,**A,a,N,k,S_r,I,j,p; +--- extensions/sfext/sfcons/SFC3.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SFC3.c 2018-08-29 20:05:52.865359501 -0600 +@@ -90,7 +90,7 @@ Step3: /* The normal language. */ + switch(m) { + case (0) : SF = NECCONDS(Lt,Lf,LA,Pp); break; + case (1) : SF = NAIVESF(Lt,Lf,LA,Pp); break; +- case (2) : SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } ++ case (2) : SF = NIL; SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } - Step1: /* Initialization. */ -- C = NIL; Sltr = NIL; Pltr = NIL; N = LENGTH(K); -+ C = NIL; Sltr = NIL; S_r = NIL; Pltr = NIL; N = LENGTH(K); + Step4: /* Massage the formula. */ + pflag = 1; +--- extensions/sfext/sfcons/SFC3f.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SFC3f.c 2018-08-29 20:05:52.865359501 -0600 +@@ -88,7 +88,7 @@ Step3: /* The normal language. */ + switch(m) { + case (0) : SF = NECCONDS(Lt,Lf,LA,Pp); break; + case (1) : SF = NAIVESF(Lt,Lf,LA,Pp); break; +- case (2) : SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } ++ case (2) : SF = NIL; SWRITE("GEOTEST requires the extended language!\n"); goto Return; } } - Step2: /* Loop over each level in D. */ - for(r = 1; r <= N; r++) { ---- ./extensions/sfext/espcad/PCAD2ESPCAD.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/espcad/PCAD2ESPCAD.c 2013-08-30 15:10:16.295906419 -0600 -@@ -44,6 +44,8 @@ Step2: /* Generate correct i-level signi - P_i = RED(P_i); - s = RED(s); } - s = INV(ss); } -+ else -+ s = NIL; + Step4: /* Massage the formula. */ + pflag = 1; +--- extensions/sfext/sfcons/SFC4.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SFC4.c 2018-08-29 20:05:52.865359501 -0600 +@@ -31,6 +31,7 @@ void QepcadCls::SFC4(Word D, Word P, Wor + { + Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag; + char e,s,m,c; ++ e = s = m = c = '\0'; + T1 = T2 = T3 = T4 = 0; + F1 = 0; - Step3: /* Construct extended Sub-CAD cell structure. */ - EDs = LIST8(C,A,LELTI(Ds,SC_INX),NIL,s,NIL,UNDET,UNDET); ---- ./source/io/FREADR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/io/FREADR.c 2013-08-28 15:44:52.884175239 -0600 -@@ -23,7 +23,7 @@ void FREADR(Word V, Word f, Word *Fs_, W - /* hide C,i,q,r,t; */ +--- extensions/sfext/sfcons/SFCFULLDf.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SFCFULLDf.c 2018-08-29 20:05:52.865359501 -0600 +@@ -52,6 +52,7 @@ Step2: /* Extended language. */ - Step1: /* Read quantifier list. */ -- t = 1; Q = NIL; r = LENGTH(V); -+ Fs = NIL; t = 1; Q = NIL; r = LENGTH(V); - for (i = f + 1; i <= r; i++) - { - C = CREADB(); ---- ./source/io/CATTRNRDR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/CATTRNRDR.c 2013-08-28 15:40:18.276327460 -0600 -@@ -39,7 +39,7 @@ Step2: /* Get the internal representatio - goto Return; - - Step3: /* Error exit. */ -- DIELOC(); t = 0; -+ DIELOC(); V = 0; t = 0; - - Return: /* Prepare for return. */ - *V_ = V; ---- ./source/io/ATOMFRDR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/ATOMFRDR.c 2013-08-28 15:37:47.085286610 -0600 + if (Lt == NIL && Lf == NIL) { + SWRITE("No cells have truth values!\n"); ++ SF = NIL; + goto Return; } + t = ESPCADDOPFSUFF(Pp,LIST1(Dp)); + LA = LISTOETAmod(Pp,n,t==NIL); +--- source/io/ATOMFRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/ATOMFRDR.c 2018-08-29 20:05:52.866359500 -0600 @@ -76,7 +76,7 @@ void ETFATOMRDR(Word V, Word P1, BDigit Word t, F, r, j, P2, P2p, r1, r2, a, P, s; @@ -195,30 +173,19 @@ Step2: /* Read "_root_" */ ---- ./source/io/RLOPRDR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/RLOPRDR.c 2013-08-28 15:47:38.828113556 -0600 -@@ -31,7 +31,7 @@ Step1: /* Read in. */ +--- source/io/CATTRNRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/CATTRNRDR.c 2018-08-29 20:05:52.866359500 -0600 +@@ -39,7 +39,7 @@ Step2: /* Get the internal representatio goto Return; - Step2: /* Error exit. */ -- DIELOC(); t = 0; goto Return; -+ DIELOC(); p = 0; t = 0; goto Return; + Step3: /* Error exit. */ +- DIELOC(); t = 0; ++ DIELOC(); V = 0; t = 0; Return: /* Prepare for return. */ - *p_ = p; ---- ./source/io/LGOPRDR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/LGOPRDR.c 2013-08-28 15:46:19.140193709 -0600 -@@ -50,7 +50,7 @@ Step1: /* Read in. */ - { SWRITE("Error LGOPRDR: Logic operator was expected.\n"); goto Step2; } - - Step2: /* Error exit. */ -- DIELOC(); t = 0; goto Return; -+ DIELOC(); p = 0; t = 0; goto Return; - - Return: /* Prepare for return. */ - *p_ = p; ---- ./source/io/DESIREDRDR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/DESIREDRDR.c 2013-08-28 15:41:17.860345319 -0600 + *V_ = V; +--- source/io/DESIREDRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/DESIREDRDR.c 2018-08-29 20:05:52.867359499 -0600 @@ -15,6 +15,7 @@ void DESIREDRDR(Word *F_, Word *t_) /* hide C,C1,R,V1,V2,t; */ @@ -227,19 +194,19 @@ t = 1; C = CREADB(); if (C == '[') goto Step2; BKSP(); ---- ./source/io/QFRDR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/QFRDR.c 2013-08-28 15:46:59.100124953 -0600 -@@ -39,7 +39,7 @@ Step1: /* Read in. */ - goto Return; +--- source/io/FREADR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/FREADR.c 2018-08-29 20:05:52.866359500 -0600 +@@ -23,7 +23,7 @@ void FREADR(Word V, Word f, Word *Fs_, W + /* hide C,i,q,r,t; */ - Step2: /* Error exit. */ -- DIELOC(); t = 0; goto Return; -+ DIELOC(); q = 0; t = 0; goto Return; - - Return: /* Prepare for return. */ - *q_ = q; ---- ./source/io/GREADR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/GREADR.c 2013-08-28 15:45:29.740181394 -0600 + Step1: /* Read quantifier list. */ +- t = 1; Q = NIL; r = LENGTH(V); ++ Fs = NIL; t = 1; Q = NIL; r = LENGTH(V); + for (i = f + 1; i <= r; i++) + { + C = CREADB(); +--- source/io/GREADR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/GREADR.c 2018-08-29 20:05:52.867359499 -0600 @@ -33,7 +33,7 @@ Step2: /* Read digits and convert. */ BKSP(); a = S * a; goto Return; @@ -249,8 +216,41 @@ Return: /* Prepare for return. */ *a_ = a; ---- ./source/main/QEPCADauto.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/QEPCADauto.c 2013-08-28 15:52:45.403836140 -0600 +--- source/io/LGOPRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/LGOPRDR.c 2018-08-29 20:05:52.866359500 -0600 +@@ -50,7 +50,7 @@ Step1: /* Read in. */ + { SWRITE("Error LGOPRDR: Logic operator was expected.\n"); goto Step2; } + + Step2: /* Error exit. */ +- DIELOC(); t = 0; goto Return; ++ DIELOC(); p = 0; t = 0; goto Return; + + Return: /* Prepare for return. */ + *p_ = p; +--- source/io/QFRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/QFRDR.c 2018-08-29 20:05:52.867359499 -0600 +@@ -39,7 +39,7 @@ Step1: /* Read in. */ + goto Return; + + Step2: /* Error exit. */ +- DIELOC(); t = 0; goto Return; ++ DIELOC(); q = 0; t = 0; goto Return; + + Return: /* Prepare for return. */ + *q_ = q; +--- source/io/RLOPRDR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/RLOPRDR.c 2018-08-29 20:05:52.866359500 -0600 +@@ -31,7 +31,7 @@ Step1: /* Read in. */ + goto Return; + + Step2: /* Error exit. */ +- DIELOC(); t = 0; goto Return; ++ DIELOC(); p = 0; t = 0; goto Return; + + Return: /* Prepare for return. */ + *p_ = p; +--- source/main/QEPCADauto.c.orig 2018-03-16 14:22:00.000000000 -0600 ++++ source/main/QEPCADauto.c 2018-08-29 20:05:52.867359499 -0600 @@ -27,6 +27,8 @@ void QepcadCls::QEPCADauto(Word Fs, Word char c1,c2; /* Chris variables. */ @@ -260,8 +260,8 @@ FIRST4(Fs,&r,&f,&Q,&Fh); F = NORMQFF(Fh); if (GVUA != NIL) GVNA = NORMQFF(GVUA); ---- ./source/main/QEPCAD.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/QEPCAD.c 2013-08-28 15:51:13.747873723 -0600 +--- source/main/QEPCAD.c.orig 2018-03-16 14:22:00.000000000 -0600 ++++ source/main/QEPCAD.c 2018-08-29 20:05:52.867359499 -0600 @@ -26,6 +26,8 @@ void QepcadCls::QEPCAD(Word Fs, Word *t_ Word Cs,Ps,Qs,Pps,Cps,Qps,SF; /* Chris variables. */ char c1,c2; /* Chris variables. */ @@ -271,18 +271,8 @@ FIRST4(Fs,&r,&f,&Q,&Fh); /*Int*/ PCNSTEP = 1; /*Int*/ if (INTERACT()) USERINT(LFS("Before Normalization"),'a'); ---- ./source/ticad/SUBST.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/SUBST.c 2013-08-30 15:36:14.959182825 -0600 -@@ -24,6 +24,7 @@ Word QepcadCls::SUBST(Word c, Word k, Wo - Word P,L,Sp,T1,T2,G,Q,f,i; - - Step1: /* Substitute. */ -+ f = UNDET; - L = NIL; - S = NIL; - Bp = B; ---- ./source/ticad/AFUPMPR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/AFUPMPR.c 2013-08-30 15:32:39.031457638 -0600 +--- source/ticad/AFUPMPR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/AFUPMPR.c 2018-08-29 20:05:52.867359499 -0600 @@ -27,6 +27,7 @@ void AFUPMPR(Word M, Word I, Word B, Wor /* hide L1,Lp,j,jp,s,t,v,vp; */ @@ -291,8 +281,18 @@ FIRST2(J,&a,&b); t = AFUPSR(M,I,B,b); if (t == 0) ---- ./source/ticad/SUBSTR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/SUBSTR.c 2013-08-30 15:36:46.631109286 -0600 +--- source/ticad/SUBST.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/SUBST.c 2018-08-29 20:05:52.867359499 -0600 +@@ -24,6 +24,7 @@ Word QepcadCls::SUBST(Word c, Word k, Wo + Word P,L,Sp,T1,T2,G,Q,f,i; + + Step1: /* Substitute. */ ++ f = UNDET; + L = NIL; + S = NIL; + Bp = B; +--- source/ticad/SUBSTR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/SUBSTR.c 2018-08-29 20:05:52.868359497 -0600 @@ -24,6 +24,7 @@ Word QepcadCls::SUBSTR(Word c, Word k, W Word P,L,Q,T1,T2,Sp,G,f,i; @@ -301,8 +301,8 @@ L = NIL; S = NIL; Bp = B; ---- ./source/userint/PREQNCONSTL.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/PREQNCONSTL.c 2013-08-30 15:37:35.045721919 -0600 +--- source/userint/PREQNCONSTL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/userint/PREQNCONSTL.c 2018-08-29 20:05:52.868359497 -0600 @@ -73,7 +73,7 @@ Return: /* Prepare for return. */ Word POLYLABEL(Word P, Word p, Word r, Word *t) diff --git a/qepcad-B-unused.patch b/qepcad-B-unused.patch index 94c0fd0..0cf7a56 100644 --- a/qepcad-B-unused.patch +++ b/qepcad-B-unused.patch @@ -1,5 +1,5 @@ ---- ./cad2d/src/CAD2D.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./cad2d/src/CAD2D.c 2013-11-21 15:31:13.803963748 -0700 +--- cad2d/src/CAD2D.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ cad2d/src/CAD2D.c 2018-08-29 20:10:06.394075819 -0600 @@ -20,8 +20,8 @@ void QepcadCls2D::CAD2D(Word Fs, Word *t_, Word *F_e_, Word *F_n_, Word *F_s_) @@ -22,30 +22,8 @@ SWRITE("graph: {\n"); ---- ./cad2d/src/TICAD.c.orig 2013-08-30 15:42:57.518153269 -0600 -+++ ./cad2d/src/TICAD.c 2013-11-21 15:33:05.259945387 -0700 -@@ -24,7 +24,7 @@ Output - - Word QepcadCls2D::TICAD(Word Q,Word F,Word f,Word P,Word A) - { -- Word As,D,Ps,Ths,Thss,c,cp,k,s,sh,sp,t,R,S; -+ Word As,D,Ps,c,k,s,sh; - Word L,d; - - Step1: /* Initialize. */ ---- ./cad2d/src/PROJECT.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./cad2d/src/PROJECT.c 2013-11-21 15:32:38.947949657 -0700 -@@ -17,7 +17,7 @@ Projection Phase. - - void QepcadCls2D::PROJECT(Word r, Word A,Word *P_, Word *J_) - { -- Word D,F,J,P,Ps,J_k1,P_k,R,Ths,Thss,k,i; -+ Word D,F,J,P,J_k1,P_k,R,Ths,Thss,k,i; - - Step1: /* Initialize. */ - P = LLCOPY(A); ---- ./cad2d/src/CONSTRUCT.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./cad2d/src/CONSTRUCT.c 2013-11-21 15:32:24.972951951 -0700 +--- cad2d/src/CONSTRUCT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ cad2d/src/CONSTRUCT.c 2018-08-29 20:10:06.395075818 -0600 @@ -19,31 +19,10 @@ Construct a stack. ======================================================================*/ #include "cad2d.h" @@ -79,18 +57,424 @@ Step1: /* Extract the projection factors from their attribute lists. */ Word Ps = Ps_; ---- ./plot2d/plot.cc.orig 2013-08-30 16:55:10.593713039 -0600 -+++ ./plot2d/plot.cc 2013-11-21 15:28:46.188989026 -0700 -@@ -112,7 +112,6 @@ void* readdata(void *x) +--- cad2d/src/PROJECT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ cad2d/src/PROJECT.c 2018-08-29 20:10:06.395075818 -0600 +@@ -17,7 +17,7 @@ Projection Phase. + + void QepcadCls2D::PROJECT(Word r, Word A,Word *P_, Word *J_) { - vector E; - istream &in = *inp; -- int flag; - char c; - do { - while( in >> c ) ---- ./extensions/rend/Rend_Sample.cc.orig 2013-08-30 16:59:11.255885740 -0600 -+++ ./extensions/rend/Rend_Sample.cc 2013-11-21 14:29:46.693509554 -0700 +- Word D,F,J,P,Ps,J_k1,P_k,R,Ths,Thss,k,i; ++ Word D,F,J,P,J_k1,P_k,R,Ths,Thss,k,i; + + Step1: /* Initialize. */ + P = LLCOPY(A); +--- cad2d/src/TICAD.c.orig 2018-08-29 20:05:52.862359504 -0600 ++++ cad2d/src/TICAD.c 2018-08-29 20:10:06.394075819 -0600 +@@ -24,7 +24,7 @@ Output + + Word QepcadCls2D::TICAD(Word Q,Word F,Word f,Word P,Word A) + { +- Word As,D,Ps,Ths,Thss,c,cp,k,s,sh,sp,t,R,S; ++ Word As,D,Ps,c,k,s,sh; + Word L,d; + + Step1: /* Initialize. */ +--- extensions/adj2d/ADJ_2D1.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/ADJ_2D1.c 2018-08-29 20:10:06.400075810 -0600 +@@ -16,6 +16,7 @@ Outputs + #include "adj2D.h" + #include "adj2D.h" + /**************************************/ ++/* + static FILE *OUTPUT; + + static void init() +@@ -30,6 +31,7 @@ static void uninit() + { + fclose(OUTPUT); + } ++*/ + /**************************************/ + + +--- extensions/adj2d/ADJ_2D1P2.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/ADJ_2D1P2.c 2018-08-29 20:10:06.401075809 -0600 +@@ -9,7 +9,7 @@ void sa_send(const char* S); + + Word ADJ_2D1P2(Word U, Word V, Word w_l, Word B) + { +- Word Sol,S,v,J,w_v,u,w_u,I,Solp,t,f; ++ Word Sol,S,v,J,w_v,u,w_u,I,Solp,f; + + /*sa_send("[");*/ + +--- extensions/adj2d/ADJ_2D.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/ADJ_2D.c 2018-08-29 20:10:06.400075810 -0600 +@@ -17,12 +17,6 @@ Outputs + ======================================================================*/ + #include "adj2D.h" + #include "adj2D.h" +-static void start(); +-static void stop(); +-static int k; +-static void zero() { k = 0; } +-void bump() { k++; } +-static void print() { SWRITE("\n\nk = "); IWRITE(k); SWRITE("\n\n"); } + + Word ADJ_2D(Word c, Word c_l, Word c_r, Word P, Word J) + { +@@ -37,18 +31,3 @@ Word ADJ_2D(Word c, Word c_l, Word c_r, + + return Sol; + } +- +-static Word ADJ_D_Time; +- +-void start() +-{ +- ADJ_D_Time = ACLOCK(); +-} +- +-void stop() +-{ +- ADJ_D_Time = ACLOCK() - ADJ_D_Time; +- SWRITE("\nADJ_2D took "); +- IWRITE(ADJ_D_Time); +- SWRITE(" millseconds.\n"); +-} +--- extensions/adj2d/ADJ_2D_PART.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/ADJ_2D_PART.c 2018-08-29 20:10:06.401075809 -0600 +@@ -80,8 +80,3 @@ Step5: /* Clean up evidence of "shadow s + Return: /* Prepare to return. */ + return Sol; + } +- +-static void dummy() +-{ +- +-} +--- extensions/adj2d/oldadj/ACMADJ2D.c.orig 2018-08-29 20:05:52.864359502 -0600 ++++ extensions/adj2d/oldadj/ACMADJ2D.c 2018-08-29 20:10:06.400075810 -0600 +@@ -239,7 +239,7 @@ Step3: /* Make assignments. */ + + Word ASYS2(Word M, Word H, Word I, Word P2) + { +- Word P,p,tH,tI,h1,h2,i1,i2,L1p,L2p,L1n,L2n,n1p,n1n,n2p,n2n,p1,p2,L1,L2,t; ++ Word P,p,tH,tI,h1,h2,i1,i2; + + tH = -LBRNSIGN(IUPLBREVAL(M,FIRST(H))); + tI = LBRNSIGN(IUPLBREVAL(M,SECOND(I))); +--- extensions/adj2d/P1.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/P1.c 2018-08-29 20:10:06.401075809 -0600 +@@ -25,7 +25,7 @@ Notes: P1 has three main cases to deal w + + Word P1(Word U, Word V, Word W, Word v_l, Word B) + { +- Word Sol,As,S,u,I,J,a,w,v,n,x,x_u,x_w,N,m_v,m_2v; ++ Word Sol,As,S,u,I,J,a,w,v,n,x,x_u,x_w,m_v,m_2v; + + Sol = NIL; As = NIL; + +--- extensions/adj2d/P3.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/P3.c 2018-08-29 20:10:06.401075809 -0600 +@@ -29,7 +29,7 @@ Note: Program 3 is the first called, an + + Word P3(Word U, Word V, Word W, Word v_l, Word B) + { +- Word I,J,Sol,S,u,As; ++ Word J,Sol,S,u,As; + + Step1: /* Special Case: No adjacencies to determine. */ + if (U == NIL && W == NIL) +--- extensions/adj2d/P4.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/P4.c 2018-08-29 20:10:06.400075810 -0600 +@@ -25,7 +25,7 @@ Notes: Program 4 tries to find solutions + + Word P4(Word U, Word V, Word W, Word v_l, Word B) + { +- Word I,Sol,S,w,As,J; ++ Word Sol,S,w,As,J; + + Step1: /* Loop. */ + J = LIST2(B,AD2D_N_In); Sol = NIL; As = NIL; +--- extensions/adj2d/sac_ext/IUPTSII.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/sac_ext/IUPTSII.c 2018-08-29 20:10:06.401075809 -0600 +@@ -14,7 +14,7 @@ Outputs + + Word IUPTSII(Word A, Word I) + { +- Word i1,i2,Ap,t,a; ++ Word i1,i2,Ap,t; + + Step1: /* One-point interval. */ + FIRST2(I,&i1,&i2); +--- extensions/adj2d/truthbytop/ADJ2DITOEL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/truthbytop/ADJ2DITOEL.c 2018-08-29 20:10:06.400075810 -0600 +@@ -27,7 +27,7 @@ int bc(int a, int b) + + Word ADJ2DITOEL(Word L, Word c1, Word c0) + { +- Word *A, E,n,l,s,a,b,k1,k0,i,itop,ibot,S; ++ Word *A, E,n,l,a,b,k1,k0,i,itop,ibot,S; + + Step1: /* Initialize & Special Case. */ + E = NIL; +--- extensions/adj2d/truthbytop/GRAPHMODULE.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/adj2d/truthbytop/GRAPHMODULE.c 2018-08-29 20:10:06.400075810 -0600 +@@ -61,9 +61,9 @@ Return: /* Prepare to return. */ + + Word GSTACKHANDLE(Word i, Word G_) + { +- Word G,Gp,h; +- G = G_; +- for(Gp = NIL; G != NIL && (i > FIRST(FIRST(G))); G = RED(G)); ++ Word G,h; ++ ++ for(G = G_; G != NIL && (i > FIRST(FIRST(G))); G = RED(G)); + if (G == NIL || FIRST(FIRST(G)) != i) + h = NIL; + else +@@ -74,7 +74,7 @@ Word GSTACKHANDLE(Word i, Word G_) + + Word GVERTEXHANDLE(Word v, Word G_) + { +- Word G,i,j,Gp,T,h; ++ Word i,j,T,h; + + FIRST2(v,&i,&j); + h = GSTACKHANDLE(i,G_); +--- extensions/lift2D/IBPRRIOAPSF.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/IBPRRIOAPSF.c 2018-08-29 20:10:06.399075811 -0600 +@@ -30,8 +30,8 @@ Outputs + + void IBPRRIOAPSF(Word M, Word I, Word B, BDigit p,BDigit k, Word *J_, Word *L_) + { +- BDigit *Mp,*bp,*c,i,m,n,q1,q2,S,s,t; +- Word b,Bp,I1,I2,J,K,L,Ls,Lp,T,Jp; ++ BDigit *Mp,*bp,*c,m,n,q1,q2,S,s,t; ++ Word b,J,L,Ls,Lp,Jp; + + Step1: /* Convert the minimal polynomial to a software interval + polynomial. */ +--- extensions/lift2D/LIFTSRD2D.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/LIFTSRD2D.c 2018-08-29 20:10:06.399075811 -0600 +@@ -14,7 +14,7 @@ + + Word LIFTSRD2D(Word c, Word D, Word P, Word L) + { +- Word S_L,S_R,s_L,s_R,S,i,c_L,c_R,cp,flag,m_L,m_R,so,mo,m,s,j; ++ Word S_L,S_R,s_R,S,i,c_R,cp,so,m,s,j; + Word M,I,P2,Rp,t,R,Rs,Rt,SP,r,k,c1,c2,prev,Sp,sor,next,s2,nextc,X; + Word DL,Rps,pf,a,b,e,temp,count,J; + Word R_L; +@@ -113,7 +113,6 @@ if (PCVERBOSE) { SWRITE("Tried up to pre + /* Go through the neighboring stacks! */ + /**************************************/ + i = 0; +- flag = FALSE; + + /* LIMITATION OF CURRENT IMPLEMENTATION + make sure the larger stack is to the right */ +@@ -127,7 +126,6 @@ if (PCVERBOSE) { SWRITE("Tried up to pre + + for(S = NIL; S_R != NIL; ) { /******* BIG LOOP!!!! **********/ + +- c_L = FIRST(S_L); + c_R = FIRST(S_R); + + if (LELTI(c_R,MULSUB) != NIL && FIRST(FIRST(LELTI(c_R,MULSUB))) == J) +@@ -153,7 +151,6 @@ if (PCVERBOSE) { SWRITE("Tried up to pre + NOTDET, + LELTI(c_R,DEGSUB),LELTI(c_R,MULSUB)); + S = COMP(cp,S); +- flag = FALSE; + if (RED(S_L) == NIL && RED(S_R) != NIL) + S_R = RED(S_R); + else { +--- extensions/lift2D/LIFTSRR2D.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/LIFTSRR2D.c 2018-08-29 20:10:06.400075810 -0600 +@@ -38,7 +38,7 @@ void debWRITEINTERVAL(Word I) { + + Word LIFTSRR2D(Word c, Word D, Word P) + { +- Word S_L,S_R,s_L,s_R,S,i,c_L,c_R,cp,flag,m_L,m_R,so,mo,m,s,j; ++ Word S_L,S_R,s_L,s_R,S,i,c_L,c_R,cp,so,m,s; + Word M,I,P2,Rp,t,R,Rs,Rt,SP,r,k,c1,c2,prev,Sp,sor,next,s2,nextc,X; + Word OC, OT,count; + +@@ -108,7 +108,6 @@ Word LIFTSRR2D(Word c, Word D, Word P) + /* Go through the neighboring stacks! */ + /**************************************/ + i = 0; +- flag = FALSE; + for(S = NIL; S_L != NIL; S_L = RED(S_L), S_R = RED(S_R)) { + + c_L = FIRST(S_L); +@@ -133,8 +132,7 @@ Word LIFTSRR2D(Word c, Word D, Word P) + CCONC(LELTI(c,INDX),LIST1(i)),COMP(FIRST(LELTI(c_L,SIGNPF)),LELTI(c,SIGNPF)), + NOTDET, + LELTI(c_L,DEGSUB),LELTI(c_L,MULSUB)); +- S = COMP(cp,S); +- flag = FALSE; } ++ S = COMP(cp,S); } + + else { + /************************************************************ +--- extensions/lift2D/modHIPRRID.c.orig 2018-08-29 20:05:52.864359502 -0600 ++++ extensions/lift2D/modHIPRRID.c 2018-08-29 20:10:06.400075810 -0600 +@@ -22,7 +22,7 @@ void modHIPRRID(BDigit n, interval *A, W + { + BDigit k,s,t; + interval *B,*C; +- Word b,I,J,L,L1,L2; ++ Word I,L,L1,L2; + + Step1: /* Compute a bound for the positive roots. */ + k = HIPPRB(n,A); +--- extensions/lift2D/modHIPRRISD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/lift2D/modHIPRRISD.c 2018-08-29 20:10:06.399075811 -0600 +@@ -23,7 +23,7 @@ Outputs + + Word modHIPRRISD(BDigit n, interval *A, Word a, Word b) + { +- BDigit s,s2,t,u,v,Th,T0,sh; ++ BDigit s,s2,t,v,Th,T0,sh; + Word c,L,L1,L2; + interval *B,*C,J; + +--- extensions/lift2D/modIBPRRIOAPSF.c.orig 2018-08-29 20:05:52.863359503 -0600 ++++ extensions/lift2D/modIBPRRIOAPSF.c 2018-08-29 20:10:06.399075811 -0600 +@@ -31,8 +31,8 @@ Outputs + + void modIBPRRIOAPSF(Word M, Word I, Word B, Word p, Word k, BDigit *J_, BDigit *L_) + { +- BDigit *Mp,*bp,*c,i,m,n,q1,q2,S,s,t; +- Word a,b,Bp,I1,I2,J,K,L,Ls,Lp,T,Jp,Js,Ld; ++ BDigit *Mp,*bp,*c,m,n,q1,q2,S,s,t; ++ Word a,b,J,L,Ls,Lp,Jp,Js,Ld; + + Step1: /* Convert the minimal polynomial to a software interval + polynomial. */ +--- extensions/newadj/HAP2.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/newadj/HAP2.c 2018-08-29 20:10:06.406075801 -0600 +@@ -18,7 +18,7 @@ Outputs + + Word HAP2(Word U, Word V, Word w_l, Word B) + { +- Word Sol,S,v,J,w_v,u,w_u,I,Solp,t,f; ++ Word Sol,S,v,J,w_v,u,w_u,I,Solp,f; + + Sol = NIL; + S = NIL; +--- extensions/newadj/HATEST.c.orig 2018-08-29 20:03:25.111519356 -0600 ++++ extensions/newadj/HATEST.c 2018-08-29 20:10:06.406075801 -0600 +@@ -111,13 +111,11 @@ Sample point coordinate write. + + void SAMPLECWR(Word c) + { +- Word I,Ip,M,Mp,b,bp,k,s,F,j,Ms,Is; ++ Word I,Ip,M,Mp,b,bp,s,F,j,Ms,Is; + Word M1; +- /* hide k; */ + + Step1: /* Setup. */ + s = LELTI(c,SAMPLE); +- k = LELTI(c,LEVEL); + + Step2: /* Extended representation. */ + if (ISPRIMIT(s)) goto Step3; +@@ -160,7 +158,7 @@ Algebraic number field elements list wri + + void strippedAFLWR(Word M,Word I,Word N,Word a,Word A) + { +- Word A1,Ap,i,l,L,j; ++ Word A1,Ap,i; + /* hide i; */ + + Step1: /* Write. */ +@@ -196,7 +194,7 @@ Side effects + + void ANDWRITExx(Word M, Word I, Word n) + { +- Word J,R,Mp,K; ++ Word J,R,K; + Word a,a1,a2,b,b1,b2,d,d1,d2,e,f,m; + Word N; + +--- extensions/rend/CH_VIEW_WIN.cc.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/CH_VIEW_WIN.cc 2018-08-29 20:10:06.397075815 -0600 +@@ -4,7 +4,7 @@ + Word CH_VIEW_WIN(Rend_Cell &M, Rend_Win &W, Word Xs, Word Xt, + Word Ys,Word Yt, Word e, Word P) + { +- Word mx,dx,dxp,dxp2,my,dy,d2x,d2y,L,i; ++ Word mx,my,d2x,d2y,L,i; + + mx = LBRNP2PROD( LBRNSUM(W.x.W,W.X.W) , -1 ); + my = LBRNP2PROD( LBRNSUM(W.y.W,W.Y.W) , -1 ); +--- extensions/rend/PLOT_2D_CAD.cc.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/PLOT_2D_CAD.cc 2018-08-29 20:10:06.397075815 -0600 +@@ -42,9 +42,8 @@ void PLOT_2D_CAD(Word D, Word P, Word J, + { + char c; + Word N; +- Word i,j,I,ap,bp,a,b,L,p_n,n,A,Q,x,yl,Xs,Ys,Xt,Yt; +- char FIFO_NAME[20] = "/tmp/_plot_pipe_", +- RM_FIFO[25] = "rm "; ++ Word L,Xs,Ys,Xt,Yt; ++ char FIFO_NAME[20] = "/tmp/_plot_pipe_"; + longtostring(getpid(),FIFO_NAME+11); + int t = 1, first = 1; + int wcount = 0; +--- extensions/rend/Rend_Cell.cc.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/rend/Rend_Cell.cc 2018-08-29 20:10:06.398075813 -0600 +@@ -183,7 +183,7 @@ Word Rend_Cell::description(Rend_Win &W) + *************************************************************/ + void Rend_Cell::out_descrip(Rend_Win &W,ostream &out,Mapper &M) + { +- Word p,x,y,L,Lp,l,l1,l2,l3,x1,x2,y1,y2; ++ Word x,y,L,l,x1,x2,y1,y2; + + int px = 8; + int py = 8; +@@ -310,7 +310,7 @@ void Rend_Cell::out_descrip(Rend_Win &W, + *************************************************************/ + void Rend_Cell::out_descrip_ps(Rend_Win &W,ostream &out, Mapper &M) + { +- Word p,x,y,L,l,x1,x2,y1,y2; ++ Word p,L; + p = 12; + switch (level) { + case 0 : +@@ -382,7 +382,7 @@ void Rend_Cell::out_descrip_ps(Rend_Win + *************************************************************/ + void Rend_Cell::out_descrip_ps_color(Rend_Win &W,ostream &out, Mapper &M) + { +- Word p,x,y,L,l,x1,x2,y1,y2; ++ Word p,L; + p = 12; + switch (level) { + case 0 : +@@ -475,7 +475,7 @@ void Rend_Cell::out_descrip_ps_color(Ren + *************************************************************/ + void Rend_Cell::out_descrip_ps_raji(Rend_Win &W,ostream &out, Mapper &M) + { +- Word p,x,y,L,l,x1,x2,y1,y2; ++ Word p,L; + p = 12; + switch (level) { + case 0 : +@@ -511,7 +511,7 @@ void Rend_Cell::out_descrip_ps_raji(Rend + *************************************************************/ + void Rend_Cell::out_descrip_ps_standard(Rend_Win &W,ostream &out, Mapper &M) + { +- Word p,x,y,L,l,x1,x2,y1,y2; ++ Word p,L; + p = 12; + switch (level) { + case 0 : +--- extensions/rend/Rend_Sample.cc.orig 2018-08-29 20:07:27.087257552 -0600 ++++ extensions/rend/Rend_Sample.cc 2018-08-29 20:10:06.396075816 -0600 @@ -46,7 +46,7 @@ Rend_Sample_1DS::Rend_Sample_1DS(Word C, *************************************************************/ Word Rend_Sample_1DS::coordinate(int k) @@ -138,80 +522,8 @@ Step1: /* Initialize and decide if refinement is even necessary. */ ---- ./extensions/rend/CH_VIEW_WIN.cc.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/CH_VIEW_WIN.cc 2013-11-21 14:35:14.101046692 -0700 -@@ -4,7 +4,7 @@ - Word CH_VIEW_WIN(Rend_Cell &M, Rend_Win &W, Word Xs, Word Xt, - Word Ys,Word Yt, Word e, Word P) - { -- Word mx,dx,dxp,dxp2,my,dy,d2x,d2y,L,i; -+ Word mx,my,d2x,d2y,L,i; - - mx = LBRNP2PROD( LBRNSUM(W.x.W,W.X.W) , -1 ); - my = LBRNP2PROD( LBRNSUM(W.y.W,W.Y.W) , -1 ); ---- ./extensions/rend/PLOT_2D_CAD.cc.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/PLOT_2D_CAD.cc 2013-11-21 14:26:45.596772262 -0700 -@@ -42,9 +42,8 @@ void PLOT_2D_CAD(Word D, Word P, Word J, - { - char c; - Word N; -- Word i,j,I,ap,bp,a,b,L,p_n,n,A,Q,x,yl,Xs,Ys,Xt,Yt; -- char FIFO_NAME[20] = "/tmp/_plot_pipe_", -- RM_FIFO[25] = "rm "; -+ Word L,Xs,Ys,Xt,Yt; -+ char FIFO_NAME[20] = "/tmp/_plot_pipe_"; - longtostring(getpid(),FIFO_NAME+11); - int t = 1, first = 1; - int wcount = 0; ---- ./extensions/rend/Rend_Cell.cc.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/rend/Rend_Cell.cc 2013-11-21 14:33:14.205210657 -0700 -@@ -183,7 +183,7 @@ Word Rend_Cell::description(Rend_Win &W) - *************************************************************/ - void Rend_Cell::out_descrip(Rend_Win &W,ostream &out,Mapper &M) - { -- Word p,x,y,L,Lp,l,l1,l2,l3,x1,x2,y1,y2; -+ Word x,y,L,l,x1,x2,y1,y2; - - int px = 8; - int py = 8; -@@ -310,7 +310,7 @@ void Rend_Cell::out_descrip(Rend_Win &W, - *************************************************************/ - void Rend_Cell::out_descrip_ps(Rend_Win &W,ostream &out, Mapper &M) - { -- Word p,x,y,L,l,x1,x2,y1,y2; -+ Word p,L; - p = 12; - switch (level) { - case 0 : -@@ -382,7 +382,7 @@ void Rend_Cell::out_descrip_ps(Rend_Win - *************************************************************/ - void Rend_Cell::out_descrip_ps_color(Rend_Win &W,ostream &out, Mapper &M) - { -- Word p,x,y,L,l,x1,x2,y1,y2; -+ Word p,L; - p = 12; - switch (level) { - case 0 : -@@ -475,7 +475,7 @@ void Rend_Cell::out_descrip_ps_color(Ren - *************************************************************/ - void Rend_Cell::out_descrip_ps_raji(Rend_Win &W,ostream &out, Mapper &M) - { -- Word p,x,y,L,l,x1,x2,y1,y2; -+ Word p,L; - p = 12; - switch (level) { - case 0 : -@@ -511,7 +511,7 @@ void Rend_Cell::out_descrip_ps_raji(Rend - *************************************************************/ - void Rend_Cell::out_descrip_ps_standard(Rend_Win &W,ostream &out, Mapper &M) - { -- Word p,x,y,L,l,x1,x2,y1,y2; -+ Word p,L; - p = 12; - switch (level) { - case 0 : ---- ./extensions/rend/WRITE_PS_INTERACTIVE.cc.orig 2013-08-28 15:31:47.564213356 -0600 -+++ ./extensions/rend/WRITE_PS_INTERACTIVE.cc 2013-11-21 14:34:40.389086693 -0700 +--- extensions/rend/WRITE_PS_INTERACTIVE.cc.orig 2018-08-29 20:05:52.863359503 -0600 ++++ extensions/rend/WRITE_PS_INTERACTIVE.cc 2018-08-29 20:10:06.399075811 -0600 @@ -190,8 +190,8 @@ void WRITE_PS_INTERACTIVE(Rend_Cell &M, **********************************************************/ case 'a': @@ -223,649 +535,31 @@ SWRITE("Provide an origin: "); qein() >> Ox >> Oy; OX = IEEELBRN(Ox); ---- ./extensions/lift2D/modIBPRRIOAPSF.c.orig 2013-08-28 15:36:30.044273572 -0600 -+++ ./extensions/lift2D/modIBPRRIOAPSF.c 2013-11-21 14:45:55.412202364 -0700 -@@ -31,8 +31,8 @@ Outputs +--- extensions/sfext/addpol/BPOLSETS.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/addpol/BPOLSETS.c 2018-08-29 20:10:06.405075803 -0600 +@@ -24,7 +24,7 @@ Outputs - void modIBPRRIOAPSF(Word M, Word I, Word B, Word p, Word k, BDigit *J_, BDigit *L_) + void BPOLSETS(Word L_, Word D, Word P, Word *T_, Word *N_) { -- BDigit *Mp,*bp,*c,i,m,n,q1,q2,S,s,t; -- Word a,b,Bp,I1,I2,J,K,L,Ls,Lp,T,Jp,Js,Ld; -+ BDigit *Mp,*bp,*c,m,n,q1,q2,S,s,t; -+ Word a,b,J,L,Ls,Lp,Jp,Js,Ld; +- Word L,T,Q,q,a,b,I_a,I_b,i_a,i_b,n,P_N,S_a,S_b,s_a,s_b,t,N,p, ++ Word L,T,Q,q,a,b,I_a,I_b,i_a,i_b,n,P_N,t,N, + S_T,S_L,s_c,c,i,Tb,Tp; - Step1: /* Convert the minimal polynomial to a software interval - polynomial. */ ---- ./extensions/lift2D/modHIPRRISD.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/modHIPRRISD.c 2013-11-21 14:41:19.020585418 -0700 -@@ -23,7 +23,7 @@ Outputs + Step1: /* Initialization. */ +--- extensions/sfext/addpol/CFLCELLLIST.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/addpol/CFLCELLLIST.c 2018-08-29 20:10:06.405075803 -0600 +@@ -21,8 +21,7 @@ static Word comp(Word A, Word B); - Word modHIPRRISD(BDigit n, interval *A, Word a, Word b) + Word CFLCELLLIST(Word L_D) { -- BDigit s,s2,t,u,v,Th,T0,sh; -+ BDigit s,s2,t,v,Th,T0,sh; - Word c,L,L1,L2; - interval *B,*C,J; - ---- ./extensions/lift2D/LIFTSRD2D.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/LIFTSRD2D.c 2013-11-21 14:43:47.732380972 -0700 -@@ -14,7 +14,7 @@ - - Word LIFTSRD2D(Word c, Word D, Word P, Word L) - { -- Word S_L,S_R,s_L,s_R,S,i,c_L,c_R,cp,flag,m_L,m_R,so,mo,m,s,j; -+ Word S_L,S_R,s_R,S,i,c_R,cp,so,m,s,j; - Word M,I,P2,Rp,t,R,Rs,Rt,SP,r,k,c1,c2,prev,Sp,sor,next,s2,nextc,X; - Word DL,Rps,pf,a,b,e,temp,count,J; - Word R_L; -@@ -113,7 +113,6 @@ if (PCVERBOSE) { SWRITE("Tried up to pre - /* Go through the neighboring stacks! */ - /**************************************/ - i = 0; -- flag = FALSE; - - /* LIMITATION OF CURRENT IMPLEMENTATION - make sure the larger stack is to the right */ -@@ -127,7 +126,6 @@ if (PCVERBOSE) { SWRITE("Tried up to pre - - for(S = NIL; S_R != NIL; ) { /******* BIG LOOP!!!! **********/ - -- c_L = FIRST(S_L); - c_R = FIRST(S_R); - - if (LELTI(c_R,MULSUB) != NIL && FIRST(FIRST(LELTI(c_R,MULSUB))) == J) -@@ -153,7 +151,6 @@ if (PCVERBOSE) { SWRITE("Tried up to pre - NOTDET, - LELTI(c_R,DEGSUB),LELTI(c_R,MULSUB)); - S = COMP(cp,S); -- flag = FALSE; - if (RED(S_L) == NIL && RED(S_R) != NIL) - S_R = RED(S_R); - else { ---- ./extensions/lift2D/IBPRRIOAPSF.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/IBPRRIOAPSF.c 2013-11-21 14:44:47.197298052 -0700 -@@ -30,8 +30,8 @@ Outputs - - void IBPRRIOAPSF(Word M, Word I, Word B, BDigit p,BDigit k, Word *J_, Word *L_) - { -- BDigit *Mp,*bp,*c,i,m,n,q1,q2,S,s,t; -- Word b,Bp,I1,I2,J,K,L,Ls,Lp,T,Jp; -+ BDigit *Mp,*bp,*c,m,n,q1,q2,S,s,t; -+ Word b,J,L,Ls,Lp,Jp; - - Step1: /* Convert the minimal polynomial to a software interval - polynomial. */ ---- ./extensions/lift2D/modHIPRRID.c.orig 2013-08-28 15:34:25.468248208 -0600 -+++ ./extensions/lift2D/modHIPRRID.c 2013-11-21 14:41:49.724543634 -0700 -@@ -22,7 +22,7 @@ void modHIPRRID(BDigit n, interval *A, W - { - BDigit k,s,t; - interval *B,*C; -- Word b,I,J,L,L1,L2; -+ Word I,L,L1,L2; - - Step1: /* Compute a bound for the positive roots. */ - k = HIPPRB(n,A); ---- ./extensions/lift2D/LIFTSRR2D.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/lift2D/LIFTSRR2D.c 2013-11-21 14:40:41.964635468 -0700 -@@ -38,7 +38,7 @@ void debWRITEINTERVAL(Word I) { - - Word LIFTSRR2D(Word c, Word D, Word P) - { -- Word S_L,S_R,s_L,s_R,S,i,c_L,c_R,cp,flag,m_L,m_R,so,mo,m,s,j; -+ Word S_L,S_R,s_L,s_R,S,i,c_L,c_R,cp,so,m,s; - Word M,I,P2,Rp,t,R,Rs,Rt,SP,r,k,c1,c2,prev,Sp,sor,next,s2,nextc,X; - Word OC, OT,count; - -@@ -108,7 +108,6 @@ Word LIFTSRR2D(Word c, Word D, Word P) - /* Go through the neighboring stacks! */ - /**************************************/ - i = 0; -- flag = FALSE; - for(S = NIL; S_L != NIL; S_L = RED(S_L), S_R = RED(S_R)) { - - c_L = FIRST(S_L); -@@ -133,8 +132,7 @@ Word LIFTSRR2D(Word c, Word D, Word P) - CCONC(LELTI(c,INDX),LIST1(i)),COMP(FIRST(LELTI(c_L,SIGNPF)),LELTI(c,SIGNPF)), - NOTDET, - LELTI(c_L,DEGSUB),LELTI(c_L,MULSUB)); -- S = COMP(cp,S); -- flag = FALSE; } -+ S = COMP(cp,S); } - - else { - /************************************************************ ---- ./extensions/adj2d/truthbytop/GRAPHMODULE.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/truthbytop/GRAPHMODULE.c 2013-11-21 15:53:05.620446855 -0700 -@@ -61,9 +61,9 @@ Return: /* Prepare to return. */ - - Word GSTACKHANDLE(Word i, Word G_) - { -- Word G,Gp,h; -- G = G_; -- for(Gp = NIL; G != NIL && (i > FIRST(FIRST(G))); G = RED(G)); -+ Word G,h; -+ -+ for(G = G_; G != NIL && (i > FIRST(FIRST(G))); G = RED(G)); - if (G == NIL || FIRST(FIRST(G)) != i) - h = NIL; - else -@@ -74,7 +74,7 @@ Word GSTACKHANDLE(Word i, Word G_) - - Word GVERTEXHANDLE(Word v, Word G_) - { -- Word G,i,j,Gp,T,h; -+ Word i,j,T,h; - - FIRST2(v,&i,&j); - h = GSTACKHANDLE(i,G_); ---- ./extensions/adj2d/truthbytop/ADJ2DITOEL.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/truthbytop/ADJ2DITOEL.c 2013-11-21 14:23:19.197081651 -0700 -@@ -27,7 +27,7 @@ int bc(int a, int b) - - Word ADJ2DITOEL(Word L, Word c1, Word c0) - { -- Word *A, E,n,l,s,a,b,k1,k0,i,itop,ibot,S; -+ Word *A, E,n,l,a,b,k1,k0,i,itop,ibot,S; - - Step1: /* Initialize & Special Case. */ - E = NIL; ---- ./extensions/adj2d/oldadj/ACMADJ2D.c.orig 2013-08-28 15:27:00.100211471 -0600 -+++ ./extensions/adj2d/oldadj/ACMADJ2D.c 2013-11-21 14:21:55.357216902 -0700 -@@ -239,7 +239,7 @@ Step3: /* Make assignments. */ - - Word ASYS2(Word M, Word H, Word I, Word P2) - { -- Word P,p,tH,tI,h1,h2,i1,i2,L1p,L2p,L1n,L2n,n1p,n1n,n2p,n2n,p1,p2,L1,L2,t; -+ Word P,p,tH,tI,h1,h2,i1,i2; - - tH = -LBRNSIGN(IUPLBREVAL(M,FIRST(H))); - tI = LBRNSIGN(IUPLBREVAL(M,SECOND(I))); ---- ./extensions/adj2d/ADJ_2D.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/adj2d/ADJ_2D.c 2013-11-21 14:16:45.565852665 -0700 -@@ -17,12 +17,6 @@ Outputs - ======================================================================*/ - #include "adj2D.h" - #include "adj2D.h" --static void start(); --static void stop(); --static int k; --static void zero() { k = 0; } --void bump() { k++; } --static void print() { SWRITE("\n\nk = "); IWRITE(k); SWRITE("\n\n"); } - - Word ADJ_2D(Word c, Word c_l, Word c_r, Word P, Word J) - { -@@ -37,18 +31,3 @@ Word ADJ_2D(Word c, Word c_l, Word c_r, - - return Sol; - } -- --static Word ADJ_D_Time; -- --void start() --{ -- ADJ_D_Time = ACLOCK(); --} -- --void stop() --{ -- ADJ_D_Time = ACLOCK() - ADJ_D_Time; -- SWRITE("\nADJ_2D took "); -- IWRITE(ADJ_D_Time); -- SWRITE(" millseconds.\n"); --} ---- ./extensions/adj2d/P4.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/P4.c 2013-11-21 14:19:00.398558416 -0700 -@@ -25,7 +25,7 @@ Notes: Program 4 tries to find solutions - - Word P4(Word U, Word V, Word W, Word v_l, Word B) - { -- Word I,Sol,S,w,As,J; -+ Word Sol,S,w,As,J; - - Step1: /* Loop. */ - J = LIST2(B,AD2D_N_In); Sol = NIL; As = NIL; ---- ./extensions/adj2d/ADJ_2D1.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/adj2d/ADJ_2D1.c 2013-11-21 14:20:11.254405149 -0700 -@@ -16,6 +16,7 @@ Outputs - #include "adj2D.h" - #include "adj2D.h" - /**************************************/ -+/* - static FILE *OUTPUT; - - static void init() -@@ -30,6 +31,7 @@ static void uninit() - { - fclose(OUTPUT); - } -+*/ - /**************************************/ - - ---- ./extensions/adj2d/P3.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/P3.c 2013-11-21 14:18:41.278605411 -0700 -@@ -29,7 +29,7 @@ Note: Program 3 is the first called, an - - Word P3(Word U, Word V, Word W, Word v_l, Word B) - { -- Word I,J,Sol,S,u,As; -+ Word J,Sol,S,u,As; - - Step1: /* Special Case: No adjacencies to determine. */ - if (U == NIL && W == NIL) ---- ./extensions/adj2d/P1.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/P1.c 2013-11-21 14:18:20.069661253 -0700 -@@ -25,7 +25,7 @@ Notes: P1 has three main cases to deal w - - Word P1(Word U, Word V, Word W, Word v_l, Word B) - { -- Word Sol,As,S,u,I,J,a,w,v,n,x,x_u,x_w,N,m_v,m_2v; -+ Word Sol,As,S,u,I,J,a,w,v,n,x,x_u,x_w,m_v,m_2v; - - Sol = NIL; As = NIL; - ---- ./extensions/adj2d/sac_ext/IUPTSII.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/sac_ext/IUPTSII.c 2013-11-21 14:22:21.469173705 -0700 -@@ -14,7 +14,7 @@ Outputs - - Word IUPTSII(Word A, Word I) - { -- Word i1,i2,Ap,t,a; -+ Word i1,i2,Ap,t; - - Step1: /* One-point interval. */ - FIRST2(I,&i1,&i2); ---- ./extensions/adj2d/ADJ_2D_PART.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/adj2d/ADJ_2D_PART.c 2013-11-21 14:17:38.837777990 -0700 -@@ -80,8 +80,3 @@ Step5: /* Clean up evidence of "shadow s - Return: /* Prepare to return. */ - return Sol; - } -- --static void dummy() --{ -- --} ---- ./extensions/adj2d/ADJ_2D1P2.c.orig 2012-03-16 06:49:32.000000000 -0600 -+++ ./extensions/adj2d/ADJ_2D1P2.c 2013-11-21 14:20:39.277351218 -0700 -@@ -9,7 +9,7 @@ void sa_send(const char* S); - - Word ADJ_2D1P2(Word U, Word V, Word w_l, Word B) - { -- Word Sol,S,v,J,w_v,u,w_u,I,Solp,t,f; -+ Word Sol,S,v,J,w_v,u,w_u,I,Solp,f; - - /*sa_send("[");*/ - ---- ./extensions/sfext/pcadst/SCADDSCON.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/SCADDSCON.c 2013-11-21 11:27:14.776096755 -0700 -@@ -30,7 +30,7 @@ example, would be bad. - - Word SCADDSCON(Word C, Word A, Word n) - { -- Word c,a,i,Cs,X,L,t; -+ Word c,a,i,Cs,X,L; - - Step1: /* Construct a preliminary version of Cs, with all but the child - list filled in. */ ---- ./extensions/sfext/pcadst/CADFPCADWI.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/CADFPCADWI.c 2013-11-21 11:23:24.761297769 -0700 -@@ -22,7 +22,7 @@ Outputs - - Word CADFPCADWI(Word D, Word P, Word S, Word I, Word Pb) - { -- Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Q,Ms,C,Cs,Ds,Ss; -+ Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Ms,C,Cs,Ds,Ss; - Word Mb,mb; - - Step1: /* Is D the root cell? */ ---- ./extensions/sfext/pcadst/SIMPLE_CAD_INFO.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/SIMPLE_CAD_INFO.c 2013-11-21 11:27:36.232075896 -0700 -@@ -6,7 +6,7 @@ n : the level - - void SIMPLE_CAD_INFO(Word D, Word P, Word n, Word flag) - { -- Word Ps,Cs,t,Db; -+ Word Ps,Cs,t; - - Step1: /* Check for the trivial cases. */ - switch( DOPFSUFF(P,LIST1(D)) ) { ---- ./extensions/sfext/pcadst/PCADWRITE.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/PCADWRITE.c 2013-11-21 11:26:44.881126611 -0700 -@@ -7,7 +7,7 @@ - - void PCADWRITE(Word Cs, Word Ps) - { -- Word C,l,i,L,k,I; -+ Word l,L,k,I; - - Step1: /* */ - I = PCADCINDEX(Cs); ---- ./extensions/sfext/pcadst/CCADCONEXT.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/CCADCONEXT.c 2013-11-21 11:24:24.281258349 -0700 -@@ -21,7 +21,7 @@ Outputs - - void CCADCONEXT(Word n, Word P, Word C, Word *Ps_, Word *Cs_, Word *N_) - { -- Word Ps,i,Cs,Q,S,c,L,Lp,b,d,bs,ds,cs,T1,T2,N,Np; -+ Word Ps,i,Cs,Q,S,L,Lp,bs,ds,cs,T1,T2,N; - - Word t; - ---- ./extensions/sfext/pcadst/LTFOCWTV.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/LTFOCWTV.c 2013-11-21 11:25:27.168208934 -0700 -@@ -15,7 +15,7 @@ Outputs - - void LTFOCWTV(Word C, Word *Lt_, Word *Lf_) - { -- Word L,Cp,Lt,Lf,t,Ltp,Lfp; -+ Word Cp,Lt,Lf,t,Ltp,Lfp; - - Step1: /* If C is undetermined recurse on the children. */ - t = LELTI(C,SC_CDTV); ---- ./extensions/sfext/pcadst/CADFPCAD.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/CADFPCAD.c 2013-11-21 11:23:05.305310830 -0700 -@@ -21,7 +21,7 @@ Outputs - - Word CADFPCAD(Word D, Word P, Word S, Word I, Word Pb) - { -- Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Q,Ms,C,Cs,Ds,Ss; -+ Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Ms,C,Cs,Ds,Ss; - Word Mb,mb; - - Step1: /* Is D the root cell? */ ---- ./extensions/sfext/pcadst/PCADSCANL.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/PCADSCANL.c 2013-11-21 11:26:21.576150561 -0700 -@@ -18,7 +18,7 @@ Outputs - - Word PCADSCANL(Word Cs, Word i) - { -- Word CC,CC1,CC2,L,c; -+ Word CC,CC1,L,c; - - Step1: /* Get list of children. */ - CC = LELTI(Cs,SC_CDTV); ---- ./extensions/sfext/pcadst/LTFOCALWTV.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/LTFOCALWTV.c 2013-11-21 11:25:45.401188973 -0700 -@@ -16,7 +16,7 @@ Outputs - - void LTFOCALWTV(Word C, Word n, Word *Lt_, Word *Lf_) - { -- Word L,Cp,Lt,Lf,t,Ltp,Lfp; -+ Word Cp,Lt,Lf,t,Ltp,Lfp; - - Step1: /* If C is undetermined recurse on the children. */ - t = LELTI(C,SC_CDTV); ---- ./extensions/sfext/pcadst/CCADCONmod.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/pcadst/CCADCONmod.c 2013-11-21 11:24:52.841239711 -0700 -@@ -22,7 +22,7 @@ Outputs - - void CCADCONmod(Word n, Word P, Word C, Word *Ps_, Word *Cs_) - { -- Word Ps,i,Cs,Q,S,c,L,Lp,b,d,bs,ds,cs,T1,T2; -+ Word Ps,i,Cs,Q,S,c,L,Lp,b,d,bs,ds,T1,T2; - - Step1: /* Set Ps to the empty projection list, and Cs to the full - original CAD C. */ ---- ./extensions/sfext/minhit/MINHITSETSRDR.c.orig 2013-08-30 09:28:39.624633978 -0600 -+++ ./extensions/sfext/minhit/MINHITSETSRDR.c 2013-11-21 11:22:32.025333379 -0700 -@@ -27,7 +27,7 @@ Note: The point is that not only sortin - static Word comp(Word a, Word b) __pure; - - static Word comp(Word a, Word b) { -- Word ap,bp,t,q; -+ Word ap,bp,t; - ap = a; bp = b; - t = BDCOMP(LENGTH(ap),LENGTH(bp)); - while ((t == 0) && (bp != NIL) && (ap != NIL)) { ---- ./extensions/sfext/sfcons/SFC2.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SFC2.c 2013-11-21 14:11:16.452311476 -0700 -@@ -5,7 +5,7 @@ Solution formula construction version 2 - - void QepcadCls::SFC2(Word D, Word P, Word J, Word n, Word sfm) - { -- Word t,SF,D0,P0,J0,D1,P1,Pp,Dp,Q,L,Lt,Lf; -+ Word t,SF,D1,P1,Pp,Dp,Q,L,Lt,Lf; - - Step1: /* Space is either empty or R^n. */ - t = DOPFSUFF(P,LIST1(D)); ---- ./extensions/sfext/sfcons/SOLEXTINT.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SOLEXTINT.c 2013-11-21 14:13:58.830085733 -0700 -@@ -10,7 +10,7 @@ method to call and, of course, calls it. - - void QepcadCls::SOLEXTINT() - { -- Word t,F_e,F_n,F_s, T, f, c; -+ Word T, f, c; - - Step1: /* Initialization */ - T = ACLOCK(); ---- ./extensions/sfext/sfcons/SFCFULLD.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/SFCFULLD.c 2013-11-21 14:12:59.286168676 -0700 -@@ -19,8 +19,7 @@ static Word PLISTOETAmod(Word p,Word B,W - - void QepcadCls::SFCFULLD(Word D, Word P, Word J, Word n) - { -- Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag, L; -- char e,s,m,c; -+ Word t,SF,Dp,Pp,Lt,Lf,LA,L; - - Step1: /* Space is either empty or R^n. */ - t = DOPFSUFF_FULLD(P,LIST1(D)); ---- ./extensions/sfext/sfcons/SFCFULLDf.c.orig 2013-08-28 15:14:42.812090282 -0600 -+++ ./extensions/sfext/sfcons/SFCFULLDf.c 2013-11-21 14:13:26.382130953 -0700 -@@ -19,8 +19,7 @@ static Word PLISTOETAmod(Word p,Word B,W - - Word QepcadCls::SFCFULLDf(Word D, Word P, Word J, Word n) - { -- Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag, L; -- char e,s,m,c; -+ Word t,SF,Dp,Pp,Lt,Lf,LA,L; - - Step1: /* Space is either empty or R^n. */ - t = DOPFSUFF_FULLD(P,LIST1(D)); ---- ./extensions/sfext/sfcons/GEOTEST.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/GEOTEST.c 2013-11-21 11:30:20.159913247 -0700 -@@ -101,7 +101,7 @@ Word GEOMERGE(Word c,Word G,Word P) - - Word GEOFIT(Word c,Word G,Word P) - { -- Word Q,Qp,C_Q,C_Qp,Ap,App,R,Rp,T,Tp,t,Rpp,A,m,L,x,a; -+ Word Q,Qp,C_Q,C_Qp,Ap,App,R,Rp,T,Tp,t,Rpp,m,L,x,a; - FIRST5(G,&Q,&C_Q,&Ap,&R,&T); - FIRST5(c,&Qp,&C_Qp,&App,&Rp,&Tp); - Tp = SINTER(Tp,T); -@@ -128,8 +128,8 @@ Word GEOFIT(Word c,Word G,Word P) - - Word GEOTEST(Word C,Word P,Word k,Word A) - { -- Word L,Lp,c,S,t,G,Q,Ap,Qp,App,C_Q,C_Qp,SF,SF1, -- SF2,Lt,Lf,Si,Fi,T,R,Tp,Rp,Rpp,Bs,Bi,i,s,t1,t2,SFp,Ap1,Ap2,a; -+ Word L,Lp,c,S,t,G,Q,Ap,Qp,App,C_Q,SF,SF1, -+ SF2,Lt,Lf,T,Bs,Bi,i,s,t1,t2,Ap1,Ap2,a; - - Step1: /* Set L to a list of all (k-1)-level cells over which there are - k-level cells with SC_TMPM of TRUE. */ ---- ./extensions/sfext/sfcons/CYLIMPFORM.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sfcons/CYLIMPFORM.c 2013-11-21 14:10:45.390354485 -0700 -@@ -9,7 +9,7 @@ A : a list of atoms from which to constr - - Word CYLIMPFORM(Word C, Word P, Word k, Word A) - { -- Word SF,L,Lp,c,S,t,Q,As,Ap,Fp,F,Lt,Lf,s,Si,Fi,Qp,SF2; -+ Word SF,L,Lp,c,S,t,F,Lt,Lf,s,Si,Fi,Qp,SF2; - - Step1: /* Set L to a list of all (k-1)-level cells over which there are - k-level cells with SC_TMPM of TRUE. */ ---- ./extensions/sfext/sfcons/SFC4.c.orig 2013-08-30 15:15:10.647569953 -0600 -+++ ./extensions/sfext/sfcons/SFC4.c 2013-11-21 14:11:55.278257632 -0700 -@@ -29,7 +29,7 @@ static Word F1; /* Flag indicating that - - void QepcadCls::SFC4(Word D, Word P, Word J, Word n, Word L) - { -- Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag; -+ Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i; - char e,s,m,c; - e = s = m = c = '\0'; - T1 = T2 = T3 = T4 = 0; ---- ./extensions/sfext/projpf/PPFLPROJ.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/projpf/PPFLPROJ.c 2013-11-21 15:50:39.540489717 -0700 -@@ -17,11 +17,10 @@ Side Effects - - void PPFLPROJ(Word L, Word i, Word P) - { -- Word A,T,p,B,b,t,tp,C; -+ Word A,p,B,b,t,tp,C; - - Step1: /* Loop over each proj. fac. p in level i of P. */ - A = LELTI(P,i); -- T = NIL; - while(A != NIL) { - ADV(A,&p,&A); - ---- ./extensions/sfext/formula/FMAATOMREAD.c.orig 2013-08-28 14:56:16.650119530 -0600 -+++ ./extensions/sfext/formula/FMAATOMREAD.c 2013-11-21 11:18:02.817535867 -0700 -@@ -13,9 +13,9 @@ Word POLYINDEX(Word P, Word p, Word r, W - - void FMAATOMREAD(Word Q, Word V, Word *F_, Word *t_) - { -- Word F,P,P1,P2,R,a,r,s,t,k,pi; -+ Word F,P1,P2,R,r,t,k,pi; - char c; -- /* hide r,s,t; */ -+ /* hide r,t; */ - - Step1: /* Read the left polynomial. */ - t = 1; r = LENGTH(V); F = NIL; ---- ./extensions/sfext/formula/FMAWRITENEWLINE.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAWRITENEWLINE.c 2013-11-21 11:19:28.921467612 -0700 -@@ -10,7 +10,7 @@ ForMulA write. - - void FMAWRITENEWLINE(Word F, Word P, Word V, Word n) - { -- Word L,E,i,j,k,op,t,Fp,O,A; -+ Word i,j,k,op,t,Fp,O,A; - - switch(FTYPEINFO(F)) { - -@@ -65,7 +65,7 @@ void FMAWRITENEWLINE(Word F, Word P, Wor - - void FMAWRITENEWLINEp(Word F, Word P, Word V, Word flag) - { -- Word L,E,i,j,k,op,t,Fp,O,A; -+ Word i,j,k,op,t,Fp,O,A; - - switch(FTYPEINFO(F)) { - ---- ./extensions/sfext/formula/FMAWRITE.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAWRITE.c 2013-11-21 11:16:14.129607618 -0700 -@@ -8,7 +8,7 @@ ForMulA write. - - void FMAWRITE(Word F, Word P, Word V) - { -- Word L,E,i,j,k,op,t,Fp,O,A; -+ Word i,j,k,op,t,Fp,O,A; - - switch(FTYPEINFO(F)) { - ---- ./extensions/sfext/formula/FMATRYDISTRIBUTE.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMATRYDISTRIBUTE.c 2013-11-21 11:21:53.921359529 -0700 -@@ -45,7 +45,7 @@ Fp: the conjunction of C and F. The fun - Word FMADISTRIBUTE(Word F, Word C) - { - -- Word Fp, f, L, flag, fp,gp,I,X,X_C, I_C, op, A, Ap; -+ Word Fp, f, L, flag, gp,I,X,X_C, I_C, op, A, Ap; - f = FIRST(F); - - switch(f) -@@ -59,7 +59,6 @@ Word FMADISTRIBUTE(Word F, Word C) - L = NIL; - for(Fp = CINV(RED(F)); Fp != NIL; Fp = RED(Fp)) - { -- fp = FIRST(Fp); - gp = FMADISTRIBUTE(FIRST(Fp),C); - L = COMP(gp,L); - } ---- ./extensions/sfext/formula/FMAPOLLIST.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAPOLLIST.c 2013-11-21 11:20:48.273405683 -0700 -@@ -19,7 +19,7 @@ static Word subprog(Word F); - - Word FMAPOLLIST(Word F, Word P) - { -- Word Q,L,i,j,n,np,P_i,G; -+ Word Q,L,i,j,P_i; - - Q = NIL; - L = subprog(F); ---- ./extensions/sfext/formula/FMAWRITEQEIN.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAWRITEQEIN.c 2013-11-21 11:20:03.704440354 -0700 -@@ -7,7 +7,7 @@ ForMulA write. - - void FMAWRITEQEIN(Word F, Word P, Word V) - { -- Word Q,L,i,j,n,np,P_i,G; -+ Word Q,i,n,np,G; - - Step1: /* Get list of polynomials. */ - Q = FMAPOLLIST(F,P); ---- ./extensions/sfext/formula/FMAWRITEp.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAWRITEp.c 2013-11-21 11:16:36.625605395 -0700 -@@ -9,7 +9,7 @@ ForMulA write. - - void FMAWRITEp(Word F, Word P, Word V, Word flag) - { -- Word L,E,i,j,k,op,t,Fp,O,A; -+ Word i,j,k,op,t,Fp,O,A; - - switch(FTYPEINFO(F)) { - ---- ./extensions/sfext/formula/FMACELLEVAL.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMACELLEVAL.c 2013-11-21 11:17:05.289582133 -0700 -@@ -15,7 +15,7 @@ Outputs - - Word FMACELLEVAL(Word F, Word C, Word P) - { -- Word t,L,i,j,k,op,s,S,ip,c,v,cp,n,t1,A1,A2,U_FLAG; -+ Word t,L,i,j,k,op,s,S,ip,c,cp,n,t1,A1,A2,U_FLAG; - - switch(FIRST(F)) { - ---- ./extensions/sfext/formula/FMAWRITELATEX.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/formula/FMAWRITELATEX.c 2013-11-21 11:18:53.993495161 -0700 -@@ -8,7 +8,7 @@ ForMulA write. - - void FMAWRITELATEX(Word F, Word P, Word V) - { -- Word L,E,i,j,k,op,t,Fp,O,A; -+ Word i,j,k,op,t,Fp,O,A; - - switch(FTYPEINFO(F)) { - -@@ -62,7 +62,7 @@ void FMAWRITELATEX(Word F, Word P, Word - - void FMAWRITELATEXp(Word F, Word P, Word V, Word flag) - { -- Word L,E,i,j,k,op,t,Fp,O,A; -+ Word i,j,k,op,t,Fp,O,A; - - switch(FTYPEINFO(F)) { - ---- ./extensions/sfext/sort/GMSDS.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/sort/GMSDS.c 2013-11-21 14:14:27.862045232 -0700 -@@ -19,7 +19,7 @@ static Word G23VSDS(Word *v,Word m,Word - - Word GMSDS(Word *A, Word m, Word (*C)(Word,Word)) - { -- Word *T,*T1,*T2,*A1,*A2,m1,m1p,m2,m2p,mp,k,l; -+ Word *T,*T1,*T2,*A1,*A2,m1,m1p,m2,m2p,mp,k; - - Step1: /* Split. */ - m1 = m >> 1; ---- ./extensions/sfext/addpol/CLEAN_BIGLOOP.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/addpol/CLEAN_BIGLOOP.c 2013-11-21 11:05:35.847767024 -0700 +- Word C,r,C_r,L,Lp,T,F,U,c,t,f,u,Fp,Up,h,Cb,Cp,Q; +- /* Time */ Word tm; ++ Word C,C_r,L,Lp,T,F,U,c,t,f,u,Fp,Up,h,Cb,Cp,Q; + + Step1: /* Initialize. */ + C = NIL; +--- extensions/sfext/addpol/CLEAN_BIGLOOP.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/addpol/CLEAN_BIGLOOP.c 2018-08-29 20:10:06.405075803 -0600 @@ -15,8 +15,8 @@ Inputs void QepcadCls::CLEAN_BIGLOOP(Word Jb, Word Pb, Word P0, Word D0, Word N, Word *P_, Word *D_) @@ -877,8 +571,8 @@ Word inum,tm,temp; Step1: /* Initialize. */ ---- ./extensions/sfext/addpol/KCONST.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/addpol/KCONST.c 2013-11-21 11:07:24.160709582 -0700 +--- extensions/sfext/addpol/KCONST.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/addpol/KCONST.c 2018-08-29 20:10:06.405075803 -0600 @@ -53,8 +53,7 @@ static Word S1_EMPTY(Word S1) static Word S2_IN(Word o, Word S2) @@ -929,32 +623,8 @@ /* Initialization. */ S1 = NIL; S2 = NIL; ---- ./extensions/sfext/addpol/BPOLSETS.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/addpol/BPOLSETS.c 2013-11-21 11:04:30.344794006 -0700 -@@ -24,7 +24,7 @@ Outputs - - void BPOLSETS(Word L_, Word D, Word P, Word *T_, Word *N_) - { -- Word L,T,Q,q,a,b,I_a,I_b,i_a,i_b,n,P_N,S_a,S_b,s_a,s_b,t,N,p, -+ Word L,T,Q,q,a,b,I_a,I_b,i_a,i_b,n,P_N,t,N, - S_T,S_L,s_c,c,i,Tb,Tp; - - Step1: /* Initialization. */ ---- ./extensions/sfext/addpol/STRIPPED_BIGLOOP.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/addpol/STRIPPED_BIGLOOP.c 2013-11-21 11:06:29.576739110 -0700 -@@ -15,8 +15,8 @@ Inputs - - void QepcadCls::STRIPPED_BIGLOOP(Word Jb, Word Pb, Word P0, Word D0, Word N, Word *P_, Word *D_) - { -- Word P,D,G,C,T,N_T,Tb,Gb,Gbp,S_N_T,Tp,Gp,K,KT,p,i,S; -- Word Q,Q_i,Ps,Ds,Qb,Qb_i,Dsp,t,Ph; -+ Word P,D,G,C,T,N_T,Gb,K,KT,p,i; -+ Word Ps,t; - Word inum,tm,tt; - - Step1: /* Initialize. */ ---- ./extensions/sfext/addpol/MINPFSETNSC.c.orig 2013-08-30 15:07:56.269063272 -0600 -+++ ./extensions/sfext/addpol/MINPFSETNSC.c 2013-11-21 11:09:34.241637528 -0700 +--- extensions/sfext/addpol/MINPFSETNSC.c.orig 2018-08-29 20:05:52.865359501 -0600 ++++ extensions/sfext/addpol/MINPFSETNSC.c 2018-08-29 20:10:06.405075803 -0600 @@ -38,8 +38,8 @@ static Word comp1(Word a,Word b) { Word MINPFSETNSC(Word P,Word S,Word D,Word K) @@ -966,20 +636,21 @@ Step1: /* Initialization. */ C = NIL; Sltr = NIL; S_r = NIL; Pltr = NIL; N = LENGTH(K); ---- ./extensions/sfext/addpol/CFLCELLLIST.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/addpol/CFLCELLLIST.c 2013-11-21 11:04:46.496787612 -0700 -@@ -21,8 +21,7 @@ static Word comp(Word A, Word B); +--- extensions/sfext/addpol/STRIPPED_BIGLOOP.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/addpol/STRIPPED_BIGLOOP.c 2018-08-29 20:10:06.405075803 -0600 +@@ -15,8 +15,8 @@ Inputs - Word CFLCELLLIST(Word L_D) + void QepcadCls::STRIPPED_BIGLOOP(Word Jb, Word Pb, Word P0, Word D0, Word N, Word *P_, Word *D_) { -- Word C,r,C_r,L,Lp,T,F,U,c,t,f,u,Fp,Up,h,Cb,Cp,Q; -- /* Time */ Word tm; -+ Word C,C_r,L,Lp,T,F,U,c,t,f,u,Fp,Up,h,Cb,Cp,Q; +- Word P,D,G,C,T,N_T,Tb,Gb,Gbp,S_N_T,Tp,Gp,K,KT,p,i,S; +- Word Q,Q_i,Ps,Ds,Qb,Qb_i,Dsp,t,Ph; ++ Word P,D,G,C,T,N_T,Gb,K,KT,p,i; ++ Word Ps,t; + Word inum,tm,tt; Step1: /* Initialize. */ - C = NIL; ---- ./extensions/sfext/crcads/CSORCELL.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/crcads/CSORCELL.c 2013-11-21 11:10:03.376621061 -0700 +--- extensions/sfext/crcads/CSORCELL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/crcads/CSORCELL.c 2018-08-29 20:10:06.405075803 -0600 @@ -19,7 +19,7 @@ Side Effects void QepcadCls::CSORCELLTR(Word c, Word Pp, Word PpO, Word PpN) @@ -989,8 +660,8 @@ k = LELTI(c,LEVEL); ---- ./extensions/sfext/crcads/CSORCELL_MOD.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/crcads/CSORCELL_MOD.c 2013-11-21 11:11:10.697582570 -0700 +--- extensions/sfext/crcads/CSORCELL_MOD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/crcads/CSORCELL_MOD.c 2018-08-29 20:10:06.406075801 -0600 @@ -25,8 +25,8 @@ static Word LLPFZC(Word c,Word P); void QepcadCls::CSORCELLTR_MOD(Word c, Word Pp, Word PpO, Word PpN, Word P) @@ -1002,8 +673,8 @@ Step0: k = LELTI(c,LEVEL); ---- ./extensions/sfext/crcads/LISTOFCWTV.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/crcads/LISTOFCWTV.c 2013-11-21 11:11:49.009560402 -0700 +--- extensions/sfext/crcads/LISTOFCWTV.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/crcads/LISTOFCWTV.c 2018-08-29 20:10:06.406075801 -0600 @@ -14,7 +14,7 @@ Outputs void LISTOFCWTV(Word C, Word *Lt_, Word *Lf_) @@ -1013,8 +684,8 @@ Step1: /* If C is undetermined recurse on the children. */ t = LELTI(C,TRUTH); ---- ./extensions/sfext/espcad/ESPCADLSNC.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/sfext/espcad/ESPCADLSNC.c 2013-11-21 11:15:39.025604946 -0700 +--- extensions/sfext/espcad/ESPCADLSNC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/espcad/ESPCADLSNC.c 2018-08-29 20:10:06.406075801 -0600 @@ -97,7 +97,7 @@ Output Word ESPCADCTLSNC(Word c1,Word c2,Word c3,Word i,Word P) @@ -1032,65 +703,383 @@ Step2: /* Figure out which polynomials are zero in c2. */ for(n = 0, Sp1 = S1, Sp2 = S2, T = NIL; n < LENGTH(S1); n++) { ---- ./extensions/newadj/HATEST.c.orig 2013-08-30 13:26:52.518542789 -0600 -+++ ./extensions/newadj/HATEST.c 2013-11-21 14:39:13.004753560 -0700 -@@ -111,13 +111,11 @@ Sample point coordinate write. +--- extensions/sfext/formula/FMAATOMREAD.c.orig 2018-08-29 20:05:52.865359501 -0600 ++++ extensions/sfext/formula/FMAATOMREAD.c 2018-08-29 20:10:06.403075806 -0600 +@@ -13,9 +13,9 @@ Word POLYINDEX(Word P, Word p, Word r, W - void SAMPLECWR(Word c) + void FMAATOMREAD(Word Q, Word V, Word *F_, Word *t_) { -- Word I,Ip,M,Mp,b,bp,k,s,F,j,Ms,Is; -+ Word I,Ip,M,Mp,b,bp,s,F,j,Ms,Is; - Word M1; -- /* hide k; */ +- Word F,P,P1,P2,R,a,r,s,t,k,pi; ++ Word F,P1,P2,R,r,t,k,pi; + char c; +- /* hide r,s,t; */ ++ /* hide r,t; */ - Step1: /* Setup. */ - s = LELTI(c,SAMPLE); -- k = LELTI(c,LEVEL); + Step1: /* Read the left polynomial. */ + t = 1; r = LENGTH(V); F = NIL; +--- extensions/sfext/formula/FMACELLEVAL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMACELLEVAL.c 2018-08-29 20:10:06.404075804 -0600 +@@ -15,7 +15,7 @@ Outputs - Step2: /* Extended representation. */ - if (ISPRIMIT(s)) goto Step3; -@@ -160,7 +158,7 @@ Algebraic number field elements list wri - - void strippedAFLWR(Word M,Word I,Word N,Word a,Word A) + Word FMACELLEVAL(Word F, Word C, Word P) { -- Word A1,Ap,i,l,L,j; -+ Word A1,Ap,i; - /* hide i; */ +- Word t,L,i,j,k,op,s,S,ip,c,v,cp,n,t1,A1,A2,U_FLAG; ++ Word t,L,i,j,k,op,s,S,ip,c,cp,n,t1,A1,A2,U_FLAG; - Step1: /* Write. */ -@@ -196,7 +194,7 @@ Side effects + switch(FIRST(F)) { + +--- extensions/sfext/formula/FMAPOLLIST.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAPOLLIST.c 2018-08-29 20:10:06.404075804 -0600 +@@ -19,7 +19,7 @@ static Word subprog(Word F); - void ANDWRITExx(Word M, Word I, Word n) + Word FMAPOLLIST(Word F, Word P) { -- Word J,R,Mp,K; -+ Word J,R,K; - Word a,a1,a2,b,b1,b2,d,d1,d2,e,f,m; - Word N; +- Word Q,L,i,j,n,np,P_i,G; ++ Word Q,L,i,j,P_i; ---- ./extensions/newadj/HAP2.c.orig 2012-03-16 06:49:31.000000000 -0600 -+++ ./extensions/newadj/HAP2.c 2013-11-21 14:36:23.403966610 -0700 + Q = NIL; + L = subprog(F); +--- extensions/sfext/formula/FMATRYDISTRIBUTE.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMATRYDISTRIBUTE.c 2018-08-29 20:10:06.404075804 -0600 +@@ -45,7 +45,7 @@ Fp: the conjunction of C and F. The fun + Word FMADISTRIBUTE(Word F, Word C) + { + +- Word Fp, f, L, flag, fp,gp,I,X,X_C, I_C, op, A, Ap; ++ Word Fp, f, L, flag, gp,I,X,X_C, I_C, op, A, Ap; + f = FIRST(F); + + switch(f) +@@ -59,7 +59,6 @@ Word FMADISTRIBUTE(Word F, Word C) + L = NIL; + for(Fp = CINV(RED(F)); Fp != NIL; Fp = RED(Fp)) + { +- fp = FIRST(Fp); + gp = FMADISTRIBUTE(FIRST(Fp),C); + L = COMP(gp,L); + } +--- extensions/sfext/formula/FMAWRITE.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAWRITE.c 2018-08-29 20:10:06.404075804 -0600 +@@ -8,7 +8,7 @@ ForMulA write. + + void FMAWRITE(Word F, Word P, Word V) + { +- Word L,E,i,j,k,op,t,Fp,O,A; ++ Word i,j,k,op,t,Fp,O,A; + + switch(FTYPEINFO(F)) { + +--- extensions/sfext/formula/FMAWRITELATEX.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAWRITELATEX.c 2018-08-29 20:10:06.404075804 -0600 +@@ -8,7 +8,7 @@ ForMulA write. + + void FMAWRITELATEX(Word F, Word P, Word V) + { +- Word L,E,i,j,k,op,t,Fp,O,A; ++ Word i,j,k,op,t,Fp,O,A; + + switch(FTYPEINFO(F)) { + +@@ -62,7 +62,7 @@ void FMAWRITELATEX(Word F, Word P, Word + + void FMAWRITELATEXp(Word F, Word P, Word V, Word flag) + { +- Word L,E,i,j,k,op,t,Fp,O,A; ++ Word i,j,k,op,t,Fp,O,A; + + switch(FTYPEINFO(F)) { + +--- extensions/sfext/formula/FMAWRITENEWLINE.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAWRITENEWLINE.c 2018-08-29 20:10:06.404075804 -0600 +@@ -10,7 +10,7 @@ ForMulA write. + + void FMAWRITENEWLINE(Word F, Word P, Word V, Word n) + { +- Word L,E,i,j,k,op,t,Fp,O,A; ++ Word i,j,k,op,t,Fp,O,A; + + switch(FTYPEINFO(F)) { + +@@ -65,7 +65,7 @@ void FMAWRITENEWLINE(Word F, Word P, Wor + + void FMAWRITENEWLINEp(Word F, Word P, Word V, Word flag) + { +- Word L,E,i,j,k,op,t,Fp,O,A; ++ Word i,j,k,op,t,Fp,O,A; + + switch(FTYPEINFO(F)) { + +--- extensions/sfext/formula/FMAWRITEp.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAWRITEp.c 2018-08-29 20:10:06.404075804 -0600 +@@ -9,7 +9,7 @@ ForMulA write. + + void FMAWRITEp(Word F, Word P, Word V, Word flag) + { +- Word L,E,i,j,k,op,t,Fp,O,A; ++ Word i,j,k,op,t,Fp,O,A; + + switch(FTYPEINFO(F)) { + +--- extensions/sfext/formula/FMAWRITEQEIN.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/formula/FMAWRITEQEIN.c 2018-08-29 20:10:06.404075804 -0600 +@@ -7,7 +7,7 @@ ForMulA write. + + void FMAWRITEQEIN(Word F, Word P, Word V) + { +- Word Q,L,i,j,n,np,P_i,G; ++ Word Q,i,n,np,G; + + Step1: /* Get list of polynomials. */ + Q = FMAPOLLIST(F,P); +--- extensions/sfext/minhit/MINHITSETSRDR.c.orig 2018-08-29 20:03:25.109519358 -0600 ++++ extensions/sfext/minhit/MINHITSETSRDR.c 2018-08-29 20:10:06.402075807 -0600 +@@ -27,7 +27,7 @@ Note: The point is that not only sortin + static Word comp(Word a, Word b) __pure; + + static Word comp(Word a, Word b) { +- Word ap,bp,t,q; ++ Word ap,bp,t; + ap = a; bp = b; + t = BDCOMP(LENGTH(ap),LENGTH(bp)); + while ((t == 0) && (bp != NIL) && (ap != NIL)) { +--- extensions/sfext/pcadst/CADFPCAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/CADFPCAD.c 2018-08-29 20:10:06.402075807 -0600 +@@ -21,7 +21,7 @@ Outputs + + Word CADFPCAD(Word D, Word P, Word S, Word I, Word Pb) + { +- Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Q,Ms,C,Cs,Ds,Ss; ++ Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Ms,C,Cs,Ds,Ss; + Word Mb,mb; + + Step1: /* Is D the root cell? */ +--- extensions/sfext/pcadst/CADFPCADWI.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/CADFPCADWI.c 2018-08-29 20:10:06.401075809 -0600 +@@ -22,7 +22,7 @@ Outputs + + Word CADFPCADWI(Word D, Word P, Word S, Word I, Word Pb) + { +- Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Q,Ms,C,Cs,Ds,Ss; ++ Word Db,Is,N,Sb,Pb_N,Ts,L,p,i,is,Ms,C,Cs,Ds,Ss; + Word Mb,mb; + + Step1: /* Is D the root cell? */ +--- extensions/sfext/pcadst/CCADCONEXT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/CCADCONEXT.c 2018-08-29 20:10:06.402075807 -0600 +@@ -21,7 +21,7 @@ Outputs + + void CCADCONEXT(Word n, Word P, Word C, Word *Ps_, Word *Cs_, Word *N_) + { +- Word Ps,i,Cs,Q,S,c,L,Lp,b,d,bs,ds,cs,T1,T2,N,Np; ++ Word Ps,i,Cs,Q,S,L,Lp,bs,ds,cs,T1,T2,N; + + Word t; + +--- extensions/sfext/pcadst/CCADCONmod.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/CCADCONmod.c 2018-08-29 20:10:06.402075807 -0600 +@@ -22,7 +22,7 @@ Outputs + + void CCADCONmod(Word n, Word P, Word C, Word *Ps_, Word *Cs_) + { +- Word Ps,i,Cs,Q,S,c,L,Lp,b,d,bs,ds,cs,T1,T2; ++ Word Ps,i,Cs,Q,S,c,L,Lp,b,d,bs,ds,T1,T2; + + Step1: /* Set Ps to the empty projection list, and Cs to the full + original CAD C. */ +--- extensions/sfext/pcadst/LTFOCALWTV.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/LTFOCALWTV.c 2018-08-29 20:10:06.402075807 -0600 +@@ -16,7 +16,7 @@ Outputs + + void LTFOCALWTV(Word C, Word n, Word *Lt_, Word *Lf_) + { +- Word L,Cp,Lt,Lf,t,Ltp,Lfp; ++ Word Cp,Lt,Lf,t,Ltp,Lfp; + + Step1: /* If C is undetermined recurse on the children. */ + t = LELTI(C,SC_CDTV); +--- extensions/sfext/pcadst/LTFOCWTV.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/LTFOCWTV.c 2018-08-29 20:10:06.402075807 -0600 +@@ -15,7 +15,7 @@ Outputs + + void LTFOCWTV(Word C, Word *Lt_, Word *Lf_) + { +- Word L,Cp,Lt,Lf,t,Ltp,Lfp; ++ Word Cp,Lt,Lf,t,Ltp,Lfp; + + Step1: /* If C is undetermined recurse on the children. */ + t = LELTI(C,SC_CDTV); +--- extensions/sfext/pcadst/PCADSCANL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/PCADSCANL.c 2018-08-29 20:10:06.402075807 -0600 @@ -18,7 +18,7 @@ Outputs - Word HAP2(Word U, Word V, Word w_l, Word B) + Word PCADSCANL(Word Cs, Word i) { -- Word Sol,S,v,J,w_v,u,w_u,I,Solp,t,f; -+ Word Sol,S,v,J,w_v,u,w_u,I,Solp,f; +- Word CC,CC1,CC2,L,c; ++ Word CC,CC1,L,c; - Sol = NIL; - S = NIL; ---- ./source/db/unnamedpipe.h.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/db/unnamedpipe.h 2013-11-21 14:24:57.148932355 -0700 -@@ -118,7 +118,7 @@ public: - if (openmask[0]) { close(fd[0]); openmask[0] = false; } - } - void closeOut() { -- const char ts[2] = {EOF,'\n'}; -+ // const char ts[2] = {EOF,'\n'}; - if (_out) { delete _out; _out = 0; } - if (openmask[1]) { - // write(fd[1],ts,2); ---- ./source/db/SINGULAR.c.orig 2013-08-30 16:22:52.913963575 -0600 -+++ ./source/db/SINGULAR.c 2013-11-21 15:54:01.972430325 -0700 + Step1: /* Get list of children. */ + CC = LELTI(Cs,SC_CDTV); +--- extensions/sfext/pcadst/PCADWRITE.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/PCADWRITE.c 2018-08-29 20:10:06.402075807 -0600 +@@ -7,7 +7,7 @@ + + void PCADWRITE(Word Cs, Word Ps) + { +- Word C,l,i,L,k,I; ++ Word l,L,k,I; + + Step1: /* */ + I = PCADCINDEX(Cs); +--- extensions/sfext/pcadst/SCADDSCON.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/SCADDSCON.c 2018-08-29 20:10:06.401075809 -0600 +@@ -30,7 +30,7 @@ example, would be bad. + + Word SCADDSCON(Word C, Word A, Word n) + { +- Word c,a,i,Cs,X,L,t; ++ Word c,a,i,Cs,X,L; + + Step1: /* Construct a preliminary version of Cs, with all but the child + list filled in. */ +--- extensions/sfext/pcadst/SIMPLE_CAD_INFO.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/pcadst/SIMPLE_CAD_INFO.c 2018-08-29 20:10:06.401075809 -0600 +@@ -6,7 +6,7 @@ n : the level + + void SIMPLE_CAD_INFO(Word D, Word P, Word n, Word flag) + { +- Word Ps,Cs,t,Db; ++ Word Ps,Cs,t; + + Step1: /* Check for the trivial cases. */ + switch( DOPFSUFF(P,LIST1(D)) ) { +--- extensions/sfext/projpf/PPFLPROJ.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/projpf/PPFLPROJ.c 2018-08-29 20:10:06.403075806 -0600 +@@ -17,11 +17,10 @@ Side Effects + + void PPFLPROJ(Word L, Word i, Word P) + { +- Word A,T,p,B,b,t,tp,C; ++ Word A,p,B,b,t,tp,C; + + Step1: /* Loop over each proj. fac. p in level i of P. */ + A = LELTI(P,i); +- T = NIL; + while(A != NIL) { + ADV(A,&p,&A); + +--- extensions/sfext/sfcons/CYLIMPFORM.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/CYLIMPFORM.c 2018-08-29 20:10:06.403075806 -0600 +@@ -9,7 +9,7 @@ A : a list of atoms from which to constr + + Word CYLIMPFORM(Word C, Word P, Word k, Word A) + { +- Word SF,L,Lp,c,S,t,Q,As,Ap,Fp,F,Lt,Lf,s,Si,Fi,Qp,SF2; ++ Word SF,L,Lp,c,S,t,F,Lt,Lf,s,Si,Fi,Qp,SF2; + + Step1: /* Set L to a list of all (k-1)-level cells over which there are + k-level cells with SC_TMPM of TRUE. */ +--- extensions/sfext/sfcons/GEOTEST.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/GEOTEST.c 2018-08-29 20:10:06.403075806 -0600 +@@ -101,7 +101,7 @@ Word GEOMERGE(Word c,Word G,Word P) + + Word GEOFIT(Word c,Word G,Word P) + { +- Word Q,Qp,C_Q,C_Qp,Ap,App,R,Rp,T,Tp,t,Rpp,A,m,L,x,a; ++ Word Q,Qp,C_Q,C_Qp,Ap,App,R,Rp,T,Tp,t,Rpp,m,L,x,a; + FIRST5(G,&Q,&C_Q,&Ap,&R,&T); + FIRST5(c,&Qp,&C_Qp,&App,&Rp,&Tp); + Tp = SINTER(Tp,T); +@@ -128,8 +128,8 @@ Word GEOFIT(Word c,Word G,Word P) + + Word GEOTEST(Word C,Word P,Word k,Word A) + { +- Word L,Lp,c,S,t,G,Q,Ap,Qp,App,C_Q,C_Qp,SF,SF1, +- SF2,Lt,Lf,Si,Fi,T,R,Tp,Rp,Rpp,Bs,Bi,i,s,t1,t2,SFp,Ap1,Ap2,a; ++ Word L,Lp,c,S,t,G,Q,Ap,Qp,App,C_Q,SF,SF1, ++ SF2,Lt,Lf,T,Bs,Bi,i,s,t1,t2,Ap1,Ap2,a; + + Step1: /* Set L to a list of all (k-1)-level cells over which there are + k-level cells with SC_TMPM of TRUE. */ +--- extensions/sfext/sfcons/SFC2.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SFC2.c 2018-08-29 20:10:06.402075807 -0600 +@@ -5,7 +5,7 @@ Solution formula construction version 2 + + void QepcadCls::SFC2(Word D, Word P, Word J, Word n, Word sfm) + { +- Word t,SF,D0,P0,J0,D1,P1,Pp,Dp,Q,L,Lt,Lf; ++ Word t,SF,D1,P1,Pp,Dp,Q,L,Lt,Lf; + + Step1: /* Space is either empty or R^n. */ + t = DOPFSUFF(P,LIST1(D)); +--- extensions/sfext/sfcons/SFC4.c.orig 2018-08-29 20:05:52.865359501 -0600 ++++ extensions/sfext/sfcons/SFC4.c 2018-08-29 20:10:06.403075806 -0600 +@@ -29,7 +29,7 @@ static Word F1; /* Flag indicating that + + void QepcadCls::SFC4(Word D, Word P, Word J, Word n, Word L) + { +- Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag; ++ Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i; + char e,s,m,c; + e = s = m = c = '\0'; + T1 = T2 = T3 = T4 = 0; +--- extensions/sfext/sfcons/SFCFULLD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SFCFULLD.c 2018-08-29 20:10:06.403075806 -0600 +@@ -19,8 +19,7 @@ static Word PLISTOETAmod(Word p,Word B,W + + void QepcadCls::SFCFULLD(Word D, Word P, Word J, Word n) + { +- Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag, L; +- char e,s,m,c; ++ Word t,SF,Dp,Pp,Lt,Lf,LA,L; + + Step1: /* Space is either empty or R^n. */ + t = DOPFSUFF_FULLD(P,LIST1(D)); +--- extensions/sfext/sfcons/SFCFULLDf.c.orig 2018-08-29 20:05:52.865359501 -0600 ++++ extensions/sfext/sfcons/SFCFULLDf.c 2018-08-29 20:10:06.403075806 -0600 +@@ -19,8 +19,7 @@ static Word PLISTOETAmod(Word p,Word B,W + + Word QepcadCls::SFCFULLDf(Word D, Word P, Word J, Word n) + { +- Word t,SF,Dp,Pp,Lt,Lf,LA,Q,D1,P1,D0,P0,J0,i,Lp,pflag, L; +- char e,s,m,c; ++ Word t,SF,Dp,Pp,Lt,Lf,LA,L; + + Step1: /* Space is either empty or R^n. */ + t = DOPFSUFF_FULLD(P,LIST1(D)); +--- extensions/sfext/sfcons/SOLEXTINT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sfcons/SOLEXTINT.c 2018-08-29 20:10:06.403075806 -0600 +@@ -10,7 +10,7 @@ method to call and, of course, calls it. + + void QepcadCls::SOLEXTINT() + { +- Word t,F_e,F_n,F_s, T, f, c; ++ Word T, f, c; + + Step1: /* Initialization */ + T = ACLOCK(); +--- extensions/sfext/sort/GMSDS.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ extensions/sfext/sort/GMSDS.c 2018-08-29 20:10:06.404075804 -0600 +@@ -19,7 +19,7 @@ static Word G23VSDS(Word *v,Word m,Word + + Word GMSDS(Word *A, Word m, Word (*C)(Word,Word)) + { +- Word *T,*T1,*T2,*A1,*A2,m1,m1p,m2,m2p,mp,k,l; ++ Word *T,*T1,*T2,*A1,*A2,m1,m1p,m2,m2p,mp,k; + + Step1: /* Split. */ + m1 = m >> 1; +--- plot2d/plot.cc.orig 2018-08-29 20:08:10.014211101 -0600 ++++ plot2d/plot.cc 2018-08-29 20:10:06.396075816 -0600 +@@ -112,7 +112,6 @@ void* readdata(void *x) + { + vector E; + istream &in = *inp; +- int flag; + char c; + do { + while( in >> c ) +--- source/db/SINGULAR.c.orig 2018-08-29 20:08:10.015211100 -0600 ++++ source/db/SINGULAR.c 2018-08-29 20:10:06.406075801 -0600 @@ -162,8 +162,6 @@ Return: /* Prepare for return. */ void SingularServer::IPFAC(Word r, Word P, Word *s_, Word *c_, Word *L_) @@ -1110,41 +1099,85 @@ // RETURN *s_ = sn; *c_ = ct; ---- ./source/sysolve/VERIFYCONSTSIGN.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/sysolve/VERIFYCONSTSIGN.c 2013-11-21 15:07:45.956197229 -0700 -@@ -77,7 +77,7 @@ BDigit VERIFYPOSITIVITY(Word A, BDigit r - else if (FIRST(A) != IROOT) - { - /* atomic formula is "P_A T_A 0", where P_A is of level k_A. */ -- Word T_A,P_A,k_A,s,rp,Pp,P,a,T; -+ Word T_A,P_A,k_A; - FIRST3(A,&T_A,&P_A,&k_A); - if (r != k_A) { goto Return; } - ---- ./source/sysolve/SYSSOLVE.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/sysolve/SYSSOLVE.c 2013-11-21 15:07:11.596126207 -0700 -@@ -21,7 +21,7 @@ Output +--- source/db/unnamedpipe.h.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/db/unnamedpipe.h 2018-08-29 20:10:06.406075801 -0600 +@@ -118,7 +118,7 @@ public: + if (openmask[0]) { close(fd[0]); openmask[0] = false; } + } + void closeOut() { +- const char ts[2] = {EOF,'\n'}; ++ // const char ts[2] = {EOF,'\n'}; + if (_out) { delete _out; _out = 0; } + if (openmask[1]) { + // write(fd[1],ts,2); +--- source/io/DNFLWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/DNFLWR.c 2018-08-29 20:10:06.407075800 -0600 +@@ -13,7 +13,7 @@ Disjuctive Normal Form Label Write. - Word SYSSOLVECAD(BDigit r, Word L, Word A, Word Vp, QepcadCls &Q) + void DNFLWR(Word N, Word V, Word F) { -- Word F, Fp, d, t, Lt, Lf, V, S; -+ Word F, Lt, Lf, V, S; +- Word F1,F2,Fp,T; ++ Word F1,Fp,T; - /* Set variable list */ - if (LENGTH(Vp) < r) { ---- ./source/sysolve/EVALSYS.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/sysolve/EVALSYS.c 2013-11-21 15:06:31.460049335 -0700 -@@ -20,7 +20,7 @@ Outputs: + Step1: /* Classify the formula F. */ + T = FIRST(F); +--- source/io/DNFWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/DNFWR.c 2018-08-29 20:10:06.408075798 -0600 +@@ -12,7 +12,7 @@ Disjunctive Normal Form Write. - Word EVALSYS(Word S, BDigit t, Word R) + void DNFWR(Word V, Word F) { -- Word r, L, i, S_i, Ap, a, A, is, As, F, f, ip, fp, s, c; -+ Word r, L, i, S_i, Ap, a, A, is, As; - - Step1: /* Construct the skelaton of L, the answer. */ - r = LENGTH(S); ---- ./source/io/PRODWR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/io/PRODWR.c 2013-11-21 14:49:35.531890901 -0700 +- Word F1,F2,Fp,T; ++ Word F1,Fp,T; + + Step1: /* Classify the formula F. */ + T = FIRST(F); +--- source/io/IPLLDWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/IPLLDWR.c 2018-08-29 20:10:06.407075800 -0600 +@@ -12,7 +12,7 @@ Integral Polynomial, List of Lists, Dist + + void IPLLDWR(Word V, Word A) + { +- Word A1,A11,i,P,L,H; ++ Word A1,A11,i,P,H; + /* hide i,j,n,r; */ + + Step1: /* Write. */ +--- source/io/IPLLDWRMOD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/IPLLDWRMOD.c 2018-08-29 20:10:06.407075800 -0600 +@@ -12,7 +12,7 @@ Integral Polynomial, List of Lists, Dist + + void IPLLDWRMOD(Word V, Word A) + { +- Word A1,A11,i,P,L,H; ++ Word A1,A11,i,P,H; + /* hide i,j,n,r; */ + + Step1: /* Write. */ +--- source/io/PCADSWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/PCADSWR.c 2018-08-29 20:10:06.407075800 -0600 +@@ -11,7 +11,7 @@ Partial CAD signature write. + + void PCADSWR(Word c) + { +- Word M,cb,cp,p,s,S; ++ Word cb,cp,p,s,S; + /* hide p; */ + + Step1: /* common. */ +--- source/io/PCADWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/PCADWR.c 2018-08-29 20:10:06.407075800 -0600 +@@ -11,7 +11,7 @@ Partial CAD write. + + void PCADWR(Word c) + { +- Word M,cb,cp,p,s; ++ Word cb,cp,p,s; + /* hide p; */ + + Step1: /* common. */ +--- source/io/PRODWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/PRODWR.c 2018-08-29 20:10:06.407075800 -0600 @@ -10,7 +10,8 @@ Product Write. void PRODWR(Word v) @@ -1155,74 +1188,8 @@ /* hide i,j,n1; */ SWRITE("In \"PRODWR\"! This is dead code!\n"); exit(1); ---- ./source/io/DNFLWR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/DNFLWR.c 2013-11-21 14:46:55.380117850 -0700 -@@ -13,7 +13,7 @@ Disjuctive Normal Form Label Write. - - void DNFLWR(Word N, Word V, Word F) - { -- Word F1,F2,Fp,T; -+ Word F1,Fp,T; - - Step1: /* Classify the formula F. */ - T = FIRST(F); ---- ./source/io/PCADWR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/PCADWR.c 2013-11-21 14:47:53.436035759 -0700 -@@ -11,7 +11,7 @@ Partial CAD write. - - void PCADWR(Word c) - { -- Word M,cb,cp,p,s; -+ Word cb,cp,p,s; - /* hide p; */ - - Step1: /* common. */ ---- ./source/io/PCADSWR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/PCADSWR.c 2013-11-21 14:48:09.404013140 -0700 -@@ -11,7 +11,7 @@ Partial CAD signature write. - - void PCADSWR(Word c) - { -- Word M,cb,cp,p,s,S; -+ Word cb,cp,p,s,S; - /* hide p; */ - - Step1: /* common. */ ---- ./source/io/IPLLDWRMOD.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/IPLLDWRMOD.c 2013-11-21 14:47:36.348059945 -0700 -@@ -12,7 +12,7 @@ Integral Polynomial, List of Lists, Dist - - void IPLLDWRMOD(Word V, Word A) - { -- Word A1,A11,i,P,L,H; -+ Word A1,A11,i,P,H; - /* hide i,j,n,r; */ - - Step1: /* Write. */ ---- ./source/io/IPLLDWR.c.orig 2012-03-16 06:49:29.000000000 -0600 -+++ ./source/io/IPLLDWR.c 2013-11-21 14:47:18.356085391 -0700 -@@ -12,7 +12,7 @@ Integral Polynomial, List of Lists, Dist - - void IPLLDWR(Word V, Word A) - { -- Word A1,A11,i,P,L,H; -+ Word A1,A11,i,P,H; - /* hide i,j,n,r; */ - - Step1: /* Write. */ ---- ./source/io/DNFWR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/io/DNFWR.c 2013-11-21 14:46:28.308156041 -0700 -@@ -12,7 +12,7 @@ Disjunctive Normal Form Write. - - void DNFWR(Word V, Word F) - { -- Word F1,F2,Fp,T; -+ Word F1,Fp,T; - - Step1: /* Classify the formula F. */ - T = FIRST(F); ---- ./source/io/SAMPLEWR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/io/SAMPLEWR.c 2013-11-21 14:50:10.635840986 -0700 +--- source/io/SAMPLEWR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/io/SAMPLEWR.c 2018-08-29 20:10:06.408075798 -0600 @@ -55,8 +55,7 @@ Return: /* Prepare for return. */ void QepcadCls::SAMPLEWR(Word c) @@ -1233,159 +1200,8 @@ s = LELTI(c,SAMPLE); k = LELTI(c,LEVEL); ---- ./source/saclib/GCSI.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/saclib/GCSI.c 2013-11-21 15:27:11.180009246 -0700 -@@ -23,10 +23,9 @@ extern void gcw_MARK(); - - void GCSI(Word s, char *EACSTACK) - { -- Word I,L,N,N1,Np,Np1,T,T1,c,**i,j,inc; -+ Word I,L,N,N1,Np,Np1,T,T1,c,inc; - char *a; -- GCArray *v; -- /* hide I,L,N,N1,Np,Np1,T,T1,c,i,j,inc,a,v; */ -+ /* hide I,L,N,N1,Np,Np1,T,T1,c,inc,a; */ - - Step1: /* Setup. */ - if (GCM == 1) { ---- ./source/proj/PROJECTauto.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/PROJECTauto.c 2013-11-21 15:06:04.620087273 -0700 -@@ -17,7 +17,7 @@ Projection Phase. - - void QepcadCls::PROJECTauto(Word r, Word A, Word *P_, Word *J_) - { -- Word D,F,J,P,Ps,J_k1,P_k,R,Ths,Thss,k,i; -+ Word D,F,J,P,J_k1,P_k,R,k,i; - - Step1: /* Initialize. */ - P = LLCOPY(A); ---- ./source/proj/ECLEVEL.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/ECLEVEL.c 2013-11-21 15:02:53.659930746 -0700 -@@ -14,10 +14,9 @@ Output - - Word ECLEVEL(Word L) - { -- Word k,Lp,L1; -+ Word k,L1; - - Step1: /* Initialize. */ -- Lp = L; - k = 0; - - Step2: /* Loop. */ ---- ./source/proj/PROJMCECmod.c.orig 2013-08-30 16:12:22.235018024 -0600 -+++ ./source/proj/PROJMCECmod.c 2013-11-21 15:05:19.164140638 -0700 -@@ -18,8 +18,8 @@ not propogate! - - Word QepcadCls::PROJMCECmod(Word r, Word A) - { -- Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S,Sp,C; -- Word Ls, Lc,LL,f,rp,fp,tf,T1,fef,esu,AssTmp,Sf,k; -+ Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S,C; -+ Word Ls, Lc,LL,f,rp,fp,T1,fef,esu,AssTmp,Sf; - - Step0: /* Obtain pivot constraint: If pivot is not all of level k, we can't use it! */ - C = LELTI(GVPIVOT,r); ---- ./source/proj/PROJMCx.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/PROJMCx.c 2013-11-21 15:03:55.332025711 -0700 -@@ -15,7 +15,7 @@ McCallum's projection excluding leading - - Word QepcadCls::PROJMCx(Word r, Word A) - { -- Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t; -+ Word A1,A2,Ap,Ap1,Ap2,App,D,P,R,W; - - Step1: /* Obtain coefficients. */ - P = NIL; ---- ./source/proj/PROJECT.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/PROJECT.c 2013-11-21 15:05:38.964122808 -0700 -@@ -19,7 +19,7 @@ Projection Phase. - - void QepcadCls::PROJECT(Word r, Word A, Word *P_, Word *J_) - { -- Word D,F,J,P,Ps,J_k1,P_k,R,Ths,Thss,k,i; -+ Word D,F,J,P,J_k1,P_k,R,Ths,Thss,k,i; - - Step1: /* Initialize. */ - P = LLCOPY(A); ---- ./source/proj/PROJCO.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/proj/PROJCO.c 2013-11-21 15:03:20.188045422 -0700 -@@ -15,7 +15,7 @@ Collins' projection. - - Word QepcadCls::PROJCO(Word r, Word A) - { -- Word A1,A2,Ap,Ap1,Ap2,App,D,L,L1,P,P1,R,R1,R11,R2,R21,Rp,Rp1,Rp11,Rp2, -+ Word A1,A2,Ap,Ap1,Ap2,App,D,L,L1,P,R,R1,R11,R2,R21,Rp,Rp1,Rp11,Rp2, - Rpp,Rs2,S1,Sp1,T,W,ap1,b,d,i,i1,i2,k,t; - - Step1: /* $r = 2$. */ ---- ./source/proj/PROJMCmod.c.orig 2013-08-30 16:11:49.731074222 -0600 -+++ ./source/proj/PROJMCmod.c 2013-11-21 15:04:46.963955950 -0700 -@@ -20,8 +20,8 @@ using namespace std; - - Word QepcadCls::PROJMCmod(Word r, Word A) - { -- Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S,Sp; -- Word Ls, Lc,LL,f,rp,fp,tf,T1,fef,esu,AssTmp,Sf; -+ Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S; -+ Word Ls, Lc,LL,f,rp,fp,T1,fef,esu,AssTmp,Sf; - - Step1: /* Obtain coefficients. */ - P = NIL; ---- ./source/main/INITIO.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/INITIO.c 2013-11-21 14:52:44.290698828 -0700 -@@ -14,8 +14,6 @@ void OutputContextInit(ostream&); - - void INITIO() - { -- Word i; -- - Step1: /* Initialize Input. */ - if (isatty(0)) - InputContextInit(*(new readlineIstream())); ---- ./source/main/QEPCADauto.c.orig 2013-08-28 15:52:45.403836140 -0600 -+++ ./source/main/QEPCADauto.c 2013-11-21 14:56:00.803557526 -0700 -@@ -20,11 +20,8 @@ Quantifier Elimination by Partial Cylind - - void QepcadCls::QEPCADauto(Word Fs, Word *t_, Word *F_e_, Word *F_n_, Word *F_s_) - { -- Word A,D,F,F_e,F_n,F_s,Fh,J,P,Q,Ths,f,i,r,t, T; -- /* hide Ths,i,t; */ -- Word cL,**cC,cr,ce,ci,*cT,cj,cs,cl,ct; /* Chris variables. */ -- Word Cs,Ps,Qs,Pps,Cps,Qps,SF; /* Chris variables. */ -- char c1,c2; /* Chris variables. */ -+ Word A,D,F,F_e,F_n,F_s,Fh,J,P,Q,f,r,t; -+ /* hide t; */ - - Step1: /* Normalize. */ - t = 0; ---- ./source/main/INITSTAT.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/INITSTAT.c 2013-11-21 14:53:05.410695532 -0700 -@@ -7,10 +7,6 @@ Initialize Statistics. - - void INITSTAT() - { -- Word i; -- /* hide i; */ -- -- - Step5: /* Statistics on Databases. */ - TMDBMNG = 0; - TMDBSAV = 0; ---- ./source/main/QEPCAD.c.orig 2013-08-28 15:51:13.747873723 -0600 -+++ ./source/main/QEPCAD.c 2013-11-21 14:54:54.611625874 -0700 -@@ -22,9 +22,6 @@ void QepcadCls::QEPCAD(Word Fs, Word *t_ - { - Word A,D,F,F_e,F_n,F_s,Fh,J,P,Q,Ths,f,i,r,t, T; - /* hide Ths,i,t; */ -- Word cL,**cC,cr,ce,ci,*cT,cj,cs,cl,ct; /* Chris variables. */ -- Word Cs,Ps,Qs,Pps,Cps,Qps,SF; /* Chris variables. */ -- char c1,c2; /* Chris variables. */ - Step1: /* Normalize. */ - t = 0; - F_e = F_n = F_s = NIL; ---- ./source/main/CADautoConst.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/CADautoConst.c 2013-11-21 15:01:56.403872771 -0700 +--- source/main/CADautoConst.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/main/CADautoConst.c 2018-08-29 20:10:06.409075797 -0600 @@ -16,11 +16,7 @@ been set to something other than NIL, th void QepcadCls::CADautoConst() @@ -1399,8 +1215,8 @@ Step1: /* Normalize. */ FIRST4(GVF,&r,&f,&Q,&Fh); ---- ./source/main/INITCTRL.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/main/INITCTRL.c 2013-11-21 14:52:22.043697090 -0700 +--- source/main/INITCTRL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/main/INITCTRL.c 2018-08-29 20:10:06.409075797 -0600 @@ -7,12 +7,9 @@ Initialize Program/Trace Control. void INITCTRL() @@ -1416,168 +1232,192 @@ Step2: /* Initialize Algorithm Trace Control Variables. */ TCPROJ = NIL; ---- ./source/ticad/MAFUPGCD.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/MAFUPGCD.c 2013-11-21 15:15:34.252159536 -0700 -@@ -17,7 +17,7 @@ Output +--- source/main/INITIO.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/main/INITIO.c 2018-08-29 20:10:06.409075797 -0600 +@@ -14,8 +14,6 @@ void OutputContextInit(ostream&); - Word MAFUPGCD(Word p, Word M, Word A, Word B) + void INITIO() { -- Word C,A1,A2,A3,a,ap,r; -+ Word C,A1,A2,A3; +- Word i; +- + Step1: /* Initialize Input. */ + if (isatty(0)) + InputContextInit(*(new readlineIstream())); +--- source/main/INITSTAT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/main/INITSTAT.c 2018-08-29 20:10:06.409075797 -0600 +@@ -7,10 +7,6 @@ Initialize Statistics. + + void INITSTAT() + { +- Word i; +- /* hide i; */ +- +- + Step5: /* Statistics on Databases. */ + TMDBMNG = 0; + TMDBSAV = 0; +--- source/main/QEPCADauto.c.orig 2018-08-29 20:05:52.867359499 -0600 ++++ source/main/QEPCADauto.c 2018-08-29 20:10:06.409075797 -0600 +@@ -20,11 +20,8 @@ Quantifier Elimination by Partial Cylind + + void QepcadCls::QEPCADauto(Word Fs, Word *t_, Word *F_e_, Word *F_n_, Word *F_s_) + { +- Word A,D,F,F_e,F_n,F_s,Fh,J,P,Q,Ths,f,i,r,t, T; +- /* hide Ths,i,t; */ +- Word cL,**cC,cr,ce,ci,*cT,cj,cs,cl,ct; /* Chris variables. */ +- Word Cs,Ps,Qs,Pps,Cps,Qps,SF; /* Chris variables. */ +- char c1,c2; /* Chris variables. */ ++ Word A,D,F,F_e,F_n,F_s,Fh,J,P,Q,f,r,t; ++ /* hide t; */ + + Step1: /* Normalize. */ + t = 0; +--- source/main/QEPCAD.c.orig 2018-08-29 20:05:52.867359499 -0600 ++++ source/main/QEPCAD.c 2018-08-29 20:10:06.409075797 -0600 +@@ -22,9 +22,6 @@ void QepcadCls::QEPCAD(Word Fs, Word *t_ + { + Word A,D,F,F_e,F_n,F_s,Fh,J,P,Q,Ths,f,i,r,t, T; + /* hide Ths,i,t; */ +- Word cL,**cC,cr,ce,ci,*cT,cj,cs,cl,ct; /* Chris variables. */ +- Word Cs,Ps,Qs,Pps,Cps,Qps,SF; /* Chris variables. */ +- char c1,c2; /* Chris variables. */ + Step1: /* Normalize. */ + t = 0; + F_e = F_n = F_s = NIL; +--- source/proj/ECLEVEL.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/ECLEVEL.c 2018-08-29 20:10:06.408075798 -0600 +@@ -14,10 +14,9 @@ Output + + Word ECLEVEL(Word L) + { +- Word k,Lp,L1; ++ Word k,L1; + + Step1: /* Initialize. */ +- Lp = L; + k = 0; + + Step2: /* Loop. */ +--- source/proj/PROJCO.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/PROJCO.c 2018-08-29 20:10:06.408075798 -0600 +@@ -15,7 +15,7 @@ Collins' projection. + + Word QepcadCls::PROJCO(Word r, Word A) + { +- Word A1,A2,Ap,Ap1,Ap2,App,D,L,L1,P,P1,R,R1,R11,R2,R21,Rp,Rp1,Rp11,Rp2, ++ Word A1,A2,Ap,Ap1,Ap2,App,D,L,L1,P,R,R1,R11,R2,R21,Rp,Rp1,Rp11,Rp2, + Rpp,Rs2,S1,Sp1,T,W,ap1,b,d,i,i1,i2,k,t; + + Step1: /* $r = 2$. */ +--- source/proj/PROJECTauto.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/PROJECTauto.c 2018-08-29 20:10:06.408075798 -0600 +@@ -17,7 +17,7 @@ Projection Phase. + + void QepcadCls::PROJECTauto(Word r, Word A, Word *P_, Word *J_) + { +- Word D,F,J,P,Ps,J_k1,P_k,R,Ths,Thss,k,i; ++ Word D,F,J,P,J_k1,P_k,R,k,i; + + Step1: /* Initialize. */ + P = LLCOPY(A); +--- source/proj/PROJECT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/PROJECT.c 2018-08-29 20:10:06.408075798 -0600 +@@ -19,7 +19,7 @@ Projection Phase. + + void QepcadCls::PROJECT(Word r, Word A, Word *P_, Word *J_) + { +- Word D,F,J,P,Ps,J_k1,P_k,R,Ths,Thss,k,i; ++ Word D,F,J,P,J_k1,P_k,R,Ths,Thss,k,i; + + Step1: /* Initialize. */ + P = LLCOPY(A); +--- source/proj/PROJMCECmod.c.orig 2018-08-29 20:07:50.511232206 -0600 ++++ source/proj/PROJMCECmod.c 2018-08-29 20:10:06.408075798 -0600 +@@ -18,8 +18,8 @@ not propogate! + + Word QepcadCls::PROJMCECmod(Word r, Word A) + { +- Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S,Sp,C; +- Word Ls, Lc,LL,f,rp,fp,tf,T1,fef,esu,AssTmp,Sf,k; ++ Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S,C; ++ Word Ls, Lc,LL,f,rp,fp,T1,fef,esu,AssTmp,Sf; + + Step0: /* Obtain pivot constraint: If pivot is not all of level k, we can't use it! */ + C = LELTI(GVPIVOT,r); +--- source/proj/PROJMCmod.c.orig 2018-08-29 20:07:50.511232206 -0600 ++++ source/proj/PROJMCmod.c 2018-08-29 20:10:06.409075797 -0600 +@@ -20,8 +20,8 @@ using namespace std; + + Word QepcadCls::PROJMCmod(Word r, Word A) + { +- Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S,Sp; +- Word Ls, Lc,LL,f,rp,fp,tf,T1,fef,esu,AssTmp,Sf; ++ Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t,Q,j,S; ++ Word Ls, Lc,LL,f,rp,fp,T1,fef,esu,AssTmp,Sf; + + Step1: /* Obtain coefficients. */ + P = NIL; +--- source/proj/PROJMCx.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/proj/PROJMCx.c 2018-08-29 20:10:06.408075798 -0600 +@@ -15,7 +15,7 @@ McCallum's projection excluding leading + + Word QepcadCls::PROJMCx(Word r, Word A) + { +- Word A1,A2,Ap,Ap1,Ap2,App,D,L,Lh,P,R,W,i,t; ++ Word A1,A2,Ap,Ap1,Ap2,App,D,P,R,W; + + Step1: /* Obtain coefficients. */ + P = NIL; +--- source/saclib/GCSI.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/saclib/GCSI.c 2018-08-29 20:10:06.408075798 -0600 +@@ -23,10 +23,9 @@ extern void gcw_MARK(); + + void GCSI(Word s, char *EACSTACK) + { +- Word I,L,N,N1,Np,Np1,T,T1,c,**i,j,inc; ++ Word I,L,N,N1,Np,Np1,T,T1,c,inc; + char *a; +- GCArray *v; +- /* hide I,L,N,N1,Np,Np1,T,T1,c,i,j,inc,a,v; */ ++ /* hide I,L,N,N1,Np,Np1,T,T1,c,inc,a; */ + + Step1: /* Setup. */ + if (GCM == 1) { +--- source/sysolve/EVALSYS.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/sysolve/EVALSYS.c 2018-08-29 20:10:06.407075800 -0600 +@@ -20,7 +20,7 @@ Outputs: + + Word EVALSYS(Word S, BDigit t, Word R) + { +- Word r, L, i, S_i, Ap, a, A, is, As, F, f, ip, fp, s, c; ++ Word r, L, i, S_i, Ap, a, A, is, As; - Step1: /* A = 0 \/ B = 0 */ - if (A == 0) { ---- ./source/ticad/ACCCVBCR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/ACCCVBCR.c 2013-11-21 15:10:06.421126382 -0700 -@@ -25,7 +25,7 @@ static Word SECTIONPOLS(Word k, Word c, + Step1: /* Construct the skelaton of L, the answer. */ + r = LENGTH(S); +--- source/sysolve/SYSSOLVE.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/sysolve/SYSSOLVE.c 2018-08-29 20:10:06.407075800 -0600 +@@ -21,7 +21,7 @@ Output - Word QepcadCls::ACCCVBCR(Word k, Word c, Word B1, Word b, Word* B1h) + Word SYSSOLVECAD(BDigit r, Word L, Word A, Word Vp, QepcadCls &Q) { -- Word d, nnf, dV, IV, cp, i, I_i, d_i, c_i, L, Q, Qb, Qbs, F, Fp, a; -+ Word d, nnf, dV, IV, i, I_i, c_i, L, Q, Qb, Qbs, F, Fp, a; +- Word F, Fp, d, t, Lt, Lf, V, S; ++ Word F, Lt, Lf, V, S; - Step1: /* Initialization **********************************************/ - a = NIL; /* this is the pseudo-sample point we're building up *******/ -@@ -41,7 +41,6 @@ Step2: /* Loop over each level from 1 to - c_i = GVPC; - for(i = 1; i <= k; i++) { - I_i = LELTI(IV,i); -- d_i = LELTI(dV,i); - c_i = LELTI(LELTI(c_i,CHILD),I_i); + /* Set variable list */ + if (LENGTH(Vp) < r) { +--- source/sysolve/VERIFYCONSTSIGN.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/sysolve/VERIFYCONSTSIGN.c 2018-08-29 20:10:06.406075801 -0600 +@@ -78,7 +78,7 @@ BDigit VERIFYPOSITIVITY(Word A, BDigit r + else if (FIRST(A) != IROOT) + { + /* atomic formula is "P_A T_A 0", where P_A is of level k_A. */ +- Word T_A,P_A,k_A,s,rp,Pp,P,a,T; ++ Word T_A,P_A,k_A; + FIRST3(A,&T_A,&P_A,&k_A); + if (r != k_A) { goto Return; } - Step3: /* c_i is a section over a 0-dimensional cell ******************/ -@@ -99,11 +98,10 @@ L : the list of all k-level polynomials - ======================================================================*/ - static Word SECTIONPOLS(Word k, Word c, Word P) - { -- Word L,P_k,M,i,Mp; -+ Word L,P_k,M,i; - L = NIL; - P_k = LELTI(P,k); -- M = LELTI(c,MULSUB); -- for(Mp = M; M != NIL; M = RED(M)) { -+ for(M = LELTI(c,MULSUB); M != NIL; M = RED(M)) { - i = FIRST(FIRST(M)); - L = COMP(LELTI(P_k,i),L); } - return L; ---- ./source/ticad/EC.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/EC.c 2013-11-21 15:14:24.997157287 -0700 -@@ -16,7 +16,7 @@ Establish Children. - - void EC(Word c, Word L, Word E, Word Bs) - { -- Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,rp,s,sp,x,xb,xp; -+ Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,s,sp,x,xb,xp; - /* hide kp,xp; */ - Word T; - -@@ -52,7 +52,6 @@ Step4: /* First section. */ - - Step5: /* Check if there are more roots. */ - if (Lp == NIL) goto Step9; -- rp = r; - - Step6: /* Next sector. */ - ADV2(Lp,&I,&B,&Lp); FIRST2(I,&l,&r); ---- ./source/ticad/SUBST.c.orig 2013-08-30 15:36:14.959182825 -0600 -+++ ./source/ticad/SUBST.c 2013-11-21 15:21:02.180078594 -0700 -@@ -20,7 +20,6 @@ Substitute the sample point into the pro - Word QepcadCls::SUBST(Word c, Word k, Word M, Word b, Word B) - { - Word B1,Bp,S,S1; -- Word dV,IV; - Word P,L,Sp,T1,T2,G,Q,f,i; - - Step1: /* Substitute. */ ---- ./source/ticad/MAFUPMON.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/MAFUPMON.c 2013-11-21 15:15:51.244158678 -0700 -@@ -17,7 +17,7 @@ Output - - Word MAFUPMON(Word p, Word M, Word A) - { -- Word B,d,Ap,a,ap,r; -+ Word B,d,Ap,a,ap; - - Step1: /* A = 0 */ - if (A == 0) { ---- ./source/ticad/TICADauto.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/TICADauto.c 2013-11-21 15:23:42.540053942 -0700 -@@ -24,7 +24,7 @@ Output - - Word QepcadCls::TICADauto(Word Q, Word F, Word f, Word P, Word A) - { -- Word As,D,Ps,Ths,Thss,c,cp,k,s,sh,sp,t,R,S; -+ Word As,D,Ps,c,k,s,sh,t; - - Step1: /* Initialize. */ - D = INITPCAD(); ---- ./source/ticad/TICAD.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/TICAD.c 2013-11-21 15:23:00.396059765 -0700 -@@ -24,7 +24,7 @@ Output - - Word QepcadCls::TICAD(Word Q, Word F, Word f, Word P, Word A) - { -- Word As,D,Ps,Ths,Thss,c,cp,k,s,sh,sp,t,R,S; -+ Word As,D,Ps,Ths,Thss,c,k,s,sh,t; - - Step1: /* Initialize. */ - D = INITPCAD(); ---- ./source/ticad/APEQC.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/APEQC.c 2013-11-21 15:10:25.996103193 -0700 -@@ -21,7 +21,7 @@ Effect - - void QepcadCls::APEQC(Word c, Word k, Word P) - { -- Word c1,E,E1,E11,Ep,Ep1,h,i,j,m,M,Mp,S,t,tp,Ps,p; -+ Word c1,E,E1,E11,Ep,Ep1,i,j,m,M,Mp,S,t,Ps,p; - - Step1: /* Get (k+1)-level equational constraints, if none, return. */ - E = LELTI(GVEQNCONST,k+1); ---- ./source/ticad/ECR.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/ECR.c 2013-11-21 15:15:04.116159572 -0700 -@@ -16,7 +16,7 @@ Establish Children on a rational sample - - void ECR(Word c, Word L, Word E, Word Bs) - { -- Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,rp,s,sp,x,xb,xp; -+ Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,s,sp,x,xb,xp; - /* hide kp,xp; */ - Word T; - -@@ -55,7 +55,6 @@ Step4: /* First section. */ - - Step5: /* Check if there are more roots. */ - if (Lp == NIL) goto Step9; -- rp = r; - - Step6: /* Next sector. */ - ADV2(Lp,&I,&B,&Lp); FIRST2(I,&l,&r); ---- ./source/ticad/SIGNP1.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/SIGNP1.c 2013-11-21 15:20:40.908084633 -0700 -@@ -19,7 +19,7 @@ using namespace std; - - void SIGNP1(Word c, Word P1, Word I) - { -- Word S1,c1,cb,I1; -+ Word c1,cb,I1; - - Step1: /* Compute the signatures of $P_1$. */ - vector S; ---- ./source/ticad/QFFTEV.c.orig 2013-08-30 13:34:05.245953999 -0600 -+++ ./source/ticad/QFFTEV.c 2013-11-21 15:19:34.709109473 -0700 -@@ -17,8 +17,8 @@ static Word ATOMETFEVAL(Word Q, Word D, - - Word QepcadCls::QFFTEV(Word F, Word c, Word k) - { -- Word F1,Fp,I,Pt,T,i,j,m,s,t,tp,z; -- /* hide m,t,tp,z; */ -+ Word F1,Fp,I,Pt,T,i,j,s,t,tp,z; -+ /* hide t,tp,z; */ - - Step1: /* Classify the formula $F$. */ - T = FIRST(F); ---- ./source/ticad/ACCCVBC.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/ACCCVBC.c 2013-11-21 15:09:16.324081437 -0700 +--- source/ticad/ACCCVBC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/ACCCVBC.c 2018-08-29 20:10:06.411075794 -0600 @@ -28,7 +28,7 @@ static Word SECTIONPOLS(Word k, Word c, Word QepcadCls::ACCCVBC(Word k, Word c, Word M, Word B1, Word b, Word* B1h) @@ -1609,27 +1449,52 @@ i = FIRST(FIRST(M)); L = COMP(LELTI(P_k,i),L); } return L; ---- ./source/ticad/EC1.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/EC1.c 2013-11-21 15:14:44.828158865 -0700 -@@ -15,7 +15,7 @@ Establish Children of the root. +--- source/ticad/ACCCVBCR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/ACCCVBCR.c 2018-08-29 20:10:06.409075797 -0600 +@@ -25,7 +25,7 @@ static Word SECTIONPOLS(Word k, Word c, - void EC1(Word c, Word L, Word Bs) + Word QepcadCls::ACCCVBCR(Word k, Word c, Word B1, Word b, Word* B1h) { -- Word B,I,J,Lp,M,N,S,Sp,P,a,b,kp,l,r,rp,s,xb,xp,Lp1,OL; -+ Word B,I,J,Lp,M,N,S,Sp,P,a,b,kp,l,r,s,xb,xp,Lp1,OL; - /* hide kp,xp; */ - Word T; +- Word d, nnf, dV, IV, cp, i, I_i, d_i, c_i, L, Q, Qb, Qbs, F, Fp, a; ++ Word d, nnf, dV, IV, i, I_i, c_i, L, Q, Qb, Qbs, F, Fp, a; -@@ -58,7 +58,6 @@ Step4: /* First section. */ + Step1: /* Initialization **********************************************/ + a = NIL; /* this is the pseudo-sample point we're building up *******/ +@@ -41,7 +41,6 @@ Step2: /* Loop over each level from 1 to + c_i = GVPC; + for(i = 1; i <= k; i++) { + I_i = LELTI(IV,i); +- d_i = LELTI(dV,i); + c_i = LELTI(LELTI(c_i,CHILD),I_i); + + Step3: /* c_i is a section over a 0-dimensional cell ******************/ +@@ -99,11 +98,10 @@ L : the list of all k-level polynomials + ======================================================================*/ + static Word SECTIONPOLS(Word k, Word c, Word P) + { +- Word L,P_k,M,i,Mp; ++ Word L,P_k,M,i; + L = NIL; + P_k = LELTI(P,k); +- M = LELTI(c,MULSUB); +- for(Mp = M; M != NIL; M = RED(M)) { ++ for(M = LELTI(c,MULSUB); M != NIL; M = RED(M)) { + i = FIRST(FIRST(M)); + L = COMP(LELTI(P_k,i),L); } + return L; +--- source/ticad/APEQC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/APEQC.c 2018-08-29 20:10:06.410075795 -0600 +@@ -21,7 +21,7 @@ Effect - Step5: /* Check if there are more roots. */ - if (Lp == NIL) goto Step9; -- rp = r; + void QepcadCls::APEQC(Word c, Word k, Word P) + { +- Word c1,E,E1,E11,Ep,Ep1,h,i,j,m,M,Mp,S,t,tp,Ps,p; ++ Word c1,E,E1,E11,Ep,Ep1,i,j,m,M,Mp,S,t,Ps,p; - Step6: /* Next sector. */ - ADV(Lp,&Lp1,&Lp); ---- ./source/ticad/CONSTRUCT.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/ticad/CONSTRUCT.c 2013-11-21 15:14:00.596153692 -0700 + Step1: /* Get (k+1)-level equational constraints, if none, return. */ + E = LELTI(GVEQNCONST,k+1); +--- source/ticad/CONSTRUCT.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/CONSTRUCT.c 2018-08-29 20:10:06.411075794 -0600 @@ -24,8 +24,7 @@ Word IUPSBRRI(Word B, BDigit k); void QepcadCls::CONSTRUCT(Word c, Word k, Word f, Word Ps_, Word As) { @@ -1672,8 +1537,121 @@ Word J = SIPIR(C[i],I,t,k); L = COMP(LIST3(i,J,t),L); } ---- ./source/ticad/SUBSTR.c.orig 2013-08-30 15:36:46.631109286 -0600 -+++ ./source/ticad/SUBSTR.c 2013-11-21 15:21:17.364075319 -0700 +--- source/ticad/EC1.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/EC1.c 2018-08-29 20:10:06.411075794 -0600 +@@ -15,7 +15,7 @@ Establish Children of the root. + + void EC1(Word c, Word L, Word Bs) + { +- Word B,I,J,Lp,M,N,S,Sp,P,a,b,kp,l,r,rp,s,xb,xp,Lp1,OL; ++ Word B,I,J,Lp,M,N,S,Sp,P,a,b,kp,l,r,s,xb,xp,Lp1,OL; + /* hide kp,xp; */ + Word T; + +@@ -58,7 +58,6 @@ Step4: /* First section. */ + + Step5: /* Check if there are more roots. */ + if (Lp == NIL) goto Step9; +- rp = r; + + Step6: /* Next sector. */ + ADV(Lp,&Lp1,&Lp); +--- source/ticad/EC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/EC.c 2018-08-29 20:10:06.410075795 -0600 +@@ -16,7 +16,7 @@ Establish Children. + + void EC(Word c, Word L, Word E, Word Bs) + { +- Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,rp,s,sp,x,xb,xp; ++ Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,s,sp,x,xb,xp; + /* hide kp,xp; */ + Word T; + +@@ -52,7 +52,6 @@ Step4: /* First section. */ + + Step5: /* Check if there are more roots. */ + if (Lp == NIL) goto Step9; +- rp = r; + + Step6: /* Next sector. */ + ADV2(Lp,&I,&B,&Lp); FIRST2(I,&l,&r); +--- source/ticad/ECR.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/ECR.c 2018-08-29 20:10:06.410075795 -0600 +@@ -16,7 +16,7 @@ Establish Children on a rational sample + + void ECR(Word c, Word L, Word E, Word Bs) + { +- Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,rp,s,sp,x,xb,xp; ++ Word B,I,J,Lp,M,N,S,Sp,Pp,P,a,b,bp,kp,l,r,s,sp,x,xb,xp; + /* hide kp,xp; */ + Word T; + +@@ -55,7 +55,6 @@ Step4: /* First section. */ + + Step5: /* Check if there are more roots. */ + if (Lp == NIL) goto Step9; +- rp = r; + + Step6: /* Next sector. */ + ADV2(Lp,&I,&B,&Lp); FIRST2(I,&l,&r); +--- source/ticad/MAFUPGCD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/MAFUPGCD.c 2018-08-29 20:10:06.409075797 -0600 +@@ -17,7 +17,7 @@ Output + + Word MAFUPGCD(Word p, Word M, Word A, Word B) + { +- Word C,A1,A2,A3,a,ap,r; ++ Word C,A1,A2,A3; + + Step1: /* A = 0 \/ B = 0 */ + if (A == 0) { +--- source/ticad/MAFUPMON.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/MAFUPMON.c 2018-08-29 20:10:06.410075795 -0600 +@@ -17,7 +17,7 @@ Output + + Word MAFUPMON(Word p, Word M, Word A) + { +- Word B,d,Ap,a,ap,r; ++ Word B,d,Ap,a,ap; + + Step1: /* A = 0 */ + if (A == 0) { +--- source/ticad/QFFTEV.c.orig 2018-08-29 20:03:25.112519355 -0600 ++++ source/ticad/QFFTEV.c 2018-08-29 20:10:06.411075794 -0600 +@@ -17,8 +17,8 @@ static Word ATOMETFEVAL(Word Q, Word D, + + Word QepcadCls::QFFTEV(Word F, Word c, Word k) + { +- Word F1,Fp,I,Pt,T,i,j,m,s,t,tp,z; +- /* hide m,t,tp,z; */ ++ Word F1,Fp,I,Pt,T,i,j,s,t,tp,z; ++ /* hide t,tp,z; */ + + Step1: /* Classify the formula $F$. */ + T = FIRST(F); +--- source/ticad/SIGNP1.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/SIGNP1.c 2018-08-29 20:10:06.410075795 -0600 +@@ -19,7 +19,7 @@ using namespace std; + + void SIGNP1(Word c, Word P1, Word I) + { +- Word S1,c1,cb,I1; ++ Word c1,cb,I1; + + Step1: /* Compute the signatures of $P_1$. */ + vector S; +--- source/ticad/SUBST.c.orig 2018-08-29 20:05:52.867359499 -0600 ++++ source/ticad/SUBST.c 2018-08-29 20:10:06.410075795 -0600 +@@ -20,7 +20,6 @@ Substitute the sample point into the pro + Word QepcadCls::SUBST(Word c, Word k, Word M, Word b, Word B) + { + Word B1,Bp,S,S1; +- Word dV,IV; + Word P,L,Sp,T1,T2,G,Q,f,i; + + Step1: /* Substitute. */ +--- source/ticad/SUBSTR.c.orig 2018-08-29 20:05:52.868359497 -0600 ++++ source/ticad/SUBSTR.c 2018-08-29 20:10:06.411075794 -0600 @@ -20,7 +20,6 @@ Substitute the rational sample point int Word QepcadCls::SUBSTR(Word c, Word k, Word b, Word B) { @@ -1682,30 +1660,30 @@ Word P,L,Q,T1,T2,Sp,G,f,i; Step1: /* Do it. */ ---- ./source/userint/PRMCC.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/PRMCC.c 2013-11-21 15:25:06.132042700 -0700 -@@ -10,7 +10,7 @@ Process "manually choose a cell" command +--- source/ticad/TICADauto.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/TICADauto.c 2018-08-29 20:10:06.410075795 -0600 +@@ -24,7 +24,7 @@ Output - void QepcadCls::PRMCC(Word *t_) + Word QepcadCls::TICADauto(Word Q, Word F, Word f, Word P, Word A) { -- Word C,c,cp,t; -+ Word c,t; - /* hide t; */ +- Word As,D,Ps,Ths,Thss,c,cp,k,s,sh,sp,t,R,S; ++ Word As,D,Ps,c,k,s,sh,t; - Step1: /* Read in an argument. */ ---- ./source/userint/PRRMPF.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/PRRMPF.c 2013-11-21 15:25:29.820039581 -0700 -@@ -7,7 +7,7 @@ Process "Remove Projection Factor" comma + Step1: /* Initialize. */ + D = INITPCAD(); +--- source/ticad/TICAD.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/ticad/TICAD.c 2018-08-29 20:10:06.410075795 -0600 +@@ -24,7 +24,7 @@ Output - void QepcadCls::PRRMPF() + Word QepcadCls::TICAD(Word Q, Word F, Word f, Word P, Word A) { -- Word A_i,C,P_i,P_ij,i,j,t; -+ Word C,P_i,P_ij,i,j,t; - /* hide C,t; */ +- Word As,D,Ps,Ths,Thss,c,cp,k,s,sh,sp,t,R,S; ++ Word As,D,Ps,Ths,Thss,c,k,s,sh,t; - Step1: /* Read in arguments. */ ---- ./source/userint/PRDLFI.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/PRDLFI.c 2013-11-21 15:24:39.420046216 -0700 + Step1: /* Initialize. */ + D = INITPCAD(); +--- source/userint/PRDLFI.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/userint/PRDLFI.c 2018-08-29 20:10:06.411075794 -0600 @@ -7,7 +7,7 @@ Process "display-level-factors i" comman void QepcadCls::PRDLFI() @@ -1715,8 +1693,8 @@ Step1: /* Get level. */ i = IREAD(); ---- ./source/userint/PREQNCONSTL.c.orig 2013-08-30 15:37:35.045721919 -0600 -+++ ./source/userint/PREQNCONSTL.c 2013-11-21 15:25:56.636036050 -0700 +--- source/userint/PREQNCONSTL.c.orig 2018-08-29 20:05:52.868359497 -0600 ++++ source/userint/PREQNCONSTL.c 2018-08-29 20:10:06.412075792 -0600 @@ -90,7 +90,7 @@ Word POLYLABEL(Word P, Word p, Word r, W void QepcadCls::PREQNCONSTPOLY() @@ -1726,8 +1704,19 @@ // Check if propagation of equational constraints was specified. if (PCPROPEC == FALSE) { ---- ./source/userint/PRPROPEC.c.orig 2012-03-16 06:49:30.000000000 -0600 -+++ ./source/userint/PRPROPEC.c 2013-11-21 15:26:16.052033493 -0700 +--- source/userint/PRMCC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/userint/PRMCC.c 2018-08-29 20:10:06.411075794 -0600 +@@ -10,7 +10,7 @@ Process "manually choose a cell" command + + void QepcadCls::PRMCC(Word *t_) + { +- Word C,c,cp,t; ++ Word c,t; + /* hide t; */ + + Step1: /* Read in an argument. */ +--- source/userint/PRPROPEC.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/userint/PRPROPEC.c 2018-08-29 20:10:06.412075792 -0600 @@ -7,7 +7,7 @@ Process prop-eqn-const command. void QepcadCls::PRPROPEC() @@ -1737,3 +1726,14 @@ Step1: /* Toggle the PCPROPEC global variable and initialize globals. */ GVEQNCONST = GVPIVOT = NIL; +--- source/userint/PRRMPF.c.orig 2018-01-25 14:25:22.000000000 -0700 ++++ source/userint/PRRMPF.c 2018-08-29 20:10:06.411075794 -0600 +@@ -7,7 +7,7 @@ Process "Remove Projection Factor" comma + + void QepcadCls::PRRMPF() + { +- Word A_i,C,P_i,P_ij,i,j,t; ++ Word C,P_i,P_ij,i,j,t; + /* hide C,t; */ + + Step1: /* Read in arguments. */ diff --git a/qepcad-B.spec b/qepcad-B.spec index 139f8ac..08ed42a 100644 --- a/qepcad-B.spec +++ b/qepcad-B.spec @@ -1,11 +1,11 @@ Name: qepcad-B -Version: 1.69 -Release: 18%{?dist} +Version: 1.72 +Release: 1%{?dist} Summary: Quantifier elimination tool License: MIT -URL: http://www.usna.edu/CS/qepcadweb/INSTALL/IQ.html -Source0: http://www.usna.edu/CS/qepcadweb/INSTALL/%{name}.%{version}.tar.gz +URL: https://www.usna.edu/Users/cs/wcbrown/qepcad/B/QEPCAD.html +Source0: https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/%{name}.%{version}.tar.gz # Don't require users to set the "qe" or "SINGULARPATH" environment variables. # Not for upstream. Patch0: %{name}-env.patch @@ -29,9 +29,9 @@ Patch7: %{name}-syntax.patch # Remove unused variables and static functions. Patch8: %{name}-unused.patch # Tell Singular not to steal the TTY (bz 1257471) -Patch9: %{name}-tty.patch +Patch9: %{name}-tty.patch # Adapt to GCC 6 -Patch10: %{name}-gcc6.patch +Patch10: %{name}-gcc6.patch BuildRequires: freeglut-devel BuildRequires: gcc-c++ @@ -123,6 +123,10 @@ ln -s %{_bindir}/qepcad %{buildroot}%{_datadir}/qepcad/bin %{_datadir}/qepcad/ %changelog +* Wed Aug 29 2018 Jerry James - 1.72-1 +- New upstream version +- Updated URLs + * Sat Jul 14 2018 Fedora Release Engineering - 1.69-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 709dded..e1a587a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8eb38dcc186076896837c75f2f206bb8 qepcad-B.1.69.tar.gz +SHA512 (qepcad-B.1.72.tar.gz) = 0bf295f9d60ecce61c1c43e6f4028ac479fc3ea9131976be81dd33a68c6e8241fd442c72d83bc530adf4c02682c86fd761124182154f14dbd6f7a498445414fe