--- parser3/src/classes/string.C	2009/09/08 09:12:47	1.189
+++ parser3/src/classes/string.C	2010/04/05 00:57:01	1.192
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2009/09/08 09:12:47 $";
+static const char * const IDENT_STRING_C="$Date: 2010/04/05 00:57:01 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -424,6 +424,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 +436,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);
 	}
 }
 
@@ -622,7 +620,7 @@ static void _save(Request& r, MethodPara
 	size_t file_name_index=0;
 	if(params.count()>1)
 		if(HashStringValue* options=params.as_no_junction(1, "second parameter should be string or hash").get_hash()){
-			size_t valid_options=0;
+			int valid_options=0;
 			if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){
 				asked_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER));
 				valid_options++;
@@ -781,7 +779,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);