===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/print.c,v
retrieving revision 1.13
retrieving revision 1.22
diff -u -p -r1.13 -r1.22
--- OpenXM_contrib2/asir2000/builtin/print.c	2001/09/05 09:01:27	1.13
+++ OpenXM_contrib2/asir2000/builtin/print.c	2006/09/26 05:35:25	1.22
@@ -45,59 +45,88 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.12 2001/09/05 04:43:58 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.21 2006/02/01 07:29:29 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 void Pprint();
 void Pquotetolist();
+void Pobjtoquote();
 void Peval_variables_in_quote();
 void Pset_print_function();
-FNODE eval_pvar_in_fnode();
-FNODE subst_in_fnode();
 
 struct ftab print_tab[] = {
 	{"print",Pprint,-2},
+	{"objtoquote",Pobjtoquote,1},
 	{"quotetolist",Pquotetolist,1},
 	{"eval_variables_in_quote",Peval_variables_in_quote,1},
 	{"set_print_function",Pset_print_function,-1},
 	{0,0,0},
 };
 
-void Pprint(arg,rp)
-NODE arg;
-pointer *rp;
+extern int I_am_server;
+
+int wfep_mode;
+
+void Pprint(NODE arg,pointer *rp)
 {
-	printexpr(CO,ARG0(arg)); 
-	if ( argc(arg) == 2 )
-		switch ( QTOS((Q)ARG1(arg)) ) {
-			case 0:
-				break;
-			case 2:
-				fflush(asir_out); break;
-				break;
-			case 1: default:
-				putc('\n',asir_out); break;
+	Obj obj;
+	STRING nl;
+	Q opt;
+
+	/* engine for wfep */
+	if ( wfep_mode ) {
+		if ( arg ) {
+			print_to_wfep((Obj)ARG0(arg));
+			if ( !NEXT(arg) || ARG1(arg) ) {
+				MKSTR(nl,"\r\n");
+				print_to_wfep((Obj)nl);
+			}
 		}
-	else
-		putc('\n',asir_out);
+		*rp = 0;
+		return;
+	}
+	if ( arg ) {
+		obj = (Obj)ARG0(arg);
+		if ( NEXT(arg) ) {
+			opt = (Q)ARG1(arg);
+			if ( INT(opt) ) {
+				printexpr(CO,obj);
+				switch ( QTOS(opt) ) {
+					case 0:
+						break;
+					case 2:
+						fflush(asir_out); break;
+						break;
+					case 1: default:
+						putc('\n',asir_out); break;
+				}
+			} else
+				error("print : invalid argument");
+		} else {
+			printexpr(CO,obj);
+			putc('\n',asir_out);
+		}
+	}
+	/* XXX : if ox_asir, we have to fflush always */
+	if ( I_am_server )
+		fflush(asir_out);
 	*rp = 0;
 }
 
-void fnodetotree();
+void Pobjtoquote(NODE arg,QUOTE *rp)
+{
+	objtoquote(ARG0(arg),rp);
+}
 
-void Pquotetolist(arg,rp)
-NODE arg;
-Obj *rp;
+void Pquotetolist(NODE arg,LIST *rp)
 {
 	asir_assert(ARG0(arg),O_QUOTE,"quotetolist");	
 	fnodetotree((FNODE)BDY((QUOTE)(ARG0(arg))),rp);
 }
 
-void Peval_variables_in_quote(arg,rp)
-NODE arg;
-QUOTE *rp;
+void Peval_variables_in_quote(NODE arg,QUOTE *rp)
 {
 	FNODE fn;
 
@@ -108,21 +137,17 @@ QUOTE *rp;
 
 /* fnode -> [tag,name,arg0,arg1,...] */
 
-void fnodetotree(f,rp)
-FNODE f;
-Obj *rp;
+void fnodetotree(FNODE f,LIST *rp)
 {
-	Obj a1,a2,a3;
+	LIST a1,a2,a3;
 	NODE n,t,t0;
 	STRING head,op,str;
-	LIST r,arg;
 	char *opname;
 
 	if ( !f ) {
 		MKSTR(head,"internal");
 		n = mknode(2,head,0);
-		MKLIST(r,n);
-		*rp = (Obj)r;
+		MKLIST(*rp,n);
 		return;
 	}
 	switch ( f->id ) {
@@ -142,8 +167,7 @@ Obj *rp;
 			}
 			fnodetotree((FNODE)FA0(f),&a1);
 			n = mknode(3,head,op,a1);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		/* binary operators */
@@ -195,8 +219,7 @@ Obj *rp;
 							MKSTR(head,"u_op");
 							MKSTR(op,opname);
 							n = mknode(3,head,op,a1);
-							MKLIST(r,n);
-							*rp = (Obj)r;
+							MKLIST(*rp,n);
 							return;
 					}
 					MKSTR(op,opname); break;
@@ -208,10 +231,24 @@ Obj *rp;
 					MKSTR(op,"||"); break;
 			}
 			n = mknode(4,head,op,a1,a2);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
+		case I_NARYOP: 
+			/* head */
+			MKSTR(head,"n_op");
+			n = (NODE)FA1(f);
+			for ( t0 = 0; n; n = NEXT(n) ) {
+				NEXTNODE(t0,t);
+				fnodetotree((FNODE)BDY(n),&a1);
+				BDY(t) = (pointer)a1;
+			}
+			MKSTR(op,((ARF)FA0(f))->name);
+			MKNODE(t,op,t0);
+			MKNODE(n,head,t);
+			MKLIST(*rp,n);
+			break;
+
 		/* ternary operators */
 		case I_CE:
 			MKSTR(head,"t_op");
@@ -220,8 +257,7 @@ Obj *rp;
 			fnodetotree((FNODE)FA1(f),&a2);
 			fnodetotree((FNODE)FA2(f),&a3);
 			n = mknode(5,head,op,a1,a2,a3);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		/* lists */
@@ -229,58 +265,55 @@ Obj *rp;
 			n = (NODE)FA0(f);
 			for ( t0 = 0; n; n = NEXT(n) ) {
 				NEXTNODE(t0,t);
-				fnodetotree(BDY(n),&BDY(t));
+				fnodetotree((FNODE)BDY(n),&a1);
+				BDY(t) = (pointer)a1;
 			}
 			if ( t0 )
 				NEXT(t) = 0;
 			MKSTR(head,"list");
 			MKNODE(n,head,t0);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		/* function */
-		case I_FUNC: case I_CAR: case I_CDR: case I_EV:
+		case I_FUNC: case I_FUNC_QARG: case I_CAR: case I_CDR: case I_EV:
 			MKSTR(head,"function");
 			switch ( f->id ) {
-				case I_FUNC:
-					MKSTR(op,((FUNC)FA0(f))->name);
-					fnodetotree((FNODE)FA1(f),&arg);
+				case I_FUNC: case I_FUNC_QARG:
+					MKSTR(op,((FUNC)FA0(f))->fullname);
+					fnodetotree((FNODE)FA1(f),&a1);
 					break;
 				case I_CAR:
 					MKSTR(op,"car");
-					fnodetotree((FNODE)FA0(f),&arg);
+					fnodetotree((FNODE)FA0(f),&a1);
 					break;
 				case I_CDR:
 					MKSTR(op,"cdr");
-					fnodetotree((FNODE)FA0(f),&arg);
+					fnodetotree((FNODE)FA0(f),&a1);
 					break;
 				case I_EV:
 					/* exponent vector; should be treated as function call */
 					MKSTR(op,"exponent_vector");
-					fnodetotree(mkfnode(1,I_LIST,FA0(f)),&arg);
+					fnodetotree(mkfnode(1,I_LIST,FA0(f)),&a1);
 					break;
 			}
-			t0 = NEXT(BDY(arg)); /* XXX : skip the headers */
+			t0 = NEXT(BDY(a1)); /* XXX : skip the headers */
 			MKNODE(t,op,t0);
 			MKNODE(n,head,t);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		case I_STR:
 			MKSTR(head,"internal");
 			MKSTR(str,FA0(f));
 			n = mknode(2,head,str);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		case I_FORMULA:
 			MKSTR(head,"internal");
 			n = mknode(2,head,FA0(f));
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		case I_PVAR:
@@ -290,8 +323,7 @@ Obj *rp;
 			GETPVNAME(FA0(f),opname);
 			MKSTR(op,opname);
 			n = mknode(2,head,op);
-			MKLIST(r,n);
-			*rp = (Obj)r;
+			MKLIST(*rp,n);
 			break;
 
 		default:
@@ -299,8 +331,7 @@ Obj *rp;
 	}
 }
 
