--- parser3/src/include/pa_memory.h	2003/03/25 10:07:00	1.1.2.9.2.13
+++ parser3/src/include/pa_memory.h	2012/03/16 09:24:09	1.18
@@ -1,7 +1,7 @@
 /** @file
 	Parser: memory reference counting classes decls.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -9,22 +9,33 @@
 #ifndef PA_MEMORY_H
 #define PA_MEMORY_H
 
-static const char* IDENT_MEMORY_H="$Date: 2003/03/25 10:07:00 $";
-
-#define PA_DEBUG_REFERENCES
+#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.18 2012/03/16 09:24:09 moko Exp $"
 
 // include
 
 #include "pa_config_includes.h"
 #include "gc.h"
 
+// defines
+
+// use destructors for Array, Hash and VMethodFrame
+#define USE_DESTRUCTORS
+
+//#define PA_DEBUG_GC_MEMORY
 
-#ifdef XML
-#	include "gdome.h"
-// for xmlChar
-#	include "libxml/tree.h"
+#ifdef PA_DEBUG_GC_MEMORY
+void* pa_gc_malloc(size_t size);
+void* pa_gc_malloc_atomic(size_t size);
+void* pa_gc_realloc(void* ptr, size_t size);
+void pa_gc_free(void* ptr);
+#else
+inline void* pa_gc_malloc(size_t size) { return GC_MALLOC(size); }
+inline void* pa_gc_malloc_atomic(size_t size) { return GC_MALLOC_ATOMIC(size); }
+inline void* pa_gc_realloc(void* ptr, size_t size) { return GC_REALLOC(ptr, size); }
+inline void pa_gc_free(void* ptr) { GC_FREE(ptr); }
 #endif
 
+
 // forwards
 
 void *pa_fail_alloc(const char* what, size_t size);
@@ -32,27 +43,26 @@ void *pa_fail_alloc(const char* what, si
 // inlines
 
 inline void *pa_malloc(size_t size) {
-	if(void *result=GC_MALLOC(size))
+	if(void *result=pa_gc_malloc(size))
 		return result;
 
 	return pa_fail_alloc("allocate", size);
 }
 
 inline void *pa_malloc_atomic(size_t size) {
-	if(void *result=GC_MALLOC_ATOMIC(size))
+	if(void *result=pa_gc_malloc_atomic(size))
 		return result;
 
 	return pa_fail_alloc("allocate clean", size);
 }
 /// @a length may be null, which mean "autocalc it"
-inline char *pa_strdup(const char* auto_variable_never_null, size_t length=0) {
-	if(!length)
-		length=strlen(auto_variable_never_null);
-
-	size_t size=length+1;
-	if(char *result=static_cast<char*>(GC_MALLOC_ATOMIC(size))) {
-		memcpy(result, auto_variable_never_null, length);
-		result[length]=0;
+inline char *pa_strdup(const char* auto_variable_never_null, size_t helper_length=0) {
+	size_t known_length=(helper_length?helper_length:strlen(auto_variable_never_null));
+
+	size_t size=known_length+1;
+	if(char *result=static_cast<char*>(pa_gc_malloc_atomic(size))) {
+		memcpy(result, auto_variable_never_null, known_length);
+		result[known_length]=0;
 		return result;
 	}
 
@@ -60,25 +70,29 @@ inline char *pa_strdup(const char* auto_
 }
 
 inline void pa_free(void *ptr) {
-	GC_FREE(ptr);
+	pa_gc_free(ptr);
 }
 
 inline void *pa_realloc(void *ptr, size_t size) {
-	if(void *result=GC_REALLOC(ptr, size))
+	if(void *result=pa_gc_realloc(ptr, size))
 		return result;
 
 	return pa_fail_alloc("reallocate to", size);
 }
 
-//{@ these operators are disabled, one should explicitely specify either new(UseGC) or new(PointerFreeGC)
-inline void *operator new(size_t size) { abort(); } // disabled
-inline void operator delete (void *ptr) { abort(); } // disabled
-inline void *operator new[] (size_t size) { abort(); } // disabled
+//{@ these operators can be used from stl. to be on a safe side, assume that data may contain pointers
+inline void *operator new[] (size_t size) {
+	return pa_malloc(size);
+}
+inline void *operator new(size_t size) {
+	return pa_malloc(size);
+}
 //}@
 
 #define UseGC ((int)1)
 #define PointerFreeGC (true)
 
+//{@ Array-oriented
 inline void *operator new[] (size_t size, int) { // UseGC
 	return pa_malloc(size);
 }
@@ -88,6 +102,19 @@ inline void *operator new[] (size_t size
 inline void operator delete[] (void *ptr) {
 	pa_free(ptr);
 }
+//}@
+
+//{@ Structure-oriented
+inline void *operator new (size_t size, int) { // UseGC
+	return pa_malloc(size);
+}
+inline void *operator new (size_t size, bool) { // PointerFreeGC
+	return pa_malloc_atomic(size);
+}
+inline void operator delete(void *ptr) {
+	pa_free(ptr);
+}
+//}@
 
 /// memory allocation/dallocation goes via pa_malloc/pa_free.
 class PA_Allocated {
@@ -105,8 +132,8 @@ public:
 	static void *malloc_atomic(size_t size) {
 		return pa_malloc_atomic(size);
 	}
-	static char *strdup(const char* auto_variable_never_null, size_t length=0) {
-		return pa_strdup(auto_variable_never_null, length);
+	static char *strdup(const char* auto_variable_never_null, size_t helper_length=0) {
+		return pa_strdup(auto_variable_never_null, helper_length);
 	}
 	static void free(void *ptr) {
 		pa_free(ptr);
@@ -124,13 +151,12 @@ private: // disabled from accidental use
 
 /// Those who want their destructor called during finalization, must derive from this class [also]
 class PA_Cleaned {
-
+#ifndef PA_DEBUG_DISABLE_GC
 	static void cleanup( void* obj, void* displ ) {
 	    ((PA_Cleaned*) ((char*) obj + (ptrdiff_t) displ))->~PA_Cleaned();
 	}
 
 public:
-
 	PA_Cleaned() {
 		GC_finalization_proc oldProc;
 		void* oldData;
@@ -149,7 +175,7 @@ public:
 	virtual ~PA_Cleaned() {
 	    GC_REGISTER_FINALIZER_IGNORE_SELF( GC_base(this), 0, 0, 0, 0 );
 	}
-
+#endif
 };
 
 /// Base for all Parser classes