===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- OpenXM/src/ox_math/math2ox.c	1999/11/06 21:39:36	1.5
+++ 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.4 1999/11/04 19:33:17 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);
@@ -49,21 +72,21 @@ int OX_reset()
 int OX_parse(char *s)
 {
     cmo *m;
-	symbol *symp;
-	int len = strlen(s);
+    symbol *symp;
+    int len = strlen(s);
     setmode_mygetc(s, len);
 
     if(s != NULL && len > 0 && (m = parse()) != NULL) {
-		if (m->tag == OX_DATA) {
-			send_ox_cmo(sv->stream, ((ox_data *)m)->cmo);
-		}else if (m->tag == OX_COMMAND) {
-			send_ox_command(sv->stream, ((ox_command *)m)->command);
-		}else {
-			send_ox_cmo(sv->stream, m);		
-		}
-		return 0;
-	}
-	return -1; /* 失敗した場合 */
+        if (m->tag == OX_DATA) {
+            send_ox_cmo(sv->stream, ((ox_data *)m)->cmo);
+        }else if (m->tag == OX_COMMAND) {
+            send_ox_command(sv->stream, ((ox_command *)m)->command);
+        }else {
+            send_ox_cmo(sv->stream, m);     
+        }
+        return 0;
+    }
+    return -1; /* 失敗した場合 */
 }
 
 int OX_start(char* s)
@@ -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;
 }
 
@@ -81,15 +105,18 @@ int OX_start_insecure(char *host, int portCtl, int por
     if (host != NULL || host[0] == '\0') {
         host = "localhost";
     }
-	if (portCtl == 0) {
-		portCtl = 1200;
-	}
-	if (portDat == 0) {
-		portDat = 1300;
-	}
-	
-	sv = ox_start_insecure_nonreverse(host, portCtl, portDat);
+    if (portCtl == 0) {
+        portCtl = 1200;
+    }
+    if (portDat == 0) {
+        portDat = 1300;
+    }
+    
+    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;
 }
 
@@ -110,9 +137,9 @@ int OX_setClientParam(char *h, char* c, char* p)
 
 int main(int argc, char *argv[])
 {
-	/* 構文解析器の設定 */
-	setflag_parse(PFLAG_ADDREV);
+    /* 構文解析器の設定 */
+    setflag_parse(PFLAG_ADDREV);
     setgetc(mygetc);
-
+	
     MLMain(argc, argv);
 }