===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/bconv.c,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM/src/ox_toolkit/bconv.c	1999/12/15 05:21:25	1.1
+++ OpenXM/src/ox_toolkit/bconv.c	2003/01/11 11:42:31	1.5
@@ -1,15 +1,15 @@
 /* -*- mode: C -*- */
-/* $OpenXM$ */
+/* $OpenXM: OpenXM/src/ox_toolkit/bconv.c,v 1.4 2000/10/10 05:23:20 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.*/
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "ox.h"
-#include "parse.h"
 
-static int display(ox *m)
+#include "ox_toolkit.h"
+
+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);
     }
 
@@ -49,25 +49,22 @@ static int display(ox *m)
 
 #define SIZE_CMDLINE  8192
 
-static int  size = SIZE_CMDLINE;
 static char cmdline[SIZE_CMDLINE];
 
-static int prompt()
+static void prompt()
 {
     fprintf(stdout, "> ");
-    fgets(cmdline, size, stdin);
-    setmode_mygetc(cmdline, size);
+    fgets(cmdline, SIZE_CMDLINE, stdin);
+    init_parser(cmdline);
 }
 
 int main()
 {
     cmo *m;
-    setbuf(stderr, NULL);
+    ox_stderr_init(NULL);
     setbuf(stdout, NULL);
 
     setflag_parse(PFLAG_ADDREV);
-    setgetc(mygetc);
-
     for(prompt(); (m = parse()) != NULL; prompt()) {
         display(m);
     }