===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Attic/serv2.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM/src/ox_math/Attic/serv2.c	1999/11/04 03:05:51	1.4
+++ OpenXM/src/ox_math/Attic/serv2.c	1999/11/07 12:12:56	1.7
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.3 1999/11/03 10:56:40 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 されていると仮定して動作する. */
@@ -12,63 +12,104 @@
 #include <gmp.h>
 #include <mathlink.h>
 #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;
-	char *function;
+    int tag;
+    int length;
+    cell head[1];
+    char *function;
 } mlo_function;
 
 
 mlo *receive_mlo_zz()
 {
-	char *s;
-	mlo  *m;
+    char *s;
+    mlo  *m;
 
-	MLGetString(lp, &s);
- 	fprintf(stderr, "--debug: zz = %s.\n", s);
-	m = (mlo *)new_cmo_zz_set_string(s);
-	MLDisownString(lp, s);
-	return 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;
-	MLGetString(lp, &s);
-	m = (cmo *)new_cmo_string(s);
-	MLDisownString(lp, s);
-	return m;
+    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; i<n; i++) {
+        fprintf(stderr, "--debug: arg[%d]\n", i);
+        fflush(stderr);
+        ob = receive_mlo();
+        append_cmo_list((cmo_list *)m, ob);
+    }
+
+    MLDisownString(lp, s);
+    return m;
+}
+
+cmo *receive_mlo_symbol()
+{
+    cmo *ob;
+    char *s;
+
+    fprintf(stderr, "--debug: MLO == MLTKSYM.\n");
+    MLGetSymbol(lp, &s);
+    fprintf(stderr, "--debug: Symbol \"%s\".\n", s);
+
+    ob = new_cmo_indeterminate(new_cmo_string(s)); 
+
+    MLDisownString(lp, s);
+    return ob;
+}
+
 /* Mathematica を起動する. */
 int MATH_init()
 {
     int argc = 2;
     char *argv[] = {"-linkname", "math -mathlink"};
 
-    if(MLInitialize(NULL) != NULL) {
-        lp = MLOpen(argc, argv);
-        if(lp != NULL) {
-            return 0;
-        }
+    if(MLInitialize(NULL) == NULL 
+       || (lp = MLOpen(argc, argv)) == NULL) {
+        fprintf(stderr, "Mathematica Kernel not found.\n");
+        exit(1);
     }
-    exit(1);
+    return 0;
 }
 
 int MATH_exit()
@@ -78,117 +119,100 @@ int MATH_exit()
     MLClose(lp);
 }
 
