--- parser3/src/include/pa_memory.h	2003/03/21 13:42:29	1.1.2.9.2.8
+++ parser3/src/include/pa_memory.h	2015/04/23 17:59:16	1.23
@@ -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,21 +9,20 @@
 #ifndef PA_MEMORY_H
 #define PA_MEMORY_H
 
-static const char* IDENT_MEMORY_H="$Date: 2003/03/21 13:42:29 $";
-
-#define PA_DEBUG_REFERENCES
+#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.23 2015/04/23 17:59:16 moko Exp $"
 
 // include
 
 #include "pa_config_includes.h"
 #include "gc.h"
 
+// define destructors use for Array, Hash and VMethodFrame
+#define USE_DESTRUCTORS
 
-#ifdef XML
-#	include "gdome.h"
-// for xmlChar
-#	include "libxml/tree.h"
-#endif
+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); }
 
 // forwards
 
@@ -32,55 +31,48 @@ 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);
-	if(!length)
-		abort();
-
-	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;
 	}
 
 	return static_cast<char*>(pa_fail_alloc("allocate clean", size));
 }
+
 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
-//}@
-
-#define UseGC ((int)1)
 #define PointerFreeGC (true)
 
-inline void *operator new[] (size_t size, int) { // UseGC
+//{@ Array-oriented
+inline void *operator new[] (size_t size) {
 	return pa_malloc(size);
 }
 inline void *operator new[] (size_t size, bool) { // PointerFreeGC
@@ -89,6 +81,35 @@ 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) {
+	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);
+}
+//}@
+
+#ifndef _MSC_VER
+// disabled from accidental use
+
+void *calloc_disabled();
+void *malloc_disabled();
+void *realloc_disabled();
+void free_disabled();
+char *strdup_disabled();
+
+inline void *calloc(size_t){ return calloc_disabled(); }
+inline void *malloc(size_t){ return malloc_disabled(); }
+inline void *realloc(void *, size_t){ return realloc_disabled(); }
+inline void free(void *){ free_disabled(); }
+inline char *strdup(const char*, size_t){ return strdup_disabled(); }
+#endif
 
 /// memory allocation/dallocation goes via pa_malloc/pa_free.
 class PA_Allocated {
@@ -100,27 +121,6 @@ public:
 	static void operator delete(void *ptr) {
 		pa_free(ptr);
 	}
-	static void *malloc(size_t size) {
-		return pa_malloc(size);
-	}
-	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 void free(void *ptr) {
-		pa_free(ptr);
-	}
-	static void *realloc(void *ptr, size_t size) {
-		return pa_realloc(ptr, size);
-	}
-
-private: // disabled from accidental use
-
-	/// use malloc instead [GC clears malloc result]
-	static void *calloc(size_t size);
-
 };
 
 /// Base for all Parser classes