--- parser3/src/classes/string.C	2010/04/05 00:57:01	1.192
+++ parser3/src/classes/string.C	2012/06/08 11:44:02	1.205
@@ -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: 2010/04/05 00:57:01 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
@@ -22,19 +20,30 @@ 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.205 2012/06/08 11:44:02 misha Exp $";
+
 // class
 
 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"
@@ -62,7 +71,7 @@ static void _int(Request& r, MethodParam
 		if(self_string.is_empty())
 			throw Exception(PARSER_RUNTIME,
 				0,
-				"parameter is empty string, error converting");
+				"unable to convert empty string without default specified");
 		converted=self_string.as_int();
 	} catch(...) { // convert problem
 		if(params.count()>0)
@@ -80,7 +89,7 @@ static void _double(Request& r, MethodPa
 		if(self_string.is_empty())
 			throw Exception(PARSER_RUNTIME,
 				0,
-				"parameter is empty string, error converting");
+				"unable to convert empty string without default specified");
 		converted=self_string.as_double();
 	} catch(...) { // convert problem
 		if(params.count()>0)
@@ -99,7 +108,7 @@ static void _bool(Request& r, MethodPara
 		if(self_string.is_empty())
 			throw Exception(PARSER_RUNTIME,
 				0,
-				"parameter is empty string, error converting");
+				"unable to convert empty string without default specified");
 		
 		try {
 			converted=self_string.as_bool();
@@ -517,44 +526,34 @@ 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;
 	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
 	default_code=0;
-	if(params.count()>1) {
-		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(voptions.is_defined() && !voptions.is_string())
-			if((options=voptions.get_hash())) {
-				int valid_options=0;
-				if(Value* vbind=options->get(sql_bind_name)) {
-					valid_options++;
-					bind=vbind->get_hash();
-				}
-				if(Value* vlimit=options->get(sql_limit_name)) {
-					valid_options++;
-					limit=(ulong)r.process_to_value(*vlimit).as_double();
-				}
-				if(Value* voffset=options->get(sql_offset_name)) {
-					valid_options++;
-					offset=(ulong)r.process_to_value(*voffset).as_double();
-				}
-				if((default_code=options->get(sql_default_name))) {
-					valid_options++;
-				}
-				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;
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
+			int valid_options=0;
+			if(Value* vbind=options->get(sql_bind_name)) {
+				valid_options++;
+				bind=vbind->get_hash();
+			}
+			if(Value* vlimit=options->get(sql_limit_name)) {
+				valid_options++;
+				limit=(ulong)r.process_to_value(*vlimit).as_double();
+			}
+			if(Value* voffset=options->get(sql_offset_name)) {
+				valid_options++;
+				offset=(ulong)r.process_to_value(*voffset).as_double();
+			}
+			if((default_code=options->get(sql_default_name))) {
+				valid_options++;
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	SQL_Driver::Placeholder* placeholders=0;
 	uint placeholders_count=0;
@@ -585,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);
@@ -603,14 +601,20 @@ 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_table(0, "param");
+		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) {
@@ -620,6 +624,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));
@@ -630,10 +635,9 @@ 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 {
+			// ^file.save[append;filespec]
 			const String& mode=params.as_string(0, "mode must be string");
 			if(mode==MODE_APPEND){
 				do_append=true;
@@ -689,23 +693,26 @@ static void _trim(Request& r, MethodPara
 	r.write_assign_lang(src.trim(kind, chars, &r.charsets.source()));
 }
 
-static void _append(Request& r, MethodParams& params) {
-	// c=a+b
-	VString& va=GET_SELF(r, VString);
-	const String& a=va.string();
-	const String& b=params.as_string(0, PARAMETER_MUST_BE_STRING);
-	String& c=*new String(a);
-	c.append(b, String::L_PASS_APPENDED);
-	va.set_string(c);
-}
-
 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,
@@ -732,7 +739,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));
 }
 
@@ -792,7 +799,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]
@@ -805,12 +812,9 @@ MString::MString(): Methoded("string") {
 	// ^string.trim[[start|both|end][;chars]]
 	add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2);
 
-	// ^string.append[string]
-	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
-
 	// ^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);