--- parser3/src/classes/string.C	2013/10/17 21:52:32	1.211
+++ parser3/src/classes/string.C	2015/05/16 22:24:38	1.217
@@ -20,7 +20,7 @@
 #include "pa_vregex.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_STRING_C="$Id: string.C,v 1.211 2013/10/17 21:52:32 moko Exp $";
+volatile const char * IDENT_STRING_C="$Id: string.C,v 1.217 2015/05/16 22:24:38 moko Exp $";
 
 // class
 
@@ -153,27 +153,18 @@ static void _bool(Request& r, MethodPara
 
 static void _left(Request& r, MethodParams& params) {
 	ssize_t sn=params.as_int(0, "n must be int", r);
-	if(sn<0)
-		throw Exception(PARSER_RUNTIME,
-			0, 
-			"n(%d) must be >=0", sn);
-	size_t n=(size_t)sn;
-
 	const String& string=GET_SELF(r, VString).string();
-	r.write_assign_lang(string.mid(r.charsets.source(), 0, n));
+	r.write_assign_lang(sn<0 ? string : string.mid(r.charsets.source(), 0, (size_t)sn));
 }
 
 static void _right(Request& r, MethodParams& params) {
-	ssize_t sn=(size_t)params.as_int(0, "n must be int", r);
-	if(sn<0)
-		throw Exception(PARSER_RUNTIME,
-			0, 
-			"n(%d) must be >=0", sn);
-	size_t n=(size_t)sn;
-
-	const String& string=GET_SELF(r, VString).string();
-	size_t length=string.length(r.charsets.source());
-	r.write_assign_lang(n<length?string.mid(r.charsets.source(), length-n, length, length):string);
+	ssize_t sn=params.as_int(0, "n must be int", r);
+	if(sn>0){
+		size_t n=(size_t)sn;
+		const String& string=GET_SELF(r, VString).string();
+		size_t length=string.length(r.charsets.source());
+		r.write_assign_lang(n<length ? string.mid(r.charsets.source(), length-n, length, length) : string);
+	}
 }
 
 static void _mid(Request& r, MethodParams& params) {
@@ -630,7 +621,7 @@ static void _save(Request& r, MethodPara
 	Charset* asked_charset=0;
 
 	size_t file_name_index=0;
-	if(params.count()>1)
+	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;
@@ -655,6 +646,7 @@ static void _save(Request& r, MethodPara
 					&mode,
 					"unknown mode, must be 'append'");
 		}
+	}
 
 	const String& file_name=params.as_string(file_name_index, FILE_NAME_MUST_BE_STRING);
 	const String& src=GET_SELF(r, VString).string();
@@ -679,7 +671,7 @@ static void _trim(Request& r, MethodPara
 	const char* chars=0;
 	if(params_count>0) {
 		const String& skind=params.as_string(0, "'where' must be string");
-		if(!skind.is_empty())
+		if(!skind.is_empty()) {
 			if(skind==TRIM_BOTH_OPTION)
 				kind=String::TRIM_BOTH;
 			else if(skind==TRIM_START_OPTION || skind=="start")
@@ -689,7 +681,8 @@ static void _trim(Request& r, MethodPara
 			else
 				throw Exception(PARSER_RUNTIME,
 					&skind,
-					"'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION);
+					"'kind' must be one of " TRIM_START_OPTION ", " TRIM_BOTH_OPTION ", " TRIM_END_OPTION);
+		}
 
 		if(params_count>1) {
 			const String& schars=params.as_string(1, "'chars' must be string");
@@ -740,6 +733,19 @@ static void _base64(Request& r, MethodPa
 	}
 }
 
+static void _idna(Request& r, MethodParams& params) {
+	if(params.count()) {
+		// decode: ^string:idna[encoded]
+		const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
+		r.write_assign_lang(*new String(pa_idna_decode(cstr, r.charsets.source()), String::L_TAINTED));
+	} else {
+		// encode: ^str.idna[]
+		VString& self=GET_SELF(r, VString);
+		const char* cstr=self.string().cstr();
+		r.write_assign_lang(*new String(pa_idna_encode(cstr, r.charsets.source()), String::L_TAINTED));
+	}
+}
+
 static void _escape(Request& r, MethodParams&){
 	const String& src=GET_SELF(r, VString).string();
 	r.write_assign_lang(src.escape(r.charsets.source()));
@@ -748,7 +754,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))
-		r.write_assign_lang(*new String(result));
+		r.write_assign_lang(*new String(result, String::L_TAINTED));
 }
 
 // constructor
@@ -821,9 +827,13 @@ MString::MString(): Methoded("string") {
 	add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2);
 
 	// ^string.base64[] << encode
-	// ^string:base64[encoded string] << decode	
+	// ^string:base64[encoded string] << decode
 	add_native_method("base64", Method::CT_ANY, _base64, 0, 2);
 
+	// ^string.idna[] << encode
+	// ^string:idna[encoded string] << decode
+	add_native_method("idna", Method::CT_ANY, _idna, 0, 1);
+
 	// ^string.js-escape[]
 	add_native_method("js-escape", Method::CT_ANY, _escape, 0, 0);