===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/al.c,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -p -r1.1 -r1.3
--- OpenXM_contrib2/asir2018/builtin/al.c	2018/09/19 05:45:05	1.1
+++ OpenXM_contrib2/asir2018/builtin/al.c	2020/10/06 06:31:19	1.3
@@ -1,6 +1,6 @@
-/* $OpenXM$ */
+/* $OpenXM: OpenXM_contrib2/asir2018/builtin/al.c,v 1.2 2018/09/28 08:20:27 noro Exp $ */
 /* ----------------------------------------------------------------------
-   $Id: al.c,v 1.1 2018/09/19 05:45:05 noro Exp $
+   $Id: al.c,v 1.3 2020/10/06 06:31:19 noro Exp $
    ----------------------------------------------------------------------
    File al.c: Real quantifier elimination code for RISA/ASIR
 
@@ -288,7 +288,7 @@ Z *rp;
   oFOP op;
 
   op = FOP((F)ARG0(arg));
-  STOQ((int)op,*rp);
+  STOZ((int)op,*rp);
 }
 
 void Pfargs(arg,rp)
@@ -334,7 +334,7 @@ LIST *rp;
 
   f = (F)ARG0(arg);
   op = FOP(f);
-  STOQ((int)op,op1);
+  STOZ((int)op,op1);
   if ( AL_TVAL(op) )
     n1 = 0;
   else if ( AL_JUNCT(op) )
@@ -358,7 +358,7 @@ void Pcompf(arg,rp)
 NODE arg;
 Z *rp;
 {
-  STOQ(compf(CO,BDY(arg),BDY(NEXT(arg))),*rp);
+  STOZ(compf(CO,BDY(arg),BDY(NEXT(arg))),*rp);
 }
 
 void Patnum(arg,rp)
@@ -783,6 +783,8 @@ int simpl_gand_smtbelhs(thop,atop,pnatop)
       return(DROP);
     }
   }
+  /* XXX */
+  return 0;
 }
 
 int simpl_gand_smtbdlhs(thop,atop,difference)
@@ -843,6 +845,8 @@ int simpl_gand_smtbdlhs(thop,atop,difference)
       return(drop2);
     }
   }
+  /* XXX */
+  return 0;
 }
 
 void lbc(f,pc)
@@ -985,6 +989,7 @@ oFOP op1,op2;
     return -1;
   }
   error("unknown relation in comprel");
+  return 0;
 }
 
 int synequalf(f1,f2)
@@ -1005,6 +1010,8 @@ F f1,f2;
       return 0;
     return 1;
   }
+  /* XXX */
+  return 0;
 }
 
 void simpl_impl(op,prem,concl,th,n,pf)
@@ -1226,7 +1233,7 @@ F f,*pnf;
     w = qevar(MAT(cel),&cvl,&n);
     qeblock_verbose1b(w,pr);
     for (sc=n; sc; sc=NEXT(sc))
-      if ((F)BDY(sc) != F_FALSE)
+      if ((F)BDY(sc) != F_FALSE) {
         if (cvl) {
           MKCEL(cel,cvl,(F)BDY(sc));
           if (!comember(co,cel))
@@ -1235,6 +1242,7 @@ F f,*pnf;
           NEXTNODE(nargl,narglc);
           BDY(narglc) = BDY(sc);
         }
+      }
   }
   qeblock_verbose2();
   smkjf(pnf,AL_OR,nargl);
@@ -1327,7 +1335,7 @@ NODE *pfl;
   for (sc=eset; sc; sc=NEXT(sc)) {
     NEXTNODE(r,rc);
     subgpf(f,x,BDY(sc),&h);
-    simpl(h,(NODE)NULL,&BDY(rc));
+    simpl(h,(NODE)NULL,(F *)BDY(rc));
   }
   *pfl = r;
   return w;
@@ -1348,7 +1356,7 @@ NODE *peset;
 
   if (FOP(f) != AL_AND)
     return 0;
-  STOQ(2,two);
+  STOZ(2,two);
   for (deg=ONE; cmpz(two,deg) >= 0; addz(deg,ONE,&deg))
     for (scvl=*pvl; scvl; scvl=NEXT(scvl)) {
       v = VR(scvl);
@@ -1385,7 +1393,7 @@ Z deg;
   rld = DC(rlhs);
   if (cmpz(DEG(rld),deg) != 0)
     return 0;
-  STOQ(2,two);
+  STOZ(2,two);
   if (cmpz(deg,two) == 0) {
     *pa = COEF(rld);
     rld = NEXT(rld);
@@ -1488,7 +1496,7 @@ NODE trans[],transc[];
     translate_a1(FOP(at),mp,trans,transc);
     return 1;
   };
-  STOQ(2,two);
+  STOZ(2,two);
   if (cmpz(two,DEG(DC(mp))) == 0) {
     translate_a2(FOP(at),mp,trans,transc);
     return 1;
@@ -1595,7 +1603,7 @@ P a,b,c,*pd;
   Z four;
   
   mulp(CO,a,c,&h1);
-  STOQ(4,four);
+  STOZ(4,four);
   mulp(CO,(P)four,h1,&h2);
   mulp(CO,b,b,&h1);
   subp(CO,h1,h2,pd);
@@ -2042,7 +2050,7 @@ RE re;
   alpha = COEF(DC(prem));
   beta = (NEXT(DC(prem))) ? COEF(NEXT(DC(prem))) : 0;
   getqcoeffs(re->p,&a,&b,&c);
-  STOQ(2,two);
+  STOZ(2,two);
   mulp(CO,(P)two,a,&h1);
   mulp(CO,h1,beta,&h2);
   mulp(CO,b,alpha,&h1);
@@ -2249,7 +2257,7 @@ pointer argv[];
     NODE sc,n=NULL,c;
     for (sc=FJARG(f); sc; sc=NEXT(sc)) {
       NEXTNODE(n,c);
-      apply2ats(BDY(sc),client,argv,&BDY(c));
+      apply2ats(BDY(sc),client,argv,(F *)&BDY(c));
     }
     MKJF(*pnf,FOP(f),n);
   }
@@ -2550,7 +2558,7 @@ RE re;
 void gpp(gp)
 GP gp;
 {
-  ap(gp->g);
+  ap((pointer *)gp->g);
   rep(gp->p);
 }