[5495] Checkpoint - doc/test to do

diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc
index 02b16745465f6b984a79412a23600c9446c41963..4ce4ea98cf15cbf6e7570d8b0cad1943617084e6 100644 (file)
--- a/src/bin/agent/agent_parser.cc
+++ b/src/bin/agent/agent_parser.cc
@@ -889,7 +889,7 @@ namespace isc { namespace agent {
   case 56:
 #line 294 "agent_parser.yy" // lalr1.cc:859
     {
-    ctx.enter(ctx.NO_KEYWORD);
+    ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 895 "agent_parser.cc" // lalr1.cc:859
     break;
@@ -924,7 +924,7 @@ namespace isc { namespace agent {
   case 58:
 #line 319 "agent_parser.yy" // lalr1.cc:859
     {
-    ctx.enter(ctx.NO_KEYWORD);
+    ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 930 "agent_parser.cc" // lalr1.cc:859
     break;

diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy
index 243a1006efb70ab1dd3ff31de64ad7d1797b6232..f02ee1bf90a0e26cfe69f71778fce7f77f8550a9 100644 (file)
--- a/src/bin/agent/agent_parser.yy
+++ b/src/bin/agent/agent_parser.yy
@@ -292,7 +292,7 @@ http_port: HTTP_PORT COLON INTEGER {
 };
 
 user_context: USER_CONTEXT {
-    ctx.enter(ctx.NO_KEYWORD);
+    ctx.enter(ctx.NO_KEYWORDS);
 } COLON map_value {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = $4;
@@ -317,7 +317,7 @@ user_context: USER_CONTEXT {
 };
 
 comment: COMMENT {
-    ctx.enter(ctx.NO_KEYWORD);
+    ctx.enter(ctx.NO_KEYWORDS);
 } COLON STRING {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(@1)));

diff --git a/src/bin/d2/tests/testdata/d2_cfg_tests.json b/src/bin/d2/tests/testdata/d2_cfg_tests.json
index bff88e763a05cfbeeb8197b25ffb3da5cd004cca..162fd0ffd9820c1a032bf782db3e8a73e1dc72cd 100644 (file)
--- a/src/bin/d2/tests/testdata/d2_cfg_tests.json
+++ b/src/bin/d2/tests/testdata/d2_cfg_tests.json
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018 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
@@ -839,7 +839,7 @@
 #----- D2.forward-ddns.dhcp-ddns.name tests
 ,{
 "description" : "D2.forward-ddns.dhcp-ddns, empty domain",
-"syntax-error" : "<string>:1.42: syntax error, unexpected }, expecting key-name or dns-servers or name or constant string",
+"syntax-error" : "<string>:1.42: syntax error, unexpected }",
 "data" :
     {
     "forward-ddns" :
@@ -1233,7 +1233,7 @@
 #----- D2.reverse-ddns.dhcp-ddns.name tests
 ,{
 "description" : "D2.reverse-ddns.dhcp-ddns, no name",
-"syntax-error" : "<string>:1.64: syntax error, unexpected }, expecting key-name or dns-servers or name or constant string",
+"syntax-error" : "<string>:1.64: syntax error, unexpected }",
 "data" :
     {
     "forward-ddns" : {},