===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/print.c,v
retrieving revision 1.17
retrieving revision 1.24
diff -u -p -r1.17 -r1.24
--- OpenXM_contrib2/asir2000/builtin/print.c	2004/05/14 09:20:56	1.17
+++ OpenXM_contrib2/asir2000/builtin/print.c	2007/11/22 05:14:48	1.24
@@ -45,11 +45,12 @@
  * 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.16 2004/03/03 01:16:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.23 2007/11/07 19:26:17 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
+void Pprintf();
 void Pprint();
 void Pquotetolist();
 void Pobjtoquote();
@@ -57,6 +58,7 @@ void Peval_variables_in_quote();
 void Pset_print_function();
 
 struct ftab print_tab[] = {
+	{"printf",Pprintf,-99999999},
 	{"print",Pprint,-2},
 	{"objtoquote",Pobjtoquote,1},
 	{"quotetolist",Pquotetolist,1},
@@ -65,11 +67,45 @@ struct ftab print_tab[] = {
 	{0,0,0},
 };
 
+extern int I_am_server;
+
+int wfep_mode;
+
+void Pprintf(NODE arg,pointer *rp)
+{
+	STRING s;
+	if ( arg ) {
+		Psprintf(arg,&s);
+		/* engine for wfep */
+		if ( wfep_mode ) {
+			print_to_wfep(s);
+		}else {
+			printexpr(CO,s);
+			fflush(asir_out);
+		}
+	}
+	*rp = 0;
+	return;
+}
+
 void Pprint(NODE arg,pointer *rp)
 {
 	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);
+			}
+		}
+		*rp = 0;
+		return;
+	}
 	if ( arg ) {
 		obj = (Obj)ARG0(arg);
 		if ( NEXT(arg) ) {
@@ -92,6 +128,9 @@ void Pprint(NODE arg,pointer *rp)
 			putc('\n',asir_out);
 		}
 	}
+	/* XXX : if ox_asir, we have to fflush always */
+	if ( I_am_server )
+		fflush(asir_out);
 	*rp = 0;
 }
 
@@ -214,6 +253,21 @@ void fnodetotree(FNODE f,LIST *rp)
 			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");
@@ -241,11 +295,11 @@ void fnodetotree(FNODE f,LIST *rp)
 			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);
+				case I_FUNC: case I_FUNC_QARG:
+					MKSTR(op,((FUNC)FA0(f))->fullname);
 					fnodetotree((FNODE)FA1(f),&a1);
 					break;
 				case I_CAR: