Changeset 10705 for trunk/gsdl/src/recpt/z3950proto.cpp

Timestamp:

2005-10-07T10:33:14+13:00 (19 years ago)

Author:

jrm21

Message:

tidied up interaction between flex/bison and greenstone's z3950 client
classes. renamed parse.y to zparse.y to make it more obvious it's related
to that stuff.

File:

• trunk/gsdl/src/recpt/z3950proto.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -30 +30 @@
 #include "filter.h"
 // z39.50 yaz stuff
-#include <stdio.h> // for (FILE *) type for yyin and fopen.
-// config file parsing stuff
-extern "C" {
+
 #include "z3950cfg.h" // for reading in config files - 
 // defines "struct z3950cfg *zserver_list" as the head of the list.
-}
+
 // note! yyin is hash-defined in z3950cfg.h to something else, to avoid
 // name conflicts with "other" yyins.
-//extern "C" {
-FILE *yyin;
-FILE *yyout; // redirect for `errors' (unmatched tokens in flex)
-//}
-extern "C" {
-  extern int zconfigparse();
-}
-
+extern FILE *yyin;
+extern FILE *yyout; // redirect for `errors' (unmatched tokens in flex)
 
 
@@ -81 +73 @@
   yyout=errfile;
 
-  // zconfigparse() is defined in zparse.tab.c,
-  // which is the bison output of zparse.y
   
   char *filename_str=filename.getcstr();
@@ -92 +82 @@
   }
   delete []filename_str;
-  zconfigparse();
+
+  // this is in zparse.tab.c,
+  // which is the bison output of zparse.y
+  yyparse();
 
   if (errfile!=stderr)