Trying to debug for F2.5

Author: LB--

Actions.cpp

@@ -4,8 +4,8 @@
 void Extension::LoadJSON(TCHAR const *JSON, int flags)
 {
 	json_settings settings = {0};
-	settings.settings = (flags ? json_relaxed_commas : 0);
-	char Error[128];
+	settings.settings = (flags ? json_enable_comments : 0);
+	char Error[json_error_max];
 #ifdef UNICODE
 	std::string json = UTF8fromUnicode(JSON);
 	if(json.empty())
@@ -69,3 +69,31 @@ void Extension::GotoRoot()
 {
 	current = root;
 }
+
+#include <sstream>
+void Extension::DebugWindow()
+{
+#ifdef UNICODE
+	std::wostringstream oss;
+#else
+	std::ostringstream oss;
+#endif
+	oss << _T("IsString:  ") << std::boolalpha << IsString()  << std::endl;
+	oss << _T("IsInteger: ") << std::boolalpha << IsInteger() << std::endl;
+	oss << _T("IsDouble:  ") << std::boolalpha << IsDouble()  << std::endl;
+	oss << _T("IsObject:  ") << std::boolalpha << IsObject()  << std::endl;
+	oss << _T("IsArray:   ") << std::boolalpha << IsArray()   << std::endl;
+	oss << _T("IsBoolean: ") << std::boolalpha << IsBoolean() << std::endl;
+	oss << _T("IsNull:    ") << std::boolalpha << IsNull()    << std::endl;
+	oss << _T("IsTrue:    ") << std::boolalpha << IsTrue()    << std::endl;
+	oss << std::endl;
+	oss << _T("GetError: ")     << GetError()     << std::endl;
+	oss << _T("GetString: ")    << GetString()    << std::endl;
+	oss << _T("GetInteger: ")   << GetInteger()   << std::endl;
+	oss << _T("GetLong: ")      << GetLong()      << std::endl;
+	oss << _T("GetFloat: ")     << GetFloat()     << std::endl;
+	oss << _T("GetDouble: ")    << GetDouble()    << std::endl;
+	oss << _T("GetNumValues: ") << GetNumValues() << std::endl;
+	oss << _T("GetBoolNum: ")   << GetBoolNum()   << std::endl;
+	MessageBox(NULL, oss.str().c_str(), _T("JSON Object Debug"), MB_OK);
+}

Ext.json

@@ -3,7 +3,7 @@
 	{
 		"Name": "JSON Object",
 		"Author": "LB",
-		"Copyright": "Copyright © 2013 LB-Stuff",
+		"Copyright": "Copyright © 2014 LB-Stuff",
 		"Comment": "Allows you to parse JSON files from strings, and in the future will allow you to modify and generate JSONs as strings.\nRequested by Rushino.\nThanks to Phi and ConceptGame for helping with debugging.",
 		"URL": "http://www.LB-Stuff.com/",
 		"Help": "Help/JSON Object/Help.chm",
@@ -22,6 +22,7 @@
 			[4, "Go to Root"]
 		],
 		"Separator",
+		[5, "Debug Window"],
 		[0, "Modification", true],
 		"Separator"
 	],
@@ -60,7 +61,7 @@
 			"Parameters":
 			[
 				["String", "JSON (not a file path, the actual JSON)"],
-				["Integer", "Flags (0 for none): currently only one: 1=relaxed commas"]
+				["Integer", "Flags (0 for none): currently only one: 1=enable comments"]
 			]
 		},
 		{	"Title": "Enter Object named (%0)",
@@ -78,6 +79,8 @@
 		{	"Title": "Go Up to Parent"
 		},
 		{	"Title": "Go to Root"
+		},
+		{	"Title": "Debug Window"
 		}
 	],
 	"Conditions":

Extension.cpp

@@ -30,6 +30,10 @@
  */
 Extension::Extension(RD *rd, SerializedED *SED, createObjectInfo *COB) : rd(rd), rh(rd->rHo.hoAdRunHeader), Runtime(rd)
 {
+	if(SDK->ActionFunctions.size() < 6)
+	{
+		MessageBox(NULL, _T("ActionFunctions vector too small!"), _T("JSON Object Debug"), MB_OK);
+	}
 	//Link all your action/condition/expression functions
 	//to their IDs to match the IDs in the JSON here.
 	LinkAction(0, LoadJSON);
@@ -38,6 +42,12 @@ Extension::Extension(RD *rd, SerializedED *SED, createObjectInfo *COB) : rd(rd),
 	LinkAction(3, GoUp);
 	LinkAction(4, GotoRoot);
 
+	LinkAction(5, DebugWindow);
+	if(!SDK->ActionFunctions[5])
+	{
+		MessageBox(NULL, _T("Function not linked after linking!"), _T("JSON Object Debug"), MB_OK);
+	}
+
 	LinkCondition(0, OnError);
 	LinkCondition(1, IsString);
 	LinkCondition(2, IsInteger);
@@ -186,17 +196,38 @@ bool Extension::Load(HANDLE File)
  * to let you know that the ID is unlinked, or you
  * may just want to use unlinked A/C/Es as a feature.
  */
+#include <sstream>
 void Extension::Action(int ID, RD *rd, long param1, long param2)
 {
+#ifdef UNICODE
+	std::wostringstream oss;
+#else
+	std::ostringstream oss;
+#endif
+	oss << _T("Unlinked Action, ID = ") << ID << std::endl;
+	MessageBox(NULL, oss.str().c_str(), _T("JSON Object Debug"), MB_OK);
 }
 
 long Extension::Condition(int ID, RD *rd, long param1, long param2)
 {
+#ifdef UNICODE
+	std::wostringstream oss;
+#else
+	std::ostringstream oss;
+#endif
+	oss << _T("Unlinked Condition, ID = ") << ID << std::endl;
+	MessageBox(NULL, oss.str().c_str(), _T("JSON Object Debug"), MB_OK);
 	return false; //hopefully StringComparison (PARAM_CMPSTRING) is not used, or this may crash
 }
 
 long Extension::Expression(int ID, RD *rd, long param)
 {
+#ifdef UNICODE
+	std::wostringstream oss;
+#else
+	std::ostringstream oss;
+#endif
+	oss << _T("Unlinked Expression, ID = ") << ID << std::endl;
+	MessageBox(NULL, oss.str().c_str(), _T("JSON Object Debug"), MB_OK);
 	return long(_T("")); //so that unlinked expressions that return strings won't crash
 }
-

Extension.hpp

@@ -80,9 +80,10 @@ class Extension
 	std::string UTF8fromUnicode(std::wstring s)
 	{
 		int size = WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, NULL, 0, NULL, NULL);
-		char *buf = new char[size];
+		char *buf = new char[size]();
 		if(!WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, buf, size, NULL, NULL))
 		{
+			delete[] buf;
 			return "";
 		}
 		std::string t (buf);
@@ -100,6 +101,8 @@ class Extension
 	void GoUp();
 	void GotoRoot();
 
+	void DebugWindow();
+
 	//Conditions
 	bool OnError(); //0
 	bool IsString();