[4204fd] Created a convert_option_name method

diff --git a/src/lib/eval/eval_context.cc b/src/lib/eval/eval_context.cc
index cb1ccee6f4b3a5c83345d0cce0821720b926ea94..10ee0c17cde817652bfd083b7d80ece923378be9 100644 (file)
--- a/src/lib/eval/eval_context.cc
+++ b/src/lib/eval/eval_context.cc
@@ -12,10 +12,13 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <dhcp/option.h>
+#include <dhcp/option_definition.h>
+#include <dhcp/libdhcp++.h>
 #include <eval/eval_context.h>
 #include <eval/parser.h>
 #include <exceptions/exceptions.h>
-#include <dhcp/option.h>
+#include <boost/lexical_cast.hpp>
 #include <fstream>
 
 EvalContext::EvalContext(const Option::Universe& option_universe)
@@ -78,3 +81,21 @@ EvalContext::convert_option_code(const std::string& option_code,
     return (static_cast<uint16_t>(n));
 }
 
+uint16_t
+EvalContext::convert_option_name(const std::string& option_name,
+                                 const isc::eval::location& loc)
+{
+    OptionDefinitionPtr option_def = LibDHCP::getOptionDef(option_universe_,
+                                                           option_name);
+    if (!option_def) {
+        const std::string global_space =
+            (option_universe_ == Option::V4) ? "dhcp4" : "dhcp6";
+        option_def = LibDHCP::getRuntimeOptionDef(global_space, option_name);
+    }
+
+    if (!option_def) {
+        error(loc, "option '" + option_name + "' is not defined");
+    }
+
+    return (option_def->getCode());
+}

diff --git a/src/lib/eval/eval_context.h b/src/lib/eval/eval_context.h
index fd763ce9570a04586e7b83fb6284dc2439f844b9..1b91d09367bd838d211d40cd14e7e50dc79f077f 100644 (file)
--- a/src/lib/eval/eval_context.h
+++ b/src/lib/eval/eval_context.h
@@ -95,6 +95,15 @@ public:
     uint16_t convert_option_code(const std::string& option_code,
                                  const isc::eval::location& loc);
 
+    /// @brief Option name convertion
+    ///
+    /// @param option_name the option name
+    /// @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);
+
     /// @brief Option universe: DHCPv4 or DHCPv6.
     ///
     /// This is used by the parser to determine which option definitions

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 668fd8a55cef600cf29367c300b0db0a344c3e44..bf14a9db844ad961a21db12f16f11efa4fca9180 100644 (file)
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -625,77 +625,61 @@ namespace isc { namespace eval {
   case 8:
 #line 109 "parser.yy" // lalr1.cc:859
     {
-                      try {
-                          // This may result in exception if the specified
-                          // name is unknown.
-                          TokenPtr opt(new TokenOption(yystack_[3].value.as< std::string > (),
-                                                       ctx.option_universe_,
-                                                       TokenOption::TEXTUAL));
-                          ctx.expression.push_back(opt);
-
-                      } catch (const isc::BadValue& ex) {
-                          ctx.error(yystack_[3].location, ex.what());
-                      }
+                      uint16_t numeric_code = ctx.convert_option_name(yystack_[3].value.as< std::string > (), yystack_[3].location);
+                      TokenPtr opt(new TokenOption(numeric_code, TokenOption::TEXTUAL));
+                      ctx.expression.push_back(opt);
                   }
-#line 641 "parser.cc" // lalr1.cc:859
+#line 633 "parser.cc" // lalr1.cc:859
     break;
 
   case 9:
-#line 123 "parser.yy" // lalr1.cc:859
+#line 115 "parser.yy" // lalr1.cc:859
     {
-                      try {
-                          // This may result in exception if the specified
-                          // name is unknown.
-                          TokenPtr opt(new TokenOption(yystack_[3].value.as< std::string > (),
-                                                       ctx.option_universe_,
-                                                       TokenOption::HEXADECIMAL));
-                          ctx.expression.push_back(opt);
-
-                      } catch (const isc::BadValue& ex) {
-                          ctx.error(yystack_[3].location, ex.what());
-                      }
+                      uint16_t numeric_code = ctx.convert_option_name(yystack_[3].value.as< std::string > (), yystack_[3].location);
+                      TokenPtr opt(new TokenOption(numeric_code, TokenOption::HEXADECIMAL));
+                      ctx.expression.push_back(opt);
                   }
-#line 659 "parser.cc" // lalr1.cc:859
+#line 643 "parser.cc" // lalr1.cc:859
     break;
 
   case 10:
-#line 137 "parser.yy" // lalr1.cc:859
+#line 121 "parser.yy" // lalr1.cc:859
     {
                       TokenPtr sub(new TokenSubstring());
                       ctx.expression.push_back(sub);
                   }
-#line 668 "parser.cc" // lalr1.cc:859
+#line 652 "parser.cc" // lalr1.cc:859
     break;
 
   case 12:
-#line 146 "parser.yy" // lalr1.cc:859
+#line 130 "parser.yy" // lalr1.cc:859
     {
                      TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ()));
                      ctx.expression.push_back(str);
                  }
