=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/testclient.c,v retrieving revision 1.13 retrieving revision 1.15 diff -u -p -r1.13 -r1.15 --- OpenXM/src/ox_toolkit/testclient.c 2003/09/15 09:31:42 1.13 +++ 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.12 2003/03/23 20:17:35 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 */ @@ -41,7 +41,6 @@ static void prompt() { fprintf(stdout, "> "); fgets(cmdline, size, stdin); - init_parser(cmdline); } #define VERSION 0x11121500 @@ -55,7 +54,7 @@ void test_0() ox_printf("testclient:: cmo received.(%p)\n", c); print_cmo(c); - mathcap_init(VERSION, ID_STRING, "testclient", NULL, NULL); + mathcap_init(ID_STRING, "testclient"); send_ox_cmo(sv, (cmo *)oxf_cmo_mathcap(sv)); ox_reset(sv); @@ -72,7 +71,7 @@ void test_1() { cmo *c, *m; - mathcap_init(1000, "test!", "testclient", NULL, NULL); + mathcap_init("test!", "testclient"); m = (cmo *)oxf_cmo_mathcap(sv); ox_printf("testclient:: test cmo_mathcap.\n"); send_ox_cmo(sv, m); @@ -113,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;