Changeset 334

Timestamp:

03/01/15 01:41:23 (10 years ago)

Author:

Maciej Komosinski

Message:

More specific error messages on failed deserialization (and the resulting value becomes null)

Location:

cpp/frams

Files:

• _demos/loader_test_param.in (modified) (1 diff)
• param/param.cpp (modified) (1 diff)

cpp/frams/_demos/loader_test_param.in

@@ -54 +54 @@
 x2:@Serialized:[[100,^1],["abc"],[300,^2]]
 i3:5
+
+#invalid serialization examples ahead
+data:
+# ^3 references the object occuring after the reference - only back references are allowed (here: ^0=whole object or ^1=[1,2,3])
+x1:@Serialized:[[1,2,3],^3,[3,2,1]]
+# whitespaces are not allowed (except before numeric types, as a side effect of "whitespace+number" being valid number)
+x2:@Serialized:[1, 2, "3", { "key" : "value" }]

cpp/frams/param/param.cpp

@@ -604 +604 @@
                         after = e.deserialize(v + strlen(SERIALIZATION_PREFIX));
                         if ((after == NULL) || (*after))
+                                {
                                 FMprintf("ParamInterface", "set", FMLV_WARN, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
+                                e.setEmpty();
+                                }
                 }
                 else if ((after = e.parseNumber(v)) && (*after == 0)) //consumed the whole string