some includes restored, mir_full.sln updated, some renaming of folders and projects

git-svn-id: http://svn.miranda-ng.org/main/trunk@140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 73 insertions, 0 deletions

diff --git a/plugins/JSON/Source/JSONChildren.cpp b/plugins/JSON/Source/JSONChildren.cpp
new file mode 100644
index 0000000000..9f9e53ee81
--- /dev/null
+++ b/plugins/JSON/Source/JSONChildren.cpp
@@ -0,0 +1,73 @@
+#include "JSONChildren.h"
+#include "JSONNode.h"
+
+void jsonChildren::inc(void){
+    if (mysize == mycapacity){  //it's full
+	   if (!mycapacity){  //the array hasn't been created yet
+		  JSON_ASSERT(!array, JSON_TEXT("Expanding a 0 capacity array, but not null"));
+		  #ifdef JSON_LESS_MEMORY
+			 array = json_malloc<JSONNode*>(1);
+			 mycapacity = 1;
+		  #else
+			 array = json_malloc<JSONNode*>(8);  //8 seems average for JSON, and it's only 64 bytes
+			 mycapacity = 8;
+		  #endif
+	   } else {
+		  #ifdef JSON_LESS_MEMORY
+			 mycapacity += 1;  //increment the size of the array
+		  #else
+			 mycapacity <<= 1;  //double the size of the array
+		  #endif
+		  array = json_realloc<JSONNode*>(array, mycapacity);
+	   }
+    }   
+}
+
+
+void jsonChildren::inc(json_index_t amount){
+    if (!amount) return;
+    if (mysize + amount >= mycapacity){  //it's full
+	   if (!mycapacity){  //the array hasn't been created yet
+		  JSON_ASSERT(!array, JSON_TEXT("Expanding a 0 capacity array, but not null"));
+		  #ifdef JSON_LESS_MEMORY
+			 array = json_malloc<JSONNode*>(amount);
+			 mycapacity = amount;
+		  #else
+			 array = json_malloc<JSONNode*>(amount > 8 ? amount : 8);  //8 seems average for JSON, and it's only 64 bytes
+			 mycapacity = amount > 8 ? amount : 8;
+		  #endif
+	   } else {
+		  #ifdef JSON_LESS_MEMORY
+			 mycapacity = mysize + amount;  //increment the size of the array
+		  #else
+			 while(mysize + amount > mycapacity){
+				mycapacity <<= 1;  //double the size of the array
+			 }
+		  #endif
+		  array = json_realloc<JSONNode*>(array, mycapacity);
+	   }
+    }   
+}
+
+//actually deletes everything within the vector, this is safe to do on an empty or even a null array
+void jsonChildren::deleteAll(void){
+    json_foreach((*this), runner){
+        JSON_ASSERT(*runner, JSON_TEXT("a null pointer within the children"));
+	   JSONNode::deleteJSONNode(*runner);  //this is why I can't do forward declaration
+    }
+}
+
+void jsonChildren::doerase(JSONNode ** position, json_index_t number){
+    JSON_ASSERT(array, JSON_TEXT("erasing something from a null array 2"));
+    JSON_ASSERT(position >= array, JSON_TEXT("position is beneath the start of the array 2"));
+    JSON_ASSERT(position + number <= array + mysize, JSON_TEXT("erasing out of bounds 2"));
+    if (position + number >= array + mysize){
+	   mysize = (json_index_t)(position - array);
+	   #ifndef JSON_ISO_STRICT
+		  JSON_ASSERT((long long)position - (long long)array >= 0, JSON_TEXT("doing negative allocation"));
+	   #endif
+    } else {
+	   memmove(position, position + number, (mysize - (position - array) - number) * sizeof(JSONNode *));
+	   mysize -= number;
+    }
+}