===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Attic/serv2.c,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -p -r1.11 -r1.14
--- OpenXM/src/ox_math/Attic/serv2.c	1999/12/14 09:31:56	1.11
+++ OpenXM/src/ox_math/Attic/serv2.c	2000/03/10 12:38:47	1.14
@@ -1,21 +1,31 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.10 1999/11/29 12:09:58 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/serv2.c,v 1.13 2000/01/22 06:29:18 ohara Exp $ */
 
-/* Open Mathematica サーバ */
-/* ファイルディスクリプタ 3, 4 は open されていると仮定して動作する. */
+/* 
+   Copyright (C) Katsuyoshi OHARA, 2000.
+   Portions copyright 1999 Wolfram Research, Inc. 
 
+   You must see OpenXM/Copyright/Copyright.generic.
+   The MathLink Library is licensed from Wolfram Research Inc..
+   See OpenXM/Copyright/Copyright.mathlink for detail.
+*/
+
+/* 
+   Remarks: 
+   file descripter 3 and 4 are already opened by the parent process.
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #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;
 
-/* MathLink 非依存部分 */
+/* MathLink independent */
 #define INIT_S_SIZE 2048
 #define EXT_S_SIZE  2048
 
@@ -43,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;
@@ -59,7 +69,7 @@ int push(cmo* m)
     }
 }
 
-/* スタックが空のときは, (CMO_NULL) をかえす. */
+/* if the stack is empty, then pop() returns (CMO_NULL). */
 cmo* pop()
 {
     if (stack_pointer > 0) {
@@ -77,14 +87,16 @@ void pops(int n)
     }
 }
 
-/* sm_XXX 関数群は、エラーのときは 0 以外の値を返し、呼び出し元で
-   エラーオブジェクトをセットする */
+/* 
+   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)
 {
     cmo* m = pop();
 #ifdef DEBUG
     symbol *symp = lookup_by_tag(m->tag);
-    fprintf(stderr, "ox_math:: opecode = SM_popCMO. (%s)\n", symp->key);
+    fprintf(stderr, "ox_math:: opecode = SM_popCMO. (%s)\n", symbol_get_key(symp));
 #endif
 
     if (m != NULL) {
@@ -104,7 +116,7 @@ int sm_pops(int fd_write)
     return ERROR_ID_UNKNOWN_SM;
 }
 
-/* MathLink 依存部分 */
+/* MathLink dependent */
 int sm_popString(int fd_write)
 {
     char *s;
@@ -143,7 +155,7 @@ int local_execute(char *s)
     return 0;
 }
 
-/* この関数はサーバに依存する. */
+/* The following function is depend on an implementation of a server. */
 int sm_executeStringByLocalParser(int fd_write)
 {
     symbol *symp;
@@ -159,7 +171,7 @@ int sm_executeStringByLocalParser(int fd_write)
             local_execute(++s);
         }else {
             /* for mathematica */
-            /* mathematica に文字列を送って評価させる */
+            /* Sending the string `s' to mathematica for its evaluation. */
             ml_evaluateStringByLocalParser(s);
 			ml_select();
             push(receive_mlo());
@@ -168,7 +180,7 @@ 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;
 }
@@ -200,7 +212,6 @@ int sm_executeFunction(int fd_write)
     return 0;
 }
 
-/* 平成12年12月14日 */
 #define VERSION 0x11121400
 #define ID_STRING  "ox_math server 1999/12/14 15:25:00"
 
@@ -219,8 +230,8 @@ 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);
+    symbol_t sp = lookup_by_tag(code);
+    fprintf(stderr, "ox_math:: %s received.\n", symbol_get_key(sp));
 #endif
 
     switch(code) {
@@ -247,7 +258,7 @@ int execute_sm_command(int fd_write, int code)
         shutdown();
         break;
     case SM_setMathCap:
-        pop();  /* 無視する */
+        pop();  /* ignore */
         break;
     default:
         fprintf(stderr, "unknown command: %d.\n", code);