===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cio.c,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -p -r1.5 -r1.10
--- OpenXM_contrib2/asir2000/io/cio.c	2000/09/07 23:59:54	1.5
+++ OpenXM_contrib2/asir2000/io/cio.c	2001/08/31 09:17:13	1.10
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/cio.c,v 1.4 2000/08/22 05:04:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/cio.c,v 1.9 2001/08/06 04:25:43 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -64,7 +64,7 @@ Obj obj;
 		return 1;
 	switch ( OID(obj) ) {
 		case O_MATHCAP: case O_P: case O_R: case O_DP: case O_STR:
-		case O_ERR: case O_USINT: case O_VOID:
+		case O_ERR: case O_USINT: case O_BYTEARRAY: case O_VOID:
 			return 1;
 		case O_N:
 			if ( NID((Num)obj) == N_Q || NID((Num)obj) == N_R )
@@ -76,6 +76,8 @@ Obj obj;
 				if ( !valid_as_cmo(BDY(m)) )
 					return 0;
 			return 1;
+		case O_QUOTE:
+			return 1;
 		default:
 			return 0;
 	}
@@ -87,6 +89,7 @@ Obj obj;
 {
 	int r;
 	char errmsg[BUFSIZ];
+	LIST l;
 
 	if ( !obj ) {
 		r = CMO_NULL; write_int(s,&r);
@@ -132,9 +135,16 @@ Obj obj;
 		case O_ERR:
 			write_cmo_error(s,obj);
 			break;
+		case O_BYTEARRAY:
+			write_cmo_bytearray(s,obj);
+			break;
 		case O_VOID:
 			r = ((USINT)obj)->body; write_int(s,&r);
 			break;
+		case O_QUOTE:
+			fnodetotree(BDY((QUOTE)obj),&l);
+			write_cmo_tree(s,l);
+			break;
 		default:
 			sprintf(errmsg, "write_cmo : id=%d not implemented.",OID(obj));
 			error(errmsg);
@@ -179,6 +189,8 @@ int *tag;
 			*tag = CMO_MATHCAP; break;
 		case O_ERR:
 			*tag = CMO_ERROR2; break;
+		case O_QUOTE:
+			*tag = CMO_TREE; break; break;
 		default:
 			return 0;
 	}
@@ -385,6 +397,17 @@ STRING str;
 	savestr(s,BDY(str));	
 }
 
+write_cmo_bytearray(s,array)
+FILE *s;
+BYTEARRAY array;
+{
+	int r;
+
+	r = CMO_DATUM; write_int(s,&r);
+	write_int(s,&array->len);
+	write_string(s,array->body,array->len);
+}
+
 write_cmo_error(s,e)
 FILE *s;
 ERR e;
@@ -395,6 +418,54 @@ ERR e;
 	write_cmo(s,BDY(e));
 }
 
+/* XXX */
+
+/*
+ * BDY(l) = treenode
+ * treenode = [property,(name,)arglist]
+ * arglist = list of treenode
+ */
+
+write_cmo_tree(s,l)
+FILE *s;
+LIST l;
+{
+	NODE n;
+	int r;
+	STRING prop,name,key;
+
+	/* (CMO_TREE (CMO_LIST,n,key1,attr1,...,keyn,attn),(CMO_LIST,m,arg1,...,argm)) */
+	n = BDY(l);
+	prop = (STRING)BDY(n);	n = NEXT(n);
+	if ( !strcmp(BDY(prop),"internal") ) {
+		write_cmo(s,(Obj)BDY(n));
+	} else {
+		if ( strcmp(BDY(prop),"list") ) {
+			r = CMO_TREE; write_int(s,&r);
+			name = (STRING)BDY(n);
+			n = NEXT(n);
+			/* function name */
+			write_cmo(s,name);
+
+			/* attribute list */
+			r = CMO_LIST; write_int(s,&r);
+			r = 2; write_int(s,&r);
+			MKSTR(key,"asir");
+			write_cmo(s,key);
+			write_cmo(s,prop);
+		}
+
+		/* argument list */
+		r = CMO_LIST; write_int(s,&r);
+		/* len = number of arguments */
+		r = length(n); write_int(s,&r);
+		while ( n ) {
+			write_cmo_tree(s,BDY(n));
+			n = NEXT(n);
+		}
+	}
+}
+
 read_cmo(s,rp)
 FILE *s;
 Obj *rp;
@@ -414,6 +485,10 @@ Obj *rp;
 	Obj obj;
 	ERR e;
 	MATHCAP mc;
+	BYTEARRAY array;
+	QUOTE quote;
+	FNODE fn;
+	LIST list;
 
 	read_int(s,&id);
 	switch ( id ) {
@@ -425,6 +500,8 @@ Obj *rp;
 			read_cmo_uint(s,rp);
 			break;
 		case CMO_DATUM:
+			loadbytearray(s,&array); *rp = (Obj)array;
+			break;
 		case CMO_STRING:
 			loadstring(s,&str); *rp = (Obj)str;
 			break;
@@ -482,6 +559,16 @@ Obj *rp;
 		case CMO_RING_BY_NAME:
 			read_cmo(s,rp);
 			break;
+		case CMO_TREE:
+			read_cmo_tree_as_list(s,&list);
+#if 0
+			treetofnode(list,&fn);
+			MKQUOTE(quote,fn);
+			*rp = (Obj)quote;
+#else
+			*rp = list;
+#endif
+			break;
 		default:
 			MKUSINT(t,id);
 			t->id = O_VOID;
@@ -688,6 +775,142 @@ P *rp;
 		NEXT(dc) = 0;
 	MKP(remote_vtab[ind],dc0,*rp);
 }
