[4204fd] Renamed two context functions per Kea coding guidelines.

diff --git a/src/lib/eval/eval_context.cc b/src/lib/eval/eval_context.cc
index 2bdecfddf0995400e54ba34eba8cca59376127d5..6e27c88d894317a0808283bbf6807cca3bfdfd35 100644 (file)
--- a/src/lib/eval/eval_context.cc
+++ b/src/lib/eval/eval_context.cc
@@ -57,8 +57,8 @@ EvalContext::error (const std::string& what)
 }
 
 uint16_t
-EvalContext::convert_option_code(const std::string& option_code,
-                                 const isc::eval::location& loc)
+EvalContext::convertOptionCode(const std::string& option_code,
+                               const isc::eval::location& loc)
 {
     int n = 0;
     try {
@@ -82,8 +82,8 @@ EvalContext::convert_option_code(const std::string& option_code,
 }
 
 uint16_t
-EvalContext::convert_option_name(const std::string& option_name,
-                                 const isc::eval::location& loc)
+EvalContext::convertOptionName(const std::string& option_name,
+                               const isc::eval::location& loc)
 {
     OptionDefinitionPtr option_def = LibDHCP::getOptionDef(option_universe_,
                                                            option_name);

diff --git a/src/lib/eval/eval_context.h b/src/lib/eval/eval_context.h
index b4f2d8293ccae178686103ad42ca1e9c19ab565e..b3ece5d672cc49e0ad035a56f91e5def2e2abaa2 100644 (file)
--- a/src/lib/eval/eval_context.h
+++ b/src/lib/eval/eval_context.h
@@ -92,8 +92,8 @@ public:
     /// @result the option code
     /// @throw calls the syntax error function if the value is no in
     ///        the range 0..255 or 0..65535
-    uint16_t convert_option_code(const std::string& option_code,
-                                 const isc::eval::location& loc);
+    uint16_t convertOptionCode(const std::string& option_code,
+                               const isc::eval::location& loc);
 
     /// @brief Option name convertion
     ///
@@ -101,8 +101,8 @@ public:
     /// @param loc the location of the token
     /// @result the option code
     /// @throw calls the syntax error function if the name cannot be resolved
-    uint16_t convert_option_name(const std::string& option_name,
-                                 const isc::eval::location& loc);
+    uint16_t convertOptionName(const std::string& option_name,
+                               const isc::eval::location& loc);
 
  private:
     /// @brief Flag determining scanner debugging.

diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh
index 4af7b6938c3d89465b54c3f2318e8a4543c80852..8f859737487b5b2822c90a5f225ac4b3410477e0 100644 (file)
--- a/src/lib/eval/location.hh
+++ b/src/lib/eval/location.hh
@@ -1,4 +1,3 @@
-// Generated 20151125
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index b01fbba7d09bbd851d12510b2f66c6b88fbfcd03..34bd22a8e21c80f10bdfe48bdde5122c778f5a0a 100644 (file)
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -661,7 +661,7 @@ namespace isc { namespace eval {
   case 9:
 #line 114 "parser.yy" // lalr1.cc:859
     {
-                     yylhs.value.as< uint16_t > () = ctx.convert_option_code(yystack_[0].value.as< std::string > (), yystack_[0].location);
+                     yylhs.value.as< uint16_t > () = ctx.convertOptionCode(yystack_[0].value.as< std::string > (), yystack_[0].location);
                  }
 #line 667 "parser.cc" // lalr1.cc:859
     break;
@@ -669,7 +669,7 @@ namespace isc { namespace eval {
   case 10:
 #line 118 "parser.yy" // lalr1.cc:859
     {
-                     yylhs.value.as< uint16_t > () = ctx.convert_option_name(yystack_[0].value.as< std::string > (), yystack_[0].location);
+                     yylhs.value.as< uint16_t > () = ctx.convertOptionName(yystack_[0].value.as< std::string > (), yystack_[0].location);
                  }
 #line 675 "parser.cc" // lalr1.cc:859
     break;

diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index eef0de9920ee9e5cdbd936914e403e3de98c13b6..de4a96136cb4841acda22106579f228c09e70ece 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -112,11 +112,11 @@ string_expr : STRING
 
 option_code : INTEGER
                  {
-                     $$ = ctx.convert_option_code($1, @1);
+                     $$ = ctx.convertOptionCode($1, @1);
                  }
             | OPTION_NAME
                  {
-                     $$ = ctx.convert_option_name($1, @1);
+                     $$ = ctx.convertOptionName($1, @1);
                  }
             ;
 

diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh
index 66b9d8599bbf51481e23654c9d0e51a8eb3a0b3f..fe32a47ff2e16c5cbb24100e26cf39a21416972e 100644 (file)
--- a/src/lib/eval/position.hh
+++ b/src/lib/eval/position.hh
@@ -1,4 +1,3 @@
-// Generated 20151125
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh
index 847d20dbec1ae51810e6b0f63b031a9cbfca9b28..c1120dccb957090fb77d338f5bcbf07ebf90549e 100644 (file)
--- a/src/lib/eval/stack.hh
+++ b/src/lib/eval/stack.hh
@@ -1,4 +1,3 @@
-// Generated 20151125
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++