=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v retrieving revision 1.1.1.1 retrieving revision 1.8 diff -u -p -r1.1.1.1 -r1.8 --- OpenXM/src/ox_math/math2ox.c 1999/10/29 08:06:42 1.1.1.1 +++ OpenXM/src/ox_math/math2ox.c 1999/11/29 12:09:57 1.8 @@ -1,6 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM$ */ -/* $Id: math2ox.c,v 1.1.1.1 1999/10/29 08:06:42 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.7 1999/11/19 20:51:36 ohara Exp $ */ #include #include @@ -11,8 +10,11 @@ #include #include #include +#include #include "ox.h" +#include "parse.h" +#include "serv2.h" static char *host = "localhost"; static char *ctlserv = "ox"; @@ -22,6 +24,20 @@ ox_file_t sv; /* 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 + ml_sendObject(c); +} + int OX_executeStringByLocalParser(const char *str) { ox_executeStringByLocalParser(sv, str); @@ -33,6 +49,12 @@ char *OX_popString() return ox_popString(sv, sv->stream); } +void OX_popCMO() +{ + cmo *c = ox_pop_cmo(sv, sv->stream); + ml_sendObject(c); +} + int OX_close() { ox_close(sv); @@ -45,7 +67,27 @@ int OX_reset() return 0; } +/* 文字列 s を parse() にかけて生成された cmo を サーバに送る. */ +int OX_parse(char *s) +{ + cmo *m; + 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; /* 失敗した場合 */ +} + int OX_start(char* s) { if (s != NULL && s[0] != '\0') { @@ -56,6 +98,24 @@ int OX_start(char* s) return 0; } +int OX_start_insecure(char *host, int portCtl, int portDat) +{ + 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); + fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); + + return 0; +} + static char *cp_str(char *src) { char *dest = malloc(strlen(src)+1); @@ -73,5 +133,9 @@ int OX_setClientParam(char *h, char* c, char* p) int main(int argc, char *argv[]) { + /* 構文解析器の設定 */ + setflag_parse(PFLAG_ADDREV); + setgetc(mygetc); + MLMain(argc, argv); }