--- parser3/src/classes/string.C 2003/02/14 12:59:09 1.125.2.7 +++ parser3/src/classes/string.C 2019/11/20 20:48:25 1.243 @@ -1,14 +1,13 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/02/14 12:59:09 $"; - #include "classes.h" #include "pa_vmethod_frame.h" +#include "pa_base64.h" #include "pa_request.h" #include "pa_vdouble.h" @@ -19,128 +18,196 @@ static const char* IDENT_STRING_C="$Date #include "pa_sql_connection.h" #include "pa_dictionary.h" #include "pa_vmethod_frame.h" +#include "pa_vregex.h" +#include "pa_charsets.h" + +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.243 2019/11/20 20:48:25 moko Exp $"; // class -class MString : public Methoded { +class MString: public Methoded { public: MString(); -public: // Methoded - bool used_directly() { return true; } }; - // global variable -MethodedPtr string_class(new MString); +DECLARE_CLASS_VAR(string, new MString); + +// 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); + +// defines for statics + +#define MATCH_VAR_NAME "match" +#define TRIM_START_OPTION "left" +#define TRIM_END_OPTION "right" +#define TRIM_BOTH_OPTION "both" + +#define MODE_APPEND "append" + +#define UNESCAPE_MODE_JS "js" +#define UNESCAPE_MODE_URI "uri" + +// statics + +static const String match_var_name(MATCH_VAR_NAME); // methods -static void _length(Request& r, StringPtr method_name, MethodParams& ) { - Pool& pool=r.pool(); - double result=GET_SELF(r, VString).string()->size(); - r.write_no_lang(ValuePtr(new VDouble(result))); +static void _length(Request& r, MethodParams&) { + double result=GET_SELF(r, VString).string().length(r.charsets.source()); + r.write(*new VDouble(result)); } -static void _int(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - StringPtr self_string=r.get_self()->get_string(&pool); +static void _int(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); int converted; - ValuePtr default_code=params.count()>0?params.as_junction(0, "default must be int") - :ValuePtr(0); // (default) - try { - if(!self_string || self_string->is_empty()) - throw Exception("parser.runtime", - method_name, - "parameter is empty string, error converting"); - converted=self_string->as_int(); - } catch(...) { // convert problem - if(!default_code) // we have a problem when no default - rethrow; + + if(self_string.is_empty()) { + if(params.count()>0) + converted=params.as_int(0, "default must be int", r); // (default) else - converted=r.process_to_value(default_code)->as_int(); + 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(ValuePtr(new VInt(converted))); + + r.write(*new VInt(converted)); } -static void _double(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - StringPtr self_string=GET_SELF(r, VString).string(); - double converted; - ValuePtr default_code=params.count()>0?params.as_junction(0, "default must be double") - :ValuePtr(0); // (default) - try { - if(!self_string || self_string->is_empty()) - throw Exception("parser.runtime", - method_name, - "parameter is empty string, error converting"); - converted=self_string->as_double(); - } catch(...) { // convert problem - if(!default_code) // we have a problem when no default - rethrow; +static void _double(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); + + if(self_string.is_empty()) { + if(params.count()>0) + r.write(*new VDouble(params.as_double(0, "default must be double", r))); // (default) else - converted=r.process_to_value(default_code)->as_double(); + throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified"); + } else { + try { + r.write(*new VDouble(self_string.as_double())); + } catch(...) { // convert problem + if(params.count()>0) + r.write(*new VDouble(params.as_double(0, "default must be double", r))); // (default) + else + rethrow; // we have a problem when no default + } + } +} + +static void _bool(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); + bool converted; + 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 + 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(ValuePtr(new VDouble(converted))); + r.write(VBool::get(converted)); } -/*not static*/void _string_format(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +/*not static*/void _string_format(Request& r, MethodParams& params) { - ValuePtr fmt_maybe_code=params[0]; + Value& fmt_maybe_code=params[0]; // for some time due to stupid {} in original design - StringPtr fmt=r.process_to_string(fmt_maybe_code); + const String& fmt=r.process_to_string(fmt_maybe_code); - const char *buf=format(pool, r.get_self()->as_double(), fmt->cstr()); + const char* buf=format(r.get_self().as_double(), fmt.trim().cstrm()); - String result; - result.APPEND_CLEAN(buf, 0, - method_name->origin().file, - method_name->origin().line); - r.write_no_lang(result); + r.write(String(buf)); } -static void _left(Request& r, StringPtr /*method_name*/, MethodParams& params) { - size_t n=(size_t)params.as_int(0, "n must be int", r); - - StringPtr string=GET_SELF(r, VString).string(); - r.write_assign_lang(*string->mid(0, n)); +static void _left(Request& r, MethodParams& params) { + ssize_t sn=params.as_int(0, "n must be int", r); + const String& string=GET_SELF(r, VString).string(); + r.write(sn<0 ? string : string.mid(r.charsets.source(), 0, (size_t)sn)); } -static void _right(Request& r, StringPtr /*method_name*/, MethodParams& params) { - size_t n=(size_t)params.as_int(0, "n must be int", r); - - StringPtr string=GET_SELF(r, VString).string(); - r.write_assign_lang(*string->mid(string->size()-n, string->size())); +static void _right(Request& r, MethodParams& params) { + 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(n1? - (size_t)max(0, params.as_int(1, "n must be int", r)):string->size(); - - r.write_assign_lang(*string->mid(p, p+n)); + ssize_t sbegin=params.as_int(0, "p must be int", r); + if(sbegin<0) + throw Exception(PARSER_RUNTIME, 0, "p(%d) must be >=0", sbegin); + size_t begin=(size_t)sbegin; + + size_t end; + size_t length=0; + if(params.count()>1) { + ssize_t sn=params.as_int(1, "n must be int", r); + if(sn<0) + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", sn); + end=begin+(size_t)sn; + } else { + length=string.length(r.charsets.source()); + end=length; + } + + r.write(string.mid(r.charsets.source(), begin, end, length)); } -static void _pos(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - ValuePtr substr=params.as_no_junction(0, "substr must not be code"); +static void _pos(Request& r, MethodParams& params) { + Value& substr=params.as_no_junction(0, "substr must not be code"); - StringPtr string=GET_SELF(r, VString).string(); - r.write_assign_lang(ValuePtr(new VInt(string->pos(*substr->as_string(&pool))))); -} + const String& string=GET_SELF(r, VString).string(); + ssize_t offset=0; + if(params.count()>1){ + offset=params.as_int(1, "n must be int", r); + if(offset<0) + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", offset); + } -static void split_list(Request& r, StringPtr method_name, - MethodParams& params, int paramIndex, - String& string, - ArrayString& result) { - Pool& pool=r.pool(); - ValuePtr delim_value=params.as_no_junction(paramIndex, "delimiter must not be code"); + r.write(*new VInt((int)string.pos(r.charsets.source(), substr.as_string(), (size_t)offset))); +} - string.split(result, 0, *delim_value->as_string(&pool)); +static void split_list(MethodParams& params, int paramIndex, const String& string, ArrayString& result) { + Value& delim_value=params.as_no_junction(paramIndex, "delimiter must not be code"); + string.split(result, 0, delim_value.as_string()); } #define SPLIT_LEFT 0x0001 @@ -148,7 +215,7 @@ static void split_list(Request& r, Strin #define SPLIT_HORIZONTAL 0x0100 #define SPLIT_VERTICAL 0x1000 -static int split_options(StringPtr options) { +static int split_options(const String* options) { struct Split_option { const char* keyL; const char* keyU; @@ -159,18 +226,16 @@ static int split_options(StringPtr optio {"r", "R", SPLIT_RIGHT, SPLIT_LEFT}, {"h", "H", SPLIT_HORIZONTAL, SPLIT_VERTICAL}, {"v", "V", SPLIT_VERTICAL, SPLIT_HORIZONTAL}, - {0} + {0, 0, 0, 0} }; int result=0; - if(options) { + if(options) { for(Split_option *o=split_option; o->keyL; o++) - if(options->pos(o->keyL)>=0 - || (o->keyU && options->pos(o->keyU)>=0)) { + if(options->pos(o->keyL)!=STRING_NOT_FOUND + || (o->keyU && options->pos(o->keyU)!=STRING_NOT_FOUND)) { if(result & o->checkBit) - throw Exception("parser.runtime", - options, - "conflicting split options"); + throw Exception(PARSER_RUNTIME, options, "conflicting split options"); result |= o->setBit; } } @@ -178,206 +243,220 @@ static int split_options(StringPtr optio return result; } -static TablePtr split_vertical(Request& r, StringPtr string, ArrayString& pieces, bool right) { - Pool& pool=r.pool(); - +static Table& split_vertical(ArrayString& pieces, bool right, const String* column_name) { Table::columns_type columns(new ArrayString); - *columns+=StringPtr(new String("piece")); + *columns+=column_name; - TablePtr table(new Table(string, columns, pieces.count())); + Table& table=*new Table(columns, pieces.count()); if(right) { // right for(int i=pieces.count(); --i>=0; ) { Table::element_type row(new ArrayString); *row+=pieces[i]; - *table+=row; + table+=row; } } else { // left - Array_iterator i(pieces); + Array_iterator i(pieces); while(i.has_next()) { Table::element_type row(new ArrayString); *row+=i.next(); - *table+=row; + table+=row; } } return table; } -static TablePtr split_horizontal(Request& r, StringPtr string, ArrayString& pieces, bool right) { - Pool& pool=r.pool(); - - TablePtr table(new Table(string, Table::columns_type(0) /* nameless */)); +static Table& split_horizontal(ArrayString& pieces, bool right) { + Table& table=*new Table(Table::columns_type(0) /* nameless */); Table::element_type row(new ArrayString(pieces.count())); if(right) { // right - for(int i=pieces.count(); --i>=0; ) { + for(int i=pieces.count(); --i>=0; ) *row+=pieces[i]; - } } else { // left - Array_iterator i(pieces); - while(i.has_next()) { + for(Array_iterator i(pieces); i.has_next(); ) *row+=i.next(); - } } - *table+=row; + table+=row; return table; } -static void split_with_options(Request& r, StringPtr method_name, MethodParams& params, - int bits) { - Pool& pool=r.pool(); - StringPtr string=GET_SELF(r, VString).string(); +static void split_with_options(Request& r, MethodParams& params, int bits) { + const String& string=GET_SELF(r, VString).string(); + size_t params_count=params.count(); ArrayString pieces; - split_list(r, method_name, params, 0, *string, pieces); + split_list(params, 0, string, pieces); if(!bits) { - StringPtr options(0); - if(params.count()>1) { - options=params.as_string(1, "options must not be code"); - } + const String* options=0; + if(params_count>1) + options=¶ms.as_string(1, OPTIONS_MUST_NOT_BE_CODE); bits=split_options(options); } bool right=(bits & SPLIT_RIGHT) != 0; bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; - TablePtr table=horizontal?split_horizontal(r, string, pieces, right) - :split_vertical(r, string, pieces, right); - r.write_no_lang(ValuePtr(new VTable(table))); + const String* column_name=0; + if(params_count>2){ + column_name=¶ms.as_string(2, COLUMN_NAME_MUST_BE_STRING); + if (horizontal && !column_name->is_empty()) + throw Exception(PARSER_RUNTIME, column_name, "column name can't be specified with horisontal split"); + } + if(!column_name || column_name->is_empty()) + column_name=new String("piece"); + + Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name); + + r.write(*new VTable(&table)); } -static void _split(Request& r, StringPtr method_name, MethodParams& params) { - split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */); +static void _split(Request& r, MethodParams& params) { + split_with_options(r, params, 0 /* maybe-determine from param #2 */); } -static void _lsplit(Request& r, StringPtr method_name, MethodParams& params) { - split_with_options(r, method_name, params, SPLIT_LEFT); +static void _lsplit(Request& r, MethodParams& params) { + split_with_options(r, params, SPLIT_LEFT); } -static void _rsplit(Request& r, StringPtr method_name, MethodParams& params) { - split_with_options(r, method_name, params, SPLIT_RIGHT); +static void _rsplit(Request& r, MethodParams& params) { + split_with_options(r, params, SPLIT_RIGHT); } -static void search_action(TablePtr table, Table::element_type row, int, int, int, int, void *) { +static void search_action(Table& table, Table::element_type row, int, int, int, int, void *) { if(row) - *table+=row; + table+=row; } #ifndef DOXYGEN struct Replace_action_info { - Request *request; - StringPtr origin; - StringPtr src; String* dest; - VTablePtr vtable; - ValuePtr replacement_code; + 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(TablePtr table, ArrayStringPtr row, - int prestart, int prefinish, - int poststart, int postfinish, - void *info) { +static void replace_action(Table& table, ArrayString* row, 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'] if(prestart!=prefinish) *ai.dest << ai.src->mid(prestart, prefinish);//ai.dest->APPEND_CONST("-"); // store found parts in one-record VTable - if(table->count()) // middle - table->put(0, row); + if(table.count()) // middle + table.put(0, row); else // begin - *table+=row; - { // execute 'replacement_code' in 'table' context - ai.vtable->set_table(table); + table+=row; - *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); } -/// @todo use pcre:study somehow -static void _match(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - ValuePtr regexp=params.as_no_junction(0, "regexp must not be code"); - - StringPtr options= - params.count()>1? - params.as_no_junction(1, "options must not be code")->as_string(&pool):StringPtr(0); - - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - StringPtr src=GET_SELF(r, VString).string(); - if(params.count()<3) { // search - bool was_global; - TablePtr table=src->match(r.charsets.source(), - method_name, - *regexp->as_string(&pool), options, - search_action, 0, - &was_global); - ValuePtr result; - // matched - // not (just matched[3=pre/match/post], no substrings) or Global search - if(table->columns()->count()>3 || was_global) - result=ValuePtr(new VTable(table/*TODO: clone this when table would be stacked!*/)); // table of pre/match/post+substrings - else - result=ValuePtr(new VBool(table)); - r.write_assign_lang(result); +static void _match(Request& r, MethodParams& params) { + 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; + + VRegex* vregex; + VRegexCleaner vrcleaner; + + if(Value* value=regexp.as(VREGEX_TYPE)){ + if(options && options->is_defined()) + throw Exception(PARSER_RUNTIME, 0, "you can not specify regex-object and options together"); + vregex=static_cast(value); + } else { + vregex=new VRegex(r.charsets.source(), ®exp.as_string(), (options) ? (&options->as_string()) : 0); + vregex->study(); + vrcleaner.vregex=vregex; + } + + const String& src=GET_SELF(r, VString).string(); + int matches_count=0; + + if(params_count<3) { // search + Table* table=src.match(vregex, search_action, 0, matches_count); + + if(table){ + r.write(*new VTable(table)); + } else { + r.write(*new VInt(matches_count)); + } + } else { // replace - ValuePtr 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; - VTablePtr vtable(new VTable); - Replace_action_info info; - info.request=&r; - info.origin=method_name; - info.src=src; - info.dest=&result; - info.vtable=vtable; - info.replacement_code=replacement_code; - Temp_value_element temp_match_var( - *replacement_code->get_junction()->method_frame, - match_var_name, vtable); - src->match(r.charsets.source(), - method_name, - *r.process_to_string(regexp), options, - replace_action, &info); - r.write_assign_lang(result); + VTable* vtable=new VTable; + Replace_action_info info={ + &r, + &src, + &result, + vtable, + replacement_code + }; + + if(is_junction){ + 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); + } + + if(!matches_count && default_code) + r.process_write(*default_code); + else + r.write(result); } } -static void change_case(Request& r, StringPtr method_name, MethodParams& params, - String::Change_case_kind kind) { - Pool& pool=r.pool(); - StringPtr src=GET_SELF(r, VString).string(); +static void change_case(Request& r, MethodParams&, String::Change_case_kind kind) { + const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(*src->change_case(pool, r.charsets.source(), kind)); + r.write(src.change_case(r.charsets.source(), kind)); } -static void _upper(Request& r, StringPtr method_name, MethodParams& params) { - change_case(r, method_name, params, String::CC_UPPER); +static void _upper(Request& r, MethodParams& params) { + change_case(r, params, String::CC_UPPER); } -static void _lower(Request& r, StringPtr method_name, MethodParams& params) { - change_case(r, method_name, params, String::CC_LOWER); +static void _lower(Request& r, MethodParams& params) { + change_case(r, params, String::CC_LOWER); } #ifndef DOXYGEN class String_sql_event_handlers: public SQL_Driver_query_event_handlers { - //Pool& pool; - StringPtr statement_string; const char* statement_cstr; bool got_column; public: bool got_cell; - StringPtr result; + const String* result; public: - String_sql_event_handlers(//Pool& apool, - StringPtr astatement_string, const char* astatement_cstr): - //pool(apool), - statement_string(astatement_string), - statement_cstr(astatement_cstr), - result(new String) {} + String_sql_event_handlers(): + got_column(false), + got_cell(false), + result(&String::Empty) {} - bool add_column(SQL_Error& error, void *ptr, size_t size) { + bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) { if(got_column) { - error=SQL_Error("parser.runtime", - //statement_string, - "result must contain exactly one column"); + error=SQL_Error("result must contain exactly one column"); return true; } got_column=true; @@ -385,134 +464,326 @@ 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, void *ptr, size_t size) { + bool add_row_cell(SQL_Error& error, const char* str, size_t) { if(got_cell) { - error=SQL_Error("parser.runtime", - //statement_string, - "result must not contain more then one row"); + error=SQL_Error("result must not contain more then one row"); return true; } - try { got_cell=true; - result->APPEND_TAINTED((const char* )ptr, size, statement_cstr, 0); + 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"); + error=SQL_Error("exception occurred in String_sql_event_handlers::add_row_cell"); return true; } } }; #endif -StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params, - HashStringValue*& options, ValuePtr& default_code) { - Pool& pool=r.pool(); - ValuePtr statement=params.as_junction(0, "statement must be code"); +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, Value*& default_code) { + Value& statement=params.as_junction(0, "statement must be code"); - ulong limit=0; + HashStringValue* bind=0; + ulong limit=SQL_NO_LIMIT; ulong offset=0; - default_code=ValuePtr(0); - if(params.count()>1) { - ValuePtr voptions=params.as_no_junction(1, "options must be hash, not code"); - if(!voptions->is_string()) - if(options=voptions->get_hash(method_name)) { - if(ValuePtr vlimit=options->get(sql_limit_name)) - limit=(ulong)r.process_to_value(vlimit)->as_double(); - if(ValuePtr voffset=options->get(sql_offset_name)) - offset=(ulong)r.process_to_value(voffset)->as_double(); - if(default_code=options->get(sql_default_name)) { - if(JunctionPtr default_junction=default_code->get_junction()) - ;//default_junction->change_context(statement.get_junction()); - else - throw Exception("parser.runtime", - method_name, - "default option must be code"); - } - } else - throw Exception("parser.runtime", - method_name, - "options must be hash"); - } else - options=0; - - Temp_lang temp_lang(r, String::UL_SQL); - StringPtr statement_string=r.process_to_string(statement); - const char* statement_cstr= - statement_string->cstr(pool, String::UL_UNSPECIFIED, r.connection(method_name)); - String_sql_event_handlers handlers(statement_string, statement_cstr); - r.connection(method_name)->query( - statement_cstr, offset, limit, - handlers, - statement_string); + default_code=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(*vlimit).as_double(); + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; + offset=(ulong)r.process(*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; + if(bind) + placeholders_count=marshal_binds(*bind, placeholders); + + const String& statement_string=r.process_to_string(statement); + const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection()); + + String_sql_event_handlers handlers; + + r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string); + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); + if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] return handlers.result; } -static void _sql(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _sql(Request& r, MethodParams& params) { - HashStringValue* options; - ValuePtr default_code; - StringPtr string=sql_result_string(r, method_name, params, options, default_code); + Value* default_code; + const String* string=sql_result_string(r, params, default_code); if(!string) { if(default_code) { - string=r.process_to_string(default_code); - if(!string) - string=StringPtr(new String); + string=&r.process_to_string(*default_code); } else - throw Exception("parser.runtime", - method_name, - "produced no result, but no default option specified"); + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } - r.write_assign_lang(*string); + r.write(*string); } -static void _replace(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - StringPtr src=GET_SELF(r, VString).string(); +static void _replace(Request& r, MethodParams& params) { + const String& src=GET_SELF(r, VString).string(); - Table* table=params.as_no_junction(0, "parameter must not be code")->get_table(); - if(!table) - throw Exception("parser.runtime", - method_name, - "parameter must be table"); + if(params.count()==1) { + // ^string.replace[table] + Table* table=params.as_table(0, "param"); + Dictionary dict(*table); + r.write(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(src.replace(dict)); + } - Dictionary dict2(TablePtr(table), 1/*am not sure why using the =default parameter causes compile errors in replace*/ ); - r.write_assign_lang(*src->replace(pool, dict2)); } -static void _save(Request& r, StringPtr method_name, MethodParams& params) { - StringPtr file_name=params.as_string(params.count()-1, - "file name must be string"); - - StringPtr src=GET_SELF(r, VString).string(); - +static void _save(Request& r, MethodParams& params) { bool do_append=false; + Charset* asked_charset=0; + + size_t file_name_index=0; if(params.count()>1) { - StringPtr 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'"); - } + 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=&pa_charsets.get(vcharset_name->as_string()); + 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 { + // ^file.save[append;filespec] + 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(); + + String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // write - CharPtr buf=src->cstr(String::UL_UNSPECIFIED, r.connection(StringPtr(0)/*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&) { + const String& src=GET_SELF(r, VString).string(); + + r.write(src); +} + +static void _trim(Request& r, MethodParams& params) { + const String& src=GET_SELF(r, VString).string(); + + String::Trim_kind kind=String::TRIM_BOTH; + size_t params_count=params.count(); + 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==TRIM_BOTH_OPTION) + kind=String::TRIM_BOTH; + else if(skind==TRIM_START_OPTION || skind=="start") + kind=String::TRIM_START; + else if(skind==TRIM_END_OPTION || skind=="end") + kind=String::TRIM_END; + else if(params_count==1) + chars=skind.cstr(); + else + throw Exception(PARSER_RUNTIME, &skind, "'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"); + if(!schars.is_empty()) + chars=schars.cstr(); + } + } + + r.write(src.trim(kind, chars, &r.charsets.source())); +} + +Base64Options base64_encode_options(Request& r, HashStringValue* options) { + Base64Options result; + if(options) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next()) { + String::Body key=i.key(); + Value* value=i.value(); + if(key == "pad") { + result.pad=r.process(*value).as_bool(); + valid_options++; + } else if(key == "wrap") { + result.wrap=r.process(*value).as_bool(); + valid_options++; + } else if(key == "url-safe") { + if(r.process(*value).as_bool()) + result.set_url_safe_abc(); + valid_options++; + } + } + + if(valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + return result; +} + +Base64Options base64_decode_options(Request& r, HashStringValue* options) { + Base64Options result; + if(options) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next() ) { + String::Body key=i.key(); + Value* value=i.value(); + if(key == "pad") { + result.pad=r.process(*value).as_bool(); + valid_options++; + } else if(key == "strict") { + result.strict=r.process(*value).as_bool(); + valid_options++; + } else if(key == "url-safe") { + if(r.process(*value).as_bool()) + result.set_url_safe_abc(); + valid_options++; + } + } + + if(valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + return result; } -static void _normalize(Request& r, StringPtr method_name, MethodParams& /*params*/) { - StringPtr src=GET_SELF(r, VString).string(); +static void _base64(Request& r, MethodParams& params) { + if(&r.get_self() == string_class) { + // decode: ^string:base64[encoded[;options]] + const char* cstr=params.count() ? params.as_string(0, PARAMETER_MUST_BE_STRING).cstr() : ""; + Base64Options options = base64_decode_options(r, params.count() > 1 ? params.as_hash(1) : NULL); + + char* decoded=0; + size_t length=pa_base64_decode(cstr, strlen(cstr), decoded, options); + + if(decoded && length){ + if(memchr(decoded, 0, length)) + throw Exception(PARSER_RUNTIME, 0, "Invalid \\x00 character found while decoding to string. Decode to file instead."); - r.write_assign_lang(*src->join_chains(r.pool())); + fix_line_breaks(decoded, length); + + if(length) + r.write(*new String(decoded, String::L_TAINTED)); + } + } else { + // encode: ^str.base64[options] + VString& self=GET_SELF(r, VString); + const char* cstr=self.string().cstr(); + Base64Options options = base64_encode_options(r, params.count() ? params.as_hash(0) : NULL); + const char* encoded=pa_base64_encode(cstr, strlen(cstr), options); + r.write(*new String(encoded, String::L_TAINTED /*once ?param=base64(something) was needed*/ )); + } +} + +static void _idna(Request& r, MethodParams& params) { + if(&r.get_self() == string_class) { + // decode: ^string:idna[encoded] + const char* cstr=params.count() ? params.as_string(0, PARAMETER_MUST_BE_STRING).cstr() : ""; + r.write(*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(*new String(pa_idna_encode(cstr, r.charsets.source()), String::L_TAINTED)); + } +} + +static void _js_escape(Request& r, MethodParams&){ + const String& src=GET_SELF(r, VString).string(); + r.write(src.escape(r.charsets.source())); +} + +static void _js_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(*new String(result, String::L_TAINTED)); +} + +static void _unescape(Request& r, MethodParams& params){ + const String& mode=params.as_string(0, MODE_MUST_NOT_BE_CODE); + const String& src=params.as_string(1, PARAMETER_MUST_BE_STRING); + + Charset* from_charset=&r.charsets.client(); + + if(params.count() > 2) + if(HashStringValue* options=params.as_hash(2)) { + int valid_options=0; + if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){ + from_charset=&pa_charsets.get(vcharset_name->as_string()); + valid_options++; + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + + bool mode_js; + if(mode==UNESCAPE_MODE_JS){ + mode_js=true; + } else if(mode==UNESCAPE_MODE_URI){ + mode_js=false; + } else { + throw Exception(PARSER_RUNTIME, &mode, "is invalid mode, must be either '" UNESCAPE_MODE_JS "' or '" UNESCAPE_MODE_URI "'"); + } + + const char* unescaped=unescape_chars(src.cstr(), src.length(), from_charset, mode_js); + if(*unescaped){ + const String* result=new String(Charset::transcode(unescaped, *from_charset, r.charsets.source()), String::L_TAINTED); + r.write(*result); + } +} + +static void _contains(Request& r, MethodParams& params) { + // empty or whitespace string is hash compatible + GET_SELF(r, VString).get_element(params.as_string(0, "key must be string")); + // ignoring result as it allways null + r.write(VBool::get(false)); } // constructor @@ -527,48 +798,80 @@ MString::MString(): Methoded("string") { // ^string.double[] // ^string.double(default) add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); + // ^void.bool[] + // ^void.bool(default) + add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); - // ^string.format{format} + // ^string.format[format] add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); // ^string.left(n) add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1); // ^string.right(n) add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1); + // ^string.mid(p) // ^string.mid(p;n) add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2); // ^string.pos[substr] - add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1); + // ^string.pos[substr](n) + add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 2); // ^string.split[delim] // ^string.split[delim][options] - add_native_method("split", Method::CT_DYNAMIC, _split, 1, 2); - // old names for backward compatibility - // ^string.lsplit[delim] - add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1); - // ^string.rsplit[delim] - add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1); - + // ^string.split[delim][options][column name] + add_native_method("split", Method::CT_DYNAMIC, _split, 1, 3); + // old names for backward compatibility + // ^string.lsplit[delim] + add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1); + // ^string.rsplit[delim] + add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1); + // ^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.toupper[] + // ^string.upper[] add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0); - // ^string.tolower[] + // ^string.lower[] add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); - // ^sql[query] - // ^sql[query][$.limit(1) $.offset(2) $.default[n/a]] + // ^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); + add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 2); - // ^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[] add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); -} + + // ^string.trim[[start|both|end][;chars]] + add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); + + // ^string.base64[] << encode + // ^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_DYNAMIC, _js_escape, 0, 0); + + // ^string:js-unescape[escaped%uXXXXstring] + add_native_method("js-unescape", Method::CT_STATIC, _js_unescape, 1, 1); + + // ^string:unescape[js|uri;escaped;$.charset[...]] + add_native_method("unescape", Method::CT_STATIC, _unescape, 2, 3); + + // ^string.contains[key] for hash compatibility + add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); +}