===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/mlo.c,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- OpenXM/src/ox_math/mlo.c	2000/01/05 06:09:11	1.4
+++ OpenXM/src/ox_math/mlo.c	2000/12/03 21:46:52	1.9
@@ -1,15 +1,22 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_math/mlo.c,v 1.3 1999/12/14 09:31:55 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/mlo.c,v 1.8 2000/11/28 20:16:03 ohara Exp $ */
 
+/* 
+   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.
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <gmp.h>
 #include <mathlink.h>
-#include "oxtag.h"
-#include "ox.h"
+#include <ox_toolkit.h>
 #include "mlo.h"
-#include "serv2.h"
+#include "sm.h"
 
 /* If this flag sets then we identify MLTKSYM to CMO_INDETERMINATE. */
 int flag_mlo_symbol = FLAG_MLTKSYM_IS_INDETERMINATE;
@@ -50,13 +57,13 @@ cmo *receive_mlo_function()
     MLGetFunction(stdlink, &s, &n);
     fprintf(stderr, "--debug: MLO == MLTKFUNC (%s[#%d]).\n", s, n);
     m = new_cmo_list();
-    append_cmo_list((cmo_list *)m, new_cmo_string(s));
+    list_append((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);
+        list_append((cmo_list *)m, ob);
     }
 
     MLDisownString(stdlink, s);
@@ -75,6 +82,8 @@ cmo *convert_mlo_to_cmo(mlo *m)
 }
 #endif
 
+#define MLO_FUNCTION   (CMO_PRIVATE+1)
+
 mlo_function *new_mlo_function(char *function)
 {
     mlo_function *c = malloc(sizeof(mlo_function));
@@ -101,7 +110,7 @@ cmo *receive_mlo_function_newer()
         fprintf(stderr, "--debug: arg[%d]\n", i);
         fflush(stderr);
         ob = receive_mlo();
-        append_cmo_list((cmo_list *)m, ob);
+        list_append((cmo_list *)m, ob);
     }
 
     MLDisownString(stdlink, s);
@@ -216,13 +225,13 @@ int send_mlo_zz(cmo *m)
 int send_mlo_list(cmo *c)
 {
     char *s;
-    cell *cp = ((cmo_list *)c)->head;
-    int len = length_cmo_list((cmo_list *)c);
+    cell *cp = list_first((cmo_list *)c);
+    int len = list_length((cmo_list *)c);
 
     MLPutFunction(stdlink, "List", len);
-    while(cp->next != NULL) {
+    while(!list_endof(c, cp)) {
         send_mlo(cp->cmo);
-        cp = cp->next;
+        cp = list_next(cp);
     }
 }