commit 0b76a04af9ab8ff08818604cd3f3897c9465c021
author Václav Kubernát <kubervac@fit.cvut.cz> Wed May 16 20:16:47 2018 +0200
committer Václav Kubernát <kubervac@fit.cvut.cz> Wed May 16 20:17:54 2018 +0200
tree 31f41fec9f42c6db374da77ec0f71b75f18d5dd2
parent 0a2a2e89c4dcedd4de10b8dfd8ffab66f3faace3

unify m_name member variable

Change-Id: I75ce562548463faed416cc0ff5ebb5f70242288b

src/ast.cpp

diff --git a/src/ast.cpp b/src/ast.cpp
index 9b1210c..28b37e9 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -21,14 +21,14 @@
 }
 
 listElement_::listElement_(const std::string& listName, const std::map<std::string, std::string>& keys)
-    : m_listName(listName)
+    : m_name(listName)
     , m_keys(keys)
 {
 }
 
 bool listElement_::operator==(const listElement_& b) const
 {
-    return (this->m_listName == b.m_listName && this->m_keys == b.m_keys);
+    return (this->m_name == b.m_name && this->m_keys == b.m_keys);
 }
 
 bool path_::operator==(const path_& b) const

src/ast.hpp

diff --git a/src/ast.hpp b/src/ast.hpp
index 26d93a6..8e71476 100644
--- a/src/ast.hpp
+++ b/src/ast.hpp
@@ -57,7 +57,7 @@
 
     bool operator==(const listElement_& b) const;
 
-    std::string m_listName;
+    std::string m_name;
     std::map<std::string, std::string> m_keys;
 };
 
@@ -73,9 +73,7 @@
     path_ m_path;
 };
 
-
-
 BOOST_FUSION_ADAPT_STRUCT(container_, m_name)
-BOOST_FUSION_ADAPT_STRUCT(listElement_, m_listName, m_keys)
+BOOST_FUSION_ADAPT_STRUCT(listElement_, m_name, m_keys)
 BOOST_FUSION_ADAPT_STRUCT(path_, m_nodes)
 BOOST_FUSION_ADAPT_STRUCT(cd_, m_path)

src/ast_handlers.hpp

diff --git a/src/ast_handlers.hpp b/src/ast_handlers.hpp
index b0d27aa..139bb5c 100644
--- a/src/ast_handlers.hpp
+++ b/src/ast_handlers.hpp
@@ -93,7 +93,7 @@
     void on_success(Iterator const&, Iterator const&, T& ast, Context const& context)
     {
         auto& parserContext = x3::get<parser_context_tag>(context);
-        parserContext.m_curPath = joinPaths(parserContext.m_curPath, ast.m_listName);
+        parserContext.m_curPath = joinPaths(parserContext.m_curPath, ast.m_name);
     }
 
     template <typename Iterator, typename Exception, typename Context>