Add support for leaflist
Change-Id: Idcb529f85240a32e84d82934c81fcf0c3451f94e
diff --git a/src/path_parser.hpp b/src/path_parser.hpp
index 15655d7..ecd3bd7 100644
--- a/src/path_parser.hpp
+++ b/src/path_parser.hpp
@@ -17,6 +17,7 @@
x3::rule<writable_leaf_path_class, dataPath_> const writableLeafPath = "writableLeafPath";
x3::rule<presenceContainerPath_class, dataPath_> const presenceContainerPath = "presenceContainerPath";
x3::rule<listInstancePath_class, dataPath_> const listInstancePath = "listInstancePath";
+x3::rule<leafListElementPath_class, dataPath_> const leafListElementPath = "leafListElementPath";
x3::rule<initializePath_class, x3::unused_type> const initializePath = "initializePath";
x3::rule<trailingSlash_class, TrailingSlash> const trailingSlash = "trailingSlash";
x3::rule<absoluteStart_class, Scope> const absoluteStart = "absoluteStart";
@@ -26,6 +27,7 @@
x3::rule<createKeySuggestions_class, x3::unused_type> const createKeySuggestions = "createKeySuggestions";
x3::rule<createValueSuggestions_class, x3::unused_type> const createValueSuggestions = "createValueSuggestions";
x3::rule<suggestKeysEnd_class, x3::unused_type> const suggestKeysEnd = "suggestKeysEnd";
+x3::rule<class leafListValue_class, leaf_data_> const leafListValue = "leafListValue";
enum class NodeParserMode {
CompleteDataNode,
@@ -56,6 +58,7 @@
using type = dataNode_;
};
+
template <NodeParserMode PARSER_MODE>
struct NodeParser : x3::parser<NodeParser<PARSER_MODE>> {
using attribute_type = typename ModeToAttribute<PARSER_MODE>::type;
@@ -113,9 +116,16 @@
}
parserContext.m_suggestions.emplace(Completion{parseString, "[", Completion::WhenToAdd::IfFullMatch});
break;
+ case yang::NodeTypes::LeafList:
+ if constexpr (std::is_same<attribute_type, schemaNode_>()) {
+ out.m_suffix = leafList_{child.second};
+ } else {
+ out.m_suffix = leafListElement_{child.second, {}};
+ }
+ parserContext.m_suggestions.emplace(Completion{parseString, "[", Completion::WhenToAdd::IfFullMatch});
+ break;
case yang::NodeTypes::Action:
case yang::NodeTypes::AnyXml:
- case yang::NodeTypes::LeafList:
case yang::NodeTypes::Notification:
case yang::NodeTypes::Rpc:
continue;
@@ -172,6 +182,25 @@
}
}
}
+
+ if (attr.m_suffix.type() == typeid(leafListElement_)) {
+ parserContext.m_tmpListKeyLeafPath.m_location = parserContext.currentSchemaPath();
+ ModuleNodePair node{attr.m_prefix.flat_map([](const auto& it) {
+ return boost::optional<std::string>{it.m_name};
+ }),
+ boost::get<leafListElement_>(attr.m_suffix).m_name};
+ parserContext.m_tmpListKeyLeafPath.m_node = node;
+ res = leafListValue.parse(begin, end, ctx, rctx, boost::get<leafListElement_>(attr.m_suffix).m_value);
+
+ if (!res) {
+ if constexpr (PARSER_MODE == NodeParserMode::IncompleteDataNode) {
+ res = true;
+ attr.m_suffix = leafList_{boost::get<leafListElement_>(attr.m_suffix).m_name};
+ } else {
+ begin = saveIter;
+ }
+ }
+ }
}
if (res) {
@@ -189,7 +218,7 @@
using schemaNode = NodeParser<NodeParserMode::SchemaNode>;
using dataNode = NodeParser<NodeParserMode::CompleteDataNode>;
-using dataNodeAllowList = NodeParser<NodeParserMode::IncompleteDataNode>;
+using incompleteDataNode = NodeParser<NodeParserMode::IncompleteDataNode>;
using pathCompletions = NodeParser<NodeParserMode::CompletionsOnly>;
using AnyPath = boost::variant<schemaPath_, dataPath_>;
@@ -245,7 +274,7 @@
if constexpr (PARSER_MODE == PathParserMode::DataPathListEnd || PARSER_MODE == PathParserMode::AnyPath) {
if (!res || !pathEnd.parse(begin, end, ctx, rctx, x3::unused)) {
dataNode_ attrNodeList;
- res = dataNodeAllowList{m_filterFunction}.parse(begin, end, ctx, rctx, attrNodeList);
+ res = incompleteDataNode{m_filterFunction}.parse(begin, end, ctx, rctx, attrNodeList);
if (res) {
attrData.m_nodes.push_back(attrNodeList);
// If the trailing slash matches, no more nodes are parsed.
@@ -295,6 +324,22 @@
#pragma GCC diagnostic ignored "-Woverloaded-shift-op-parentheses"
#endif
+struct SuggestLeafListEnd : x3::parser<SuggestLeafListEnd> {
+ using attribute_type = x3::unused_type;
+ template <typename It, typename Ctx, typename RCtx, typename Attr>
+ bool parse(It& begin, It, Ctx const& ctx, RCtx&, Attr&) const
+ {
+ auto& parserContext = x3::get<parser_context_tag>(ctx);
+ parserContext.m_completionIterator = begin;
+ parserContext.m_suggestions = {Completion{"]"}};
+
+ return true;
+ }
+} const suggestLeafListEnd;
+
+auto const leafListValue_def =
+ '[' >> leaf_data >> suggestLeafListEnd >> ']';
+
auto const rest =
x3::omit[x3::no_skip[+(x3::char_ - '/' - space_separator)]];
@@ -344,6 +389,9 @@
auto const listInstancePath_def =
dataPath;
+auto const leafListElementPath_def =
+ dataPath;
+
// A "nothing" parser, which is used to indicate we tried to parse a path
auto const initializePath_def =
x3::eps;
@@ -360,9 +408,11 @@
BOOST_SPIRIT_DEFINE(writableLeafPath)
BOOST_SPIRIT_DEFINE(presenceContainerPath)
BOOST_SPIRIT_DEFINE(listInstancePath)
+BOOST_SPIRIT_DEFINE(leafListElementPath)
BOOST_SPIRIT_DEFINE(initializePath)
BOOST_SPIRIT_DEFINE(createKeySuggestions)
BOOST_SPIRIT_DEFINE(createValueSuggestions)
BOOST_SPIRIT_DEFINE(suggestKeysEnd)
+BOOST_SPIRIT_DEFINE(leafListValue)
BOOST_SPIRIT_DEFINE(absoluteStart)
BOOST_SPIRIT_DEFINE(trailingSlash)