New dynamic object macros.

Author: eduard93

MDX2JSON/MDX2JSON.inc.xml

@@ -10,14 +10,21 @@
 #define Private '$$$Public
 
 #; For work with dynamic objects
-#define IsNewVersion $S($System.Version.GetMajor()>2015:"1",$System.Version.GetMajor()=2015:$S($System.Version.GetMinor()>=3:"1",1:"0"),1:"0")
-#define NewDynObj ##Expression($S($$$IsNewVersion=1:"##class(%Object).%New()",1:"##class(%ZEN.proxyObject).%New()"))
-#define NewDynObjList ##Expression($S($$$IsNewVersion=1:"##class(%Array).%New()",1:"##class(%ListOfObjects).%New()"))
-#define NewDynDTList ##Expression($S($$$IsNewVersion=1:"##class(%Array).%New()",1:"##class(%ListOfDataTypes).%New()"))
-#define Insert(%obj,%element) ##Expression($S($$$IsNewVersion=1:"do %obj.$push(%element)",1:"do %obj.Insert(%element)"))
-#define InsertQuoted(%obj,%element) ##Expression($S($$$IsNewVersion=1:"do %obj.$push("%element")",1:"do %obj.Insert("%element")"))
-#define DynObjToJSON(%obj) ##Expression($S($$$IsNewVersion=1:"do %obj.$toJSON()",1:"do %obj.%ToJSON()"))
-#define ListToJSON(%obj) ##Expression($S($$$IsNewVersion=1:"do %obj.$toJSON()",1:"do ##class(%ZEN.Auxiliary.jsonProvider).%ObjectToJSON(%obj)"))
+#if $$$comClassDefined("%Library.Array")
+	#define NewDynObj ##class(%Object).%New()
+	#define NewDynDTList ##class(%Array).%New()
+	#define NewDynObjList $$$NewDynDTList
+	#define Insert(%obj,%element) do %obj.$push(%element)
+	#define DynObjToJSON(%obj) do %obj.$toJSON()
+	#define ListToJSON(%obj) $$$DynObjToJSON(%obj)
+#else
+	#define NewDynObj ##class(%ZEN.proxyObject).%New()
+	#define NewDynDTList ##class(%ListOfDataTypes).%New()
+	#define NewDynObjList ##class(%ListOfObjects).%New()
+	#define Insert(%obj,%element) do %obj.Insert(%element)
+	#define DynObjToJSON(%obj) do %obj.%ToJSON()
+	#define ListToJSON(%obj) do ##class(%ZEN.Auxiliary.jsonProvider).%ObjectToJSON(%obj)
+#endif
 
 ]]></Routine>
 </Export>

MDX2JSON/Tests.cls.xml

@@ -109,14 +109,14 @@ do ##class(MDX2JSON.Tests).DynamicObjects()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 	
-	set obj = $$$NewDynObj
+	/*set obj = $$$NewDynObj
 	set obj.prop = "val"
 	$$$DynObjToJSON(obj)
-	
+	*/
 	set dtList = $$$NewDynDTList
 	s a=1
-	$$$Insert(dtList,a)
-	$$$ListToJSON(dtList)
+	$$$Insert(dtList,"a")
+	//$$$ListToJSON(dtList)
 ]]></Implementation>
 </Method>
 </Class>