+
+/* XXX */
+
+extern struct oARF arf[];
+
+struct operator_tab {
+	char *name;
+	fid id;	
+	ARF arf;
+	cid cid;
+};
+
+static struct operator_tab optab[] = {
+	{"+",I_BOP,&arf[0],0}, /* XXX */
+	{"-",I_BOP,&arf[1],0},
+	{"*",I_BOP,&arf[2],0},
+	{"/",I_BOP,&arf[3],0},
+	{"%",I_BOP,&arf[4],0},
+	{"^",I_BOP,&arf[5],0},
+	{"==",I_COP,0,C_EQ},
+	{"!=",I_COP,0,C_NE},
+	{"<",I_COP,0,C_LT},
+	{"<=",I_COP,0,C_LE},
+	{">",I_COP,0,C_GT},
+	{">=",I_COP,0,C_GE},
+	{"&&",I_AND,0,0},
+	{"||",I_OR,0,0},
+	{"!",I_NOT,0,0},
+};
+
+static int optab_len = sizeof(optab)/sizeof(struct operator_tab);
+
+#if 0
+/* old code */
+read_cmo_tree(s,rp)
+FILE *s;
+FNODE *rp;
+{
+	int r,i,n;
+	char *opname;
+	STRING name,cd;
+	int op;
+	pointer *arg;
+	QUOTE quote;
+	FNODE fn;
+	NODE t,t1;
+	fid id;
+	Obj expr;
+	FUNC func;
+
+	read_cmo(s,&name);
+	read_cmo(s,&attr);
+	for ( i = 0; i < optab_len; i++ )
+		if ( !strcmp(optab[i].name,BDY(name)) )
+			break;
+	if ( i == optab_len ) {
+		/* may be a function name */
+		n = read_cmo_tree_arg(s,&arg);
+		for ( i = n-1, t = 0; i >= 0; i-- ) {
+			MKNODE(t1,arg[i],t); t = t1;		
+		}
+		searchf(sysf,BDY(name),&func); 
+		if ( !func )
+			searchf(ubinf,BDY(name),&func);
+		if ( !func )
+			searchpf(BDY(name),&func);
+		if ( !func )
+			searchf(usrf,BDY(name),&func);
+		if ( !func )
+			appenduf(BDY(name),&func);
+		*rp = mkfnode(2,I_FUNC,func,mkfnode(1,I_LIST,t));
+	} else {
+		opname = optab[i].name;
+		id = optab[i].id;
+		switch ( id ) {
+			case I_BOP:
+				read_cmo_tree_arg(s,&arg);
+				*rp = mkfnode(3,I_BOP,optab[i].arf,arg[0],arg[1]);
+				return;
+			case I_COP:
+				read_cmo_tree_arg(s,&arg);
+				*rp = mkfnode(3,I_COP,optab[i].cid,arg[0],arg[0]);
+				return;
+			case I_AND:
+				read_cmo_tree_arg(s,&arg);
+				*rp = mkfnode(2,I_AND,arg[0],arg[1]);
+				return;
+			case I_OR:
+				read_cmo_tree_arg(s,&arg);
+				*rp = mkfnode(2,I_OR,arg[0],arg[1]);
+				return;
+			case I_NOT:
+				read_cmo_tree_arg(s,&arg);
+				*rp = mkfnode(1,I_OR,arg[0]);
+				return;
+		}
+	}
+}
+
+int read_cmo_tree_arg(s,argp)
+FILE *s;
+pointer **argp;
+{
+	int id,n,i;
+	pointer *ap;
+	Obj t;
+
+	read_int(s,&id); /* id = CMO_LIST */
+	read_int(s,&n); /* n = the number of args */
+	*argp = ap = (pointer *) MALLOC(n*sizeof(pointer));
+	for ( i = 0; i < n; i++ ) {
+		read_cmo(s,&t);
+		if ( !t || (OID(t) != O_QUOTE) )
+			ap[i] = mkfnode(1,I_FORMULA,t);
+		else
+			ap[i] = BDY((QUOTE)t);
+	}
+	return n;
+}
+#else
+read_cmo_tree_as_list(s,rp)
+FILE *s;
+LIST *rp;
+{
+	STRING name;
+	LIST attr,args;
+	NODE t0,t1;
+
+	read_cmo(s,&name);
+	read_cmo(s,&attr);
+	read_cmo(s,&args);
+	MKNODE(t1,name,BDY(args));
+	MKNODE(t0,attr,t1);
+	MKLIST(*rp,t0);
+}
+#endif
 
 localname_to_cmoname(a,b)
 char *a;