Ticket #933: 0001-ticket-933-fix-bison-header-file-generation.patch

File 0001-ticket-933-fix-bison-header-file-generation.patch, 4.2 KB (added by Dimitar Misev, 9 years ago)

  • .gitignore 

    From 1ecf30fc2b600441163d6f7b8a0c046a5ca2587d Mon Sep 17 00:00:00 2001
From: Dimitar Misev <misev@rasdaman.com>
Date: Thu, 11 Jun 2015 15:00:05 +0200
Subject: [PATCH] ticket:933 - fix bison header file generation

---
 .gitignore           |  2 ++
 qlparser/Makefile.am | 13 +++----------
 qlparser/lex.ll      |  2 +-
 qlparser/oql.yy      |  2 ++
 rasdl/Makefile.am    | 13 +++----------
 rasdl/lex.ll         |  2 +-
 rasdl/odl.yy         |  2 ++
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ea43d1..53138d2 100644
    a b lockmgr/ecpg_lockmanager.cc  
    2020qlparser/lex.cc
    2121qlparser/oql.cc
    2222qlparser/oql.h
     23qlparser/oql.hh
    2324rascontrol/rascontrol
    2425rascontrol/raspasswd
    2526rasdl/lex.cc
    2627rasdl/odl.cc
    2728rasdl/odl.h
     29rasdl/odl.hh
    2830rasdl/rasdl
    2931rasmgr/rasmgr
    3032reladminif/adminif.cc

  • qlparser/Makefile.am 

    diff --git a/qlparser/Makefile.am b/qlparser/Makefile.am
index d44b117..cb55123 100755
    a b nobase_dist_pkgdata_DATA=udf/cpp.cc  
    3838AM_LFLAGS=-i -I
    3939
    4040# -d generates token definitions in .h file
    41 AM_YFLAGS=-d -y
     41AM_YFLAGS=-y
    4242AM_CXXFLAGS=@BASEDBCXXFLAGS@ @GDAL_CXXFLAGS@
    4343AM_CFLAGS=$(CXXFLAGS)
    4444libqlparser_a_SOURCES=oql.yy lex.ll alloca.c\
    … … libqlparser_a_SOURCES=oql.yy lex.ll alloca.c\  
    119119
    120120EXTRA_libqlparser_a_SOURCES = autogen_qtui.hh autogen_qtui.icc autogen_qtui.cc
    121121
    122 BUILT_SOURCES=lex.cc oql.cc oql.h
    123 CLEANFILES=lex.cc oql.cc oql.h udf/cpp.cc
     122BUILT_SOURCES=lex.cc oql.cc oql.hh
     123CLEANFILES=lex.cc oql.cc oql.hh udf/cpp.cc
    124124
    125125udf/cpp.cc: udf/cpp.cc.in
    126126        $(SED) -e 's|AUTOCONF_TOKEN_FOR_SHARE_DIR|$(pkgdatadir)|g' \
    … … udf/cpp.cc: udf/cpp.cc.in  
    128128               -e 's|AUTOCONF_TOKEN_FOR_UDFCXXFLAGS|$(UDFCXXFLAGS)|g' \
    129129               -e 's|AUTOCONF_TOKEN_FOR_UDFLDFLAGS|$(UDFLDFLAGS)|g' \
    130130               'udf/cpp.cc.in' > udf/cpp.cc
    131 
    132 oql.h: correct_oql_h
    133 
    134 .PHONY: correct_oql_h
    135 
    136 correct_oql_h:
    137         if [ -e oql.hh ]; then mv oql.hh oql.h ; fi

  • qlparser/lex.ll 

    diff --git a/qlparser/lex.ll b/qlparser/lex.ll
index af9f21e..4845c3f 100755
    a b struct QtUpdateSpecElement  
    4949  QtOperation* domain;
    5050};
    5151
    52 #include "oql.h"
     52#include "oql.hh"
    5353
    5454QueryTree* parseQueryTree = NULL;
    5555char* beginParseString = NULL;

  • qlparser/oql.yy 

    diff --git a/qlparser/oql.yy b/qlparser/oql.yy
index 2e9d607..293a30f 100755
    a b struct QtUpdateSpecElement  
    114114
    115115%}
    116116
     117%defines "oql.hh"
     118
    117119// definition section
    118120
    119121%union {

  • rasdl/Makefile.am 

    diff --git a/rasdl/Makefile.am b/rasdl/Makefile.am
index 475a418..fbd0616 100755
    a b  
    3030##################################################################
    3131
    3232AM_LFLAGS=-I
    33 AM_YFLAGS=-d -y
     33AM_YFLAGS=-y
    3434AM_CXXFLAGS=@BASEDBCXXFLAGS@
    3535AM_LDFLAGS=
    3636
    … … rasdl_LDADD = ../reladminif/libreladminif.a ../relmddif/librelmddif.a \  
    4949
    5050rasdl_LDFLAGS = -pthread
    5151
    52 BUILT_SOURCES=lex.cc odl.cc odl.h             
    53 CLEANFILES=lex.cc odl.cc odl.h
     52BUILT_SOURCES=lex.cc odl.cc odl.hh             
     53CLEANFILES=lex.cc odl.cc odl.hh
    5454
    5555SUBDIRS=../reladminif ../conversion ../relmddif ../relstorageif ../relindexif ../relcatalogif \
    5656         ../relfiletileif ../relblobif ../indexmgr ../catalogmgr ../storagemgr ../tilemgr \
    … … SUBDIRS=../reladminif ../conversion ../relmddif ../relstorageif ../relindexif ..  
    5959$(RECURSIVE_CLEAN_TARGETS):
    6060        @$(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed s/-recursive/-am/`
    6161
    62 odl.h: correct_odl_h
    63 
    64 .PHONY: correct_odl_h
    65 
    66 correct_odl_h:
    67         if [ -e odl.hh ]; then mv odl.hh odl.h ; fi
    68 
    6962#.PHONY : doc
    7063#doc:
    7164#       -rm $(DOCDIR)/*

  • rasdl/lex.ll 

    diff --git a/rasdl/lex.ll b/rasdl/lex.ll
index f34907a..16adadb 100755
    a b rasdaman GmbH.  
    4141#include "parse.hh"
    4242#include "yparse.hh"
    4343
    44 #include "odl.h"   
     44#include "odl.hh"   
    4545
    4646/*   for error output */
    4747long   lineNumber   =   1;   /* number of line in current file   */

  • rasdl/odl.yy 

    diff --git a/rasdl/odl.yy b/rasdl/odl.yy
index 8f109b6..25f1545 100755
    a b extern const char *error_token;  
    6565
    6666%}
    6767
     68%defines "odl.hh"
     69
    6870%union{
    6971            // types for LEX
    7072            struct