--- parser3/src/classes/string.C 2001/08/28 09:27:42 1.71 +++ parser3/src/classes/string.C 2004/03/01 08:52:24 1.135 @@ -1,13 +1,15 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char *RCSId="$Id: string.C,v 1.71 2001/08/28 09:27:42 parser Exp $"; + +static const char * const IDENT_STRING_C="$Date: 2004/03/01 08:52:24 $"; #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" @@ -16,404 +18,524 @@ static const char *RCSId="$Id: string.C, #include "pa_string.h" #include "pa_sql_connection.h" #include "pa_dictionary.h" - -// defines - -#define STRING_CLASS_NAME "string" +#include "pa_vmethod_frame.h" // 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(); - Value& result=*new(pool) VDouble(pool, r.self->get_string()->size()); - result.set_name(method_name); - r.write_no_lang(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, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); + int converted; + Value* default_code=params.count()>0?¶ms.as_junction(0, "default must be int") + :0; // (default) + try { + if(self_string.is_empty()) + throw Exception("parser.runtime", + 0, + "parameter is empty string, error converting"); + converted=self_string.as_int(); + } catch(...) { // convert problem + if(default_code) + converted=r.process_to_value(*default_code).as_int(); + else + rethrow; // we have a problem when no default + } + r.write_no_lang(*new VInt(converted)); } -static void _int(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - Value& result=*new(pool) VInt(pool, r.self->as_int()); - result.set_name(method_name); - r.write_no_lang(result); -} +static void _double(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); + double converted; + Value* default_code=params.count()>0?¶ms.as_junction(0, "default must be double") + :0; // (default) + try { + 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(default_code) + converted=r.process_to_value(*default_code).as_double(); + else + rethrow; // we have a problem when no default + } -static void _double(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - Value& result=*new(pool) VDouble(pool, r.self->as_double()); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new VDouble(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=params->as_junction(0, "fmt must be code"); + 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); - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().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(); - - size_t n=(size_t)r.process(params->get(0)).as_double(); +static void _left(Request& r, MethodParams& params) { + size_t n=(size_t)params.as_int(0, "n must be int", r); - const String& string=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(string.mid(0, n))); + 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)r.process(params->get(0)).as_double(); +static void _right(Request& r, MethodParams& params) { + size_t n=(size_t)params.as_int(0, "n must be int", r); - const String& string=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(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(0)).as_double(); - size_t n=(size_t)r.process(params->get(1)).as_double(); + size_t p=(size_t)max(0, params.as_int(0, "p must be int", r)); + size_t n=params.count()>1? + (size_t)max(0, params.as_int(1, "n must be int", r)):string.length(); - const String& string=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(string.mid(p, p+n))); + r.write_assign_lang(string.mid(p, p+n)); } -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.self)->get_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, - const String& string, - Array& result) { - Value& delim_value=params->as_no_junction(0, "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"); + + size_t pos_after=0; + string.split(result, pos_after, delim_value.as_string()); +} + +#define SPLIT_LEFT 0x0001 +#define SPLIT_RIGHT 0x0010 +#define SPLIT_HORIZONTAL 0x0100 +#define SPLIT_VERTICAL 0x1000 + +static int split_options(const String* options) { + struct Split_option { + const char* keyL; + const char* keyU; + int setBit; + int checkBit; + } split_option[]={ + {"l", "L", SPLIT_LEFT, SPLIT_RIGHT}, // 0xVHRL + {"r", "R", SPLIT_RIGHT, SPLIT_LEFT}, + {"h", "H", SPLIT_HORIZONTAL, SPLIT_VERTICAL}, + {"v", "V", SPLIT_VERTICAL, SPLIT_HORIZONTAL}, + {0, 0, 0, 0} + }; + + int result=0; + if(options) { + for(Split_option *o=split_option; o->keyL; o++) + 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"); + result |= o->setBit; + } + } - string.split(result, 0, delim_value.as_string()); + return result; } -static void _lsplit(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_string(); - - Array pieces(pool); - split_list(r, method_name, params, string, pieces); +static Table& split_vertical(ArrayString& pieces, bool right) { + Table::columns_type columns(new ArrayString); + *columns+=new String("piece"); + + 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; + } + } else { // left + Array_iterator i(pieces); + while(i.has_next()) { + Table::element_type row(new ArrayString); + *row+=i.next(); + table+=row; + } + } - Array& columns=*new(pool) Array(pool); - columns+=new(pool) String(pool, "piece"); + return table; +} - Table& table=*new(pool) Table(pool, &string, - &columns, pieces.size()); - Array_iter i(pieces); - while(i.has_next()) { - Array& row=*new(pool) Array(pool); - row+=i.next(); - table+=&row; +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; ) + *row+=pieces[i]; + } else { // left + for(Array_iterator i(pieces); i.has_next(); ) + *row+=i.next(); } - r.write_no_lang(*new(pool) VTable(pool, &table)); -} + table+=row; -static void _rsplit(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_string(); + return table; +} - Array pieces(pool); - split_list(r, method_name, params, string, pieces); +static void split_with_options(Request& r, MethodParams& params, + int bits) { + const String& string=GET_SELF(r, VString).string(); - Array& columns=*new(pool) Array(pool); - columns+=new(pool) String(pool, "piece"); + ArrayString pieces; + split_list(params, 0, string, pieces); - Table& table=*new(pool) Table(pool, &string, - &columns, pieces.size()); - for(int i=pieces.size(); --i>=0; ) { - Array& row=*new(pool) Array(pool); - row+=pieces.get(i); - table+=&row; + if(!bits) { + const String* options=0; + if(params.count()>1) + options=¶ms.as_string(1, "options must not be code"); + + bits=split_options(options); } - r.write_no_lang(*new(pool) VTable(pool, &table)); + bool right=(bits & SPLIT_RIGHT) != 0; + bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; + Table& table=horizontal?split_horizontal(pieces, right) + :split_vertical(pieces, right); + + r.write_no_lang(*new VTable(&table)); +} +static void _split(Request& r, MethodParams& params) { + split_with_options(r, params, 0 /* maybe-determine from param #2 */); +} +static void _lsplit(Request& r, MethodParams& params) { + split_with_options(r, params, SPLIT_LEFT); +} +static void _rsplit(Request& r, MethodParams& params) { + split_with_options(r, params, SPLIT_RIGHT); } -static void search_action(Table& table, Array *row, int, int, void *) { +static void search_action(Table& table, Table::element_type row, int, int, int, int, void *) { if(row) table+=row; } -/// used by string: _match / replace_action +#ifndef DOXYGEN struct Replace_action_info { - Request *request; const String *origin; - const String *src; String *dest; - Value *replacement_code; - const String *post_match; + Request* request; + const String* src; String* dest; + VTable* vtable; + Value* replacement_code; }; -static void replace_action(Table& table, Array *row, int start, int finish, - void *info) { +#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) { Replace_action_info& ai=*static_cast(info); if(row) { // begin&middle - // piece from last match['start'] to beginning of this match['finish'] - if(start!=finish) - *ai.dest << ai.src->mid(start, finish);//ai.dest->APPEND_CONST("-"); + // 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; { // execute 'replacement_code' in 'table' context - VTable& vtable=*new(table.pool()) VTable(table.pool(), &table); - vtable.set_name(*ai.origin); + ai.vtable->set_table(table); - Junction *junction=ai.replacement_code->get_junction(); - Value *saved_match_var_value=junction->root->get_element(*match_var_name); - junction->root->put_element(*match_var_name, &vtable); - Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false); - junction->root->put_element(*match_var_name, saved_match_var_value); - - /* - ai.dest->APPEND_CONST("("); - *ai.dest << *(String *)row->get(1/*match* /); - ai.dest->APPEND_CONST(")"); - */ - *ai.dest << replaced.as_string(); + *ai.dest << ai.request->process_to_string(*ai.replacement_code); } - ai.post_match=(String *)row->get(2/*post_match*/); } else // end - *ai.dest << *ai.post_match; + *ai.dest << ai.src->mid(poststart, postfinish); } /// @todo use pcre:study somehow -static void _match(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String& src=*static_cast(r.self)->get_string(); - - 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; - - Value *result; - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - Table *table; - if(params->size()<3) { // search - bool was_global; - bool matched=src.match(r.pcre_tables, - &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); - // 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); // table of pre/match/post+substrings + just_matched); + Value* result; + if(table) + result=new VTable(table); // table of pre/match/post+substrings else - result=new(pool) VBool(pool, matched); + result=new VBool(just_matched); + r.write_assign_lang(*result); } else { // replace - Value& replacement_code=params->as_junction(2, "replacement code must be code"); + Value& replacement_code=params.as_junction(2, "replacement param must be code"); - String& dest=*new(pool) String(pool); - Replace_action_info replace_action_info={ - &r, &method_name, - &src, &dest, - &replacement_code, - &src + String result; + VTable* vtable=new VTable; + Replace_action_info info={ + &r, + &src, + &result, + vtable, + &replacement_code }; - src.match(r.pcre_tables, - &method_name, - r.process(regexp).as_string(), options, - &table, - replace_action, &replace_action_info); - result=new(pool) VString(dest); + Temp_value_element temp_match_var( + *replacement_code.get_junction()->method_frame, + match_var_name, vtable); + src.match(r.charsets.source(), + r.process_to_string(regexp), options, + replace_action, &info, + just_matched); + r.write_assign_lang(result); } - result->set_name(method_name); - 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.self)->get_string(); + const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables, - 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); - } - - void add_column(void *ptr, size_t size) { - if(got_column) - PTHROW(0, 0, - &statement_string, + 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, const char* /*str*/, size_t /*length*/) { + if(got_column) { + error=SQL_Error("parser.runtime", + //statement_string, "result must contain exactly one column"); + return true; + } got_column=true; + return false; } - void before_rows() { /* ignore */ } - void add_row() { /* ignore */ } - void add_row_cell(void *ptr, size_t size) { - if(got_cell) - PTHROW(0, 0, - &statement_string, + 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) { + if(got_cell) { + error=SQL_Error("parser.runtime", + //statement_string, "result must not contain more then one row"); - got_cell=true; + return true; + } - result->APPEND_TAINTED((const char *)ptr, size, statement_cstr, 0); + try { + got_cell=true; + 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) { - Pool& pool=r.pool(); - - if(!r.connection) - PTHROW(0, 0, - &method_name, - "without connect"); - - Value& statement=params->as_junction(0, "statement must be code"); +extern String sql_limit_name; +extern String sql_offset_name; +extern String sql_default_name; +extern String sql_distinct_name; +const String* sql_result_string(Request& r, MethodParams& params, + HashStringValue*& options, Value*& default_code) { + Value& statement=params.as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; - if(params->size()>1) { - Value& options_param=params->as_no_junction(1, "options must be hash, not code"); - if(options=options_param.get_hash()) { - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); - if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); - } else - PTHROW(0, 0, - &method_name, - "options must be hash"); + default_code=0; + if(params.count()>1) { + Value& voptions=params.as_no_junction(1, "options must be hash, not code"); + if(!voptions.is_string()) + if((options=voptions.get_hash())) { + if(Value* vlimit=options->get(sql_limit_name)) + limit=(ulong)r.process_to_value(*vlimit).as_double(); + if(Value* voffset=options->get(sql_offset_name)) + offset=(ulong)r.process_to_value(*voffset).as_double(); + if((default_code=options->get(sql_default_name))) { + if(!default_code->get_junction()) + throw Exception("parser.runtime", + 0, + "default option must be code"); + } + } else + throw Exception("parser.runtime", + 0, + "options must be hash"); } else options=0; - Temp_lang temp_lang(r, String::UL_SQL); - const String& statement_string=r.process(statement).as_string(); - const char *statement_cstr= - statement_string.cstr(String::UL_UNSPECIFIED, r.connection); - String_sql_event_handlers handlers(pool, statement_string, statement_cstr); - bool need_rethrow=false; Exception rethrow_me; - PTRY { - r.connection->query( - statement_cstr, offset, limit, - handlers); - } - PCATCH(e) { // query problem - rethrow_me=e; need_rethrow=true; - } - PEND_CATCH - if(need_rethrow) - PTHROW(rethrow_me.type(), rethrow_me.code(), - &statement_string, // setting more specific source [were url] - rethrow_me.comment()); + 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()); + String_sql_event_handlers handlers(statement_string, statement_cstr); + r.connection()->query( + statement_cstr, offset, limit, + handlers, + statement_string); 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; - const String *string=sql_result_string(r, method_name, params, options); + HashStringValue* options; + Value* default_code; + const String* string=sql_result_string(r, params, options, default_code); if(!string) { - if(options) { - if(Value *vdefault=(Value *)options->get(*sql_default_name)) { - if(!vdefault->get_junction()) - PTHROW(0, 0, - &method_name, - "default option must be code"); - string=r.process(*vdefault).get_string(); - if(!string) - string=empty_string; - } else - PTHROW(0, 0, - &method_name, - "produced no result, but no default option specified"); + if(default_code) { + string=&r.process_to_string(*default_code); } else - PTHROW(0, 0, - &method_name, - "produced no result, but no options (no default) specified"); + throw Exception("parser.runtime", + 0, + "produced no result, but no default option specified"); } - VString& result=*new(pool) VString(*string); - result.set_name(method_name); - r.write_assign_lang(result); + + r.write_assign_lang(*string); } -static void _replace(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String& src=*static_cast(r.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) - PTHROW(0, 0, - &method_name, + throw Exception("parser.runtime", + 0, "parameter must be table"); Dictionary dict(*table); - r.write_assign_lang(*new(pool) VString(src.replace(pool, dict))); + r.write_assign_lang(src.replace(dict)); } -// constructor -MString::MString(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), STRING_CLASS_NAME)); +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=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'"); + } + + // 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); +} + +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==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' should be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION); + + if(params.count()>1) + chars=params.as_string(1, + "'chars' must be string").cstr(); + } + + r.write_assign_lang(src.trim(kind, chars)); +} +// constructor +MString::MString(): Methoded("string") { // ^string.length[] add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0); // ^string.int[] - add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0); - + // ^string.int(default) + add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); // ^string.double[] - add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0); + // ^string.double(default) + add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); // ^string.format{format} add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); @@ -423,16 +545,20 @@ MString::MString(Pool& apool) : Methoded // ^string.right(n) add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1); // ^string.mid(p;n) - add_native_method("mid", Method::CT_DYNAMIC, _mid, 2, 2); + add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2); // ^string.pos[substr] add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1); - // ^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] + // ^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.match[regexp][options] // ^string.match[regexp][options]{replacement-code} add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3); @@ -448,14 +574,13 @@ MString::MString(Pool& apool) : Methoded // ^string.replace[table] add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1); -} -// global variable - -Methoded *string_class; + // ^string.save[file] + add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); -// creator + // ^string.normalize[] + add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); -Methoded *MString_create(Pool& pool) { - return string_class=new(pool) MString(pool); -} + // ^string.trim[[start|both|end][;chars]] + add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); +}