[#3378] Updated syntaxes

diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll
index 9a162f342c1398ff381cd81ac665479749a55135..4d740ea4eaa4477faa511023b62a564118966997 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.ll
+++ b/src/bin/dhcp4/dhcp4_lexer.ll
@@ -1566,7 +1566,6 @@ ControlCharacterFill            [^"\\]|\\["\\/bfnrtu]
 
 \"ip-address\" {
     switch(driver.ctx_) {
-    case isc::dhcp::Parser4Context::RELAY:
     case isc::dhcp::Parser4Context::RESERVATIONS:
     return isc::dhcp::Dhcp4Parser::make_IP_ADDRESS(driver.loc_);
     default:

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index a6a535f3473c06833924b19a138a66b4ed24739c..b1b3941885cbf1820ccca5ed95653ec017c79e99 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -195,6 +195,7 @@ using namespace std;
   POOL_ID "pool-id"
 
   RESERVATIONS "reservations"
+  IP_ADDRESS "ip-address"
   DUID "duid"
   HW_ADDRESS "hw-address"
   CIRCUIT_ID "circuit-id"
@@ -203,7 +204,6 @@ using namespace std;
   FLEX_ID "flex-id"
 
   RELAY "relay"
-  IP_ADDRESS "ip-address"
   IP_ADDRESSES "ip-addresses"
 
   HOOKS_LIBRARIES "hooks-libraries"
@@ -2333,17 +2333,6 @@ ip_address: IP_ADDRESS {
     ctx.leave();
 };
 
-ip_addresses: IP_ADDRESSES {
-    ctx.unique("ip-addresses", ctx.loc2pos(@1));
-    ElementPtr l(new ListElement(ctx.loc2pos(@1)));
-    ctx.stack_.back()->set("ip-addresses", l);
-    ctx.stack_.push_back(l);
-    ctx.enter(ctx.NO_KEYWORD);
-} COLON list_strings {
-    ctx.stack_.pop_back();
-    ctx.leave();
-};
-
 duid: DUID {
     ctx.unique("duid", ctx.loc2pos(@1));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2423,10 +2412,20 @@ relay: RELAY {
     ctx.leave();
 };
 
-relay_map: ip_address
-         | ip_addresses
+relay_map: ip_addresses
          ;
 
+ip_addresses: IP_ADDRESSES {
+    ctx.unique("ip-addresses", ctx.loc2pos(@1));
+    ElementPtr l(new ListElement(ctx.loc2pos(@1)));
+    ctx.stack_.back()->set("ip-addresses", l);
+    ctx.stack_.push_back(l);
+    ctx.enter(ctx.NO_KEYWORD);
+} COLON list_strings {
+    ctx.stack_.pop_back();
+    ctx.leave();
+};
+
 // --- end of relay definitions ------------------------------
 
 // --- client classes ----------------------------------------

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index 0710f2a010f257b82a2622f04a430a2b5a36c944..6762e6d6b5e8a02360b7f9aee94498eb3e602ca7 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -1908,15 +1908,6 @@ ControlCharacterFill            [^"\\]|\\["\\/bfnrtu]
     }
 }
 
-\"ip-address\" {
-    switch(driver.ctx_) {
-    case isc::dhcp::Parser6Context::RELAY:
-        return isc::dhcp::Dhcp6Parser::make_IP_ADDRESS(driver.loc_);
-    default:
-        return isc::dhcp::Dhcp6Parser::make_STRING("ip-address", driver.loc_);
-    }
-}
-
 \"hooks-libraries\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 76a932e6278a8ed7491d3aa01d3cce07f8ae1e35..c54ed4aa6098978b186a1541a029d13ea1bacae6 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -200,7 +200,6 @@ using namespace std;
   FLEX_ID "flex-id"
 
   RELAY "relay"
-  IP_ADDRESS "ip-address"
 
   HOOKS_LIBRARIES "hooks-libraries"
   LIBRARY "library"
@@ -2480,19 +2479,9 @@ relay: RELAY {
     ctx.leave();
 };
 
-relay_map: ip_address
-         | ip_addresses
+relay_map: ip_addresses
          ;
 
-ip_address: IP_ADDRESS {
-    ctx.unique("ip-address", ctx.loc2pos(@1));
-    ctx.enter(ctx.NO_KEYWORD);
-} COLON STRING {
-    ElementPtr addr(new StringElement($4, ctx.loc2pos(@4)));
-    ctx.stack_.back()->set("ip-address", addr);
-    ctx.leave();
-};
-
 // --- end of relay definitions ------------------------------
 
 // --- client classes ----------------------------------------