[3543] Checkpoint: lexer typo

diff --git a/src/bin/d2/d2_controller.h b/src/bin/d2/d2_controller.h
index 0c0fcb3e00a9af7fd3d00d630db08092da5b2d3b..7911bad525b2e0d793c1ae20df4c4906eede8e6a 100644 (file)
--- a/src/bin/d2/d2_controller.h
+++ b/src/bin/d2/d2_controller.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-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
@@ -68,6 +68,12 @@ private:
     /// @throw BadValue if the file is empty
     virtual isc::data::ConstElementPtr parseFile(const std::string& file_name);
 
+    /// @brief Register commands.
+    void registerCommands();
+
+    /// @brief Deregister commands.
+    void deregisterCommands();
+
     /// @brief Constructor is declared private to maintain the integrity of
     /// the singleton instance.
     D2Controller();

diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc
index ff5ca19023b49de14a730804a6787edef86fdb04..adb0b01fd97eab783b84187a8f04c51aab186f18 100644 (file)
--- a/src/bin/d2/d2_lexer.cc
+++ b/src/bin/d2/d2_lexer.cc
@@ -1930,22 +1930,25 @@ YY_RULE_SETUP
         return isc::d2::D2Parser::make_CONTROL_SOCKET(driver.loc_);
     default:
         return isc::d2::D2Parser::make_STRING("control-socket", driver.loc_);
+    }
 }
 
 \"socket-type\" {
     switch(driver.ctx_) {
-    case isc::d2::D2ParserContext::CONTROL_SOCKET
+    case isc::d2::D2ParserContext::CONTROL_SOCKET:
         return isc::d2::D2Parser::make_SOCKET_TYPE(driver.loc_);
     default:
         return isc::d2::D2Parser::make_STRING("socket-type", driver.loc_);
+    }
 }
 
 \"socket-name\" {
     switch(driver.ctx_) {
-    case isc::d2::D2ParserContext::CONTROL_SOCKET
+    case isc::d2::D2ParserContext::CONTROL_SOCKET:
         return isc::d2::D2Parser::make_SOCKET_NAME(driver.loc_);
     default:
         return isc::d2::D2Parser::make_STRING("socket-name", driver.loc_);
+    }
 }
 
 

diff --git a/src/bin/d2/d2_lexer.ll b/src/bin/d2/d2_lexer.ll
index a89a581407ab930a480f84e8011b96017e0ce65e..ce5262d3dbd4f325f6fee51ac114996ce50e3116 100644 (file)
--- a/src/bin/d2/d2_lexer.ll
+++ b/src/bin/d2/d2_lexer.ll
@@ -396,22 +396,25 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
         return isc::d2::D2Parser::make_CONTROL_SOCKET(driver.loc_);
     default:
         return isc::d2::D2Parser::make_STRING("control-socket", driver.loc_);
+    }
 }
 
 \"socket-type\" {
     switch(driver.ctx_) {
-    case isc::d2::D2ParserContext::CONTROL_SOCKET
+    case isc::d2::D2ParserContext::CONTROL_SOCKET:
         return isc::d2::D2Parser::make_SOCKET_TYPE(driver.loc_);
     default:
         return isc::d2::D2Parser::make_STRING("socket-type", driver.loc_);
+    }
 }
 
 \"socket-name\" {
     switch(driver.ctx_) {
-    case isc::d2::D2ParserContext::CONTROL_SOCKET
+    case isc::d2::D2ParserContext::CONTROL_SOCKET:
         return isc::d2::D2Parser::make_SOCKET_NAME(driver.loc_);
     default:
         return isc::d2::D2Parser::make_STRING("socket-name", driver.loc_);
+    }
 }