--- parser3/src/classes/string.C	2011/05/19 06:58:40	1.199
+++ parser3/src/classes/string.C	2012/03/03 00:21:48	1.202
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2011/05/19 06:58:40 $";
+static const char * const IDENT_STRING_C="$Date: 2012/03/03 00:21:48 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -554,8 +554,7 @@ const String* sql_result_string(Request&
 			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
-		} else
-			throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
+		}
 	else
 		options=0;
 
@@ -606,14 +605,24 @@ static void _sql(Request& r, MethodParam
 static void _replace(Request& r, MethodParams& params) {
 	const String& src=GET_SELF(r, VString).string();
 
-	Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table();
-	if(!table)
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"parameter must be table");
+	if(params.count()==1) {
+		// ^string.replace[table]
+		Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table();
+		if(!table)
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"parameter must be table");
+		Dictionary dict(*table);
+		r.write_assign_lang(src.replace(dict));
+	} else {
+		// ^string.replace[from-string;to-string]
+		Dictionary dict(
+						params.as_string(0, "from must be string"),
+						params.as_string(1, "to must be string")
+					);
+		r.write_assign_lang(src.replace(dict));
+	}
 
-	Dictionary dict(*table);
-	r.write_assign_lang(src.replace(dict));
 }
 
 static void _save(Request& r, MethodParams& params) {
@@ -692,11 +701,24 @@ static void _trim(Request& r, MethodPara
 
 static void _base64(Request& r, MethodParams& params) {
 	if(params.count()) {
-		// decode: ^string:base64[encoded]
+		// decode: ^string:base64[encoded[;$.strict(true|false)]]
 		const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
 		char* decoded=0;
 		size_t length=0;
-		pa_base64_decode(cstr, strlen(cstr), decoded, length);
+
+		bool strict=false;
+		if(params.count() > 1)
+			if(HashStringValue* options=params.as_hash(1)) {
+				int valid_options=0;
+				if(Value* vstrict=options->get(BASE64_STRICT_OPTION_NAME)) {
+					strict=r.process_to_value(*vstrict).as_bool();
+					valid_options++;
+				}
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+			}
+
+		pa_base64_decode(cstr, strlen(cstr), decoded, length, strict);
 		if(decoded && length){
 			if(memchr((const char*)decoded, 0, length))
 				throw Exception(PARSER_RUNTIME,
@@ -783,7 +805,7 @@ MString::MString(): Methoded("string") {
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 
 	// ^string.replace[table]
-	add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1);
+	add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 2);
 
 	// ^string.save[append][file]
 	// ^string.save[file]
@@ -798,7 +820,7 @@ MString::MString(): Methoded("string") {
 
 	// ^string.base64[] << encode
 	// ^string:base64[encoded string] << decode	
-	add_native_method("base64", Method::CT_ANY, _base64, 0, 1);
+	add_native_method("base64", Method::CT_ANY, _base64, 0, 2);
 
 	// ^string.js-escape[]
 	add_native_method("js-escape", Method::CT_ANY, _escape, 0, 0);