--- parser3/src/classes/string.C 2002/12/09 12:19:16 1.124 +++ parser3/src/classes/string.C 2007/02/03 18:08:38 1.151 @@ -1,13 +1,15 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2002/12/09 12:19:16 $"; +static const char * const IDENT_STRING_C="$Date: 2007/02/03 18:08:38 $"; #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" @@ -20,123 +22,166 @@ static const char* IDENT_STRING_C="$Date // class -class MString : public Methoded { +class MString: public Methoded { public: - MString(Pool& pool); + MString(); public: // Methoded bool used_directly() { return true; } }; +// global variable + +DECLARE_CLASS_VAR(string, new MString, 0); + +// defines for statics + +#define MATCH_VAR_NAME "match" +#define TRIM_START_OPTION "start" +#define TRIM_BOTH_OPTION "both" +#define TRIM_END_OPTION "end" + +// statics + +static const String match_var_name(MATCH_VAR_NAME); + // methods -static void _length(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - double result=r.get_self()->get_string()->size(); - r.write_no_lang(*new(pool) VDouble(pool, result)); +static void _length(Request& r, MethodParams&) { + double result=GET_SELF(r, VString).string().length(); + r.write_no_lang(*new VDouble(result)); } -static void _int(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String *self_string=r.get_self()->get_string(); +static void _int(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); int converted; - Value *default_code=params->size()>0?¶ms->as_junction(0, "default must be int"):0; // (default) try { - if(!self_string || self_string->is_empty()) + if(self_string.is_empty()) throw Exception("parser.runtime", - &method_name, + 0, "parameter is empty string, error converting"); - converted=self_string->as_int(); + converted=self_string.as_int(); } catch(...) { // convert problem - if(!default_code) // we have a problem when no default - /*re*/throw; + 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(); + rethrow; // we have a problem when no default } - r.write_no_lang(*new(pool) VInt(pool, converted)); + r.write_no_lang(*new VInt(converted)); } -static void _double(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String *self_string=r.get_self()->get_string(); +static void _double(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); double converted; - Value *default_code=params->size()>0?¶ms->as_junction(0, "default must be double"):0; // (default) try { - if(!self_string || self_string->is_empty()) + if(self_string.is_empty()) + throw Exception("parser.runtime", + 0, + "parameter is empty string, error converting"); + 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)); +} + +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", - &method_name, + 0, "parameter is empty string, error converting"); - converted=self_string->as_double(); + converted=self_string.as_bool(); } catch(...) { // convert problem - if(!default_code) // we have a problem when no default - /*re*/throw; + if(params.count()>0) + converted=params.as_bool(0, "default must be bool", r); // (default) else - converted=r.process_to_value(*default_code).as_double(); + rethrow; // we have a problem when no default } - r.write_no_lang(*new(pool) VDouble(pool, converted)); + r.write_no_lang(*new VBool(converted)); } -/*not static*/void _string_format(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +/*not static*/void _string_format(Request& r, MethodParams& params) { - Value& fmt_maybe_code=params->get(0); + Value& fmt_maybe_code=params[0]; // for some time due to stupid {} in original design const String& fmt=r.process_to_string(fmt_maybe_code); - char *buf=format(pool, r.get_self()->as_double(), fmt.cstr()); + const char* buf=format(r.get_self().as_double(), fmt.cstrm()); - String result(pool); - result.APPEND_CLEAN(buf, 0, - method_name.origin().file, - method_name.origin().line); - r.write_no_lang(result); + r.write_no_lang(String(buf)); } -static void _left(Request& r, const String&, MethodParams *params) { - Pool& pool=r.pool(); +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; - size_t n=(size_t)params->as_int(0, "n must be int", r); - - const String& string=static_cast(r.get_self())->string(); + const String& string=GET_SELF(r, VString).string(); r.write_assign_lang(string.mid(0, n)); } -static void _right(Request& r, const String&, MethodParams *params) { - Pool& pool=r.pool(); - - size_t n=(size_t)params->as_int(0, "n must be int", r); +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=static_cast(r.get_self())->string(); - r.write_assign_lang(string.mid(string.size()-n, string.size())); + + const String& string=GET_SELF(r, VString).string(); + size_t length=string.length(); + r.write_assign_lang(nget_string(); +static void _mid(Request& r, MethodParams& params) { + const String& string=GET_SELF(r, VString).string(); - size_t p=(size_t)max(0, params->as_int(0, "p must be int", r)); - size_t n=params->size()>1? - (size_t)max(0, params->as_int(1, "n must be int", r)):string.size(); + 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; + 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 + end=string.length(); - r.write_assign_lang(string.mid(p, p+n)); + r.write_assign_lang(string.mid(begin, end)); } -static void _pos(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - Value& 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"); - const String& string=static_cast(r.get_self())->string(); - r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string()))); + const String& string=GET_SELF(r, VString).string(); + r.write_assign_lang(*new VInt((int)string.pos(substr.as_string()))); } -static void split_list(Request& r, const String& method_name, - MethodParams *params, int paramIndex, - const String& string, - Array& result) { - Value& delim_value=params->as_no_junction(paramIndex, "delimiter must not be code"); +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()); + size_t pos_after=0; + string.split(result, pos_after, delim_value.as_string()); } #define SPLIT_LEFT 0x0001 @@ -144,10 +189,10 @@ static void split_list(Request& r, const #define SPLIT_HORIZONTAL 0x0100 #define SPLIT_VERTICAL 0x1000 -static int split_options(const String *options) { +static int split_options(const String* options) { struct Split_option { - const char *keyL; - const char *keyU; + const char* keyL; + const char* keyU; int setBit; int checkBit; } split_option[]={ @@ -155,14 +200,14 @@ static int split_options(const String *o {"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, @@ -174,114 +219,101 @@ static int split_options(const String *o return result; } -static Table *split_vertical(Request& r, const String& string, Array& pieces, bool right) { - Pool& pool=r.pool(); +static Table& split_vertical(ArrayString& pieces, bool right) { + Table::columns_type columns(new ArrayString); + *columns+=new String("piece"); - Array& columns=*new(pool) Array(pool); - columns+=new(pool) String(pool, "piece"); - - Table& table=*new(pool) Table(pool, &string, - &columns, pieces.size()); + Table& table=*new Table(columns, pieces.count()); if(right) { // right - for(int i=pieces.size(); --i>=0; ) { - Array& row=*new(pool) Array(pool); - row+=pieces.get(i); - table+=&row; + for(int i=pieces.count(); --i>=0; ) { + Table::element_type row(new ArrayString); + *row+=pieces[i]; + table+=row; } } else { // left - Array_iter i(pieces); + Array_iterator i(pieces); while(i.has_next()) { - Array& row=*new(pool) Array(pool); - row+=i.next(); - table+=&row; + Table::element_type row(new ArrayString); + *row+=i.next(); + table+=row; } } - return &table; + return table; } -static Table *split_horizontal(Request& r, const String& string, Array& pieces, bool right) { - Pool& pool=r.pool(); - - Table& table=*new(pool) Table(pool, &string, 0 /* nameless */); - Array& row=*new(pool) Array(pool); +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.size(); --i>=0; ) { - row+=pieces.get(i); - } + for(int i=pieces.count(); --i>=0; ) + *row+=pieces[i]; } else { // left - Array_iter i(pieces); - while(i.has_next()) { - row+=i.next(); - } + for(Array_iterator i(pieces); i.has_next(); ) + *row+=i.next(); } - table+=&row; + table+=row; - return &table; + return table; } -static void split_with_options(Request& r, const String& method_name, MethodParams *params, +static void split_with_options(Request& r, MethodParams& params, int bits) { - Pool& pool=r.pool(); - const String& string=*r.get_self()->get_string(); + const String& string=GET_SELF(r, VString).string(); - Array pieces(pool); - split_list(r, method_name, params, 0, - string, pieces); + ArrayString pieces; + split_list(params, 0, string, pieces); if(!bits) { - const String *options=0; - if(params->size()>1) { - options=¶ms->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; - Table *table; - if(horizontal) - table=split_horizontal(r, string, pieces, right); - else - table=split_vertical(r, string, pieces, right); + Table& table=horizontal?split_horizontal(pieces, right) + :split_vertical(pieces, right); - r.write_no_lang(*new(pool) VTable(pool, table)); + r.write_no_lang(*new VTable(&table)); } -static void _split(Request& r, const String& 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, const String& 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, const String& 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(Table& table, Array *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; } #ifndef DOXYGEN struct Replace_action_info { - Request *request; const String *origin; - const String *src; String *dest; - VTable *vtable; - Value *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(Table& table, Array *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.size()) // middle + if(table.count()) // middle table.put(0, row); else // begin table+=row; @@ -295,89 +327,83 @@ static void replace_action(Table& table, } /// @todo use pcre:study somehow -static void _match(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - Value& regexp=params->as_no_junction(0, "regexp must not be code"); - - const String *options= - params->size()>1? - ¶ms->as_no_junction(1, "options must not be code").as_string():0; - - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - Table *table; - if(params->size()<3) { // search - const String& src=static_cast(r.get_self())->string(); - - bool was_global; - bool matched=src.match( - &method_name, +static void _match(Request& r, MethodParams& params) { + Value& regexp=params.as_no_junction(0, "regexp must not be code"); + + const String* options= + params.count()>1? + ¶ms.as_no_junction(1, "options must not be code").as_string():0; + + Temp_lang temp_lang(r, String::L_PASS_APPENDED); + const String& src=GET_SELF(r, VString).string(); + bool just_matched; + if(params.count()<3) { // search + Table* table=src.match(r.charsets.source(), regexp.as_string(), options, - &table, search_action, 0, - &was_global); - Value *result; - // matched - // not (just matched[3=pre/match/post], no substrings) or Global search - if(table->columns()->size()>3 || was_global) - result=new(pool) VTable(pool, table/*TODO: clone this when table would be stacked!*/); // table of pre/match/post+substrings - else - result=new(pool) VBool(pool, matched); - r.write_assign_lang(*result); + just_matched); + // Value* result; + // if(table) + // result=new VTable(table); // table of pre/match/post+substrings + // else + // result=new VBool(just_matched); + // r.write_assign_lang(*result); + r.write_assign_lang(*new VTable(table)); } else { // replace - const String& src=*r.get_self()->get_string(); - - Value& replacement_code=params->as_junction(2, "replacement param must be code"); + Value& replacement_code=params.as_junction(2, "replacement param must be code"); - String& result=*new(pool) String(pool); - VTable vtable(pool); - Replace_action_info replace_action_info={ - &r, &method_name, - &src, &result, - &vtable, + String result; + VTable* vtable=new VTable; + Replace_action_info info={ + &r, + &src, + &result, + vtable, &replacement_code }; Temp_value_element temp_match_var( *replacement_code.get_junction()->method_frame, - *match_var_name, &vtable); - src.match( - &method_name, + match_var_name, vtable); + src.match(r.charsets.source(), r.process_to_string(regexp), options, - &table, - replace_action, &replace_action_info); + replace_action, &info, + just_matched); r.write_assign_lang(result); } } -static void change_case(Request& r, const String& method_name, MethodParams *params, +static void change_case(Request& r, MethodParams&, String::Change_case_kind kind) { - Pool& pool=r.pool(); - const String& src=static_cast(r.get_self())->string(); + const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(src.change_case(pool, kind)); + r.write_assign_lang(src.change_case(r.charsets.source(), kind)); } -static void _upper(Request& r, const String& 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, const String& 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 { +class String_sql_event_handlers: public SQL_Driver_query_event_handlers { + const String& statement_string; const char* statement_cstr; + bool got_column; public: - String_sql_event_handlers(Pool& apool, - const String& astatement_string, const char *astatement_cstr): - pool(apool), - statement_string(astatement_string), - statement_cstr(astatement_cstr), - got_column(false), got_cell(false) { - result=new(pool) String(pool); - } + bool got_cell; + 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) {} - 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, + //statement_string, "result must contain exactly one column"); return true; } @@ -386,124 +412,137 @@ 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 length) { if(got_cell) { error=SQL_Error("parser.runtime", - &statement_string, + //statement_string, "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.append_know_length(str, length, String::L_TAINTED); return false; } catch(...) { error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell"); return true; } } - -private: - Pool& pool; - const String& statement_string; const char *statement_cstr; - bool got_column; -public: - bool got_cell; - String *result; }; #endif -const String* sql_result_string(Request& r, const String& method_name, MethodParams *params, - Hash *& options, Value *& default_code) { - Pool& pool=r.pool(); - - Value& statement=params->as_junction(0, "statement must be code"); +extern String sql_bind_name; +extern String sql_limit_name; +extern String sql_offset_name; +extern String sql_default_name; +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) { + Value& statement=params.as_junction(0, "statement must be code"); + HashStringValue* bind=0; ulong limit=0; ulong offset=0; default_code=0; - if(params->size()>1) { - Value& voptions=params->as_no_junction(1, "options must be hash, not code"); - if(!voptions.is_string()) - if(options=voptions.get_hash(&method_name)) { - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + 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=(Value *)options->get(*sql_offset_name)) + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; offset=(ulong)r.process_to_value(*voffset).as_double(); - if(default_code=(Value *)options->get(*sql_default_name)) { - if(Junction *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"); } + 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", - &method_name, + 0, "options must be hash"); } else options=0; - Temp_lang temp_lang(r, String::UL_SQL); + SQL_Driver::Placeholder* placeholders=0; + uint placeholders_count=0; + if(bind) + placeholders_count=marshal_binds(*bind, placeholders); + + 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::UL_UNSPECIFIED, r.connection(&method_name)); - String_sql_event_handlers handlers(pool, statement_string, statement_cstr); - r.connection(&method_name)->query( - statement_cstr, offset, limit, + const char* statement_cstr= + statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + String_sql_event_handlers handlers(statement_string, statement_cstr); + 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; + return &handlers.result; } -static void _sql(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +static void _sql(Request& r, MethodParams& params) { - Hash *options; - Value *default_code; - const String *string=sql_result_string(r, method_name, params, options, default_code); + HashStringValue* options; + Value* default_code; + const String* string=sql_result_string(r, params, options, default_code); if(!string) { if(default_code) { string=&r.process_to_string(*default_code); - if(!string) - string=new(pool) String(pool); } else throw Exception("parser.runtime", - &method_name, + 0, "produced no result, but no default option specified"); } r.write_assign_lang(*string); } -static void _replace(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String& src=*r.get_self()->get_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(); + Table* table=params.as_no_junction(0, "parameter must not be code").get_table(); if(!table) throw Exception("parser.runtime", - &method_name, + 0, "parameter must be table"); Dictionary dict(*table); - r.write_assign_lang(src.replace(pool, dict)); + r.write_assign_lang(src.replace(dict)); } -static void _save(Request& r, const String& method_name, MethodParams *params) { - const String& file_name=params->as_string(params->size()-1, +static void _save(Request& r, MethodParams& params) { + const String& file_name=params.as_string(params.count()-1, "file name must be string"); - const String& src=static_cast(r.get_self())->string(); + const String& src=GET_SELF(r, VString).string(); bool do_append=false; - if(params->size()>1) { - const String& mode=params->as_string(0, "mode must be string"); + if(params.count()>1) { + const String& mode=params.as_string(0, "mode must be string"); if(mode=="append") do_append=true; else @@ -513,18 +552,78 @@ static void _save(Request& r, const Stri } // write - const char *buf=src.cstr(String::UL_UNSPECIFIED, r.connection(0/*no error if none*/)); + 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); } -static void _normalize(Request& r, const String& method_name, MethodParams * /*params*/) { - r.write_assign_lang(r.get_self()->get_string()->join_chains(r.pool(), 0/*cstr*/)); +static void _normalize(Request& r, MethodParams&) { + const String& src=GET_SELF(r, VString).string(); + + r.write_assign_lang(src); +} + +static void _trim(Request& r, MethodParams& params) { + const String& src=GET_SELF(r, VString).string(); + + String::Trim_kind kind=String::TRIM_BOTH; + const char* chars=0; + if(params.count()>0) { + const String& skind=params.as_string(0, + "'where' must be string"); + if(skind.length()) + if(skind==TRIM_START_OPTION) + kind=String::TRIM_START; + else if(skind==TRIM_END_OPTION) + kind=String::TRIM_END; + else if(skind==TRIM_BOTH_OPTION) + kind=String::TRIM_BOTH; + 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.length()) + chars=schars.cstr(); + } + } + + r.write_assign_lang(src.trim(kind, chars)); +} + +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 + const char* cstr=params.as_string(0, "parameter must be string").cstr(); + char* decoded_cstr=0; + size_t decoded_size=0; + pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size); + if(decoded_cstr && decoded_size) + r.write_assign_lang(*new String(decoded_cstr, decoded_size, true)); + } else { + // encode + 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/*once ?param=base64(something) was needed*/)); + } } // constructor -MString::MString(Pool& apool) : Methoded(apool, "string") { +MString::MString(): Methoded("string") { // ^string.length[] add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0); @@ -534,6 +633,9 @@ MString::MString(Pool& apool) : Methoded // ^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} add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); @@ -567,7 +669,7 @@ MString::MString(Pool& apool) : Methoded add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); // ^sql[query] - // ^sql[query][$.limit(1) $.offset(2) $.default[n/a]] + // ^sql[query][options hash] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); // ^string.replace[table] @@ -578,14 +680,14 @@ MString::MString(Pool& apool) : Methoded // ^string.normalize[] add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); -} -// global variable - -Methoded *string_class; + // ^string.trim[[start|both|end][;chars]] + add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); -// creator + // ^string.append[string] + add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1); -Methoded *MString_create(Pool& pool) { - return string_class=new(pool) MString(pool); -} + // ^string.base64[] << encode + // ^string:base64[encoded string] << decode + add_native_method("base64", Method::CT_ANY, _base64, 0, 1); +}