--- parser3/src/classes/string.C	2012/01/08 05:58:27	1.201
+++ parser3/src/classes/string.C	2013/08/27 11:27:45	1.209
@@ -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.209 2013/08/27 11:27:45 moko Exp $";
+
 // class
 
 class MString: public Methoded {
@@ -67,35 +67,44 @@ static void _length(Request& r, MethodPa
 static void _int(Request& r, MethodParams& params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	int converted;
-	try {
-		if(self_string.is_empty())
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"unable to convert empty string without default specified");
-		converted=self_string.as_int();
-	} catch(...) { // convert problem
+
+	if(self_string.is_empty()) {
 		if(params.count()>0)
 			converted=params.as_int(0, "default must be int", r); // (default)
 		else
-			rethrow; // we have a problem when no default			
+			throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified");
+	} else {
+		try {
+			converted=self_string.as_int();
+		} catch(...) { // convert problem
+			if(params.count()>0)
+				converted=params.as_int(0, "default must be int", r); // (default)
+			else
+				rethrow; // we have a problem when no default
+		}
 	}
+
 	r.write_no_lang(*new VInt(converted));
 }
 
 static void _double(Request& r, MethodParams& params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	double converted;
-	try {
-		if(self_string.is_empty())
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"unable to convert empty string without default specified");
-		converted=self_string.as_double();
-	} catch(...) { // convert problem
+
+	if(self_string.is_empty()) {
 		if(params.count()>0)
 			converted=params.as_double(0, "default must be double", r); // (default)
 		else
-			rethrow; // we have a problem when no default
+			throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified");
+	} else {
+		try {
+			converted=self_string.as_double();
+		} catch(...) { // convert problem
+			if(params.count()>0)
+				converted=params.as_double(0, "default must be double", r); // (default)
+			else
+				rethrow; // we have a problem when no default
+		}
 	}
 
 	r.write_no_lang(*new VDouble(converted));
@@ -104,29 +113,28 @@ static void _double(Request& r, MethodPa
 static void _bool(Request& r, MethodParams& params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	bool converted;
-	try {
-		if(self_string.is_empty())
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"unable to convert empty string without default specified");
-		
-		try {
-			converted=self_string.as_bool();
-		} catch(...) {
-			const String& lower_string=self_string.change_case(r.charsets.source(), String::CC_LOWER);
-			if(lower_string == "true"){
-				converted=true;
-			} else if (lower_string == "false"){
-				converted=false;
-			} else {
-				rethrow;
-			}
-		}
-	} catch(...) { // convert problem
+	const char *str=self_string.cstr();
+
+	if(self_string.is_empty()) {
 		if(params.count()>0)
 			converted=params.as_bool(0, "default must be bool", r); // (default)
 		else
-			rethrow; // we have a problem when no default
+			throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified");
+	} else if( (str[0]=='T' || str[0]=='t') && (str[1]=='R' || str[1]=='r') && (str[2]=='U' || str[2]=='u') &&
+		   (str[3]=='E' || str[3]=='e') && str[4]==0 ) { // "true"
+		converted=true;
+	} else if( (str[0]=='F' || str[0]=='f') && (str[1]=='A' || str[1]=='a') && (str[2]=='L' || str[2]=='l') &&
+		   (str[3]=='S' || str[3]=='s') && (str[4]=='E' || str[4]=='e') && str[5]==0 ) { // "false"
+		converted=false;
+	} else {
+		try {
+			converted=self_string.as_bool();
+		} catch(...) { // convert problem
+			if(params.count()>0)
+				converted=params.as_bool(0, "default must be bool", r); // (default)
+			else
+				rethrow; // we have a problem when no default
+		}
 	}
 
 	r.write_no_lang(VBool::get(converted));
@@ -478,14 +486,14 @@ class String_sql_event_handlers: public
 	bool got_column;
 public:
 	bool got_cell;
-	String& result;
+	const String* result;
 public:
 	String_sql_event_handlers(
 		const String& astatement_string, const char* astatement_cstr):
 		statement_string(astatement_string), statement_cstr(astatement_cstr),
 		got_column(false),
 		got_cell(false),
-		result(*new String) {}
+		result(&String::Empty) {}
 
 	bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) {
 		if(got_column) {
@@ -509,7 +517,7 @@ public:
 
 		try {
 			got_cell=true;
-			result.append_know_length(str, length, String::L_TAINTED);
+			result=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */ );
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell");
@@ -526,8 +534,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 +542,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, "sql options")) {
 			int valid_options=0;
 			if(Value* vbind=options->get(sql_bind_name)) {
 				valid_options++;
@@ -555,8 +562,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;
@@ -582,14 +587,13 @@ const String* sql_result_string(Request&
 	if(!handlers.got_cell)
 		return 0; // no lines, caller should return second param[default value]
 
-	return &handlers.result;
+	return handlers.result;
 }
 
 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);
@@ -607,11 +611,7 @@ static void _replace(Request& r, MethodP
 
 	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");
+		Table* table=params.as_table(0, "param");
 		Dictionary dict(*table);
 		r.write_assign_lang(src.replace(dict));
 	} else {
@@ -632,6 +632,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()){
+			// ^file.save[filespec;$.charset[] $.append(true)]
 			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));
@@ -644,6 +645,7 @@ static void _save(Request& r, MethodPara
 			if(valid_options != options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		} else {
+			// ^file.save[append;filespec]
 			const String& mode=params.as_string(0, "mode must be string");
 			if(mode==MODE_APPEND){
 				do_append=true;
@@ -657,7 +659,7 @@ static void _save(Request& r, MethodPara
 	const String& file_name=params.as_string(file_name_index, FILE_NAME_MUST_BE_STRING);
 	const String& src=GET_SELF(r, VString).string();
 
-	String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/));
+	String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets);
 
 	// write
 	file_write(r.charsets, r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append, asked_charset);
@@ -701,11 +703,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 +822,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);