[#453] Update attempt

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 5c82130338e094eef021665469cbb8cf8df97532..8460435e262ce80d0f8860122057d97b9bbc2a5a 100644 (file)
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -112,7 +112,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 0a9e9f6737cefe7a96e7a9140d3c2a8037f8b5a1..a2eeb0f5785c34ce0bdb54ef3030b619ebf0407a 100644 (file)
--- a/src/bin/agent/agent_parser.yy
+++ b/src/bin/agent/agent_parser.yy
@@ -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 b3167d095c6f5cfb3659c1a0fef4e0f5d1b6b301..7931924b9f34f01fc37597556f3d5da798bc97a4 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -93,7 +93,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 1f6427306fb81248c5a27b653748ceedb57c59e3..954877c020ea87b722325bbebff4ff4e875a1de6 100644 (file)
--- a/src/bin/d2/d2_parser.yy
+++ b/src/bin/d2/d2_parser.yy
@@ -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 e0670b043ee0fef7dcffcd1b9faf0dfeca3c9b13..5084fbf9f65cf47b5bcc87c47d907f629edab5b3 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -143,7 +143,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 6b5b3ef7415e4f0f20a085cf9e374cd7537a8478..c1329e9cf5600febe0c2dc525382657e9a6687ad 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 f093aa320c226bc3e548eb92c9f87c2360db2a8b..19588ae2e576ae91eb4958b89edf95bfcbca1e07 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -142,7 +142,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 555eed87e78b02b1348dd0a7fd4965b1e02cf4ed..bc29b05dc6519464f579fafe4a03be0773337838 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -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 85e7fe1d2918d92deaecb2aa6e8c2efd835ae33a..42e57ec47e671c56194c7023929aaa0fc5be64dd 100644 (file)
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -115,7 +115,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 1bedbcc4b8823b338a0a4776f48be36316338aa2..da8125c2b130da50c6e837fe42eca109e3822eda 100644 (file)
--- a/src/bin/netconf/netconf_parser.yy
+++ b/src/bin/netconf/netconf_parser.yy
@@ -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 412306a19f32ca367dd9feba5154d5f71f216927..8426b6eb517605931eaf0a34e5d5851cb8e50cc3 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -112,7 +112,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 a60a93b0edf46a1d9617ca9e8e65ace81741b0bc..bba1128c9013545eee066869e00addcdb39ec300 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -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