===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/cmo.c,v
retrieving revision 1.8
retrieving revision 1.18
diff -u -p -r1.8 -r1.18
--- OpenXM/src/kan96xx/plugin/cmo.c	2001/05/04 01:06:29	1.8
+++ OpenXM/src/kan96xx/plugin/cmo.c	2020/10/06 11:33:47	1.18
@@ -1,8 +1,9 @@
-/*$OpenXM: OpenXM/src/kan96xx/plugin/cmo.c,v 1.7 2001/04/15 07:55:07 takayama Exp $*/
+/*$OpenXM: OpenXM/src/kan96xx/plugin/cmo.c,v 1.17 2020/10/04 06:10:36 noro Exp $*/
 #include <stdio.h>
 #include <string.h>
 /* #include <netinet/in.h> */
 #include <stdlib.h>
+#include <arpa/inet.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -18,6 +19,13 @@
 #include "cmotag.htmp"   /* static char *cmotagToName(int tag) is defined
                             here. */
 
+void warningCmo(char *s);
+void errorCmo(char *s);
+size_t cmoOutGMPCoeff(mpz_srcptr x); // defined in cmo-gmp.c
+size_t cmoGetGMPCoeff(MP_INT *x, struct cmoBuffer *cb); 
+int cmoCheckMathCap(struct object ob, struct object *mathcapObjp); // in oxmisc2.h
+
+
 extern int OxVersion;
 
 int CmoClientMode = 1;  /* This flag is used to translate names for
@@ -47,7 +55,7 @@ extern struct ring *CurrentRingp;
 extern struct ring *SmallRingp;
 extern int CmoDMSOutputOption;
 
-struct object NullObjectInCmo;
+struct object NullObjectInCmo = OINIT;
 
 extern int SerialCurrent;
 extern int DebugCMO;
@@ -156,29 +164,30 @@ struct cmoBuffer *cmoOutputToBuf(cmoAction a,void *dat
   }
 }
 
-dumpCmoBuf(struct cmoBuffer *cb)
+int dumpCmoBuf(struct cmoBuffer *cb)
 {
   int i,size, tag;
   char *s;
   if (cb->isStream) {
     printf("cmoBuffer is directed to a stream.\n");
-    return;
+    return 0;
   }
   size = cb->pos;
   s = (char *)(cb->buf);
   tag = htonl(*((int *) s));
-  printf("CMO StandardEncoding: size = %d, size/sizeof(int) = %d, tag=%s \n",size,size/sizeof(int),cmotagToName(tag));
+  printf("CMO StandardEncoding: size = %d, size/sizeof(int) = %d, tag=%s \n",size,size/((int)sizeof(int)),cmotagToName(tag));
   for (i=0; i<size; i++) {
     if (i % 20 == 0) putchar('\n');
     printf("%3x",(int)(unsigned char)s[i]);
   }
   putchar('\n');
+  return 0;
 }
 
 /* This obsolete function is used to write data
    in cmoBuffer (cmo object in kan)
    to a stream */
-cmoToStream(struct object cmoObj,struct object of)
+int cmoToStream(struct object cmoObj,struct object of)
 {
   int i,size;
   struct cmoBuffer *cb;
@@ -213,7 +222,7 @@ struct object streamToCmo(struct object of)
 {
   int c;
   unsigned char s[1];
-  struct object ob;
+  struct object ob = OINIT;
   int file2 = 0;
   if (of.tag == Sfile) {
 
@@ -244,7 +253,7 @@ struct object streamToCmo(struct object of)
 }
 
 
-cmoOutCmoNull() {
+void cmoOutCmoNull() {
   cmoint tmp[1];
   tmp[0] = htonl((cmoint) CMO_NULL);
   cmoOutputToBuf(CMOPUT,tmp,sizeof(cmoint));
@@ -254,7 +263,7 @@ cmoOutCmoNull() {
 
 
 /* unsigned short int must be 32 bits */
-cmoOutInt32(int k)
+void cmoOutInt32(int k)
 {
   cmoint tmp[2];
   tmp[0] = htonl((cmoint) CMO_INT32);
@@ -262,12 +271,13 @@ cmoOutInt32(int k)
   cmoOutputToBuf(CMOPUT,tmp,2*sizeof(cmoint));
 }
 
-cmoOutString(char *d,int size) {
+int cmoOutString(char *d,int size) {
   cmoint tmp[2];
   tmp[0] = htonl((cmoint) CMO_STRING);
   tmp[1] = htonl((cmoint ) size);
   cmoOutputToBuf(CMOPUT,tmp,2*sizeof(cmoint));
   cmoOutputToBuf(CMOPUT,d,size);
+  return 0;
 }
 
 
@@ -361,7 +371,7 @@ int cmoOutPolynomial2(POLY f) 
   return(0);
 }
 
-int cmoOutRingDefinition(struct ring *rp,int option)
+void cmoOutRingDefinition(struct ring *rp,int option)
 {
   cmoint tmp[3];
   /* minimal information */
@@ -387,7 +397,7 @@ int cmoOutRingDefinition(struct ring *rp,int option)
   
 }
 
-int cmoOutRingDefinition2(struct ring *rp,int option)
+void cmoOutRingDefinition2(struct ring *rp,int option)
 {
   cmoint tmp[3];
   /* minimal information */
@@ -625,13 +635,14 @@ POLY cmoGetMonomial32(struct cmoBuffer *cb)
 /* ------------------------------------- */
 void cmoObjectToCmo00(struct object ob)
 {
-  struct object rob;
+  struct object rob = OINIT;
   cmoint tmp[16];
   char tmpc[16];
   int i,size;
-  struct object vlist, vlist0;
+  struct object vlist = OINIT;
+  struct object vlist0 = OINIT;
   int m;
-  struct object ob2;
+  struct object ob2 = OINIT;
 
   /* NO initialization */
   switch(ob.tag) {
@@ -660,6 +671,12 @@ void cmoObjectToCmo00(struct object ob)
   case SuniversalNumber:
     cmoOutGMPCoeff(ob.lc.universalNumber->val.bigp);
     break;
+  case SrationalFunction:
+    tmp[0] = htonl(CMO_RATIONAL);
+    cmoOutputToBuf(CMOPUT,tmp,sizeof(cmoint));
+	cmoObjectToCmo00(*(Knumerator(ob)));
+	cmoObjectToCmo00(*(Kdenominator(ob)));
+    break;
   case Sdouble:
     if (sizeof(double) != 8) errorCmo("double is assumed to be 8 bytes.");
     cmoOutRawInt(CMO_64BIT_MACHINE_DOUBLE);
@@ -771,7 +788,7 @@ void cmoObjectToCmo00(struct object ob)
 
 struct object cmoObjectToCmo(struct object ob)
 {
-  struct object rob;
+  struct object rob = OINIT;
   if (DebugCMO) {
     fprintf(stderr,"cmoObjectToCmo: ");
     printObject(ob,1,stderr);
@@ -799,19 +816,20 @@ int Lisplike = 0;  
 
 struct object cmoCmoToObject00(struct cmoBuffer *cb)
 {
-  struct object rob;
-  struct object ob1;
-  struct object ob2;
+  struct object rob = OINIT;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
   int tt,ival;
   int i,size;
   MP_INT *mi;
   MP_INT *mi2;
   struct ring *oldringp;
   char tmpc[16];
-  struct object vlist, vlist0;
+  struct object vlist = OINIT;
+  struct object vlist0 = OINIT;
   int k;
   int m;
-  struct object ob;
+  struct object ob = OINIT;
 
 
   tt = cmoGetIntFromBuf(CMOGET,cb); /* read the tag */
@@ -1011,8 +1029,8 @@ struct object cmoCmoToObject00(struct cmoBuffer *cb)
     }else{
       ob1 = getoa(rob,0);
       if (ob1.tag != Sdollar) warningCmo("CMO_TREE : the first arg must be the node name by a string.");
-      ob2 = getoa(rob,1); /* content dictionary name. */
-      if (ob2.tag != Sdollar) warningCmo("CMO_TREE : the second arg must be the node name by a string.");
+      ob2 = getoa(rob,1); /* Attribute List */
+      if (ob2.tag != Sarray) warningCmo("CMO_TREE : the second arg must be a list of attributes.");
       rob = KpoTree(rob);
     }
     break;
@@ -1058,8 +1076,8 @@ struct object cmoCmoToObject00(struct cmoBuffer *cb)
     
 struct object cmoCmoToObject(struct object ob)
 {
-  struct object rob;
-  struct object ob0;
+  struct object rob = OINIT;
+  struct object ob0 = OINIT;
   struct cmoBuffer *cb;
   if (!(ob.tag == Sclass && ob.lc.ival == CMO)) {
     rob.tag = Snull;
@@ -1083,8 +1101,8 @@ struct object cmoCmoToObject(struct object ob)
 }
 
 struct object cmoListToPoly(struct object ob) {
-  struct object ob0;
-  struct object rob;
+  struct object ob0 = OINIT;
+  struct object rob = OINIT;
   int i,n;
   if (ob.tag == Sarray) {
     n = getoaSize(ob);
@@ -1110,7 +1128,8 @@ struct object cmoListToPoly(struct object ob) {
 struct object cmoListToPoly2(struct object ob) 
 {
   int size,i;
-  struct object ob0,ob1;
+  struct object ob0 = OINIT;
+  struct object ob1 = OINIT;
   POLY f;
   /*
     printf("<<");printObject(ob,0,stdout); printf(">>\n"); fflush(stdout);
@@ -1151,7 +1170,8 @@ main() {
 POLY cmoListToPOLY(struct object ob) 
 {
   int size,i;
-  struct object ob0,ob1;
+  struct object ob0 = OINIT;
+  struct object ob1 = OINIT;
   POLY f;
   /*
     printf("<<");printObject(ob,0,stdout); printf(">>\n"); fflush(stdout);
@@ -1190,7 +1210,7 @@ POLY cmoListToPOLY(struct object ob) 
 int Kan_PushBinary(int size,void *data)
 {
   struct cmoBuffer cb;
-  struct object ob;
+  struct object ob = OINIT;
   cb.pos = size;
   cb.rpos = 0;
   cb.buf = data;
@@ -1203,7 +1223,7 @@ int Kan_PushBinary(int size,void *data)
 
 void *Kan_PopBinary(int *sizep)
 {
-  struct object ob;
+  struct object ob = OINIT;
   struct cmoBuffer *cb;
   ob = KSpop();
   ob = cmoObjectToCmo(ob);
@@ -1222,8 +1242,8 @@ void *Kan_PopBinary(int *sizep)
 struct object cmoObjectFromStream(struct object obStream)
 {
   struct cmoBuffer cb;
-  struct object rob;
-  extern DebugCMO;
+  struct object rob = OINIT;
+  extern int DebugCMO;
   if (obStream.tag != Sfile) {
     errorCmo("cmoObjectFromStream: Argument must be of type file.");
   }
@@ -1240,7 +1260,7 @@ struct object cmoObjectFromStream(struct object obStre
 struct object cmoObjectFromStream2(FILE2 *fp2)
 {
   struct cmoBuffer cb;
-  struct object rob;
+  struct object rob = OINIT;
   cb.isStream=1; cb.fp = fp2;
   cmoGetIntFromBuf(CMOINITSTREAM,&cb);
   rob = cmoCmoToObject00(&cb);
@@ -1255,7 +1275,7 @@ struct object cmoObjectFromStream2(FILE2 *fp2)
 
 struct object cmoObjectToStream(struct object ob, struct object obStream)
 {
-  struct object rob;
+  struct object rob = OINIT;
   extern int DebugCMO;
   if (obStream.tag != Sfile) {
     errorCmo("cmoObjectToStream: Argument must be of type file.");
@@ -1272,7 +1292,7 @@ struct object cmoObjectToStream(struct object ob, stru
 
 struct object cmoObjectToStream2(struct object ob, FILE2 *fp2)
 {
-  struct object rob;
+  struct object rob = OINIT;
   cmoOutputToBuf(CMOINITSTREAM,(void *)fp2,0);
   if (DebugCMO) {
     fprintf(stderr,"cmoObjectToStream2: ");
@@ -1286,8 +1306,8 @@ struct object cmoObjectToStream2(struct object ob, FIL
 
 int Kan_pushCMOFromStream(FILE2 *fp)
 {
-  struct object ob;
-  struct object rob;
+  struct object ob = OINIT;
+  struct object rob = OINIT;
   ob.tag = Sfile; ob.rc.voidp = (void *)fp; ob.lc.str = MAGIC2;
   rob = cmoObjectFromStream(ob);
   KSpush(rob);
@@ -1296,8 +1316,8 @@ int Kan_pushCMOFromStream(FILE2 *fp)
 
 int Kan_popCMOToStream(FILE2 *fp,int serial)
 {
-  struct object ob;
-  struct object sob;
+  struct object ob = OINIT;
+  struct object sob = OINIT;
   sob.tag = Sfile; sob.rc.file = (void *)fp; sob.lc.str = MAGIC2;
   ob = Kpop();
   /*outfp2(fp);*/ /* outfp2 is for debugging. see develop/97feb.. 1999, 1/19*/
@@ -1320,16 +1340,16 @@ int Kan_setMathCapToStream(FILE2 *fp,struct object ob)
 
 /* It is declared in oxmisc2.h, too. */
 struct object newMathCap(struct mathCap *mathcap){
-  struct object rob;
-  struct object ob1;
-  struct object ob2;
-  struct object ob3;
-  struct object obOx;
-  struct object obSm;
-  struct object ob3tmp;
+  struct object rob = OINIT;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
+  struct object ob3 = OINIT;
+  struct object obOx = OINIT;
+  struct object obSm = OINIT;
+  struct object ob3tmp = OINIT;
   struct object *obp;
   int i,j;
-  struct object mathinfo;
+  struct object mathinfo = OINIT;
 
   rob = newObjectArray(3);
 
@@ -1373,7 +1393,7 @@ void *KSmathCapByStruct(void) 
      /* Return the math cap of kan/sm1 with cmo.c as a mathcap classObject*/
 {
   struct mathCap *mathcap;
-  struct object ob;
+  struct object ob = OINIT;
   char *s1,*s2;
   struct object *mathinfo;
   char *sys;
@@ -1430,8 +1450,9 @@ void *KSmathCapByStruct(void) 
   mathcap->cmo[19]= CMO_64BIT_MACHINE_DOUBLE;
   mathcap->cmo[20]= CMO_ARRAY;
   mathcap->cmo[21]= CMO_RATIONAL;
+  mathcap->cmo[22]= CMO_QQ;
 
-  mathcap->n = 22 ;   /* This is the number of cmo object. You can use
+  mathcap->n = 23 ;   /* This is the number of cmo object. You can use
                          cmo upto 1023. see mathcap.h */
 
   mathcap->ox[0] = OX_DATA;
@@ -1450,7 +1471,9 @@ void *KSmathCapByStruct(void) 
   mathcap->sm[9] = SM_getsp;
   mathcap->sm[10] = SM_dupErrors;
   mathcap->sm[11] = SM_pushCMOtag;
-  mathcap->smSize = 12;  
+  mathcap->sm[12] = SM_executeFunctionWithOptionalArgument;
+  mathcap->sm[13] = SM_nop;
+  mathcap->smSize = 14;  
 
   return((void *)mathcap);
 }
@@ -1462,11 +1485,11 @@ int cmoOutRawInt(int k)
   cmoOutputToBuf(CMOPUT,tmp,sizeof(cmoint));
 }  
 
-warningCmo(char *s) {
+void warningCmo(char *s) {
   fprintf(stderr,"Warning: plugin/cmo.c : %s\n",s);
 }
 
-errorCmo(char *s) {
+void errorCmo(char *s) {
   fprintf(stderr,"plugin/cmo.c : %s\n",s);
   errorKan1("%s\n","cmo fatal error. ox servers need SM_control_reset_connection.");
   /* ErrorPacket is automatically push on the ErrorStack.