Integrate DataQuery
Change-Id: I439374afe485baf08a4d5a1a02fd70d908bec9e1
diff --git a/src/parser_context.hpp b/src/parser_context.hpp
index 77357e7..98022db 100644
--- a/src/parser_context.hpp
+++ b/src/parser_context.hpp
@@ -6,9 +6,10 @@
*
*/
+#include "data_query.hpp"
#include "schema.hpp"
struct ParserContext {
- ParserContext(const Schema& schema, const dataPath_& curDir);
+ ParserContext(const Schema& schema, const std::shared_ptr<const DataQuery> dataQuery, const dataPath_& curDir);
schemaPath_ currentSchemaPath();
dataPath_ currentDataPath();
void clearPath();
@@ -18,16 +19,17 @@
const Schema& m_schema;
const dataPath_ m_curPathOrig;
+ const std::shared_ptr<const DataQuery> m_dataquery;
boost::optional<std::string> m_curModule;
std::string m_errorMsg;
std::string m_tmpListName;
bool m_topLevelModulePresent = false;
- std::set<std::string> m_tmpListKeys;
struct {
schemaPath_ m_location;
ModuleNodePair m_node;
} m_tmpListKeyLeafPath;
+ std::map<std::string, leaf_data_> m_tmpListKeys;
bool m_errorHandled = false;
bool m_completing = false;
std::set<std::string> m_suggestions;