[453-update-makefile-using-bison] Update attempt

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index ffea77b4dfe979276026aa19d311c0d0ab1561be..5f7a1a10633713e5714ba4b8074f778d8ee5966e 100644 (file)
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -103,7 +103,8 @@ parser: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_pa
 # 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
-       $(YACC) --defines=agent_parser.h --report=all --report-file=agent_parser.report -o agent_parser.cc agent_parser.yy
+       $(YACC) -Wno-yacc --defines=agent_parser.h --report=all \
+       --report-file=agent_parser.report -o agent_parser.cc agent_parser.yy
 
 agent_lexer.cc: agent_lexer.ll
        $(LEX) --prefix agent_ -o agent_lexer.cc agent_lexer.ll

diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy
index fe590f7fea7f685f9a4ef42bd3b1d5d4a5b17320..b788474073f3b524d01a24bb48227d955ab24273 100644 (file)
--- a/src/bin/agent/agent_parser.yy
+++ b/src/bin/agent/agent_parser.yy
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 %skeleton "lalr1.cc" /* -*- C++ -*- */
 %require "3.0.0"
 %defines
-%define parser_class_name {AgentParser}
+%define api.parser.class {AgentParser}
 %define api.prefix {agent_}
 %define api.token.constructor
 %define api.value.type variant

diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 7f52bafb400cde8d785d8df7b91f4aa1b585dd23..9c1d9997680d91c0e13831405863cd42248f4197 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -117,7 +117,8 @@ parser: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h
 # 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
-       $(YACC) --defines=d2_parser.h --report=all --report-file=d2_parser.report -o d2_parser.cc d2_parser.yy
+       $(YACC) -Wno-yacc --defines=d2_parser.h --report=all \
+       --report-file=d2_parser.report -o d2_parser.cc d2_parser.yy
 
 d2_lexer.cc: d2_lexer.ll
        $(LEX) --prefix d2_parser_ -o d2_lexer.cc d2_lexer.ll

diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy
index f3c770d7bd35d954cf13cec6e60fd1f2c7fc5178..9b217661912534e866e7fdde88d99ca65dc443cc 100644 (file)
--- a/src/bin/d2/d2_parser.yy
+++ b/src/bin/d2/d2_parser.yy
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 %skeleton "lalr1.cc" /* -*- C++ -*- */
 %require "3.0.0"
 %defines
-%define parser_class_name {D2Parser}
+%define api.parser.class {D2Parser}
 %define api.prefix {d2_parser_}
 %define api.token.constructor
 %define api.value.type variant

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 56defd6e6c53823bf446b684db74dcf5c1aba4cf..1313609321396e28fc2d144cdd63e2a4163e97dd 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -131,7 +131,8 @@ parser: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_pa
 # 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
-       $(YACC) --defines=dhcp4_parser.h --report=all --report-file=dhcp4_parser.report -o dhcp4_parser.cc dhcp4_parser.yy
+       $(YACC) -Wno-yacc --defines=dhcp4_parser.h --report=all \
+       --report-file=dhcp4_parser.report -o dhcp4_parser.cc dhcp4_parser.yy
 
 dhcp4_lexer.cc: dhcp4_lexer.ll
        $(LEX) --prefix parser4_ -o dhcp4_lexer.cc dhcp4_lexer.ll

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index a91c949fb1f9e5d933a57cad937a8478e050dcd2..a2ef0cab39691104b0a5c31a040f65b91d4cfe00 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -7,7 +7,7 @@
 %skeleton "lalr1.cc" /* -*- C++ -*- */
 %require "3.0.0"
 %defines
-%define parser_class_name {Dhcp4Parser}
+%define api.parser.class {Dhcp4Parser}
 %define api.prefix {parser4_}
 %define api.token.constructor
 %define api.value.type variant

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 6d26c557c1dd1d7b349d48210d501a031f991c5a..60d0c0920a22c10be54bf837866af628e0d09196 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -132,7 +132,8 @@ parser: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_pa
 # 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
-       $(YACC) --defines=dhcp6_parser.h --report=all --report-file=dhcp6_parser.report -o dhcp6_parser.cc dhcp6_parser.yy
+       $(YACC) -Wno-yacc --defines=dhcp6_parser.h --report=all \
+       --report-file=dhcp6_parser.report -o dhcp6_parser.cc dhcp6_parser.yy
 
 dhcp6_lexer.cc: dhcp6_lexer.ll
        $(LEX) --prefix parser6_ -o dhcp6_lexer.cc dhcp6_lexer.ll

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 71253663eceeeda409653ebbef3531d323fd235e..fcd891c3b798efa80e0e828f4b87ceabdd78b000 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 %skeleton "lalr1.cc" /* -*- C++ -*- */
 %require "3.0.0"
 %defines
-%define parser_class_name {Dhcp6Parser}
+%define api.parser.class {Dhcp6Parser}
 %define api.prefix {parser6_}
 %define api.token.constructor
 %define api.value.type variant

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 50040b69b9c88a13d57b537763aad0e82e96765d..51edd27523b2f222efddaeff222977ee8132417c 100644 (file)
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -104,7 +104,9 @@ parser: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netc
 # 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
-       $(YACC) --defines=netconf_parser.h --report=all --report-file=netconf_parser.report -o netconf_parser.cc netconf_parser.yy
+       $(YACC) -Wno-yacc --defines=netconf_parser.h --report=all \
+       --report-file=netconf_parser.report -o netconf_parser.cc \
+       netconf_parser.yy
 
 netconf_lexer.cc: netconf_lexer.ll
        $(LEX) --prefix netconf_ -o netconf_lexer.cc netconf_lexer.ll

diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy
index e7ccfe38f064ec517c4d9ecb5d92e9bd8426dc5b..3d31eee31b90114a5b9844d0b0faa1a7c59b3c47 100644 (file)
--- a/src/bin/netconf/netconf_parser.yy
+++ b/src/bin/netconf/netconf_parser.yy
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 %skeleton "lalr1.cc" /* -*- C++ -*- */
 %require "3.0.0"
 %defines
-%define parser_class_name {NetconfParser}
+%define api.parser.class {NetconfParser}
 %define api.prefix {netconf_}
 %define api.token.constructor
 %define api.value.type variant

diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index 5d04e08ac1f82e24e2e31192b380c67ac7bcc7d3..298051f97876e4633d73625e104b26840a58301b 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -93,7 +93,7 @@ parser: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
 # 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
-       $(YACC) --defines=parser.h -o parser.cc parser.yy
+       $(YACC) -Wno-yacc --defines=parser.h -o parser.cc parser.yy
 
 lexer.cc: lexer.ll
        $(LEX) --prefix eval -o lexer.cc lexer.ll

diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index f35fa23a77a65f56b020a7bac53e3662412e22e3..0e3408b13ddc30ea5a3a84b324502a490f55719b 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2015-2019 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 %skeleton "lalr1.cc" /* -*- C++ -*- */
 %require "3.0.0"
 %defines
-%define parser_class_name {EvalParser}
+%define api.parser.class {EvalParser}
 %define api.prefix {eval}
 %define api.token.constructor
 %define api.value.type variant