--- parser3/src/main/pa_globals.C	2015/10/26 01:21:58	1.194
+++ parser3/src/main/pa_globals.C	2017/12/03 23:36:23	1.199
@@ -1,7 +1,7 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -17,44 +17,37 @@ extern "C" {
 #endif
 
 #include "pa_globals.h"
-#include "pa_string.h"
 #include "pa_sapi.h"
 #include "pa_threads.h"
 #include "pa_xml_io.h"
 #include "pa_common.h"
+#include "pa_symbols.h"
 
 #include "pa_cache_managers.h"
 
 #include "ltdl.h"
 #include "pcre.h"
 
-volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.194 2015/10/26 01:21:58 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H;
+volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.199 2017/12/03 23:36:23 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H;
 
 // defines
 
 //#define PA_DEBUG_XML_GC_MEMORY
 
-//20051130 trying to remove this, author claims that fixed a lot there // 20040920 for now both workarounds needed. wait for new libxml/xsl versions
-// // there is a problem with testcase, it's unstable. 
-// // see paf@six/bug20040920/cgi-bin/t for it-showed-bug-on-20040920-day
-// #define PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY
-// #define PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY
-
 // globals
 
-short hex_value[0x100];
+short hex_value[0x100]={0};
 
 static void setup_hex_value() {
-	memset(hex_value, 0, sizeof(hex_value));
-	hex_value['0'] = 0;	
-	hex_value['1'] = 1;	
-	hex_value['2'] = 2;	
-	hex_value['3'] = 3;	
-	hex_value['4'] = 4;	
-	hex_value['5'] = 5;	
-	hex_value['6'] = 6;	
-	hex_value['7'] = 7;	
-	hex_value['8'] = 8;	
+	hex_value['0'] = 0;
+	hex_value['1'] = 1;
+	hex_value['2'] = 2;
+	hex_value['3'] = 3;
+	hex_value['4'] = 4;
+	hex_value['5'] = 5;
+	hex_value['6'] = 6;
+	hex_value['7'] = 7;
+	hex_value['8'] = 8;
 	hex_value['9'] = 9;
 	hex_value['A'] = 10;
 	hex_value['B'] = 11;
@@ -123,7 +116,7 @@ const char* xmlGenericErrors() {
 	return 0; // no errors for our thread_id registered
 }
 
-#endif
+#endif // XML
 
 #ifdef XML
 
@@ -132,7 +125,8 @@ static char *pa_GC_strdup(const char *s)
 		return 0;
 
 	size_t size=strlen(s)+1;
-	char *result=(char *)pa_gc_malloc_atomic(size);
+	char *result=(char *)GC_MALLOC_ATOMIC(size);
+
 	if(!result)
 		pa_fail_alloc("duplicate XML string",size);
 
@@ -146,27 +140,27 @@ static char *pa_GC_strdup(const char *s)
 #ifdef PA_DEBUG_XML_GC_MEMORY
 
 static void* pa_gc_malloc_log(size_t size){
-	void *p=pa_gc_malloc(size);
+	void *p=GC_MALLOC(size);
         fprintf(stderr, "pa_gc_malloc_log(%d)=0x%p\n", size, p);
 	return p;
         
 }
 
 static void* pa_gc_malloc_atomic_log(size_t size){
-	void *p=pa_gc_malloc_atomic(size);
+	void *p=GC_MALLOC_ATOMIC(size);
         fprintf(stderr, "pa_gc_malloc_atomic_log(%d)=0x%p\n", size, p);
 	return p;
 }
 
 static void* pa_gc_realloc_log(void *ptr, size_t size){
-	void *p=pa_gc_realloc(ptr, size);
+	void *p=GC_REALLOC(ptr, size);
         fprintf(stderr, "pa_gc_realloc_log(0x%p, %d)=0x%p\n", ptr, size, p);
 	return p;
 }
 
 static void pa_gc_free_log(void *p){
         fprintf(stderr, "pa_gc_free_log(0x%p)\n", p);
-        pa_gc_free(p);
+        GC_FREE(p);
 }
 
 #else
@@ -178,23 +172,24 @@ inline void *check(void *result, const c
 }
 
 static void* pa_gc_malloc_nonull(size_t size) { 
-	return check(pa_gc_malloc(size), "allocate XML compsite memory", size);
+	return check(GC_MALLOC(size), "allocate XML compsite memory", size);
 }
 
 static void* pa_gc_malloc_atomic_nonull(size_t size) { 
-	return check(pa_gc_malloc_atomic(size), "allocate XML atomic memory", size);
+	return check(GC_MALLOC_ATOMIC(size), "allocate XML atomic memory", size);
 }
 
 static void* pa_gc_realloc_nonull(void* ptr, size_t size) { 
-	return check(pa_gc_realloc(ptr, size), "reallocate XML memory", size);
+	return check(GC_REALLOC(ptr, size), "reallocate XML memory", size);
 }
 
 static void pa_gc_free_maybeignore(void* ptr) {
-	pa_gc_free(ptr);
+	GC_FREE(ptr);
 }
 
 #endif
-#endif
+
+#endif // XML
 
 void pa_CORD_oom_fn(void) {
 	pa_fail_alloc("expand string", 0);
@@ -226,8 +221,8 @@ static void gc_substitute_memory_managem
 #endif
 
 	// pcre
-	pcre_malloc=pa_gc_malloc;
-	pcre_free=pa_gc_free;
+	pcre_malloc=pa_malloc;
+	pcre_free=pa_free;
 
 	// cord
 	CORD_oom_fn=pa_CORD_oom_fn;
@@ -240,13 +235,17 @@ void pa_globals_init() {
 	// global variables 
 	cache_managers=new Cache_managers;
 
-
 	// in various libraries
 	gc_substitute_memory_management_functions();
 
 	// hex value
 	setup_hex_value();
 
+#ifdef SYMBOLS_CACHING
+	// symbols cache
+	Symbols::init();
+#endif
+
 #ifdef XML
 	// initializing xml libs
 
@@ -286,7 +285,7 @@ void pa_globals_init() {
 	xmlSetGenericErrorFunc(0, xmlParserGenericErrorFunc);
 	xsltSetGenericErrorFunc(0, xmlParserGenericErrorFunc);
 
-//	FILE *f=fopen("y:\\xslt.log", "wt");
+//	FILE *f=fopen("xslt.log", "wt");
 //	xsltSetGenericDebugFunc(f/*stderr*/, 0);
 
 	pa_xml_io_init();
@@ -322,7 +321,7 @@ void pa_dlinit() {
 #pragma comment(lib, GC_LIB "/Release/gc.lib")
 #endif
 
-#endif
+#endif // PA_DEBUG_DISABLE_GC
 
 
 #ifdef XML
@@ -355,6 +354,12 @@ void pa_dlinit() {
 #pragma comment(lib, LIB_XSLT "libexslt.lib")
 #endif
 
-#endif
+#endif // XML
 
+// defines for VS2015 to link with gc/xml libs compiled in the previous VS versions
+#if _MSC_VER >= 1900
+#pragma comment(lib,"legacy_stdio_definitions.lib")
+extern "C" { FILE _iob[3] = { *stdin, *stdout, *stderr }; }
 #endif
+
+#endif // _MSC_VER