--- parser3/src/classes/string.C 2009/04/28 04:53:52 1.178 +++ parser3/src/classes/string.C 2010/07/05 05:54:46 1.194 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2009/04/28 04:53:52 $"; +static const char * const IDENT_STRING_C="$Date: 2010/07/05 05:54:46 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -20,6 +20,7 @@ static const char * const IDENT_STRING_C #include "pa_dictionary.h" #include "pa_vmethod_frame.h" #include "pa_vregex.h" +#include "pa_charsets.h" // class @@ -41,6 +42,8 @@ DECLARE_CLASS_VAR(string, new MString, 0 #define TRIM_END_OPTION "right" #define TRIM_BOTH_OPTION "both" +#define MODE_APPEND "append" + // statics static const String match_var_name(MATCH_VAR_NAME); @@ -292,7 +295,7 @@ static void split_with_options(Request& if(!bits) { const String* options=0; if(params_count>1) - options=¶ms.as_string(1, "options must not be code"); + options=¶ms.as_string(1, OPTIONS_MUST_NOT_BE_CODE); bits=split_options(options); } @@ -332,17 +335,18 @@ static void search_action(Table& table, #ifndef DOXYGEN struct Replace_action_info { - Request* request; - const String* src; String* dest; + Request* request; + const String* src; + String* dest; VTable* vtable; Value* replacement_code; }; #endif /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this static void replace_action(Table& table, ArrayString* row, - int prestart, int prefinish, - int poststart, int postfinish, - void *info) { + int prestart, int prefinish, + int poststart, int postfinish, + void *info) { Replace_action_info& ai=*static_cast(info); if(row) { // begin&middle // piece from last match['prestart'] to beginning of this match['prefinish'] @@ -353,10 +357,12 @@ static void replace_action(Table& table, table.put(0, row); else // begin table+=row; - { // execute 'replacement_code' in 'table' context - ai.vtable->set_table(table); - *ai.dest << ai.request->process_to_string(*ai.replacement_code); + { // execute 'replacement_code' in 'table' context + if(ai.replacement_code){ + ai.vtable->set_table(table); + *ai.dest << ai.request->process_to_string(*ai.replacement_code); + } } } else // end *ai.dest << ai.src->mid(poststart, postfinish); @@ -366,12 +372,12 @@ static void _match(Request& r, MethodPar size_t params_count=params.count(); Value& regexp=params.as_no_junction(0, "regexp must not be code"); - Value* options=(params_count>1)?¶ms.as_no_junction(1, "options must not be code"):0; + Value* options=(params_count>1)?¶ms.as_no_junction(1, OPTIONS_MUST_NOT_BE_CODE):0; VRegex* vregex; VRegexCleaner vrcleaner; - if(Value* value=regexp.as(VREGEX_TYPE, false)){ + if(Value* value=regexp.as(VREGEX_TYPE)){ if(options && options->is_defined()) throw Exception(PARSER_RUNTIME, 0, @@ -402,7 +408,23 @@ static void _match(Request& r, MethodPar } } else { // replace - Value& replacement_code=params.as_junction(2, "replacement param must be code"); + + Value* replacement_code=0; + bool is_junction=false; + + Value* replacement=¶ms[2]; + if(replacement->get_junction()){ + replacement_code=replacement; + is_junction=true; + } else if(replacement->is_string()){ + if(replacement->is_defined()) + replacement_code=replacement; + } else if(!replacement->is_void()) + throw Exception(PARSER_RUNTIME, + 0, + "replacement option should be junction or string"); + + Value* default_code=(params_count==4)?¶ms.as_junction(3, "default value must be code"):0; String result; VTable* vtable=new VTable; @@ -411,17 +433,20 @@ static void _match(Request& r, MethodPar &src, &result, vtable, - &replacement_code + replacement_code }; - Temp_value_element temp_match_var( - *replacement_code.get_junction()->method_frame, - match_var_name, vtable); - src.match(vregex, - replace_action, &info, - matches_count); + if(is_junction){ + Temp_value_element temp( *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); + } - r.write_assign_lang(result); + if(!matches_count && default_code) + r.process_write(*default_code); + else + r.write_assign_lang(result); } } @@ -521,13 +546,9 @@ const String* sql_result_string(Request& valid_options++; } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); + throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); } else options=0; @@ -538,8 +559,8 @@ const String* sql_result_string(Request& Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); - const char* statement_cstr= - statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection()); + String_sql_event_handlers handlers(statement_string, statement_cstr); r.connection()->query( @@ -589,26 +610,41 @@ static void _replace(Request& r, MethodP } static void _save(Request& r, MethodParams& params) { - size_t params_count=params.count(); - const String& file_name=params.as_string(params_count-1, FILE_NAME_MUST_BE_STRING); + bool do_append=false; + Charset* asked_charset=0; + + 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()){ + 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)); + valid_options++; + } + if(Value* vappend=options->get(MODE_APPEND)){ + do_append=vappend->as_bool(); + valid_options++; + } + if(valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } else { + const String& mode=params.as_string(0, "mode must be string"); + if(mode==MODE_APPEND){ + do_append=true; + file_name_index++; + } else + throw Exception(PARSER_RUNTIME, + &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(); - bool do_append=false; - if(params_count>1) { - const String& mode=params.as_string(0, "mode must be string"); - if(mode=="append") - do_append=true; - else - throw Exception(PARSER_RUNTIME, - &mode, - "unknown mode, must be 'append'"); - } + String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/)); // write - const char* buf=src.cstr(String::L_UNSPECIFIED, r.connection(false/*no error if none*/)); - file_write(r.absolute(file_name), - buf, strlen(buf), true, do_append); + file_write(r.charsets, r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append, asked_charset); } static void _normalize(Request& r, MethodParams&) { @@ -644,7 +680,7 @@ static void _trim(Request& r, MethodPara } } - r.write_assign_lang(src.trim(kind, chars)); + r.write_assign_lang(src.trim(kind, chars, &r.charsets.source())); } static void _append(Request& r, MethodParams& params) { @@ -671,16 +707,15 @@ static void _base64(Request& r, MethodPa "Invalid \\x00 character found while decode to string. Decode it to file instead."); fix_line_breaks(decoded, length); - if(length){ - r.write_assign_lang(*new String(decoded, length, true/*tainted*/)); - } + if(length) + r.write_assign_lang(*new String(decoded, String::L_TAINTED)); } } else { // encode: ^str.base64[] VString& self=GET_SELF(r, VString); const char* cstr=self.string().cstr(); const char* encoded=pa_base64_encode(cstr, strlen(cstr)); - r.write_assign_lang(*new String(encoded, 0, true/*tainted. once ?param=base64(something) was needed*/)); + r.write_assign_lang(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/)); } } @@ -691,7 +726,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)); } @@ -738,21 +773,24 @@ MString::MString(): Methoded("string") { // ^string.match[regexp][options] // ^string.match[regexp][options]{replacement-code} - add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3); + // ^string.match[regexp][options]{replacement-code}{code-if-nothing-is-found} + add_native_method("match", Method::CT_DYNAMIC, _match, 1, 4); // ^string.upper[] add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0); // ^string.lower[] add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); - // ^sql[query] - // ^sql[query][options hash] + // ^string:sql{query} + // ^string:sql{query}[options hash] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); // ^string.replace[table] add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1); - // ^string.save[file] + // ^string.save[append][file] + // ^string.save[file] + // ^string.save[file][$.append(true) $.charset[...]] add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); // ^string.normalize[] @@ -769,7 +807,8 @@ MString::MString(): Methoded("string") { add_native_method("base64", Method::CT_ANY, _base64, 0, 1); // ^string.js-escape[] - // ^string:js-unescape[escaped%uXXXXstring] add_native_method("js-escape", Method::CT_ANY, _escape, 0, 0); + + // ^string:js-unescape[escaped%uXXXXstring] add_native_method("js-unescape", Method::CT_STATIC, _unescape, 1, 1); }