-FNODE eval_pvar_in_fnode(f)
-FNODE f;
+FNODE eval_pvar_in_fnode(FNODE f)
 {
 	FNODE a1,a2,a3;
 	pointer r;
@@ -369,20 +400,17 @@ FNODE f;
 
 		default:
 			error("eval_pvar_in_fnode : not implemented yet");
+			/* NOTREACHED */
+			return 0;
 	}
 }
 
-FNODE subst_in_fnode(f,v,g)
-FNODE f;
-V v;
-FNODE g;
+FNODE subst_in_fnode(FNODE f,V v,FNODE g)
 {
 	FNODE a1,a2,a3;
 	DCP dc;
-	pointer r;
 	V vf;
 	NODE n,t,t0;
-	QUOTE q;
 	Obj obj;
 
 	if ( !f )
@@ -461,17 +489,18 @@ FNODE g;
 
 		default:
 			error("subst_in_fnode : not implemented yet");
+			/* NOTREACHED */
+			return 0;
 	}
 }
 
-char *get_attribute(key,attr)
-char *key;
-LIST attr;
+/* not completed yet */
+
+#if 0
+char *get_attribute(char *key,LIST attr)
 {}
 
-void treetofnode(obj,f)
-Obj obj;
-FNODE *f;
+void treetofnode(Obj obj,FNODE *f)
 {
 	NODE n;
 	LIST attr;
@@ -493,12 +522,11 @@ FNODE *f;
 			/* default will be set to P_FUNC */
 	}
 }
+#endif
 
 FUNC user_print_function;
 
-void Pset_print_function(arg,rp)
-NODE arg;
-pointer *rp;
+void Pset_print_function(NODE arg,pointer *rp)
 {
 	if ( !arg )
 		user_print_function = 0;