=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/bconv.c,v retrieving revision 1.3 retrieving revision 1.7 diff -u -p -r1.3 -r1.7 --- OpenXM/src/ox_toolkit/bconv.c 2000/03/10 12:24:38 1.3 +++ OpenXM/src/ox_toolkit/bconv.c 2005/07/20 17:48:03 1.7 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/bconv.c,v 1.2 1999/12/22 11:26:37 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/bconv.c,v 1.6 2003/02/04 20:43:54 ohara Exp $ */ /* bconv can convert an OX expression or a CMO expression to a byte stream. */ /* Any expressions, as a string, must have shorter length than 8192.*/ @@ -9,7 +9,7 @@ #include "ox_toolkit.h" -static int display(ox *m) +static void display(ox *m) { int i; int len = 0; @@ -19,19 +19,19 @@ static int display(ox *m) case OX_DATA: len = sizeof(int) + sizeof(int) + cmolen_cmo(((ox_data *)m)->cmo); d_buff = malloc(len); - init_dump_buffer(d_buff); + dump_buffer_init(d_buff); dump_ox_data((ox_data *)m); break; case OX_COMMAND: len = sizeof(int) + sizeof(int) + sizeof(int); d_buff = malloc(len); - init_dump_buffer(d_buff); + dump_buffer_init(d_buff); dump_ox_command((ox_command *)m); break; default: len = cmolen_cmo((cmo *)m); d_buff = malloc(len); - init_dump_buffer(d_buff); + dump_buffer_init(d_buff); dump_cmo((cmo *)m); } @@ -51,21 +51,19 @@ static int display(ox *m) static char cmdline[SIZE_CMDLINE]; -static int prompt() +static void prompt() { fprintf(stdout, "> "); fgets(cmdline, SIZE_CMDLINE, stdin); - init_parser(cmdline); } int main() { cmo *m; - setbuf(stderr, NULL); + ox_stderr_init(stderr); setbuf(stdout, NULL); - setflag_parse(PFLAG_ADDREV); - for(prompt(); (m = parse()) != NULL; prompt()) { + for(prompt(); (m = ox_parse_lisp(cmdline)) != NULL; prompt()) { display(m); } return 0;