From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 10 Nov 2016 23:03:02 +0000 (+0900)
Subject: [5014] grammar for Logging object added.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e96e9c96e1dee05c9f58902d0a7cdd08e2ffcb3;p=thirdparty%2Fkea.git

[5014] grammar for Logging object added.
---

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index 009ebce92e..67282f288b 100644
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -134,7 +134,7 @@ JSONString                              \"{JSONStringCharacter}*\"
 \"Logging\" { return isc::dhcp::Dhcp6Parser::make_LOGGING(loc); }
 \"loggers\" { return isc::dhcp::Dhcp6Parser::make_LOGGERS(loc); }
 \"output_options\" { return isc::dhcp::Dhcp6Parser::make_OUTPUT_OPTIONS(loc); }
-\"output\" { return isc::dhcp::Dhcp6Parser::make_OUTPUT_OPTIONS(loc); }
+\"output\" { return isc::dhcp::Dhcp6Parser::make_OUTPUT(loc); }
 \"debuglevel\" { return isc::dhcp::Dhcp6Parser::make_DEBUGLEVEL(loc); }
 \"severity\" { return isc::dhcp::Dhcp6Parser::make_SEVERITY(loc); }
 
diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 51d37255a6..899aec3b5c 100644
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -258,6 +258,8 @@ pool_params: pool_param
 pool_param: POOL COLON STRING
 | option_data_list;
 
+// --- end of pools definition -------------------------------
+
 dhcp6_object: DHCP6 COLON LCURLY_BRACKET {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -269,7 +271,61 @@ dhcp6_object: DHCP6 COLON LCURLY_BRACKET {
     // for it.
 };
 
-logging_object: LOGGING COLON map;
+// --- logging entry -----------------------------------------
+
+// This defines the top level "Logging" object. It parses
+// the following "Logging": { ... }. The ... is defined
+// by logging_params
+logging_object: LOGGING COLON LCURLY_BRACKET {
+
+} logging_params RCURLY_BRACKET {
+
+};
+
+// This defines the list of allowed parameters that may appear
+// in the top-level Logging object. It can either be a single
+// parameter or several parameters separated by commas.
+logging_params: logging_param
+| logging_params COMMA logging_param;
+
+// There's currently only one parameter defined, which is "loggers".
+logging_param: loggers;
+
+// "loggers", the only parameter currently defined in "Logging" object,
+// is "Loggers": [ ... ].
+loggers: LOGGERS COLON LSQUARE_BRACKET loggers_entries RSQUARE_BRACKET;
+
+// These are the parameters allowed in loggers: either one logger
+// entry or multiple entries separate by commas.
+loggers_entries: logger_entry
+| loggers_entries COMMA logger_entry;
+
+// This defines a single entry defined in loggers in Logging.
+logger_entry: LCURLY_BRACKET logger_params RCURLY_BRACKET;
+
+logger_params: logger_param
+| logger_params COMMA logger_param;
+
+logger_param: NAME COLON STRING
+| output_options_list
+| debuglevel
+| severity
+;
+
+debuglevel: DEBUGLEVEL COLON INTEGER;
+severity: SEVERITY COLON STRING;
+
+output_options_list: OUTPUT_OPTIONS COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET;
+
+output_options_list_content: output_entry
+| output_options_list_content COMMA output_entry;
+
+output_entry: LCURLY_BRACKET output_params RCURLY_BRACKET;
+
+output_params: output_param
+| output_params COMMA output_param;
+
+output_param: OUTPUT COLON STRING;
 
 // This represents a single top level entry, e.g. Dhcp6 or DhcpDdns.
 global_object: dhcp6_object