commit 0c90dd43bbd5a8009075a72f95897a8e60f299d0
author Václav Kubernát <kubernat@cesnet.cz> Tue Jan 18 00:07:29 2022 +0100
committer Václav Kubernát <kubernat@cesnet.cz> Tue Jan 18 11:15:54 2022 +0100
tree cafb2405cb25f7c03d08bd5a4b934bee6c87fb17
parent 97f6b60439d30fd9c1dedf6b1d172dda49a60987

yang-cli: Make parsing strict by default and add flag

Change-Id: I941b0c4c43c94804cc3e429d1ab00ca6f1ad402e

src/yang_access.cpp

diff --git a/src/yang_access.cpp b/src/yang_access.cpp
index b8631d5..0555616 100644
--- a/src/yang_access.cpp
+++ b/src/yang_access.cpp
@@ -312,14 +312,19 @@
     m_schema->enableFeature(module, feature);
 }
 
-void YangAccess::addDataFile(const std::string& path)
+void YangAccess::addDataFile(const std::string& path, const StrictDataParsing strict)
 {
     std::ifstream fs(path);
     char firstChar;
     fs >> firstChar;
 
     std::cout << "Parsing \"" << path << "\" as " << (firstChar == '{' ? "JSON" : "XML") << "...\n";
-    auto dataNode = lyd_parse_path(m_ctx.get(), path.c_str(), firstChar == '{' ? LYD_JSON : LYD_XML, LYD_OPT_DATA | LYD_OPT_DATA_NO_YANGLIB | LYD_OPT_TRUSTED);
+
+    auto parseFlags = LYD_OPT_DATA | LYD_OPT_DATA_NO_YANGLIB | LYD_OPT_TRUSTED;
+    if (strict == StrictDataParsing::Yes) {
+        parseFlags |= LYD_OPT_STRICT;
+    }
+    auto dataNode = lyd_parse_path(m_ctx.get(), path.c_str(), firstChar == '{' ? LYD_JSON : LYD_XML, parseFlags);
 
     if (!dataNode) {
         throw std::runtime_error("Supplied data file " + path + " couldn't be parsed.");