porting JSON to the Dynamic::Var

Marian Krivos · Marian Krivos · commit dc42208ee8dd · 2012-05-02T04:22:16.000Z
added to JSON to gmake build
diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h
@@ -44,7 +44,7 @@
 
 #include "Poco/JSON/JSON.h"
 #include "Poco/SharedPtr.h"
-#include "Poco/DynamicAny.h"
+#include "Poco/Dynamic/Var.h"
 
 namespace Poco
 {
@@ -214,15 +214,18 @@ inline void Array::remove(unsigned int index)
 namespace Poco
 {
 
+namespace Dynamic
+{
+
 template <>
-class DynamicAnyHolderImpl<JSON::Array::Ptr>: public DynamicAnyHolder
+class VarHolderImpl<JSON::Array::Ptr>: public VarHolder
 {
 public:
-	DynamicAnyHolderImpl(const JSON::Array::Ptr& val): _val(val)
+	VarHolderImpl(const JSON::Array::Ptr& val): _val(val)
 	{
 	}
 
-	~DynamicAnyHolderImpl()
+	~VarHolderImpl()
 	{
 	}
 
@@ -313,9 +316,9 @@ class DynamicAnyHolderImpl<JSON::Array::Ptr>: public DynamicAnyHolder
 		throw BadCastException();
 	}
 
-	DynamicAnyHolder* clone() const
+	VarHolder* clone() const
 	{
-		return new DynamicAnyHolderImpl(_val);
+		return new VarHolderImpl(_val);
 	}
 
 	const JSON::Array::Ptr& value() const
@@ -352,6 +355,7 @@ class DynamicAnyHolderImpl<JSON::Array::Ptr>: public DynamicAnyHolder
 	JSON::Array::Ptr _val;
 };
 
+} // Namespace Dynamic
 } // Namespace Poco
 
 
diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h
@@ -45,7 +45,7 @@
 #include <sstream>
 
 #include "Poco/SharedPtr.h"
-#include "Poco/DynamicAny.h"
+#include "Poco/Dynamic/Var.h"
 
 #include "Poco/JSON/JSON.h"
 #include "Poco/JSON/Array.h"
@@ -216,15 +216,18 @@ inline void Object::remove(const std::string& key)
 namespace Poco
 {
 
+namespace Dynamic
+{
+
 template <>
-class DynamicAnyHolderImpl<JSON::Object::Ptr>: public DynamicAnyHolder
+class VarHolderImpl<JSON::Object::Ptr>: public VarHolder
 {
 public:
-	DynamicAnyHolderImpl(const JSON::Object::Ptr& val): _val(val)
+	VarHolderImpl(const JSON::Object::Ptr& val): _val(val)
 	{
 	}
 
-	~DynamicAnyHolderImpl()
+	~VarHolderImpl()
 	{
 	}
 
@@ -315,9 +318,9 @@ class DynamicAnyHolderImpl<JSON::Object::Ptr>: public DynamicAnyHolder
 		//TODO: ts = _val.timestamp();
 	}
 
-	DynamicAnyHolder* clone() const
+	VarHolderImpl* clone() const
 	{
-		return new DynamicAnyHolderImpl(_val);
+		return new VarHolderImpl(_val);
 	}
 
 	const JSON::Object::Ptr& value() const
@@ -354,6 +357,7 @@ class DynamicAnyHolderImpl<JSON::Object::Ptr>: public DynamicAnyHolder
 	JSON::Object::Ptr _val;
 };
 
+}
 }
 
 #endif // JSON_Object_INCLUDED
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ endif
 all: libexecs tests samples
 
 INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
-COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler PageCompiler/File2Page PDF CppParser
+COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler PageCompiler/File2Page PDF CppParser JSON
 
 cppunit:
 	$(MAKE) -C $(POCO_BASE)/CppUnit 
@@ -44,9 +44,9 @@ install: libexecs
 	find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
 	find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
 
-libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec PDF-libexec CppParser-libexec
-tests    =  Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests
-samples  =  Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples
+libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec PDF-libexec CppParser-libexec JSON-libexec
+tests    =  Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests JSON-tests
+samples  =  Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples JSON-samples
 
 .PHONY: $(libexecs)
 .PHONY: $(tests)
@@ -170,6 +170,15 @@ CppParser-libexec: Foundation-libexec
 CppParser-tests: CppParser-libexec 
 	$(MAKE) -C $(POCO_BASE)/CppParser/testsuite
 
+JSON-libexec:  Foundation-libexec
+	$(MAKE) -C $(POCO_BASE)/JSON
+
+#JSON-tests: JSON-libexec cppunit
+#	$(MAKE) -C $(POCO_BASE)/JSON/testsuite
+	
+#JSON-samples: JSON-libexec 
+#	$(MAKE) -C $(POCO_BASE)/JSON/samples
+
 
 clean:
 	$(MAKE) -C $(POCO_BASE)/Foundation clean
@@ -211,6 +220,9 @@ clean:
 	$(MAKE) -C $(POCO_BASE)/CppParser clean
 	$(MAKE) -C $(POCO_BASE)/CppParser/testsuite clean
 	$(MAKE) -C $(POCO_BASE)/CppUnit clean
+	$(MAKE) -C $(POCO_BASE)/JSON clean
+	$(MAKE) -C $(POCO_BASE)/JSON/testsuite clean
+	$(MAKE) -C $(POCO_BASE)/JSON/samples clean
 
 distclean:
 	rm -rf $(POCO_BUILD)/lib
