tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix glitches in bison run and parser build

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-08-04 17:55:48 +02:00
parent 5846cb7a7a
commit c39c94f904
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgignore
View File

@ -13,6 +13,7 @@ libtool
\#* \#*
ptrans ptrans
src/aclocal.m4 src/aclocal.m4
src/compile
src/config.guess src/config.guess
src/config.sub src/config.sub
src/depcomp src/depcomp
@ -29,7 +30,6 @@ src/config.log
src/config.status src/config.status
src/configure src/configure
src/ylwrap src/ylwrap
src/query/wasaparse.h
src/Makefile src/Makefile
src/autom4te.cache src/autom4te.cache
src/common/autoconfig.h src/common/autoconfig.h

4
src/Makefile.am
View File

@ -143,7 +143,6 @@ query/reslistpager.cpp \
query/reslistpager.h \ query/reslistpager.h \
query/sortseq.cpp \ query/sortseq.cpp \
query/sortseq.h \ query/sortseq.h \
query/wasaparse.h \
query/wasaparse.ypp \ query/wasaparse.ypp \
query/wasaparseaux.cpp \ query/wasaparseaux.cpp \
query/wasaparserdriver.h \ query/wasaparserdriver.h \
@ -237,7 +236,8 @@ utils/workqueue.h \
utils/x11mon.cpp \ utils/x11mon.cpp \
utils/x11mon.h utils/x11mon.h
BUILT_SOURCES = query/wasaparse.cpp query/wasaparse.h BUILT_SOURCES = query/wasaparse.cpp query/wasaparse.hpp
CLEANFILES = $(BUILT_SOURCES)
# We use -release: the lib is only shared # We use -release: the lib is only shared
# between recoll programs from the same release. # between recoll programs from the same release.

2
src/query/wasaparse.ypp
View File

@ -8,7 +8,7 @@
#include "searchdata.h" #include "searchdata.h"
#include "wasaparserdriver.h" #include "wasaparserdriver.h"
#include "wasaparse.h" #include "wasaparse.hpp"
using namespace std; using namespace std;

2
src/query/wasaparseaux.cpp
View File

@ -26,7 +26,7 @@
#define YYDEBUG 1 #define YYDEBUG 1
// bison-generated file // bison-generated file
#include "wasaparse.h" #include "wasaparse.hpp"
using namespace std; using namespace std;
using namespace Rcl; using namespace Rcl;

4
src/query/y.tab.h
View File

@ -3,11 +3,11 @@
// Bison generates y.tab.h and inserts a line in the generated cpp // Bison generates y.tab.h and inserts a line in the generated cpp
// file to include it // file to include it
// However, we tell automake to use wasaparse.cpp and wasaparse.h as // However, we tell automake to use wasaparse.cpp and wasaparse.hpp as
// names for the generated files. This does not fix the #include // names for the generated files. This does not fix the #include
// y.tab.h line, so it fails. // y.tab.h line, so it fails.
// This workaround file just includes the appropriate file as // This workaround file just includes the appropriate file as
// generated by automake // generated by automake
#include "wasaparse.h" #include "wasaparse.hpp"