===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Attic/serv2.c,v
retrieving revision 1.1.1.1
retrieving revision 1.11
diff -u -p -r1.1.1.1 -r1.11
--- 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/12/14 09:31:56	1.11
@@ -1,230 +1,92 @@
 /* -*- 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.10 1999/11/29 12:09:58 ohara Exp $ */
 
 /* Open Mathematica サーバ */
 /* ファイルディスクリプタ 3, 4 は open されていると仮定して動作する. */
 
-/* MathLink との通信部分 */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <gmp.h>
 #include <mathlink.h>
 #include "ox.h"
+#include "parse.h"
 #include "serv2.h"
 
-#define UNKNOWN_SM_COMMAND 50000
-#define MATH_ERROR         50001
+extern int flag_mlo_symbol;
 
+/* MathLink 非依存部分 */
+#define INIT_S_SIZE 2048
+#define EXT_S_SIZE  2048
 
-/* MLINK はポインタ型. */
-MLINK lp = NULL;
+static int stack_size = 0;
+static int stack_pointer = 0;
+static cmo **stack = NULL;
 
-/* Mathematica を起動する. */
-int MATH_init()
+int initialize_stack()
 {
-    int argc = 2;
-    char *argv[] = {"-linkname", "math -mathlink"};
-
-    if(MLInitialize(NULL) != NULL) {
-        lp = MLOpen(argc, argv);
-        if(lp != NULL) {
-            return 0;
-        }
-    }
-    exit(1);
+    stack_pointer = 0;
+	stack_size = INIT_S_SIZE;
+	stack = malloc(stack_size*sizeof(cmo*));
 }
 
-int MATH_exit()
+static int extend_stack()
 {
-    /* quit Mathematica then close the link */
-    MLPutFunction(lp, "Exit", 0);
-    MLClose(lp);
+	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;
 }
 
-char *MATH_getObject()
-{
-    char *s;
-
-    /* skip any packets before the first ReturnPacket */
-    while (MLNextPacket(lp) != RETURNPKT) {
-        usleep(10);
-        MLNewPacket(lp);
-    }
-    /* いまはタイプにかかわらず文字列を取得する. */
-    switch(MLGetNext(lp)) {
-    case MLTKINT:
-        fprintf(stderr, "type is INTEGER.\n");
-        MLGetString(lp, &s);
-        break;
-    case MLTKSTR:
-        fprintf(stderr, "type is STRING.\n");
-        MLGetString(lp, &s);
-        break;
-    default:
-        MLGetString(lp, &s);
-    }
-    return s;
-}
-
-cmo *MATH_getObject2()
-{
-    char *s;
-    cmo  *m;
-    char **sp;
-    int  i,n;
-
-    /* skip any packets before the first ReturnPacket */
-    while (MLNextPacket(lp) != RETURNPKT) {
-        usleep(10);
-        MLNewPacket(lp);
-    }
-    /* いまはタイプにかかわらず文字列を取得する. */
-    switch(MLGetNext(lp)) {
-    case MLTKINT:
-        fprintf(stderr, "type is INTEGER.\n");
-        MLGetString(lp, &s);
-        m = (cmo *)new_cmo_zz_set_string(s);
-        break;
-    case MLTKSTR:
-        fprintf(stderr, "type is STRING.\n");
-        MLGetString(lp, &s);
-        m = (cmo *)new_cmo_string(s);
-        break;
-    case MLTKERR:
-        fprintf(stderr, "type is ERROR.\n");
-        m = gen_error_object(MATH_ERROR);
-        break;
-    case MLTKSYM:
-        fprintf(stderr, "MLTKSYM.\n");
-        MLGetString(lp, s);
-        m = (cmo *)new_cmo_string(s);
-        break;
-    case MLTKFUNC:
-        fprintf(stderr, "MLTKFUNC.\n");
-#if DEBUG
-        MLGetString(lp, s);
-        m = (cmo *)new_cmo_string(s);
-        break;
-#endif
-        MLGetFunction(lp, sp, &n);
-        fprintf(stderr, "n = %d\n", n);
-        for (i=0; i<=n; i++) {
-            fprintf(stderr, "%s ");
-        }
-        fprintf(stderr, "\n");
-        m = (cmo *)new_cmo_string(s[0]);
-        break;
-    case MLTKREAL:
-        fprintf(stderr, "MLTKREAL is not supported: we use MLTKSTR.\n");
-        MLGetString(lp, &s);
-        m = (cmo *)new_cmo_string(s);
-        break;
-    default:
-        fprintf(stderr, "unknown type: we use STRING.\n");
-        MLGetString(lp, &s);
-        m = (cmo *)new_cmo_string(s);
-    }
-    return m;
-}
-
-int MATH_sendObject(cmo *m)
-{
-    char *s;
-    switch(m->tag) {
-    case CMO_INT32:
-        MLPutInteger(lp, ((cmo_int32 *)m)->i);
-        break;
-    case CMO_STRING:
-        s = ((cmo_string *)m)->s;
-        MLPutString(lp, s);
-        fprintf(stderr, "put %s.", s);
-        break;
-    default:
-        MLPutFunction(lp, "ToExpression", 1);
-        s = CONVERT_CMO_TO_CSTRING(m);
-        MLPutString(lp, s);
-        fprintf(stderr, "put %s.", 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; i<argc; i++) {
-        MATH_sendObject(argv[i]);
-    }
-    MLEndPacket(lp);
-}
-
-/* MathLink 非依存部分 */
-
-#define SIZE_OPERAND_STACK   2048
-
-static cmo* Operand_Stack[SIZE_OPERAND_STACK];
-static int Stack_Pointer = 0;
-
-int initialize_stack()
-{
-    Stack_Pointer = 0;
-} 
-
 int push(cmo* m)
 {
 #if DEBUG
-    fprintf(stderr, "server:: a cmo is pushed: tag == %d.\n", m->tag);
+    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[stack_pointer] = m;
+    stack_pointer++;
+    if (stack_pointer >= stack_size) {
+		extend_stack();
     }
 }
 
-/* エラーのときは NULL を返す */
-/* gen_error_object(SM_popCMO); */
-/* CMO_ERROR2 */
-
+/* スタックが空のときは, (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 NULL;
+    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;
     }
 }
 
-
 /* sm_XXX 関数群は、エラーのときは 0 以外の値を返し、呼び出し元で
    エラーオブジェクトをセットする */
 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
 
-    fprintf(stderr, "code: SM_popCMO.\n");
     if (m != NULL) {
         send_ox_cmo(fd_write, m);
         return 0;
@@ -239,41 +101,75 @@ 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 = new_string_set_cmo(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)
+{
+    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;
+}
+
 /* この関数はサーバに依存する. */
 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 に文字列を送って評価させる */
+            ml_evaluateStringByLocalParser(s);
+			ml_select();
+            push(receive_mlo());
+        }
         return 0;
     }
