===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- OpenXM/src/ox_math/math2ox.c	1999/11/07 12:12:55	1.6
+++ OpenXM/src/ox_math/math2ox.c	1999/11/19 20:51:36	1.7
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.5 1999/11/06 21:39:36 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.6 1999/11/07 12:12:55 ohara Exp $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10,18 +10,35 @@
 #include <mathlink.h>
 #include <unistd.h>
 #include <signal.h>
+#include <mathlink.h>
 
 #include "ox.h"
 #include "parse.h"
+#include "serv2.h"
 
 static char *host    = "localhost";
 static char *ctlserv = "ox";
 static char *oxprog  = "ox_sm1";
 
 ox_file_t sv;
+MLINK lp;
 
 /* Mathematica から直接呼び出される関数の定義. */
 /* 呼び出しの方法は math2ox.tm で定義される.   */
+void OX_receive()
+{
+	cmo *c = NULL;
+
+	receive_ox_tag(sv->stream);
+	c = receive_cmo(sv->stream);
+#ifdef DEBUG
+	fprintf(stderr, "received ox in OxReceive[].\n");
+	print_cmo(c);
+	fflush(stderr);
+#endif
+	MATH_sendObject(c);
+}
+
 int OX_executeStringByLocalParser(const char *str)
 {
     ox_executeStringByLocalParser(sv, str);
@@ -33,6 +50,12 @@ char *OX_popString()
     return ox_popString(sv, sv->stream);
 }
 
+void OX_popCMO()
+{
+    cmo *c = ox_pop_cmo(sv, sv->stream);
+	MATH_sendObject(c);
+}
+
 int OX_close()
 {
     ox_close(sv);
@@ -73,6 +96,7 @@ int OX_start(char* s)
     }
     sv = ox_start(host, ctlserv, oxprog);
     fprintf(stderr, "open (%s)\n", "localhost");
+	lp = stdlink;
     return 0;
 }
 
@@ -90,6 +114,9 @@ int OX_start_insecure(char *host, int portCtl, int por
     
     sv = ox_start_insecure_nonreverse(host, portCtl, portDat);
     fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat);
+
+	lp = stdlink;
+
     return 0;
 }
 
@@ -113,6 +140,6 @@ int main(int argc, char *argv[])
     /* 構文解析器の設定 */
     setflag_parse(PFLAG_ADDREV);
     setgetc(mygetc);
-
+	
     MLMain(argc, argv);
 }