Made persistent types more explicit.

Source/DFPSR/persistent/atomic/PersistentBoolean.h

@@ -29,8 +29,8 @@
 namespace dsr {
 
 class PersistentBoolean : public Persistent {
-PERSISTENT_DECLARATION(PersistentBoolean)
 public:
+	PERSISTENT_DECLARATION(PersistentBoolean)
 	bool value;
 public:
 	PersistentBoolean() : value(0) {}

Source/DFPSR/persistent/atomic/PersistentColor.h

@@ -30,8 +30,8 @@
 namespace dsr {
 
 class PersistentColor : public Persistent {
-PERSISTENT_DECLARATION(PersistentColor)
 public:
+	PERSISTENT_DECLARATION(PersistentColor)
 	ColorRgbI32 value;
 public:
 	PersistentColor() : value(0, 0, 0) {}

Source/DFPSR/persistent/atomic/PersistentInteger.h

@@ -29,8 +29,8 @@
 namespace dsr {
 
 class PersistentInteger : public Persistent {
-PERSISTENT_DECLARATION(PersistentInteger)
 public:
+	PERSISTENT_DECLARATION(PersistentInteger)
 	int64_t value;
 public:
 	PersistentInteger() : value(0) {}

Source/DFPSR/persistent/atomic/PersistentString.cpp

@@ -27,6 +27,12 @@ using namespace dsr;
 
 PERSISTENT_DEFINITION(PersistentString)
 
+PersistentString PersistentString::unmangled(const ReadableString &text) {
+	PersistentString result;
+	result.value = text;
+	return result;
+}
+
 bool PersistentString::assignValue(const ReadableString &text) {
 	this->value = string_unmangleQuote(text);
 	return true;

Source/DFPSR/persistent/atomic/PersistentString.h

@@ -29,12 +29,13 @@
 namespace dsr {
 
 class PersistentString : public Persistent {
-PERSISTENT_DECLARATION(PersistentString)
 public:
+	PERSISTENT_DECLARATION(PersistentString)
 	String value;
 public:
 	PersistentString() : value("") {}
-	explicit PersistentString(String text) : value(text) {}
+	// Because the constructor from text is used for serialization, an explicit constructor must be used to avoid mangling
+	static PersistentString unmangled(const ReadableString &text);
 public:
 	virtual bool assignValue(const ReadableString &text) override;
 	virtual String& toStreamIndented(String& out, const ReadableString& indentation) const override;

Source/test/tests/PersistentTest.cpp

@@ -11,7 +11,7 @@ public:
 	PersistentString b;
 public:
 	MyClass() {}
-	MyClass(int a, const String &b) : a(a), b(b) {}
+	MyClass(int a, const String &b) : a(a), b(PersistentString::unmangled(b)) {}
 public:
 	void declareAttributes(StructureDefinition &target) const override {
 		target.declareAttribute(U"a");
@@ -154,7 +154,6 @@ START_TEST(Persistent)
 	tree.addChild(std::make_shared<MySubClass>(34, U"foo", 56, 78));
 	second->addChild(std::make_shared<MyClass>(3, U"third"));
 	ASSERT_MATCH(tree.toString(), exampleThree);
-	//printText(tree.toString(), U"\n");
 
 	// Tree structure from text
 	std::shared_ptr<Persistent> treeCopy = createPersistentClassFromText(exampleThree);