===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/mlo.c,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- OpenXM/src/ox_math/mlo.c	2000/03/10 12:38:46	1.6
+++ OpenXM/src/ox_math/mlo.c	2000/12/03 21:46:52	1.9
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_math/mlo.c,v 1.5 2000/01/22 06:29:18 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.
@@ -16,7 +16,7 @@
 #include <mathlink.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;
@@ -57,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);
@@ -82,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));
@@ -108,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);
@@ -223,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);
     }
 }