--- parser3/src/classes/string.C 2012/06/08 11:44:02 1.205 +++ 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.205 2012/06/08 11:44:02 misha Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.217 2015/05/16 22:24:38 moko Exp $"; // class @@ -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)); @@ -145,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(n0){ + 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(nget_junction()->method_frame, match_var_name, vtable); + Temp_value_element temp(r, *replacement_code->get_junction()->method_frame, match_var_name, vtable); src.match(vregex, replace_action, &info, matches_count); } else { src.match(vregex, replace_action, &info, matches_count); @@ -478,14 +477,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) { @@ -499,7 +498,7 @@ public: } bool before_rows(SQL_Error& /*error*/ ) { /* ignore */ return false; } bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } - bool add_row_cell(SQL_Error& error, const char* str, size_t length) { + bool add_row_cell(SQL_Error& error, const char* str, size_t) { if(got_cell) { error=SQL_Error(PARSER_RUNTIME, //statement_string, @@ -509,7 +508,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"); @@ -579,7 +578,7 @@ 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) { @@ -622,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; @@ -647,11 +646,12 @@ 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(); - 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); @@ -671,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") @@ -681,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"); @@ -732,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())); @@ -740,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 @@ -813,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);