-char *MATH_getObject()
+cmo *MATH_get_object()
 {
-    char *s;
-
     /* skip any packets before the first ReturnPacket */
     while (MLNextPacket(lp) != RETURNPKT) {
         usleep(10);
         MLNewPacket(lp);
     }
-    /* いまはタイプにかかわらず文字列を取得する. */
-    switch(MLGetNext(lp)) {
+    return receive_mlo();
+}
+
+cmo *receive_mlo()
+{
+    char *s;
+    int type;
+
+    switch(type = MLGetNext(lp)) {
     case MLTKINT:
-        fprintf(stderr, "type is INTEGER.\n");
-        MLGetString(lp, &s);
-        break;
+        return receive_mlo_zz();
     case MLTKSTR:
-        fprintf(stderr, "type is STRING.\n");
+        return receive_mlo_string();
+    case MLTKREAL:
+        /* double はまだ... */
+        fprintf(stderr, "--debug: MLO == MLTKREAL.\n");
         MLGetString(lp, &s);
-        break;
+        return (cmo *)new_cmo_string(s);
+    case MLTKSYM:
+        return receive_mlo_symbol();
+    case MLTKFUNC:
+        return receive_mlo_function();
+    case MLTKERR:
+        fprintf(stderr, "--debug: MLO == MLTKERR.\n");
+        return (cmo *)make_error_object(ERROR_ID_FAILURE_MLINK, new_cmo_null());
     default:
+        fprintf(stderr, "--debug: MLO(%d) is unknown.\n", type);
         MLGetString(lp, &s);
+        fprintf(stderr, "--debug: \"%s\"\n", s);
+        return (cmo *)new_cmo_string(s);
     }
-    return s;
 }
 
+int send_mlo_int32(cmo *m)
+{
+    MLPutInteger(lp, ((cmo_int32 *)m)->i);
+}
 
-cmo *MATH_getObject2()
+int send_mlo_string(cmo *m)
 {
-    /* skip any packets before the first ReturnPacket */
-    while (MLNextPacket(lp) != RETURNPKT) {
-        usleep(10);
-        MLNewPacket(lp);
-    }
-    /* いまはタイプにかかわらず文字列を取得する. */
-	return MATH_getObject3();
+    char *s = ((cmo_string *)m)->s;
+    MLPutString(lp, s);
+    fprintf(stderr, "ox_math:: put %s.", s);
 }
 
-cmo *MATH_getObject3()
+int send_mlo_zz(cmo *m)
 {
     char *s;
-    cmo  *m;
-    cmo  *ob;
-    int  i,n;
-	int type;
+    MLPutFunction(lp, "ToExpression", 1);
+    s = convert_cmo_to_string(m);
+    MLPutString(lp, s);
+    fprintf(stderr, "put %s.", s);
+}
 
-    /* いまはタイプにかかわらず文字列を取得する. */
-	type = MLGetNext(lp);
-    switch(type) {
-    case MLTKINT:
-        fprintf(stderr, "--debug: MLO == MLTKINT.\n");
-		m = receive_mlo_zz();
-        break;
-    case MLTKSTR:
-        fprintf(stderr, "--debug: MLO == MLTKSTR.\n");
-		m = receive_mlo_string();
-        break;
-#if 0
-    case MLTKREAL:
-        fprintf(stderr, "MLTKREAL is not supported: we use MLTKSTR.\n");
-        MLGetString(lp, &s);
-        m = (cmo *)new_cmo_string(s);
-        break;
-    case MLTKERR:
-        fprintf(stderr, "--debug: MLO == MLTKERR.\n");
-        m = (cmo *)gen_error_object(MATH_ERROR);
-        break;
-#endif
-    case MLTKSYM:
-		fprintf(stderr, "--debug: MLO == MLTKSYM.\n");
-		/* この部分に問題がある. */
-        MLGetSymbol(lp, &s);
-		fprintf(stderr, "--debug: Symbol \"%s\".\n", s);
-        m = (cmo *)new_cmo_string(s);
-        break;
-    case MLTKFUNC:
-        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(m, new_cmo_string(s));
-		fflush(stderr);
-        for (i=0; i<n; i++) {
-            fprintf(stderr, "--debug: arg[%d]\n", i);
-			fflush(stderr);
-			ob = MATH_getObject3();
-			append_cmo_list(m, ob);
-        }
-        break;
-    default:
-        fprintf(stderr, "--debug: MLO(%d) != MLTKINT, MLTKSTR.\n", type);
-        fprintf(stderr, "--debug: MLTKFUNC(%d), MLTKSYM(%d).\n", MLTKFUNC, MLTKSYM);
+int send_mlo_list(cmo *c)
+{
+    char *s;
+    cell *cp = ((cmo_list *)c)->head;
+    int len = length_cmo_list((cmo_list *)c);
 
-        MLGetString(lp, &s);
-		fprintf(stderr, "--debug: \"%s\"\n", s);
-        m = (cmo *)new_cmo_string(s);
+    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;
     }
-    return m;
 }
 
 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_string(m);
@@ -210,7 +234,7 @@ int MATH_executeFunction(char *function, int argc, cmo
     int i;
     MLPutFunction(lp, function, argc);
     for (i=0; i<argc; i++) {
-        MATH_sendObject(argv[i]);
+        send_mlo(argv[i]);
     }
     MLEndPacket(lp);
 }
@@ -230,16 +254,20 @@ int initialize_stack()
 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_Pointer--;
     }
 }
 
@@ -266,8 +294,11 @@ void pops(int n)
 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;
@@ -282,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_string(m)) != NULL) {
+    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));
-        return 0;
+    }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;
 }
 
@@ -335,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<argc; i++) {
-        if ((argv[i] = pop()) == NULL) {
-            return SM_executeFunction;
-        }
+        argv[i] = pop();
     }
     MATH_executeFunction(func, argc, argv);
-    push(MATH_getObject2());
+    push(MATH_get_object());
     return 0;
 }
 
@@ -353,8 +408,7 @@ int sm_executeFunction(int fd_write)
 
 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;
 }
 
@@ -391,10 +445,10 @@ int execute_sm_command(int fd_write, int code)
         break;
     default:
         fprintf(stderr, "unknown command: %d.\n", code);
-        err = UNKNOWN_SM_COMMAND;
+        err = ERROR_ID_UNKNOWN_SM;
     }
 
     if (err != 0) {
-        push((cmo *)gen_error_object(err));
+        push((cmo *)make_error_object(err, new_cmo_null()));
     }
 }