===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/testclient.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM/src/ox_toolkit/testclient.c	2003/02/04 20:43:55	1.11
+++ OpenXM/src/ox_toolkit/testclient.c	2005/07/26 12:52:05	1.15
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/testclient.c,v 1.10 2003/01/13 12:03:12 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/testclient.c,v 1.14 2005/07/20 17:48:03 ohara Exp $ */
 
 /* A sample implementation of an OpenXM client with OpenXM C library */
 
@@ -37,30 +37,25 @@ int dumpx(OXFILE *oxfp, int n)
 static int  size = SIZE_CMDLINE;
 static char cmdline[SIZE_CMDLINE];
 
-static int prompt()
+static void prompt()
 {
     fprintf(stdout, "> ");
     fgets(cmdline, size, stdin);
-    init_parser(cmdline);
 }
 
 #define VERSION 0x11121500
 #define ID_STRING  "v0.11121500"
 
-int test_0()
+void test_0()
 {
     cmo* c = NULL;
-#ifdef DEBUG
     ox_printf("testclient:: calling ox_mathcap().\n");
-    c = ox_mathcap(sv);
-    ox_printf("testclient:: cmo received.(%p)\n", c);
-#else
     c = (cmo *)ox_mathcap(sv);
-#endif
+    ox_printf("testclient:: cmo received.(%p)\n", c);
     print_cmo(c);
 
-    mathcap_init(VERSION, ID_STRING, "testclient", NULL, NULL);
-    send_ox_cmo(sv, oxf_cmo_mathcap(sv));
+    mathcap_init(ID_STRING, "testclient");
+    send_ox_cmo(sv, (cmo *)oxf_cmo_mathcap(sv));
 
     ox_reset(sv);
     send_ox_cmo(sv, (cmo *)new_cmo_string("N[ArcTan[1]]"));
@@ -72,12 +67,12 @@ int test_0()
     print_cmo(c);
 }
 
-int test_1()
+void test_1()
 {
     cmo *c, *m;
 
-	mathcap_init(1000, "test!", "testclient", NULL, NULL);
-	m = oxf_cmo_mathcap(sv);
+	mathcap_init("test!", "testclient");
+	m = (cmo *)oxf_cmo_mathcap(sv);
     ox_printf("testclient:: test cmo_mathcap.\n");
     send_ox_cmo(sv, m);
     send_ox_command(sv, SM_popCMO);
@@ -117,9 +112,7 @@ int main(int argc, char* argv[])
         test_1();
     }
 
-    setflag_parse(PFLAG_ADDREV);
-
-    while(prompt(), (m = parse()) != NULL) {
+    while(prompt(), (m = ox_parse_lisp(cmdline)) != NULL) {
         send_ox(sv, m);
         if (m->tag == OX_COMMAND) {
             code = ((ox_command *)m)->command;