=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/Attic/serv2.c,v retrieving revision 1.1.1.1 retrieving revision 1.7 diff -u -p -r1.1.1.1 -r1.7 --- OpenXM/src/ox_math/Attic/serv2.c 1999/10/29 08:06:41 1.1.1.1 +++ OpenXM/src/ox_math/Attic/serv2.c 1999/11/07 12:12:56 1.7 @@ -1,6 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM$ */ -/* $Id: serv2.c,v 1.1.1.1 1999/10/29 08:06:41 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.6 1999/11/06 21:39:37 ohara Exp $ */ /* Open Mathematica サーバ */ /* ファイルディスクリプタ 3, 4 は open されていると仮定して動作する. */ @@ -13,28 +12,104 @@ #include #include #include "ox.h" +#include "parse.h" #include "serv2.h" -#define UNKNOWN_SM_COMMAND 50000 -#define MATH_ERROR 50001 +#define ERROR_ID_UNKNOWN_SM 10 +#define ERROR_ID_FAILURE_MLINK 11 - /* MLINK はポインタ型. */ MLINK lp = NULL; +typedef cmo mlo; +typedef cmo_string mlo_string; +typedef cmo_zz mlo_zz; + +/* cmo_list の派生クラス*/ +typedef struct { + int tag; + int length; + cell head[1]; + char *function; +} mlo_function; + + +mlo *receive_mlo_zz() +{ + char *s; + mlo *m; + + fprintf(stderr, "--debug: MLO == MLTKINT.\n"); + MLGetString(lp, &s); + fprintf(stderr, "--debug: zz = %s.\n", s); + m = (mlo *)new_cmo_zz_set_string(s); + MLDisownString(lp, s); + return m; +} + +mlo *receive_mlo_string() +{ + char *s; + mlo *m; + fprintf(stderr, "--debug: MLO == MLTKSTR.\n"); + MLGetString(lp, &s); + fprintf(stderr, "--debug: string = \"%s\".\n", s); + m = (cmo *)new_cmo_string(s); + MLDisownString(lp, s); + return m; +} + +cmo *receive_mlo_function() +{ + char *s; + cmo *m; + cmo *ob; + int i,n; + + fprintf(stderr, "--debug: MLO == MLTKFUNC.\n"); + MLGetFunction(lp, &s, &n); + fprintf(stderr, "--debug: Function = \"%s\", # of args = %d\n", s, n); + m = new_cmo_list(); + append_cmo_list((cmo_list *)m, new_cmo_string(s)); + + for (i=0; ii); +} + +int send_mlo_string(cmo *m) +{ + char *s = ((cmo_string *)m)->s; + MLPutString(lp, s); + fprintf(stderr, "ox_math:: put %s.", s); +} + +int send_mlo_zz(cmo *m) +{ + char *s; + MLPutFunction(lp, "ToExpression", 1); + s = convert_cmo_to_string(m); + MLPutString(lp, s); + fprintf(stderr, "put %s.", s); +} + +int send_mlo_list(cmo *c) +{ + char *s; + cell *cp = ((cmo_list *)c)->head; + int len = length_cmo_list((cmo_list *)c); + + fprintf(stderr, "ox_math:: put List with %d args.\n", len); + MLPutFunction(lp, "List", len); + while(cp->next != NULL) { + send_mlo(cp->cmo); + cp = cp->next; + } +} + int MATH_sendObject(cmo *m) { + send_mlo(m); + MLEndPacket(lp); +} + +int send_mlo(cmo *m) +{ char *s; switch(m->tag) { case CMO_INT32: - MLPutInteger(lp, ((cmo_int32 *)m)->i); + send_mlo_int32(m); break; case CMO_STRING: - s = ((cmo_string *)m)->s; - MLPutString(lp, s); - fprintf(stderr, "put %s.", s); + send_mlo_string(m); break; + case CMO_LIST: + send_mlo_list(m); + break; default: MLPutFunction(lp, "ToExpression", 1); - s = CONVERT_CMO_TO_CSTRING(m); + s = convert_cmo_to_string(m); MLPutString(lp, s); fprintf(stderr, "put %s.", s); break; @@ -163,7 +234,7 @@ int MATH_executeFunction(char *function, int argc, cmo int i; MLPutFunction(lp, function, argc); for (i=0; itag); + symbol *symp; + if (m->tag == CMO_STRING) { - fprintf(stderr, "server:: %s\n", ((cmo_string *)m)->s); + fprintf(stderr, "ox_math:: a CMO_STRING(%s) was pushed.\n", ((cmo_string *)m)->s); + }else { + symp = lookup_by_tag(m->tag); + fprintf(stderr, "ox_math:: a %s was pushed.\n", symp->key); } #endif Operand_Stack[Stack_Pointer] = m; Stack_Pointer++; if (Stack_Pointer >= SIZE_OPERAND_STACK) { fprintf(stderr, "stack over flow.\n"); - exit(1); + Stack_Pointer--; } } -/* エラーのときは NULL を返す */ -/* gen_error_object(SM_popCMO); */ -/* CMO_ERROR2 */ - +/* スタックが空のときは, (CMO_NULL) をかえす. */ cmo* pop() { if (Stack_Pointer > 0) { Stack_Pointer--; return Operand_Stack[Stack_Pointer]; } - return NULL; + return new_cmo_null(); } void pops(int n) @@ -217,14 +289,16 @@ void pops(int n) } } - /* sm_XXX 関数群は、エラーのときは 0 以外の値を返し、呼び出し元で エラーオブジェクトをセットする */ int sm_popCMO(int fd_write) { cmo* m = pop(); - - fprintf(stderr, "code: SM_popCMO.\n"); +#ifdef DEBUG + symbol *symp = lookup_by_tag(m->tag); + + fprintf(stderr, "ox_math:: opecode = SM_popCMO. (%s)\n", symp->key); +#endif if (m != NULL) { send_ox_cmo(fd_write, m); return 0; @@ -239,41 +313,66 @@ int sm_pops(int fd_write) pops(((cmo_int32 *)m)->i); return 0; } - return UNKNOWN_SM_COMMAND; + return ERROR_ID_UNKNOWN_SM; } /* MathLink 依存部分 */ int sm_popString(int fd_write) { - char* s; - cmo* m; + char *s; + cmo *err; + cmo *m; #ifdef DEBUG - fprintf(stderr, "code: SM_popString.\n"); + fprintf(stderr, "ox_math:: opecode = SM_popString.\n"); #endif - if ((m = pop()) != NULL && (s = CONVERT_CMO_TO_CSTRING(m)) != NULL) { - send_ox_cmo(fd_write, new_cmo_string(s)); - return 0; + m = pop(); + if (m->tag == CMO_STRING) { + send_ox_cmo(fd_write, m); + }else if ((s = convert_cmo_to_string(m)) != NULL) { + send_ox_cmo(fd_write, (cmo *)new_cmo_string(s)); + }else { + err = make_error_object(SM_popString, m); + send_ox_cmo(fd_write, err); } - return SM_popString; + return 0; } +int local_execute(char *s) +{ + return 0; +} + /* この関数はサーバに依存する. */ int sm_executeStringByLocalParser(int fd_write) { - cmo* m = NULL; + symbol *symp; + cmo* m = pop(); + char *s = NULL; #ifdef DEBUG - fprintf(stderr, "code: SM_executeStringByLocalParser.\n"); + fprintf(stderr, "ox_math:: opecode = SM_executeStringByLocalParser.\n"); #endif - if ((m = pop()) != NULL && m->tag == CMO_STRING) { - /* for mathematica */ - /* mathematica に文字列を送って評価させる */ - MATH_evaluateStringByLocalParser(((cmo_string *)m)->s); - push(MATH_getObject2()); + + if (m->tag == CMO_STRING + && strlen(s = ((cmo_string *)m)->s) != 0) { + if (s[0] == ':') { + local_execute(s); + }else { + /* for mathematica */ + /* mathematica に文字列を送って評価させる */ + MATH_evaluateStringByLocalParser(s); + push(MATH_get_object()); + } return 0; } - fprintf(stderr, "cannot execute: top of stack is not string!(%p, %d)\n", m, m->tag); +#ifdef DEBUG + if ((symp = lookup_by_tag(m->tag)) != NULL) { + fprintf(stderr, "ox_math:: error. the top of stack is %s.\n", symp->key); + }else { + fprintf(stderr, "ox_math:: error. the top of stack is unknown cmo. (%d)\n", m->tag); + } +#endif return SM_executeStringByLocalParser; } @@ -292,15 +391,14 @@ int sm_executeFunction(int fd_write) if ((m = pop()) == NULL || m->tag != CMO_INT32) { return SM_executeFunction; } + argc = ((cmo_int32 *)m)->i; - argv = malloc(sizeof(cmo *)*argc); + argv = malloc(argc*sizeof(cmo *)); for (i=0; i