===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/print.c,v
retrieving revision 1.20
retrieving revision 1.26
diff -u -p -r1.20 -r1.26
--- OpenXM_contrib2/asir2000/builtin/print.c	2005/12/10 14:14:15	1.20
+++ OpenXM_contrib2/asir2000/builtin/print.c	2015/03/15 19:31:30	1.26
@@ -45,11 +45,14 @@
  * 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.19 2005/09/28 08:08:34 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.25 2011/06/16 08:17:15 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
+void Psprintf(NODE,STRING *);
+
+void Pprintf();
 void Pprint();
 void Pquotetolist();
 void Pobjtoquote();
@@ -57,6 +60,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 +69,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 +130,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;
 }
 
@@ -126,7 +167,7 @@ void fnodetotree(FNODE f,LIST *rp)
 
 	if ( !f ) {
 		MKSTR(head,"internal");
-		n = mknode(2,head,0);
+		n = mknode(2,head,NULLP);
 		MKLIST(*rp,n);
 		return;
 	}