===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/cmo.c,v
retrieving revision 1.1.1.1
retrieving revision 1.7
diff -u -p -r1.1.1.1 -r1.7
--- OpenXM/src/kan96xx/plugin/cmo.c	1999/10/08 02:12:05	1.1.1.1
+++ OpenXM/src/kan96xx/plugin/cmo.c	2001/04/15 07:55:07	1.7
@@ -1,6 +1,7 @@
+/*$OpenXM: OpenXM/src/kan96xx/plugin/cmo.c,v 1.6 2000/02/02 03:30:48 takayama Exp $*/
 #include <stdio.h>
 #include <string.h>
-#include <netinet/in.h>
+/* #include <netinet/in.h> */
 #include <stdlib.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -36,7 +37,9 @@ int CmoClientMode = 1;  /* This flag is used to transl
 **************************************************************************/
 /*  If you change the format of mathcap, do the follows.
     Mofify  cmoCheckMathCap in oxmisc2.c,
-    oxReq, SM_setMathCap:, and
+            oxSendMathCap  in oxmisc.c,
+	    newMathCap in cmo.c,
+    oxReq, SM_setMathCap: in oxmisc2.c, and
     grep mathCap and make all modifications.
 */
 
@@ -86,7 +89,7 @@ struct cmoBuffer *cmoOutputToBuf(cmoAction a,void *dat
       break;
     case CMOPUT:
       for (i=0; i<size; i++) {
-	fp2fputc(((char *)data)[i], b.fp);
+	fp2fputc((int) ((char *)data)[i], b.fp);
       }
       break;
     case CMOFLUSH:
@@ -195,9 +198,9 @@ cmoToStream(struct object cmoObj,struct object of)
   s = (char *)(cb->buf);
   for (i=0; i<size; i++) {
     if (file2) {
-      fp2fputc(s[i],(FILE2 *)(of.rc.voidp));
+      fp2fputc((int) s[i],(FILE2 *)(of.rc.voidp));
     }else{
-      fputc(s[i],of.rc.file);
+      fputc((int) s[i],of.rc.file);
     }
   }
 }
@@ -689,9 +692,9 @@ void cmoObjectToCmo00(struct object ob)
       /* cmoObjectToCmo00(KopIndeterminate(ob)); Old code. */
       /* If you need to translate the name, do it here. */
       if (CmoClientMode) {
-	ob = KopIndeterminate(ob);
+        ob = KopIndeterminate(ob);
       }else{
-	ob = cmoTranslateVariable_outGoing(KopIndeterminate(ob));
+        ob = cmoTranslateVariable_outGoing(KopIndeterminate(ob));
       }
       cmoObjectToCmo00(ob);
       break;
@@ -704,13 +707,17 @@ void cmoObjectToCmo00(struct object ob)
       vlist = getoa(ob,0);
       vlist0 = newObjectArray(getoaSize(vlist));
       for (i=0; i<getoaSize(vlist); i++) {
-	if (CmoClientMode) {
-	  putoa(vlist0,i,
-		KpoIndeterminate(getoa(vlist,i)));
-	}else{
-	  putoa(vlist0,i,
-		KpoIndeterminate(cmoTranslateVariable_outGoing(getoa(vlist,i))));
-	}
+		if (getoa(vlist,i).tag == Sdollar) {
+		  if (CmoClientMode) {
+			putoa(vlist0,i,
+				  KpoIndeterminate(getoa(vlist,i)));
+		  }else{
+			putoa(vlist0,i,
+				  KpoIndeterminate(cmoTranslateVariable_outGoing(getoa(vlist,i))));
+		  }
+		}else{
+		  putoa(vlist0,i,getoa(vlist,i));
+		}
       }
       cmoObjectToCmo00(vlist0); /* output the list of variables. */
       cmoObjectToCmo00(getoa(ob,1)); /* output the body of the recursive poly
@@ -953,8 +960,10 @@ struct object cmoCmoToObject00(struct cmoBuffer *cb)
     for (i=0; i<getoaSize(vlist0); i++) {
       ob1 = getoa(vlist0,i);
       if (ectag(ob1) == CLASSNAME_indeterminate) {
-	ob1 = KopIndeterminate(ob1);
-      }
+        ob1 = KopIndeterminate(ob1);
+      }else if (ectag(ob1) == CLASSNAME_tree) {
+        /* do nothing. */
+	  }
       putoa(vlist,i,ob1);
     }
     /* vlist is a list of variables by strings. */
@@ -1317,8 +1326,9 @@ struct object newMathCap(struct mathCap *mathcap){
   struct object ob3;
   struct object obOx;
   struct object obSm;
+  struct object ob3tmp;
   struct object *obp;
-  int i;
+  int i,j;
   struct object mathinfo;
 
   rob = newObjectArray(3);
@@ -1328,17 +1338,17 @@ struct object newMathCap(struct mathCap *mathcap){
   for (i=0; i<getoaSize(mathinfo); i++) {
     putoa(ob1,i,getoa(mathinfo,i));
   }
-  ob2 = newObjectArray(mathcap->n);
-  for (i=0; i<mathcap->n; i++) {
-    putoa(ob2,i,KpoInteger((mathcap->cmo)[i]));
-  }
-  obOx = newObjectArray(mathcap->oxSize);
+  ob3 = newObjectArray(mathcap->oxSize);
   for (i=0; i<mathcap->oxSize; i++) {
-    putoa(obOx,i,KpoInteger((mathcap->ox)[i]));
+    ob3tmp = newObjectArray(2);
+    putoa(ob3tmp,0,KpoInteger((mathcap->ox)[i]));
+    ob2 = newObjectArray(mathcap->n);
+    for (j=0; j<mathcap->n; j++) {
+      putoa(ob2,j,KpoInteger((mathcap->cmo)[j]));
+    }
+    putoa(ob3tmp,1,ob2);
+    putoa(ob3,i,ob3tmp);
   }
-  ob3 = newObjectArray(2);
-  putoa(ob3,0,obOx); 
-  putoa(ob3,1,ob2);
 
   obSm = newObjectArray(mathcap->smSize);
   for (i=0; i<mathcap->smSize; i++) {
@@ -1385,6 +1395,7 @@ void *KSmathCapByStruct(void) 
   putoa(ob,1,KpoString(sys));
   putoa(ob,2,KpoString(sysVersion));
   s1 = getenv("HOSTTYPE");
+  if (s1 == NULL) s1="unknown";
   s2 = (char *)sGC_malloc(strlen(s1)+2+strlen("HOSTTYPE="));
   strcpy(s2,"HOSTTYPE=");
   strcat(s2,s1);
@@ -1438,7 +1449,8 @@ void *KSmathCapByStruct(void) 
   mathcap->sm[8] = SM_setMathCap;
   mathcap->sm[9] = SM_getsp;
   mathcap->sm[10] = SM_dupErrors;
-  mathcap->smSize = 11;  
+  mathcap->sm[11] = SM_pushCMOtag;
+  mathcap->smSize = 12;  
 
   return((void *)mathcap);
 }