===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Attic/serv2.c,v
retrieving revision 1.13
retrieving revision 1.16
diff -u -p -r1.13 -r1.16
--- OpenXM/src/ox_math/Attic/serv2.c	2000/01/22 06:29:18	1.13
+++ OpenXM/src/ox_math/Attic/serv2.c	2000/10/10 19:58:30	1.16
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.12 2000/01/05 06:09:11 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.15 2000/03/10 12:45:48 ohara Exp $ */
 
 /* 
    Copyright (C) Katsuyoshi OHARA, 2000.
@@ -20,8 +20,7 @@
 #include <unistd.h>
 #include <gmp.h>
 #include <mathlink.h>
-#include "ox.h"
-#include "parse.h"
+#include <ox_toolkit.h>
 #include "serv2.h"
 
 extern int flag_mlo_symbol;
@@ -54,13 +53,13 @@ static int extend_stack()
 int push(cmo* m)
 {
 #if DEBUG
-    symbol *symp;
+    symbol_t symp;
 
     if (m->tag == CMO_STRING) {
         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);
+        fprintf(stderr, "ox_math:: a %s was pushed.\n", symbol_get_key(symp));
     }
 #endif
     stack[stack_pointer] = m;
@@ -92,22 +91,22 @@ void pops(int n)
    if error occurs, then a sm_*() function returns non-zero and 
    an error obect is set by a function which calls sm_*().
 */
-int sm_popCMO(int fd_write)
+int sm_popCMO(OXFILE* oxfp)
 {
     cmo* m = pop();
 #ifdef DEBUG
-    symbol *symp = lookup_by_tag(m->tag);
-    fprintf(stderr, "ox_math:: opecode = SM_popCMO. (%s)\n", symp->key);
+    symbol_t symp = lookup_by_tag(m->tag);
+    fprintf(stderr, "ox_math:: opecode = SM_popCMO. (%s)\n", symbol_get_key(symp));
 #endif
 
     if (m != NULL) {
-        send_ox_cmo(fd_write, m);
+        send_ox_cmo(oxfp, m);
         return 0;
     }
     return SM_popCMO;
 }
 
-int sm_pops(int fd_write)
+int sm_pops(OXFILE* oxfp)
 {
     cmo* m = pop();
     if (m != NULL && m->tag == CMO_INT32) {
@@ -118,7 +117,7 @@ int sm_pops(int fd_write)
 }
 
 /* MathLink dependent */
-int sm_popString(int fd_write)
+int sm_popString(OXFILE* oxfp)
 {
     char *s;
     cmo *err;
@@ -130,12 +129,12 @@ int sm_popString(int fd_write)
 
     m = pop();
     if (m->tag == CMO_STRING) {
-        send_ox_cmo(fd_write, m);
+        send_ox_cmo(oxfp, m);
     }else if ((s = new_string_set_cmo(m)) != NULL) {
-        send_ox_cmo(fd_write, (cmo *)new_cmo_string(s));
+        send_ox_cmo(oxfp, (cmo *)new_cmo_string(s));
     }else {
         err = make_error_object(SM_popString, m);
-        send_ox_cmo(fd_write, err);
+        send_ox_cmo(oxfp, err);
     }
     return 0;
 }
@@ -157,9 +156,9 @@ int local_execute(char *s)
 }
 
 /* The following function is depend on an implementation of a server. */
-int sm_executeStringByLocalParser(int fd_write)
+int sm_executeStringByLocalParser(OXFILE* oxfp)
 {
-    symbol *symp;
+    symbol_t symp;
     cmo* m = pop();
     char *s = NULL;
 #ifdef DEBUG
@@ -181,12 +180,12 @@ int sm_executeStringByLocalParser(int fd_write)
     }
 #ifdef DEBUG
     symp = lookup_by_tag(m->tag);
-    fprintf(stderr, "ox_math:: error. the top of stack is %s.\n", symp->key);
+    fprintf(stderr, "ox_math:: error. the top of stack is %s.\n", symbol_get_key(symp));
 #endif
     return SM_executeStringByLocalParser;
 }
 
-int sm_executeFunction(int fd_write)
+int sm_executeFunction(OXFILE* oxfp)
 {
     int i, argc;
     cmo **argv;
@@ -214,46 +213,47 @@ int sm_executeFunction(int fd_write)
 }
 
 #define VERSION 0x11121400
-#define ID_STRING  "ox_math server 1999/12/14 15:25:00"
+#define ID_STRING  "1999/12/14 15:25:00"
 
-int sm_mathcap(int fd_write)
+int sm_mathcap(OXFILE* oxfp)
 {
-    push(make_mathcap_object(VERSION, ID_STRING));
+    mathcap_sysinfo_set(VERSION, ID_STRING, "ox_math");
+    push(mathcap_get());
     return 0;
 }
 
-int receive_sm_command(int fd_read)
+int receive_sm_command(OXFILE* oxfp)
 {
-    return receive_int32(fd_read);
+    return receive_int32(oxfp);
 }
 
-int execute_sm_command(int fd_write, int code)
+int execute_sm_command(OXFILE* oxfp, int code)
 {
     int err = 0;
 #ifdef DEBUG    
-    symbol *sp = lookup_by_tag(code);
-    fprintf(stderr, "ox_math:: %s received.\n", sp->key);
+    symbol_t sp = lookup_by_tag(code);
+    fprintf(stderr, "ox_math:: %s received.\n", symbol_get_key(sp));
 #endif
 
     switch(code) {
     case SM_popCMO:
-        err = sm_popCMO(fd_write);
+        err = sm_popCMO(oxfp);
         break;
     case SM_popString:
-        err = sm_popString(fd_write);
+        err = sm_popString(oxfp);
         break;
     case SM_mathcap:
-        err = sm_mathcap(fd_write);
+        err = sm_mathcap(oxfp);
         break;
     case SM_pops:
-        err = sm_pops(fd_write);
+        err = sm_pops(oxfp);
         break;
     case SM_executeStringByLocalParser:
     case SM_executeStringByLocalParserInBatchMode:
-        err = sm_executeStringByLocalParser(fd_write);
+        err = sm_executeStringByLocalParser(oxfp);
         break;
     case SM_executeFunction:
-        err = sm_executeFunction(fd_write);
+        err = sm_executeFunction(oxfp);
         break;
     case SM_shutdown:
         shutdown();