[5014_phase2] Added Element position

src/bin/dhcp6/parser_context.cc

@@ -85,6 +85,15 @@ Parser6Context::fatal (const std::string& what)
     isc_throw(Dhcp6ParseError, what);
 }
 
+isc::data::Element::Position
+Parser6Context::loc2pos(isc::dhcp::location& loc)
+{
+    const std::string& file = *loc.begin.filename;
+    const uint32_t line = loc.begin.line;
+    const uint32_t pos = loc.begin.column;
+    return (isc::data::Element::Position(file, line, pos));
+}
+
 void
 Parser6Context::enter(const ParserContext& ctx)
 {

src/bin/dhcp6/parser_context.h

@@ -92,6 +92,12 @@ public:
     /// Used by YY_FATAL_ERROR macro so required to be static.
     static void fatal(const std::string& what);
 
+    /// @brief Convert position
+    ///
+    /// Convert a bison location into an element position
+    /// (take the begin, the end is lost)
+    isc::data::Element::Position loc2pos(isc::dhcp::location& loc);
+
     /// @brief Defines syntactic contexts for lexical tie-ins
     typedef enum {
         /// at toplevel

src/bin/dhcp6/tests/kea_controller_unittest.cc

@@ -389,7 +389,7 @@ TEST_F(JSONFileBackendTest, recursiveInclude) {
         "}";
     string include = "\"eth\", <?include \"" + string(TEST_INCLUDE) + "\"?>";
     string msg = "configuration error using file '" + string(TEST_FILE) +
-	"': Too many nested include.";
+        "': Too many nested include.";
 
     writeFile(TEST_FILE, config_recursive_include);
     writeFile(TEST_INCLUDE, include);