diff --git a/components b/components
@@ -17,4 +17,4 @@ PDF
 CppParser
 PocoDoc
 ProGen
-
+JSON

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`
`45`	`45`	`#include "Poco/JSON/JSON.h"`
`46`	`46`	`#include "Poco/SharedPtr.h"`
`47`		`-#include "Poco/DynamicAny.h"`
	`47`	`+#include "Poco/Dynamic/Var.h"`
`48`	`48`
`49`	`49`	`namespace Poco`
`50`	`50`	`{`
`@@ -214,15 +214,18 @@ inline void Array::remove(unsigned int index)`
`214`	`214`	`namespace Poco`
`215`	`215`	`{`
`216`	`216`
	`217`	`+namespace Dynamic`
	`218`	`+{`
	`219`	`+`
`217`	`220`	`template <>`
`218`		`-class DynamicAnyHolderImpl<JSON::Array::Ptr>: public DynamicAnyHolder`
	`221`	`+class VarHolderImpl<JSON::Array::Ptr>: public VarHolder`
`219`	`222`	`{`
`220`	`223`	`public:`
`221`		`- DynamicAnyHolderImpl(const JSON::Array::Ptr& val): _val(val)`
	`224`	`+ VarHolderImpl(const JSON::Array::Ptr& val): _val(val)`
`222`	`225`	`{`
`223`	`226`	`}`
`224`	`227`
`225`		`- ~DynamicAnyHolderImpl()`
	`228`	`+ ~VarHolderImpl()`
`226`	`229`	`{`
`227`	`230`	`}`
`228`	`231`
`@@ -313,9 +316,9 @@ class DynamicAnyHolderImpl<JSON::Array::Ptr>: public DynamicAnyHolder`
`313`	`316`	`throw BadCastException();`
`314`	`317`	`}`
`315`	`318`
`316`		`- DynamicAnyHolder* clone() const`
	`319`	`+ VarHolder* clone() const`
`317`	`320`	`{`
`318`		`- return new DynamicAnyHolderImpl(_val);`
	`321`	`+ return new VarHolderImpl(_val);`
`319`	`322`	`}`
`320`	`323`
`321`	`324`	`const JSON::Array::Ptr& value() const`
`@@ -352,6 +355,7 @@ class DynamicAnyHolderImpl<JSON::Array::Ptr>: public DynamicAnyHolder`
`352`	`355`	`JSON::Array::Ptr _val;`
`353`	`356`	`};`
`354`	`357`
	`358`	`+} // Namespace Dynamic`
`355`	`359`	`} // Namespace Poco`
`356`	`360`
`357`	`361`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`#include <sstream>`
`46`	`46`
`47`	`47`	`#include "Poco/SharedPtr.h"`
`48`		`-#include "Poco/DynamicAny.h"`
	`48`	`+#include "Poco/Dynamic/Var.h"`
`49`	`49`
`50`	`50`	`#include "Poco/JSON/JSON.h"`
`51`	`51`	`#include "Poco/JSON/Array.h"`
`@@ -216,15 +216,18 @@ inline void Object::remove(const std::string& key)`
`216`	`216`	`namespace Poco`
`217`	`217`	`{`
`218`	`218`
	`219`	`+namespace Dynamic`
	`220`	`+{`
	`221`	`+`
`219`	`222`	`template <>`
`220`		`-class DynamicAnyHolderImpl<JSON::Object::Ptr>: public DynamicAnyHolder`
	`223`	`+class VarHolderImpl<JSON::Object::Ptr>: public VarHolder`
`221`	`224`	`{`
`222`	`225`	`public:`
`223`		`- DynamicAnyHolderImpl(const JSON::Object::Ptr& val): _val(val)`
	`226`	`+ VarHolderImpl(const JSON::Object::Ptr& val): _val(val)`
`224`	`227`	`{`
`225`	`228`	`}`
`226`	`229`
`227`		`- ~DynamicAnyHolderImpl()`
	`230`	`+ ~VarHolderImpl()`
`228`	`231`	`{`
`229`	`232`	`}`
`230`	`233`
`@@ -315,9 +318,9 @@ class DynamicAnyHolderImpl<JSON::Object::Ptr>: public DynamicAnyHolder`
`315`	`318`	`//TODO: ts = _val.timestamp();`
`316`	`319`	`}`
`317`	`320`
`318`		`- DynamicAnyHolder* clone() const`
	`321`	`+ VarHolderImpl* clone() const`
`319`	`322`	`{`
`320`		`- return new DynamicAnyHolderImpl(_val);`
	`323`	`+ return new VarHolderImpl(_val);`
`321`	`324`	`}`
`322`	`325`
`323`	`326`	`const JSON::Object::Ptr& value() const`
`@@ -354,6 +357,7 @@ class DynamicAnyHolderImpl<JSON::Object::Ptr>: public DynamicAnyHolder`
`354`	`357`	`JSON::Object::Ptr _val;`
`355`	`358`	`};`
`356`	`359`
	`360`	`+}`
`357`	`361`	`}`
`358`	`362`
`359`	`363`	`#endif // JSON_Object_INCLUDED`
-Original file line number
+Diff line change
 CppParser
 PocoDoc
 ProGen
+-
 +JSON