-#line 677 "parser.cc" // lalr1.cc:859
+#line 661 "parser.cc" // lalr1.cc:859
     break;
 
   case 13:
-#line 153 "parser.yy" // lalr1.cc:859
+#line 137 "parser.yy" // lalr1.cc:859
     {
                       TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ()));
                       ctx.expression.push_back(str);
                   }
-#line 686 "parser.cc" // lalr1.cc:859
+#line 670 "parser.cc" // lalr1.cc:859
     break;
 
   case 14:
-#line 158 "parser.yy" // lalr1.cc:859
+#line 142 "parser.yy" // lalr1.cc:859
     {
                      TokenPtr str(new TokenString("all"));
                      ctx.expression.push_back(str);
                  }
-#line 695 "parser.cc" // lalr1.cc:859
+#line 679 "parser.cc" // lalr1.cc:859
     break;
 
 
-#line 699 "parser.cc" // lalr1.cc:859
+#line 683 "parser.cc" // lalr1.cc:859
             default:
               break;
             }
@@ -1043,8 +1027,8 @@ namespace isc { namespace eval {
   const unsigned char
   EvalParser::yyrline_[] =
   {
-       0,    76,    76,    79,    86,    91,    96,   102,   108,   122,
-     136,   141,   145,   152,   157
+       0,    76,    76,    79,    86,    91,    96,   102,   108,   114,
+     120,   125,   129,   136,   141
   };
 
   // Print the state stack on the debug stream.
@@ -1079,8 +1063,8 @@ namespace isc { namespace eval {
 
 #line 21 "parser.yy" // lalr1.cc:1167
 } } // isc::eval
-#line 1083 "parser.cc" // lalr1.cc:1167
-#line 164 "parser.yy" // lalr1.cc:1168
+#line 1067 "parser.cc" // lalr1.cc:1167
+#line 148 "parser.yy" // lalr1.cc:1168
 
 void
 isc::eval::EvalParser::error(const location_type& loc,

diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index c3463f3c592ee5e8b43fb8e5d3610d0dfe9190dd..eef5bbdfa7f3cc0e519c737218293bc0bcee2cc8 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -107,31 +107,15 @@ string_expr : STRING
                   }
             | OPTION "[" OPTION_NAME "]" DOT TEXT
                   {
-                      try {
-                          // This may result in exception if the specified
-                          // name is unknown.
-                          TokenPtr opt(new TokenOption($3,
-                                                       ctx.option_universe_,
-                                                       TokenOption::TEXTUAL));
-                          ctx.expression.push_back(opt);
-
-                      } catch (const isc::BadValue& ex) {
-                          ctx.error(@3, ex.what());
-                      }
+                      uint16_t numeric_code = ctx.convert_option_name($3, @3);
+                      TokenPtr opt(new TokenOption(numeric_code, TokenOption::TEXTUAL));
+                      ctx.expression.push_back(opt);
                   }
             | OPTION "[" OPTION_NAME "]" DOT HEX
                   {
-                      try {
-                          // This may result in exception if the specified
-                          // name is unknown.
-                          TokenPtr opt(new TokenOption($3,
-                                                       ctx.option_universe_,
-                                                       TokenOption::HEXADECIMAL));
-                          ctx.expression.push_back(opt);
-
-                      } catch (const isc::BadValue& ex) {
-                          ctx.error(@3, ex.what());
-                      }
+                      uint16_t numeric_code = ctx.convert_option_name($3, @3);
+                      TokenPtr opt(new TokenOption(numeric_code, TokenOption::HEXADECIMAL));
+                      ctx.expression.push_back(opt);
                   }
             | SUBSTRING "(" string_expr "," start_expr "," length_expr ")"
                   {