Added more operators

Author: sea5kg

src/examples/example_operators.cpp

@@ -17,6 +17,9 @@ void example_operator_1() {
     WsjcppYamlCursor cur = yaml.getCursor();
     std::cout << "before : " << cur["test"].valStr() << std::endl;
     cur["test"] = "some new string";
-    std::cout << "after : " << cur["test"].valStr() << std::endl;
-    
+    std::cout << "after 1 : " << cur["test"].valStr() << std::endl;
+    cur["test"] = 111;
+    std::cout << "after 2 : " << cur["test"].valStr() << std::endl;
+    cur["test"] = true;
+    std::cout << "after 3 : " << cur["test"].valStr() << std::endl;
 }

src/main.cpp

@@ -55,5 +55,11 @@ int main(int argc, char* argv[]) {
         return -1;
     }
     std::cout << "Done." << std::endl;
+    std::string s = yaml["version"];
+    // int nVer = yaml["version"];
+    // bool bVer = yaml["version"];
+    std::cout << s << std::endl;
+
+    example_operator_1();
     return 0;
 }

src/wsjcpp_yaml.cpp

@@ -1160,29 +1160,23 @@ WsjcppYamlCursor &WsjcppYamlCursor::comment(const std::string& sComment) {
 
 // ---------------------------------------------------------------------
 
-std::string WsjcppYamlCursor::valStr() {
+std::string WsjcppYamlCursor::valStr() const {
     return m_pCurrentNode != nullptr ? m_pCurrentNode->getValue() : "";
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlCursor &WsjcppYamlCursor::val(const std::string &sValue) {
     if (m_pCurrentNode != nullptr) {
         m_pCurrentNode->setValue(sValue); // TODO reserch need or not add quotes
     }
     return *this;
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlCursor &WsjcppYamlCursor::val(const char *sValue) {
     this->val(std::string(sValue));
     return *this;
 }
 
-// ---------------------------------------------------------------------
-
-int WsjcppYamlCursor::valInt() {
+int WsjcppYamlCursor::valInt() const {
     if (m_pCurrentNode != nullptr) {
         std::string sValue = m_pCurrentNode->getValue();
         sValue = WsjcppYaml::toLower(sValue);
@@ -1195,18 +1189,14 @@ int WsjcppYamlCursor::valInt() {
     return 0;
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlCursor &WsjcppYamlCursor::val(int nValue) {
     if (m_pCurrentNode != nullptr) {
         m_pCurrentNode->setValue(std::to_string(nValue));
     }
     return *this;
 }
 
-// ---------------------------------------------------------------------
-
-bool WsjcppYamlCursor::valBool() {
+bool WsjcppYamlCursor::valBool() const {
     if (m_pCurrentNode != nullptr) {
         std::string sValue = m_pCurrentNode->getValue();
         sValue = WsjcppYaml::toLower(sValue);
@@ -1222,39 +1212,47 @@ bool WsjcppYamlCursor::valBool() {
     return false;
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlCursor &WsjcppYamlCursor::val(bool bValue) {
     if (m_pCurrentNode != nullptr) {
         m_pCurrentNode->setValue((bValue ? "yes" : "no"));
     }
     return *this;
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlNode *WsjcppYamlCursor::node() {
     return m_pCurrentNode;
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlCursor WsjcppYamlCursor::operator[](int idx) const {
     if (m_pCurrentNode != nullptr && m_pCurrentNode->isArray() && idx < m_pCurrentNode->getLength() && idx >= 0) {
         return WsjcppYamlCursor(m_pCurrentNode->getElement(idx));
     }
     return WsjcppYamlCursor();
 }
 
-// ---------------------------------------------------------------------
-
 WsjcppYamlCursor WsjcppYamlCursor::operator[](const std::string &sName) const {
     if (m_pCurrentNode != nullptr && m_pCurrentNode->isMap() && m_pCurrentNode->hasElement(sName)) {
         return WsjcppYamlCursor(m_pCurrentNode->getElement(sName));
     }
     return WsjcppYamlCursor();
 }
 
+WsjcppYamlCursor& WsjcppYamlCursor::operator=(const char *sVal) {
+    return this->val(std::string(sVal));
+}
+
+WsjcppYamlCursor& WsjcppYamlCursor::operator=(const std::string &sVal) {
+    return this->val(sVal);
+}
+
+WsjcppYamlCursor& WsjcppYamlCursor::operator=(const int &nVal) {
+    return this->val(nVal);
+}
+
+WsjcppYamlCursor& WsjcppYamlCursor::operator=(const bool &bVal) {
+    return this->val(bVal);
+}
+
 // ---------------------------------------------------------------------
 // WsjcppYaml
 

src/wsjcpp_yaml.h

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <vector>
+#include <cstddef>
 #include <map>
 #include <stdio.h>
 #include <stdlib.h>
@@ -246,22 +247,30 @@ class WsjcppYamlCursor {
         WsjcppYamlCursor &comment(const std::string& sComment);
 
         // val
-        std::string valStr();
+        std::string valStr() const;
         WsjcppYamlCursor &val(const std::string &sValue);
         WsjcppYamlCursor &val(const char *sValue);
-        int valInt();
+        int valInt() const;
         WsjcppYamlCursor &val(int nValue);
-        bool valBool();
+        bool valBool() const;
         WsjcppYamlCursor &val(bool bValue);
 
         // node
         WsjcppYamlNode *node();
 
+        std::string getCurrentNodePath();
+
+        explicit operator int() const { return valInt(); };
+        explicit operator bool() const { return valBool(); }
+        operator std::string() const { return valStr(); };
+
         WsjcppYamlCursor operator[](int idx) const;
         WsjcppYamlCursor operator[](const std::string &sName) const;
-        WsjcppYamlCursor& operator=(const std::string &sVal) noexcept {
-            return this->val(sVal);
-        }
+
+        WsjcppYamlCursor& operator=(const char *sVal);
+        WsjcppYamlCursor& operator=(const std::string &sVal);
+        WsjcppYamlCursor& operator=(const int &nVal);
+        WsjcppYamlCursor& operator=(const bool &bVal);
 
     private:
         std::string TAG;