--- parser3/src/include/pa_string.h	2009/04/15 07:47:36	1.176
+++ parser3/src/include/pa_string.h	2009/04/22 04:37:52	1.178
@@ -8,7 +8,7 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-static const char * const IDENT_STRING_H="$Date: 2009/04/15 07:47:36 $";
+static const char * const IDENT_STRING_H="$Date: 2009/04/22 04:37:52 $";
 
 // includes
 #include "pa_types.h"
@@ -36,6 +36,7 @@ class Dictionary;
 class Request_charsets;
 class String;
 typedef Array<const String*> ArrayString;
+class VRegex;
 
 // generally useful
 
@@ -201,21 +202,6 @@ public:
 			append(current, CORD_chars((char)alang, asize_helper.length()));
 		}
 
-
-		/// MUST be called exactly prior to modification of current [uses it's length]
-		template<typename C>
-		void append(C current, size_t appending_length, const Languages src) {
-			assert(appending_length);
-
-			if(!langs)
-				langs=src.langs; // to uninitialized
-			else if(!src.opt.is_not_just_lang)
-				append(current, src.opt.lang, appending_length); // simplifying when simple source
-			else
-				append(current, src.make_langs(appending_length));
-		}
-
-
 		template<typename C>
 		void appendHelper(C current, C length_helper, const Languages src) {
 
@@ -536,9 +522,7 @@ public:
 			prematch/match/postmatch/1/2/3/...
 		@endverbatim
 	*/
-	Table* match(Charset& source_charset,
-		const String& regexp, 
-		const String* options,
+	Table* match(VRegex* vregex,
 		Row_action row_action, void *info,
 		int& matches_count) const;
 	enum Change_case_kind {