--- parser3/src/main/pa_globals.C	2002/03/05 07:48:06	1.118
+++ parser3/src/main/pa_globals.C	2002/06/12 10:58:42	1.128
@@ -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.118 2002/03/05 07:48:06 paf Exp $
+	$Id: pa_globals.C,v 1.128 2002/06/12 10:58:42 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -39,24 +39,22 @@ String *name_name;
 String *size_name;
 String *text_name;
 
-String *exception_method_name;
-String *post_process_method_name;
-
 String *content_disposition_name;
 String *content_disposition_filename_name;
 
-String *unnamed_name;
-
+String *conf_method_name;
 String *auto_method_name;
-String *main_method_name;
 
 String *main_class_name;
 
 String *result_var_name;
 String *match_var_name;
-String *string_pre_match_name;
-String *string_match_name;
-String *string_post_match_name;
+
+String *exception_var_name;
+String *exception_type_part_name;
+String *exception_source_part_name;
+String *exception_comment_part_name;
+String *exception_handled_part_name;
 
 String *charsets_name;
 String *mime_types_name;
@@ -66,7 +64,8 @@ String *origins_mode_name;
 String *class_path_name;
 
 String *switch_data_name;
-String *case_default_value;
+
+String *cache_data_name;
 
 String *sql_limit_name;
 String *sql_offset_name;
@@ -76,6 +75,8 @@ String *charset_UTF8_name;
 
 String *hash_default_element_name;
 
+Table *string_match_table_template;
+
 Hash *untaint_lang_name2enum;
 
 Charset *utf8_charset;
@@ -314,25 +315,22 @@ void pa_globals_init(Pool& pool) {
 	size_name=NEW String(pool, SIZE_NAME);
 	text_name=NEW String(pool, TEXT_NAME);
 
-	exception_method_name=NEW String(pool, 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);
 
-	unnamed_name=NEW String(pool, UNNAMED_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);
 
 	result_var_name=NEW String(pool, RESULT_VAR_NAME);
 	match_var_name=NEW String(pool, MATCH_VAR_NAME);
-	string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME);
-	string_match_name=NEW String(pool, STRING_MATCH_NAME);
-	string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME);
 
+	exception_var_name=NEW String(pool, EXCEPTION_VAR_NAME);
+	exception_type_part_name=NEW String(pool, EXCEPTION_TYPE_PART_NAME);
+	exception_source_part_name=NEW String(pool, EXCEPTION_SOURCE_PART_NAME);
+	exception_comment_part_name=NEW String(pool, EXCEPTION_COMMENT_PART_NAME);
+	exception_handled_part_name=NEW String(pool, EXCEPTION_HANDLED_PART_NAME);
 
 	charsets_name=NEW String(pool, CHARSETS_NAME);
 	mime_types_name=NEW String(pool, MIME_TYPES_NAME);
@@ -343,7 +341,9 @@ void pa_globals_init(Pool& pool) {
 
 	//^switch ^case
 	switch_data_name=NEW String(pool, SWITCH_DATA_NAME);
-	case_default_value=NEW String(pool, CASE_DEFAULT_VALUE);
+
+	//^cache
+	cache_data_name=NEW String(pool, CACHE_DATA_NAME);
 
 	// sql
 	sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);
@@ -356,7 +356,6 @@ void pa_globals_init(Pool& pool) {
 	// hash
 	hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);
 
-
 	// hashes
 	untaint_lang_name2enum=NEW Hash(pool);
 	#define ULN(cstr, LANG) \
@@ -373,6 +372,20 @@ void pa_globals_init(Pool& pool) {
 	ULN("html", HTML);
 	ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
 
+	// table
+	{ // create table
+		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 *)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
 	charsets=NEW Charsets(pool);
 	charsets->put(*charset_UTF8_name, 
@@ -445,7 +458,7 @@ void pa_globals_init(Pool& pool) {
 }
 
 #if defined(XML) && defined(_MSC_VER)
-#	define XML_LIBS "/parser3project/win32xml"
+#	define XML_LIBS "/parser3project/win32/xml"
 #	pragma comment(lib, XML_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")