Get rid of m_topLevelModulePresent
This is a remnant from the old-style path parsing, where I parsed
modules separately from node identifiers. Right now, I parse them at the
same time, so I don't need a flag signifying whether the top level
module is present. Also, the node_identifier_class code was a part of a
bug fixed in a later patch.
Change-Id: Ibc28f3871456f0944b73829e524dc379569e3b1e
diff --git a/src/parser_context.cpp b/src/parser_context.cpp
index 6b15cb9..723fbae 100644
--- a/src/parser_context.cpp
+++ b/src/parser_context.cpp
@@ -13,14 +13,11 @@
, m_dataquery(dataQuery)
, m_curPath(curDir)
{
- if (!currentDataPath().m_nodes.empty() && currentDataPath().m_nodes.at(0).m_prefix)
- m_topLevelModulePresent = true;
}
void ParserContext::clearPath()
{
m_curPath = dataPath_{Scope::Absolute, {}};
- m_topLevelModulePresent = false;
}
schemaPath_ ParserContext::currentSchemaPath()
@@ -42,12 +39,9 @@
void ParserContext::pushPathFragment(const dataNode_& node)
{
- auto pushNode = [this] (auto& where, const auto& what) {
+ auto pushNode = [] (auto& where, const auto& what) {
if (std::holds_alternative<nodeup_>(what.m_suffix)) {
where.m_nodes.pop_back();
- if (where.m_nodes.empty()) {
- m_topLevelModulePresent = false;
- }
} else {
where.m_nodes.push_back(what);
}
@@ -67,13 +61,9 @@
}
boost::get<schemaPath_>(m_curPath).m_nodes.push_back(node);
- if (currentSchemaPath().m_nodes.empty()) {
- m_topLevelModulePresent = false;
- }
}
void ParserContext::resetPath()
{
m_curPath = m_curPathOrig;
- m_topLevelModulePresent = !currentDataPath().m_nodes.empty() && currentDataPath().m_nodes.at(0).m_prefix;
}