[#453] move to bison 3.3.0

diff --git a/configure.ac b/configure.ac
index c8c46412efc68c1b211d25db1a47fb92a1ecdc7c..d1343037f47ae0ff156fe1a40cb7fde8eda57637 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1232,10 +1232,11 @@ if test "x$enable_generate_parser" != "xno"; then
        AC_MSG_ERROR([Bison is required for enable-generate-parser, but was not found])
     fi
 
-# Ok, let's check if we have at least 3.0.0 version of the bison. The code used
-# to generate parsers is roughly based on bison 3.0 examples.
+# Let's check if we have at least 3.3.0 version of the bison. The
+# api.parser.class is available with 3.2.91, but let's be safe and offer support
+# for minor versions, as opposed to patch versions.
    cat > bisontest.y << EOF
-%require "3.0.0"
+%require "3.3.0"
 %token X
 %%
 %start Y;
@@ -1247,7 +1248,7 @@ EOF
     if test $? -ne 0 ; then
         $YACC -V
         $RM -f bisontest.y bisontest.cc
-        AC_MSG_ERROR("Error with $YACC. Possibly incorrect version? Required at least 3.0.0.")
+        AC_MSG_ERROR("Error with $YACC. Possibly incorrect version? Required at least 3.3.0.")
     fi
     $RM -f bisontest.y bisontest.cc
 fi

diff --git a/doc/devel/bison.dox b/doc/devel/bison.dox
index eafa2d240af47d4e1130ed9fced79495efdc205e..6cc677674dcc3b8315f84c549b592c092121f6d3 100644 (file)
--- a/doc/devel/bison.dox
+++ b/doc/devel/bison.dox
@@ -94,9 +94,9 @@ convey the intent; a more detailed description is available in subsequent sectio
 The only input file used by flex is the .ll file and the only input file used by bison is the .yy
 file. When making changes to the lexer or parser, only those two files are edited. When processed,
 the two tools generate a number of .h, .hh and .cc files. The major ones have the same name as their
-.ll and .yy counterparts (e.g. dhcp6_lexer.cc, dhcp6_parser.cc and dhcp6_parser.h etc.), but a
-number of additional files are also created: location.hh, position.hh and stack.hh. Those are
-internal bison headers that are needed for compilation.
+.ll and .yy counterparts (e.g. dhcp6_lexer.cc, dhcp6_parser.cc and dhcp6_parser.h etc.), but an
+additional file is also created: location.hh. Those are internal bison headers that are needed for
+compilation.
 
 To avoid the need for every user to have flex and bison installed, the output files are generated
 when the .ll or .yy files are altered and are stored in the Kea repository. To generate those files,

diff --git a/src/bin/agent/.gitattributes b/src/bin/agent/.gitattributes
index 28e66530188b2bff30feb10eaafe4acc35b88d91..4c3efcf22c16888ee15f72f1373ea6a4ec235fec 100644 (file)
--- a/src/bin/agent/.gitattributes
+++ b/src/bin/agent/.gitattributes
@@ -4,5 +4,3 @@
 /ca_messages.cc                  -diff merge=ours
 /ca_messages.h                   -diff merge=ours
 /location.hh                     -diff merge=ours
-/position.hh                     -diff merge=ours
-/stack.hh                        -diff merge=ours

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 8460435e262ce80d0f8860122057d97b9bbc2a5a..9d9f342566526e13aa5fbc7e410cc8511b7fc370 100644 (file)
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -29,7 +29,7 @@ libagent_la_SOURCES += ca_response_creator.cc ca_response_creator.h
 libagent_la_SOURCES += ca_response_creator_factory.h
 libagent_la_SOURCES += simple_parser.cc simple_parser.h
 libagent_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h
-libagent_la_SOURCES += agent_lexer.ll location.hh position.hh stack.hh
+libagent_la_SOURCES += agent_lexer.ll location.hh
 libagent_la_SOURCES += ca_messages.h ca_messages.cc
 EXTRA_DIST += ca_messages.mes
 EXTRA_DIST += agent_lexer.ll
@@ -97,9 +97,9 @@ endif
 if GENERATE_PARSER
 
 # Generate parser first.
-all-recursive: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_parser.h
+all-recursive: agent_lexer.cc location.hh agent_parser.cc agent_parser.h
 
-parser: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_parser.h
+parser: agent_lexer.cc location.hh agent_parser.cc agent_parser.h
        @echo "Flex/bison files regenerated"
 
 # --- Flex/Bison stuff below --------------------------------------------------
@@ -111,7 +111,7 @@ parser: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_pa
 # Call flex with -s to check that the default rule can be suppressed
 # Call bison with -W to get warnings like unmarked empty rules
 # Note C++11 deprecated register still used by flex < 2.6.0
-location.hh position.hh stack.hh agent_parser.cc agent_parser.h: agent_parser.yy
+location.hh agent_parser.cc agent_parser.h: agent_parser.yy
        $(YACC) -Wno-yacc --defines=agent_parser.h --report=all \
        --report-file=agent_parser.report -o agent_parser.cc agent_parser.yy
 
@@ -120,7 +120,7 @@ agent_lexer.cc: agent_lexer.ll
 
 else
 
-parser location.hh position.hh stack.hh agent_parser.cc agent_parser.h agent_lexer.cc:
+parser location.hh agent_parser.cc agent_parser.h agent_lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif

diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy
index a2eeb0f5785c34ce0bdb54ef3030b619ebf0407a..063523457f9e6c6a8b692e37457b73b9f6db6f78 100644 (file)
--- a/src/bin/agent/agent_parser.yy
+++ b/src/bin/agent/agent_parser.yy
@@ -5,7 +5,7 @@
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %skeleton "lalr1.cc" /* -*- C++ -*- */
-%require "3.0.0"
+%require "3.3.0"
 %defines
 %define api.parser.class {AgentParser}
 %define api.prefix {agent_}

diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh
deleted file mode 100644 (file)
index 6575075..0000000
--- a/src/bin/agent/position.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined in "location.hh".
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system
-// 3. if you used to include it, include "location.hh" instead.
-
-#include "location.hh"

diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh
deleted file mode 100644 (file)
index e6c46cc..0000000
--- a/src/bin/agent/stack.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined with the parser itself.
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system.

diff --git a/src/bin/d2/.gitattributes b/src/bin/d2/.gitattributes
index accd257fe9935dd4ff8a038253834dd1500387d3..4a11c9ea2abb8d46e63c1fc1417801823593a006 100644 (file)
--- a/src/bin/d2/.gitattributes
+++ b/src/bin/d2/.gitattributes
@@ -2,5 +2,3 @@
 /d2_parser.cc                    -diff merge=ours
 /d2_parser.h                     -diff merge=ours
 /location.hh                     -diff merge=ours
-/position.hh                     -diff merge=ours
-/stack.hh                        -diff merge=ours

diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 7931924b9f34f01fc37597556f3d5da798bc97a4..9a716e42e483398b203d0b534689741285b2673f 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -30,7 +30,7 @@ noinst_LTLIBRARIES = libd2.la
 
 libd2_la_SOURCES  =
 libd2_la_SOURCES += d2_process.cc d2_process.h
-libd2_la_SOURCES += d2_lexer.ll location.hh position.hh stack.hh
+libd2_la_SOURCES += d2_lexer.ll location.hh
 libd2_la_SOURCES += d2_parser.cc d2_parser.h
 libd2_la_SOURCES += d2_queue_mgr.cc d2_queue_mgr.h
 libd2_la_SOURCES += d2_update_message.cc d2_update_message.h
@@ -78,9 +78,9 @@ kea_dhcp_ddnsdir = $(pkgdatadir)
 if GENERATE_PARSER
 
 # Generate parser first.
-all-recursive: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h
+all-recursive: d2_lexer.cc location.hh d2_parser.cc d2_parser.h
 
-parser: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h
+parser: d2_lexer.cc location.hh d2_parser.cc d2_parser.h
        @echo "Flex/bison files regenerated"
 
 # --- Flex/Bison stuff below --------------------------------------------------
@@ -92,7 +92,7 @@ parser: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h
 # Call flex with -s to check that the default rule can be suppressed
 # Call bison with -W to get warnings like unmarked empty rules
 # Note C++11 deprecated register still used by flex < 2.6.0
-location.hh position.hh stack.hh d2_parser.cc d2_parser.h: d2_parser.yy
+location.hh d2_parser.cc d2_parser.h: d2_parser.yy
        $(YACC) -Wno-yacc --defines=d2_parser.h --report=all \
        --report-file=d2_parser.report -o d2_parser.cc d2_parser.yy
 
@@ -101,7 +101,7 @@ d2_lexer.cc: d2_lexer.ll
 
 else
 
-parser location.hh position.hh stack.hh d2_parser.cc d2_parser.h d2_lexer.cc:
+parser location.hh d2_parser.cc d2_parser.h d2_lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif

diff --git a/src/bin/d2/d2_parser.h b/src/bin/d2/d2_parser.h
index 78e9da7c0ba4bb5a3f09f0fdd63f488e6023c874..3c2e8d598a1cae63dba377a90b84c46597f09730 100644 (file)
--- a/src/bin/d2/d2_parser.h
+++ b/src/bin/d2/d2_parser.h
@@ -48,10 +48,10 @@
 #line 17 "d2_parser.yy"
 
 #include <string>
-#include <boost/lexical_cast.hpp>
 #include <cc/data.h>
-#include <d2/parser_context_decl.h>
 #include <d2srv/d2_config.h>
+#include <boost/lexical_cast.hpp>
+#include <d2/parser_context_decl.h>
 
 using namespace isc::d2;
 using namespace isc::data;

diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy
index 954877c020ea87b722325bbebff4ff4e875a1de6..796ff239d6a98ce97eed54749a6a805513a6ea00 100644 (file)
--- a/src/bin/d2/d2_parser.yy
+++ b/src/bin/d2/d2_parser.yy
@@ -5,7 +5,7 @@
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %skeleton "lalr1.cc" /* -*- C++ -*- */
-%require "3.0.0"
+%require "3.3.0"
 %defines
 %define api.parser.class {D2Parser}
 %define api.prefix {d2_parser_}

diff --git a/src/bin/d2/position.hh b/src/bin/d2/position.hh
deleted file mode 100644 (file)
index 6575075..0000000
--- a/src/bin/d2/position.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined in "location.hh".
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system
-// 3. if you used to include it, include "location.hh" instead.
-
-#include "location.hh"

diff --git a/src/bin/d2/stack.hh b/src/bin/d2/stack.hh
deleted file mode 100644 (file)
index e6c46cc..0000000
--- a/src/bin/d2/stack.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined with the parser itself.
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system.

diff --git a/src/bin/dhcp4/.gitattributes b/src/bin/dhcp4/.gitattributes
index 17f2596b46683c7da1e38f6d37d2aa5a2baaa6db..33fac547ac23b545a4c57d7f5dde4810076b6bef 100644 (file)
--- a/src/bin/dhcp4/.gitattributes
+++ b/src/bin/dhcp4/.gitattributes
@@ -4,5 +4,3 @@
 /dhcp4_parser.cc                 -diff merge=ours
 /dhcp4_parser.h                  -diff merge=ours
 /location.hh                     -diff merge=ours
-/position.hh                     -diff merge=ours
-/stack.hh                        -diff merge=ours

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 5084fbf9f65cf47b5bcc87c47d907f629edab5b3..10a69c9ec247514384c42fa22f2f40f4a64069d7 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -37,7 +37,7 @@ libdhcp4_la_SOURCES += dhcp4_log.cc dhcp4_log.h
 libdhcp4_la_SOURCES += dhcp4_srv.cc dhcp4_srv.h
 libdhcp4_la_SOURCES += dhcp4to6_ipc.cc dhcp4to6_ipc.h
 libdhcp4_la_SOURCES += client_handler.cc client_handler.h
-libdhcp4_la_SOURCES += dhcp4_lexer.ll location.hh position.hh stack.hh
+libdhcp4_la_SOURCES += dhcp4_lexer.ll location.hh
 libdhcp4_la_SOURCES += dhcp4_parser.cc dhcp4_parser.h
 libdhcp4_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h
 libdhcp4_la_SOURCES += dhcp4_messages.h dhcp4_messages.cc
@@ -128,9 +128,9 @@ endif
 if GENERATE_PARSER
 
 # Generate parser first.
-all-recursive: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h
+all-recursive: dhcp4_lexer.cc location.hh dhcp4_parser.cc dhcp4_parser.h
 
-parser: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h
+parser: dhcp4_lexer.cc location.hh dhcp4_parser.cc dhcp4_parser.h
        @echo "Flex/bison files regenerated"
 
 # --- Flex/Bison stuff below --------------------------------------------------
@@ -142,7 +142,7 @@ parser: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_pa
 # Call flex with -s to check that the default rule can be suppressed
 # Call bison with -W to get warnings like unmarked empty rules
 # Note C++11 deprecated register still used by flex < 2.6.0
-location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h: dhcp4_parser.yy
+location.hh dhcp4_parser.cc dhcp4_parser.h: dhcp4_parser.yy
        $(YACC) -Wno-yacc --defines=dhcp4_parser.h --report=all \
        --report-file=dhcp4_parser.report -o dhcp4_parser.cc dhcp4_parser.yy
 
@@ -151,7 +151,7 @@ dhcp4_lexer.cc: dhcp4_lexer.ll
 
 else
 
-parser location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h dhcp4_lexer.cc:
+parser location.hh dhcp4_parser.cc dhcp4_parser.h dhcp4_lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index c1329e9cf5600febe0c2dc525382657e9a6687ad..e907cae9f0bc2133cbca076ae209081e4fa9fe7d 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -5,7 +5,7 @@
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %skeleton "lalr1.cc" /* -*- C++ -*- */
-%require "3.0.0"
+%require "3.3.0"
 %defines
 %define api.parser.class {Dhcp4Parser}
 %define api.prefix {parser4_}

diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
deleted file mode 100644 (file)
index 6575075..0000000
--- a/src/bin/dhcp4/position.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined in "location.hh".
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system
-// 3. if you used to include it, include "location.hh" instead.
-
-#include "location.hh"

diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
deleted file mode 100644 (file)
index e6c46cc..0000000
--- a/src/bin/dhcp4/stack.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined with the parser itself.
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system.

diff --git a/src/bin/dhcp6/.gitattributes b/src/bin/dhcp6/.gitattributes
index ed120aeec60603194b62185f0df238d9f1a38f61..84b7c0ed5317fd5c761482dce282cefbf8c8208d 100644 (file)
--- a/src/bin/dhcp6/.gitattributes
+++ b/src/bin/dhcp6/.gitattributes
@@ -4,5 +4,3 @@
 /dhcp6_parser.cc                 -diff merge=ours
 /dhcp6_parser.h                  -diff merge=ours
 /location.hh                     -diff merge=ours
-/position.hh                     -diff merge=ours
-/stack.hh                        -diff merge=ours

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 19588ae2e576ae91eb4958b89edf95bfcbca1e07..4ff91eaa69e27d6fe961ba5f5227df6e20a28189 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -35,7 +35,7 @@ libdhcp6_la_SOURCES += ctrl_dhcp6_srv.cc ctrl_dhcp6_srv.h
 libdhcp6_la_SOURCES += json_config_parser.cc json_config_parser.h
 libdhcp6_la_SOURCES += dhcp6to4_ipc.cc dhcp6to4_ipc.h
 libdhcp6_la_SOURCES += client_handler.cc client_handler.h
-libdhcp6_la_SOURCES += dhcp6_lexer.ll location.hh position.hh stack.hh
+libdhcp6_la_SOURCES += dhcp6_lexer.ll location.hh
 libdhcp6_la_SOURCES += dhcp6_parser.cc dhcp6_parser.h
 libdhcp6_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h
 libdhcp6_la_SOURCES += dhcp6_messages.h dhcp6_messages.cc
@@ -127,9 +127,9 @@ endif
 if GENERATE_PARSER
 
 # Generate parser first.
-all-recursive: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h
+all-recursive: dhcp6_lexer.cc location.hh dhcp6_parser.cc dhcp6_parser.h
 
-parser: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h
+parser: dhcp6_lexer.cc location.hh dhcp6_parser.cc dhcp6_parser.h
        @echo "Flex/bison files regenerated"
 
 # --- Flex/Bison stuff below --------------------------------------------------
@@ -141,7 +141,7 @@ parser: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_pa
 # Call flex with -s to check that the default rule can be suppressed
 # Call bison with -W to get warnings like unmarked empty rules
 # Note C++11 deprecated register still used by flex < 2.6.0
-location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h: dhcp6_parser.yy
+location.hh dhcp6_parser.cc dhcp6_parser.h: dhcp6_parser.yy
        $(YACC) -Wno-yacc --defines=dhcp6_parser.h --report=all \
        --report-file=dhcp6_parser.report -o dhcp6_parser.cc dhcp6_parser.yy
 
@@ -150,7 +150,7 @@ dhcp6_lexer.cc: dhcp6_lexer.ll
 
 else
 
-parser location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h dhcp6_lexer.cc:
+parser location.hh dhcp6_parser.cc dhcp6_parser.h dhcp6_lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index bc29b05dc6519464f579fafe4a03be0773337838..0002e1dce624c4ce0c5a49dba66196dda3d92ac5 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -5,7 +5,7 @@
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %skeleton "lalr1.cc" /* -*- C++ -*- */
-%require "3.0.0"
+%require "3.3.0"
 %defines
 %define api.parser.class {Dhcp6Parser}
 %define api.prefix {parser6_}

diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh
deleted file mode 100644 (file)
index 6575075..0000000
--- a/src/bin/dhcp6/position.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined in "location.hh".
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system
-// 3. if you used to include it, include "location.hh" instead.
-
-#include "location.hh"

diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh
deleted file mode 100644 (file)
index e6c46cc..0000000
--- a/src/bin/dhcp6/stack.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined with the parser itself.
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system.

diff --git a/src/bin/netconf/.gitattributes b/src/bin/netconf/.gitattributes
index cccfd3df0984926d3b675a6fec442ffa2ff25093..390b9151f89b00619dcfecaa45f2c59cbd68e405 100644 (file)
--- a/src/bin/netconf/.gitattributes
+++ b/src/bin/netconf/.gitattributes
@@ -4,5 +4,3 @@
 /netconf_messages.h              -diff merge=ours
 /netconf_parser.cc               -diff merge=ours
 /netconf_parser.h                -diff merge=ours
-/position.hh                     -diff merge=ours
-/stack.hh                        -diff merge=ours

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 42e57ec47e671c56194c7023929aaa0fc5be64dd..b3b762bd11a9f5eabfb419fe50644510ffbcda16 100644 (file)
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -35,7 +35,7 @@ libnetconf_la_SOURCES += netconf_process.cc netconf_process.h
 libnetconf_la_SOURCES += parser_context.cc parser_context.h
 libnetconf_la_SOURCES += parser_context_decl.h
 libnetconf_la_SOURCES += simple_parser.cc simple_parser.h
-libnetconf_la_SOURCES += location.hh position.hh stack.hh
+libnetconf_la_SOURCES += location.hh
 libnetconf_la_SOURCES += netconf_lexer.ll netconf_parser.yy
 libnetconf_la_SOURCES += netconf_messages.h netconf_messages.cc
 
@@ -100,9 +100,9 @@ endif
 if GENERATE_PARSER
 
 # Generate parser first.
-all-recursive: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h
+all-recursive: netconf_lexer.cc location.hh netconf_parser.cc netconf_parser.h
 
-parser: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h
+parser: netconf_lexer.cc location.hh netconf_parser.cc netconf_parser.h
        @echo "Flex/bison files regenerated"
 
 # --- Flex/Bison stuff below --------------------------------------------------
@@ -114,7 +114,7 @@ parser: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netc
 # Call flex with -s to check that the default rule can be suppressed
 # Call bison with -W to get warnings like unmarked empty rules
 # Note C++11 deprecated register still used by flex < 2.6.0
-location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h: netconf_parser.yy
+location.hh netconf_parser.cc netconf_parser.h: netconf_parser.yy
        $(YACC) -Wno-yacc --defines=netconf_parser.h --report=all \
        --report-file=netconf_parser.report -o netconf_parser.cc \
        netconf_parser.yy
@@ -124,7 +124,7 @@ netconf_lexer.cc: netconf_lexer.ll
 
 else
 
-parser location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h netconf_lexer.cc:
+parser location.hh netconf_parser.cc netconf_parser.h netconf_lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif

diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy
index da8125c2b130da50c6e837fe42eca109e3822eda..53a2bbdbe16dad178907661ef1b6f2b6760c4024 100644 (file)
--- a/src/bin/netconf/netconf_parser.yy
+++ b/src/bin/netconf/netconf_parser.yy
@@ -5,7 +5,7 @@
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %skeleton "lalr1.cc" /* -*- C++ -*- */
-%require "3.0.0"
+%require "3.3.0"
 %defines
 %define api.parser.class {NetconfParser}
 %define api.prefix {netconf_}

diff --git a/src/bin/netconf/position.hh b/src/bin/netconf/position.hh
deleted file mode 100644 (file)
index 6575075..0000000
--- a/src/bin/netconf/position.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined in "location.hh".
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system
-// 3. if you used to include it, include "location.hh" instead.
-
-#include "location.hh"

diff --git a/src/bin/netconf/stack.hh b/src/bin/netconf/stack.hh
deleted file mode 100644 (file)
index e6c46cc..0000000
--- a/src/bin/netconf/stack.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined with the parser itself.
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system.

diff --git a/src/lib/eval/.gitattributes b/src/lib/eval/.gitattributes
index e1fcf15a3557ced56aceb0ebaff074cc88bfc8e3..2fc2d744b17bee389a0550312f1e84f5ba561c26 100644 (file)
--- a/src/lib/eval/.gitattributes
+++ b/src/lib/eval/.gitattributes
@@ -4,5 +4,3 @@
 /location.hh                     -diff merge=ours
 /parser.cc                       -diff merge=ours
 /parser.h                        -diff merge=ours
-/position.hh                     -diff merge=ours
-/stack.hh                        -diff merge=ours

diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index 8426b6eb517605931eaf0a34e5d5851cb8e50cc3..f16acfdf801ae302abb6b87479bb2c6fad23a952 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -20,7 +20,7 @@ libkea_eval_la_SOURCES += token.cc token.h
 
 libkea_eval_la_SOURCES += parser.cc parser.h
 libkea_eval_la_SOURCES += lexer.cc
-libkea_eval_la_SOURCES += location.hh position.hh stack.hh
+libkea_eval_la_SOURCES += location.hh
 libkea_eval_la_SOURCES += eval_context.cc eval_context.h eval_context_decl.h
 libkea_eval_la_SOURCES += eval_messages.h eval_messages.cc
 
@@ -85,7 +85,7 @@ endif
 # reconfigure, a new target parser-clean has been added.
 maintainer-clean-local:
        rm -f eval_messages.h eval_messages.cc
-       rm -f location.hh lexer.cc parser.cc parser.h position.hh stack.hh
+       rm -f location.hh lexer.cc parser.cc parser.h
 
 # To regenerate flex/bison files, one can do:
 #
@@ -95,14 +95,14 @@ maintainer-clean-local:
 # This is needed only when the lexer.ll or parser.yy files are modified.
 # Make sure you have both flex and bison installed.
 parser-clean:
-       rm -f location.hh lexer.cc parser.cc parser.h position.hh stack.hh
+       rm -f location.hh lexer.cc parser.cc parser.h
 
 if GENERATE_PARSER
 
 # Generate parser first.
-all-recursive: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
+all-recursive: lexer.cc location.hh parser.cc parser.h
 
-parser: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
+parser: lexer.cc location.hh parser.cc parser.h
        @echo "Flex/bison files regenerated"
 
 # --- Flex/Bison stuff below --------------------------------------------------
@@ -111,7 +111,7 @@ parser: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
 # It can be used to manually follow what's going on in the parser.
 # This is especially useful if yydebug_ is set to 1 as that variable
 # will cause parser to print out its internal state.
-location.hh position.hh stack.hh parser.cc parser.h: parser.yy
+location.hh parser.cc parser.h: parser.yy
        $(YACC) -Wno-yacc --defines=parser.h -o parser.cc parser.yy
 
 lexer.cc: lexer.ll
@@ -119,7 +119,7 @@ lexer.cc: lexer.ll
 
 else
 
-parser location.hh position.hh stack.hh parser.cc parser.h lexer.cc:
+parser location.hh parser.cc parser.h lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif

diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index bba1128c9013545eee066869e00addcdb39ec300..6a5ffd6a5276427bf6c7bdef2f3c2343c96b386e 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -5,7 +5,7 @@
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %skeleton "lalr1.cc" /* -*- C++ -*- */
-%require "3.0.0"
+%require "3.3.0"
 %defines
 %define api.parser.class {EvalParser}
 %define api.prefix {eval}

diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh
deleted file mode 100644 (file)
index 6575075..0000000
--- a/src/lib/eval/position.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined in "location.hh".
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system
-// 3. if you used to include it, include "location.hh" instead.
-
-#include "location.hh"

diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh
deleted file mode 100644 (file)
index e6c46cc..0000000
--- a/src/lib/eval/stack.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.6.
-
-// Starting with Bison 3.2, this file is useless: the structure it
-// used to define is now defined with the parser itself.
-//
-// To get rid of this file:
-// 1. add '%require "3.2"' (or newer) to your grammar file
-// 2. remove references to this file from your build system.