--- parser3/src/main/pa_globals.C	2002/04/19 09:36:51	1.123
+++ parser3/src/main/pa_globals.C	2002/06/24 13:06:39	1.132
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_globals.C,v 1.123 2002/04/19 09:36:51 paf Exp $
+	$Id: pa_globals.C,v 1.132 2002/06/24 13:06:39 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -39,14 +39,11 @@ String *name_name;
 String *size_name;
 String *text_name;
 
-String *unhandled_exception_method_name;
-String *post_process_method_name;
-
 String *content_disposition_name;
 String *content_disposition_filename_name;
 
+String *conf_method_name;
 String *auto_method_name;
-String *main_method_name;
 
 String *main_class_name;
 
@@ -78,7 +75,7 @@ String *charset_UTF8_name;
 
 String *hash_default_element_name;
 
-Array *string_match_table_columns;
+Table *string_match_table_template;
 
 Hash *untaint_lang_name2enum;
 
@@ -318,14 +315,11 @@ void pa_globals_init(Pool& pool) {
 	size_name=NEW String(pool, SIZE_NAME);
 	text_name=NEW String(pool, TEXT_NAME);
 
-	unhandled_exception_method_name=NEW String(pool, UNHANDLED_EXCEPTION_METHOD_NAME);
-	post_process_method_name=NEW String(pool, POST_PROCESS_METHOD_NAME);
-
 	content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME);
 	content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);
 
+	conf_method_name=NEW String(pool, CONF_METHOD_NAME);
 	auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
-	main_method_name=NEW String(pool, MAIN_METHOD_NAME);
 
 	main_class_name=NEW String(pool, MAIN_CLASS_NAME);
 
@@ -380,15 +374,16 @@ void pa_globals_init(Pool& pool) {
 
 	// table
 	{ // create table
-		string_match_table_columns=NEW Array(pool);
+		Array *string_match_table_columns=NEW Array(pool);
 		*string_match_table_columns+=NEW String(pool, STRING_PRE_MATCH_NAME);
 		*string_match_table_columns+=NEW String(pool, STRING_MATCH_NAME);
 		*string_match_table_columns+=NEW String(pool, STRING_POST_MATCH_NAME);
 		for(int i=1; i<=MAX_STRING_MATCH_TABLE_COLUMNS; i++) {
-			char *column=(char *)malloc(MAX_NUMBER);
+			char *column=(char *)pool.malloc(MAX_NUMBER);
 			snprintf(column, MAX_NUMBER, "%d", i);
 			*string_match_table_columns+=NEW String(pool, column); // .i column name
 		}
+		string_match_table_template=NEW Table(pool, 0, string_match_table_columns);
 	}
 
 	// charsets
@@ -463,17 +458,17 @@ void pa_globals_init(Pool& pool) {
 }
 
 #if defined(XML) && defined(_MSC_VER)
-#	define XML_LIBS "/parser3project/win32xml"
-#	pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib")
+#	define GNOME_LIBS "/parser3project/win32xml/win32/gnome"
+#	pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
 #	ifdef _DEBUG
-#		pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")
-#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib")
-#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib")
-#		pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib")
 #	else
-#		pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib")
-#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib")
-#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib")
-#		pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
 #	endif
 #endif