=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/Attic/serv2.c,v retrieving revision 1.9 retrieving revision 1.11 diff -u -p -r1.9 -r1.11 --- OpenXM/src/ox_math/Attic/serv2.c 1999/11/19 20:51:36 1.9 +++ OpenXM/src/ox_math/Attic/serv2.c 1999/12/14 09:31:56 1.11 @@ -1,11 +1,9 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.8 1999/11/18 21:56:44 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.10 1999/11/29 12:09:58 ohara Exp $ */ /* Open Mathematica サーバ */ /* ファイルディスクリプタ 3, 4 は open されていると仮定して動作する. */ -/* MathLink との通信部分 */ - #include #include #include @@ -15,256 +13,33 @@ #include "parse.h" #include "serv2.h" -#define FLAG_MLTKSYM_IS_INDETERMINATE 0 -#define FLAG_MLTKSYM_IS_STRING 1 +extern int flag_mlo_symbol; -int flag_mlo_symbol = FLAG_MLTKSYM_IS_INDETERMINATE; +/* MathLink 非依存部分 */ +#define INIT_S_SIZE 2048 +#define EXT_S_SIZE 2048 -#define ERROR_ID_UNKNOWN_SM 10 -#define ERROR_ID_FAILURE_MLINK 11 +static int stack_size = 0; +static int stack_pointer = 0; +static cmo **stack = NULL; -/* 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() +int initialize_stack() { - 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; + stack_pointer = 0; + stack_size = INIT_S_SIZE; + stack = malloc(stack_size*sizeof(cmo*)); } -mlo *receive_mlo_string() +static int extend_stack() { - 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; + int size2 = stack_size + EXT_S_SIZE; + cmo **stack2 = malloc(size2*sizeof(cmo*)); + memcpy(stack2, stack, stack_size*sizeof(cmo *)); + free(stack); + stack = stack2; + stack_size = size2; } -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); -} - -int send_mlo_zz(cmo *m) -{ - char *s; - MLPutFunction(lp, "ToExpression", 1); - s = convert_cmo_to_string(m); - MLPutString(lp, s); -} - -int send_mlo_list(cmo *c) -{ - char *s; - cell *cp = ((cmo_list *)c)->head; - int len = length_cmo_list((cmo_list *)c); - - 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: - send_mlo_int32(m); - break; - case CMO_ZERO: - case CMO_NULL: - send_mlo_int32(new_cmo_int32(0)); - break; - case CMO_STRING: - send_mlo_string(m); - break; - case CMO_LIST: - send_mlo_list(m); - break; - case CMO_MATHCAP: - send_mlo(((cmo_mathcap *)m)->ob); - break; - case CMO_ZZ: - send_mlo_zz(m); - break; - default: - MLPutFunction(lp, "ToExpression", 1); - s = convert_cmo_to_string(m); - MLPutString(lp, s); - break; - } -} - -int MATH_evaluateStringByLocalParser(char *str) -{ - MLPutFunction(lp, "ToExpression", 1); - MLPutString(lp, str); - MLEndPacket(lp); -} - -int MATH_executeFunction(char *function, int argc, cmo *argv[]) -{ - int i; - MLPutFunction(lp, function, argc); - for (i=0; ikey); } #endif - Operand_Stack[Stack_Pointer] = m; - Stack_Pointer++; - if (Stack_Pointer >= SIZE_OPERAND_STACK) { - fprintf(stderr, "stack over flow.\n"); - Stack_Pointer--; + stack[stack_pointer] = m; + stack_pointer++; + if (stack_pointer >= stack_size) { + extend_stack(); } } /* スタックが空のときは, (CMO_NULL) をかえす. */ cmo* pop() { - if (Stack_Pointer > 0) { - Stack_Pointer--; - return Operand_Stack[Stack_Pointer]; + if (stack_pointer > 0) { + stack_pointer--; + return stack[stack_pointer]; } return new_cmo_null(); } void pops(int n) { - Stack_Pointer -= n; - if (Stack_Pointer < 0) { - Stack_Pointer = 0; + stack_pointer -= n; + if (stack_pointer < 0) { + stack_pointer = 0; } } @@ -310,9 +84,9 @@ int sm_popCMO(int fd_write) cmo* m = pop(); #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; @@ -344,7 +118,7 @@ int sm_popString(int fd_write) m = pop(); if (m->tag == CMO_STRING) { send_ox_cmo(fd_write, m); - }else if ((s = convert_cmo_to_string(m)) != NULL) { + }else if ((s = new_string_set_cmo(m)) != NULL) { send_ox_cmo(fd_write, (cmo *)new_cmo_string(s)); }else { err = make_error_object(SM_popString, m); @@ -355,17 +129,17 @@ int sm_popString(int fd_write) int local_execute(char *s) { - if(*s == 'i') { - switch(s[1]) { - case '+': - flag_mlo_symbol = FLAG_MLTKSYM_IS_STRING; - break; - case '-': - case '=': - default: - flag_mlo_symbol = FLAG_MLTKSYM_IS_INDETERMINATE; - } - } + if(*s == 'i') { + switch(s[1]) { + case '+': + flag_mlo_symbol = FLAG_MLTKSYM_IS_STRING; + break; + case '-': + case '=': + default: + flag_mlo_symbol = FLAG_MLTKSYM_IS_INDETERMINATE; + } + } return 0; } @@ -386,17 +160,15 @@ int sm_executeStringByLocalParser(int fd_write) }else { /* for mathematica */ /* mathematica に文字列を送って評価させる */ - MATH_evaluateStringByLocalParser(s); - push(MATH_get_object()); + ml_evaluateStringByLocalParser(s); + ml_select(); + push(receive_mlo()); } return 0; } #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); - } + symp = lookup_by_tag(m->tag); + fprintf(stderr, "ox_math:: error. the top of stack is %s.\n", symp->key); #endif return SM_executeStringByLocalParser; } @@ -422,14 +194,15 @@ int sm_executeFunction(int fd_write) for (i=0; ikey); +#ifdef DEBUG + symbol *sp = lookup_by_tag(code); + fprintf(stderr, "ox_math:: %s received.\n", sp->key); #endif switch(code) { @@ -464,16 +237,17 @@ int execute_sm_command(int fd_write, int code) err = sm_pops(fd_write); break; case SM_executeStringByLocalParser: + case SM_executeStringByLocalParserInBatchMode: err = sm_executeStringByLocalParser(fd_write); break; case SM_executeFunction: err = sm_executeFunction(fd_write); break; - case SM_setMathCap: - pop(); /* 無視する */ - break; case SM_shutdown: shutdown(); + break; + case SM_setMathCap: + pop(); /* 無視する */ break; default: fprintf(stderr, "unknown command: %d.\n", code);