2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -43,6 +43,8 @@ Step2: /* Choose. */
|
|
|
|
if (L == 0) { /* Init for 1D Sectors */
|
|
|
|
L = LELTI(D,CHILD);
|
|
|
|
d = 1; }
|
|
|
|
+ else
|
|
|
|
+ d = 0;
|
|
|
|
|
|
|
|
if (d == 1 && L != NIL) { /* Choose next 1D sectors */
|
|
|
|
c = FIRST(L);
|
|
|
|
@@ -51,6 +53,7 @@ Step2: /* Choose. */
|
|
|
|
else
|
|
|
|
L = RED2(L); }
|
|
|
|
else if (d == 1 && L == NIL) { /* Init for 1D sections */
|
|
|
|
+ c = NIL;
|
|
|
|
d = 0;
|
|
|
|
L = RED(LELTI(D,CHILD));
|
|
|
|
}
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -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))
|
|
|
|
{
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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): ");
|
|
|
|
p = LREAD(); }
|
|
|
|
+ else
|
|
|
|
+ p = NIL;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
switch(c) {
|
|
|
|
case 'x': // 1D Sectors
|
|
|
|
--- 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;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
Step1: /* Initialization. */
|
|
|
|
- C = NIL; Sltr = NIL; Pltr = NIL; N = LENGTH(K);
|
|
|
|
+ C = NIL; Sltr = NIL; S_r = NIL; Pltr = NIL; N = LENGTH(K);
|
|
|
|
|
|
|
|
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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -27,6 +27,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 = LIST7(C,A,LELTI(Ds,SC_INX),NIL,s,NIL,UNDET);
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -18,7 +18,7 @@ void FMAATOMREAD(Word Q, Word V, Word *F
|
|
|
|
/* hide r,s,t; */
|
|
|
|
|
|
|
|
Step1: /* Read the left polynomial. */
|
|
|
|
- t = 1; r = LENGTH(V);
|
|
|
|
+ t = 1; r = LENGTH(V); F = NIL;
|
|
|
|
IPEXPREAD(r,V,&P1,&t); if (t == 0) goto Return;
|
|
|
|
|
|
|
|
Step2: /* Read the relational operator. */
|
|
|
|
@@ -71,6 +71,7 @@ Word POLYINDEX(Word P, Word p, Word r, W
|
|
|
|
p = SECOND(p);
|
|
|
|
|
|
|
|
/* Is p already in P? */
|
|
|
|
+ pp = NIL;
|
|
|
|
P_r = LELTI(P,r); *t = 0;
|
|
|
|
for(Pp = P_r; Pp != NIL; Pp = RED(Pp)) {
|
|
|
|
pp = FIRST(Pp);
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -16,6 +16,7 @@ Step1: /* Atoms and Constants. */
|
|
|
|
if (ISLIST(F1) || F1 == TRUE || F1 == FALSE) {
|
|
|
|
G = F;
|
|
|
|
goto Return; }
|
|
|
|
+ G = NIL;
|
|
|
|
|
|
|
|
Step2: /* AND's */
|
|
|
|
if (F1 == ANDOP) {
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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; } }
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
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; } }
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
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;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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. */
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
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;
|
|
|
|
|
|
|
|
Step1: /* Prepare */
|
|
|
|
- t = 1; r = LENGTH(V);
|
|
|
|
+ t = 1; r = LENGTH(V); F = NIL;
|
|
|
|
|
|
|
|
|
|
|
|
Step2: /* Read "_root_" */
|
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -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;
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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; */
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
Step1: /* Atomic condition. */
|
|
|
|
+ F = NIL;
|
|
|
|
t = 1;
|
|
|
|
C = CREADB(); if (C == '[') goto Step2;
|
|
|
|
BKSP();
|
|
|
|
--- 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; */
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
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;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
Step3: /* Error. */
|
2014-02-14 19:17:12 +00:00
|
|
|
- DIELOC(); t = 0; goto Return;
|
2018-08-30 02:27:13 +00:00
|
|
|
+ DIELOC(); a = 0; t = 0; goto Return;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
|
|
|
Return: /* Prepare for return. */
|
2018-08-30 02:27:13 +00:00
|
|
|
*a_ = a;
|
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -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;
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -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;
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
2018-08-30 02:27:13 +00:00
|
|
|
Step2: /* Error exit. */
|
2014-02-14 19:17:12 +00:00
|
|
|
- DIELOC(); t = 0; goto Return;
|
2018-08-30 02:27:13 +00:00
|
|
|
+ DIELOC(); p = 0; t = 0; goto Return;
|
2014-02-14 19:17:12 +00:00
|
|
|
|
|
|
|
Return: /* Prepare for return. */
|
2018-08-30 02:27:13 +00:00
|
|
|
*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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -27,6 +27,8 @@ void QepcadCls::QEPCADauto(Word Fs, Word
|
|
|
|
char c1,c2; /* Chris variables. */
|
|
|
|
|
|
|
|
Step1: /* Normalize. */
|
|
|
|
+ t = 0;
|
|
|
|
+ F_e = F_n = F_s = NIL;
|
|
|
|
FIRST4(Fs,&r,&f,&Q,&Fh);
|
|
|
|
F = NORMQFF(Fh);
|
|
|
|
if (GVUA != NIL) GVNA = NORMQFF(GVUA);
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -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. */
|
|
|
|
Step1: /* Normalize. */
|
|
|
|
+ t = 0;
|
|
|
|
+ F_e = F_n = F_s = NIL;
|
|
|
|
FIRST4(Fs,&r,&f,&Q,&Fh);
|
|
|
|
/*Int*/ PCNSTEP = 1;
|
|
|
|
/*Int*/ if (INTERACT()) USERINT(LFS("Before Normalization"),'a');
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -27,6 +27,7 @@ void AFUPMPR(Word M, Word I, Word B, Wor
|
|
|
|
/* hide L1,Lp,j,jp,s,t,v,vp; */
|
|
|
|
|
|
|
|
Step1: /* Initialize. */
|
|
|
|
+ j = 0;
|
|
|
|
FIRST2(J,&a,&b);
|
|
|
|
t = AFUPSR(M,I,B,b);
|
|
|
|
if (t == 0)
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -24,6 +24,7 @@ Word QepcadCls::SUBSTR(Word c, Word k, W
|
|
|
|
Word P,L,Q,T1,T2,Sp,G,f,i;
|
|
|
|
|
|
|
|
Step1: /* Do it. */
|
|
|
|
+ f = UNDET;
|
|
|
|
L = NIL;
|
|
|
|
S = NIL;
|
|
|
|
Bp = B;
|
2018-08-30 02:27:13 +00:00
|
|
|
--- 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
|
2014-02-14 19:17:12 +00:00
|
|
|
@@ -73,7 +73,7 @@ Return: /* Prepare for return. */
|
|
|
|
|
|
|
|
Word POLYLABEL(Word P, Word p, Word r, Word *t)
|
|
|
|
{
|
|
|
|
- Word P_r, Pp, pp;
|
|
|
|
+ Word P_r, Pp, pp = NIL;
|
|
|
|
|
|
|
|
for(; PDEG(p) == 0; r--)
|
|
|
|
p = SECOND(p);
|