--- parser3/src/classes/string.C	2009/09/10 09:40:34	1.190
+++ parser3/src/classes/string.C	2010/10/21 15:25:07	1.196
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2009/09/10 09:40:34 $";
+static const char * const IDENT_STRING_C="$Date: 2010/10/21 15:25:07 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -27,14 +27,23 @@ static const char * const IDENT_STRING_C
 class MString: public Methoded {
 public:
 	MString();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
 
 DECLARE_CLASS_VAR(string, new MString, 0);
 
+// void class, inherited from string and thus should be inited afterwards
+
+class MVoid: public Methoded {
+public:
+	MVoid();
+};
+
+// void global variable should be after string global variable
+
+DECLARE_CLASS_VAR(void, new MVoid, 0);
+
 // defines for statics
 
 #define MATCH_VAR_NAME "match"
@@ -424,6 +433,8 @@ static void _match(Request& r, MethodPar
 				0,
 				"replacement option should be junction or string");
 
+		Value* default_code=(params_count==4)?&params.as_junction(3, "default value must be code"):0;
+
 		String result;
 		VTable* vtable=new VTable;
 		Replace_action_info info={
@@ -434,21 +445,17 @@ static void _match(Request& r, MethodPar
 			replacement_code
 		};
 
-		Temp_value_element* temp_match_var=0;
-
-		if(is_junction)
-			temp_match_var=new Temp_value_element(
-				*replacement_code->get_junction()->method_frame,
-				match_var_name, vtable);
-
-		src.match(vregex,
-			replace_action, &info,
-			matches_count);
-
-		if(temp_match_var)
-			delete temp_match_var;
+		if(is_junction){
+			Temp_value_element temp( *replacement_code->get_junction()->method_frame, match_var_name, vtable);
+			src.match(vregex, replace_action, &info, matches_count);
+		} else {
+			src.match(vregex, replace_action, &info, matches_count);
+		}
 
-		r.write_assign_lang(result);
+		if(!matches_count && default_code)
+			r.process_write(*default_code);
+		else
+			r.write_assign_lang(result);
 	}
 }
 
@@ -548,13 +555,9 @@ const String* sql_result_string(Request&
 					valid_options++;
 				}
 				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"called with invalid option");
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"options must be hash");
+				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
 	} else
 		options=0;
 
@@ -632,9 +635,7 @@ static void _save(Request& r, MethodPara
 				valid_options++;
 			}
 			if(valid_options != options->count())
-				throw Exception(PARSER_RUNTIME,
-					0,
-					INVALID_OPTION_PASSED);
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		} else {
 			const String& mode=params.as_string(0, "mode must be string");
 			if(mode==MODE_APPEND){
@@ -734,7 +735,7 @@ static void _escape(Request& r, MethodPa
 
 static void _unescape(Request& r, MethodParams& params){
 	const String& src=params.as_string(0, PARAMETER_MUST_BE_STRING);
-	if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true/* don't unescape '+' char */))
+	if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true))
 		r.write_assign_lang(*new String(result));
 }
 
@@ -781,7 +782,8 @@ MString::MString(): Methoded("string") {
 	
 	// ^string.match[regexp][options]
 	// ^string.match[regexp][options]{replacement-code}
-	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
+	// ^string.match[regexp][options]{replacement-code}{code-if-nothing-is-found}
+	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 4);
 
 	// ^string.upper[]
 	add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);