-    fprintf(stderr, "cannot execute: top of stack is not string!(%p, %d)\n", m, m->tag);
+#ifdef DEBUG
+    symp = lookup_by_tag(m->tag);
+    fprintf(stderr, "ox_math:: error. the top of stack is %s.\n", symp->key);
+#endif
     return SM_executeStringByLocalParser;
 }
 
@@ -292,26 +188,25 @@ 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<argc; i++) {
-        if ((argv[i] = pop()) == NULL) {
-            return SM_executeFunction;
-        }
+        argv[i] = pop();
     }
-    MATH_executeFunction(func, argc, argv);
-    push(MATH_getObject2());
+    ml_executeFunction(func, argc, argv);
+	ml_select();
+    push(receive_mlo());
     return 0;
 }
 
-/* 平成11年10月13日 */
-#define VERSION 0x11102700
-#define ID_STRING  "ox_math server 1999/10/28 17:29:25"
+/* 平成12年12月14日 */
+#define VERSION 0x11121400
+#define ID_STRING  "ox_math server 1999/12/14 15:25:00"
 
 int sm_mathcap(int fd_write)
 {
-    cmo* c = make_mathcap_object(VERSION, ID_STRING);
-    push(c);
+    push(make_mathcap_object(VERSION, ID_STRING));
     return 0;
 }
 
@@ -323,6 +218,10 @@ int receive_sm_command(int fd_read)
 int execute_sm_command(int fd_write, int code)
 {
     int err = 0;
+#ifdef DEBUG    
+    symbol *sp = lookup_by_tag(code);
+    fprintf(stderr, "ox_math:: %s received.\n", sp->key);
+#endif
 
     switch(code) {
     case SM_popCMO:
@@ -338,20 +237,24 @@ 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:
+    case SM_shutdown:
+        shutdown();
+        break;
+    case SM_setMathCap:
         pop();  /* 無視する */
         break;
     default:
         fprintf(stderr, "unknown command: %d.\n", code);
-        err = UNKNOWN_SM_COMMAND;
+        err = ERROR_ID_UNKNOWN_SM;
     }
 
     if (err != 0) {
-        push(gen_error_object(err));
+        push((cmo *)make_error_object(err, new_cmo_null()));
     }
 }