rpms/qepcad-B
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New upstream version. Updated URLs.

Browse Source
This commit is contained in:
Jerry James 2018-08-29 20:27:13 -06:00
parent 7635aef710
commit 91dd25b6a6
14 changed files with 1692 additions and 1688 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/qepcad-B.1.69.tar.gz
/qepcad-B.*.tar.gz

262
qepcad-B-attr.patch
View File

@ -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 <iostream>
#include <sstream>
-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 <iostream>
#include <sstream>
-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);

28
qepcad-B-destructor.patch
View File

@ -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

6
qepcad-B-env.patch
View File

@ -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");

4
qepcad-B-gcc6.patch
View File

@ -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++)

72
qepcad-B-parens.patch
View File

@ -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;

34
qepcad-B-return.patch
View File

@ -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);

12
qepcad-B-signed.patch
View File

@ -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();
}

12
qepcad-B-syntax.patch
View File

@ -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 */

8
qepcad-B-tty.patch
View File

@ -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 <iostream>
@ -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)); }

348
qepcad-B-uninit.patch
View File

@ -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)

2574
qepcad-B-unused.patch
View File

File diff suppressed because it is too large Load Diff

16
qepcad-B.spec
View File

@ -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 <loganjerry@gmail.com> - 1.72-1
- New upstream version
- Updated URLs
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.69-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
8eb38dcc186076896837c75f2f206bb8 qepcad-B.1.69.tar.gz
SHA512 (qepcad-B.1.72.tar.gz) = 0bf295f9d60ecce61c1c43e6f4028ac479fc3ea9131976be81dd33a68c6e8241fd442c72d83bc530adf4c02682c86fd761124182154f14dbd6f7a498445414fe