commit 4c3d22f6275f2c20f6ea7fa46fcf66fd12355977
author Václav Kubernát <kubernat@cesnet.cz> Fri Jun 12 16:05:01 2020 +0200
committer Václav Kubernát <kubernat@cesnet.cz> Tue Jun 16 10:28:17 2020 +0200
tree 22b3ac9548b078862146ac0748db0051d166d532
parent 7e16769a06ea6a6d4444db74069e68d5a40125ce

Rework ls interpreter to use resolvePath

This has a side-effect that availableNodes is called with a dataPath_ if
ls had a dataPath_ originally. There is no difference, because first
thing availableNodes does is convert everything to dataPath_ anyway.

Change-Id: Iaffa53e4a19523d304c5477b84552be058eab5ba

src/interpreter.hpp

diff --git a/src/interpreter.hpp b/src/interpreter.hpp
index 67940c8..e008375 100644
--- a/src/interpreter.hpp
+++ b/src/interpreter.hpp
@@ -12,6 +12,7 @@
 #include "datastore_access.hpp"
 #include "parser.hpp"
 
+
 struct Interpreter : boost::static_visitor<void> {
     Interpreter(Parser& parser, DatastoreAccess& datastore);
 
@@ -32,10 +33,10 @@
     std::string buildTypeInfo(const std::string& path) const;
 
     template <typename PathType>
-    std::string toCanonicalPath(const boost::optional<PathType>& path) const;
+    boost::variant<dataPath_, schemaPath_, module_> toCanonicalPath(const boost::optional<PathType>& path) const;
 
     template <typename PathType>
-    std::string toCanonicalPath(const PathType& path) const;
+    boost::variant<dataPath_, schemaPath_, module_> toCanonicalPath(const PathType& path) const;
 
     Parser& m_parser;
     DatastoreAccess& m_datastore;