rename some of the classes
CParser is now just parser. CTree is now Schema. The namespace "schema" is
now called "yang".
Change-Id: Ief9c22fb6a7633b80010d355f9582e313e818d45
diff --git a/src/ast_handlers.hpp b/src/ast_handlers.hpp
index ce8a196..0c7f1c3 100644
--- a/src/ast_handlers.hpp
+++ b/src/ast_handlers.hpp
@@ -8,20 +8,20 @@
#pragma once
-#include "CTree.hpp"
#include "parser_context.hpp"
+#include "schema.hpp"
struct keyValue_class {
template <typename T, typename Iterator, typename Context>
void on_success(Iterator const&, Iterator const&, T& ast, Context const& context)
{
auto& parserContext = x3::get<parser_context_tag>(context);
- const CTree& tree = parserContext.m_tree;
+ const Schema& schema = parserContext.m_schema;
if (parserContext.m_tmpListKeys.find(ast.first) != parserContext.m_tmpListKeys.end()) {
_pass(context) = false;
parserContext.m_errorMsg = "Key \"" + ast.first + "\" was entered more than once.";
- } else if (tree.listHasKey(parserContext.m_curPath, parserContext.m_tmpListName, ast.first)) {
+ } else if (schema.listHasKey(parserContext.m_curPath, parserContext.m_tmpListName, ast.first)) {
parserContext.m_tmpListKeys.insert(ast.first);
} else {
_pass(context) = false;
@@ -36,9 +36,9 @@
void on_success(Iterator const&, Iterator const&, T& ast, Context const& context)
{
auto& parserContext = x3::get<parser_context_tag>(context);
- const CTree& tree = parserContext.m_tree;
+ const Schema& schema = parserContext.m_schema;
- if (tree.isList(parserContext.m_curPath, ast)) {
+ if (schema.isList(parserContext.m_curPath, ast)) {
parserContext.m_tmpListName = ast;
} else {
_pass(context) = false;
@@ -51,9 +51,9 @@
void on_success(Iterator const&, Iterator const&, T& ast, Context const& context)
{
auto& parserContext = x3::get<parser_context_tag>(context);
- const CTree& tree = parserContext.m_tree;
+ const Schema& schema = parserContext.m_schema;
- const auto& keysNeeded = tree.listKeys(parserContext.m_curPath, parserContext.m_tmpListName);
+ const auto& keysNeeded = schema.listKeys(parserContext.m_curPath, parserContext.m_tmpListName);
std::set<std::string> keysSupplied;
for (const auto& it : ast)
keysSupplied.insert(it.first);
@@ -119,9 +119,9 @@
void on_success(Iterator const&, Iterator const&, T& ast, Context const& context)
{
auto& parserContext = x3::get<parser_context_tag>(context);
- const auto& tree = parserContext.m_tree;
+ const auto& schema = parserContext.m_schema;
- if (tree.isContainer(parserContext.m_curPath, ast.m_name)) {
+ if (schema.isContainer(parserContext.m_curPath, ast.m_name)) {
parserContext.m_curPath.m_nodes.push_back(ast);
} else {
_pass(context) = false;