--- parser3/src/classes/string.C	2012/01/08 05:58:27	1.201
+++ parser3/src/classes/string.C	2012/04/19 19:41:29	1.204
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2012/01/08 05:58:27 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
@@ -22,6 +20,8 @@ static const char * const IDENT_STRING_C
 #include "pa_vregex.h"
 #include "pa_charsets.h"
 
+volatile const char * IDENT_STRING_C="$Id: string.C,v 1.204 2012/04/19 19:41:29 moko Exp $";
+
 // class
 
 class MString: public Methoded {
@@ -526,8 +526,7 @@ extern String sql_distinct_name;
 extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders);
 extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders);
 
-const String* sql_result_string(Request& r, MethodParams& params,
-				HashStringValue*& options, Value*& default_code) {
+const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code) {
 	Value& statement=params.as_junction(0, "statement must be code");
 
 	HashStringValue* bind=0;
@@ -535,7 +534,7 @@ const String* sql_result_string(Request&
 	ulong offset=0;
 	default_code=0;
 	if(params.count()>1)
-		if((options=params.as_hash(1))) {
+		if(HashStringValue* options=params.as_hash(1)) {
 			int valid_options=0;
 			if(Value* vbind=options->get(sql_bind_name)) {
 				valid_options++;
@@ -555,8 +554,6 @@ const String* sql_result_string(Request&
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
-	else
-		options=0;
 
 	SQL_Driver::Placeholder* placeholders=0;
 	uint placeholders_count=0;
@@ -587,9 +584,8 @@ const String* sql_result_string(Request&
 
 static void _sql(Request& r, MethodParams& params) {
 
-	HashStringValue* options;
 	Value* default_code;
-	const String* string=sql_result_string(r, params, options, default_code);
+	const String* string=sql_result_string(r, params, default_code);
 	if(!string) {
 		if(default_code) {
 			string=&r.process_to_string(*default_code);
@@ -701,11 +697,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,
@@ -807,7 +816,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);