Sync

PiPedalCommon/src/include/json.hpp

@@ -57,6 +57,17 @@
     }                  \
     ;
 
+
+#define JSON_GETTER_SETTER_REF(name)                               \
+    const decltype(name##_) &name() const { return name##_; } \
+    decltype(name##_) &name() { return name##_; } \
+    void name(const decltype(name##_) &value) { name##_ = value; }
+
+#define JSON_GETTER_SETTER(name)                            \
+    decltype(name##_) name() const { return name##_; } \
+    void name(decltype(name##_) value) { name##_ = value; }
+
+
 namespace pipedal
 {
     class JsonException: public std::runtime_error {

PiPedalCommon/src/json.cpp

@@ -562,8 +562,8 @@ void json_reader::skip_array()
 
 void json_reader::skip_object()
 {
-    int c;
     consume('{');
+    int c;
     while (true)
     {
         c = peek();
@@ -571,11 +571,11 @@ void json_reader::skip_object()
         if (c == '}')
         {
             c = get();
-            break;
+            return;
         }
         skip_string(); // name.
         consume(':');
-        skip_object();
+        skip_property();
         if (peek() == ',')
         {
             consume(',');