Split path_ into schemaPath_ and dataPath_
This change is necessary because different commands accept different
kinds of paths (for example "cd" only accepts a data path, on the other
hand "ls" doesn't care about data, so it accepts both). One option was to
create a new path struct for every command, but that could get quickly
out of control as new commands get added. The other option was define only
the data path and schema path and then change the commands' grammars, so
that they only accept the relevant paths, but in the end always return a
data path or a schema path.
Change-Id: I7668a446fbf674c7a5deae22d9aacdfb3da9b07e
diff --git a/src/ast_commands.hpp b/src/ast_commands.hpp
index a1c377b..91380e7 100644
--- a/src/ast_commands.hpp
+++ b/src/ast_commands.hpp
@@ -40,27 +40,27 @@
struct ls_ : x3::position_tagged {
bool operator==(const ls_& b) const;
std::vector<LsOption> m_options;
- boost::optional<path_> m_path;
+ boost::optional<dataPath_> m_path;
};
struct cd_ : x3::position_tagged {
bool operator==(const cd_& b) const;
- path_ m_path;
+ dataPath_ m_path;
};
struct create_ : x3::position_tagged {
bool operator==(const create_& b) const;
- path_ m_path;
+ dataPath_ m_path;
};
struct delete_ : x3::position_tagged {
bool operator==(const delete_& b) const;
- path_ m_path;
+ dataPath_ m_path;
};
struct set_ : x3::position_tagged {
bool operator==(const set_& b) const;
- path_ m_path;
+ dataPath_ m_path;
leaf_data_ m_data;
};
@@ -70,7 +70,7 @@
struct get_ : x3::position_tagged {
bool operator==(const get_& b) const;
- boost::optional<path_> m_path;
+ boost::optional<dataPath_> m_path;
};
using command_ = boost::variant<discard_, ls_, cd_, create_, delete_, set_, commit_, get_>;