--- parser3/src/classes/string.C 2001/10/09 07:06:00 1.78 +++ parser3/src/classes/string.C 2002/08/29 12:22:46 1.119 @@ -1,12 +1,12 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: string.C,v 1.78 2001/10/09 07:06:00 parser Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_STRING_C="$Date: 2002/08/29 12:22:46 $"; + #include "classes.h" #include "pa_request.h" #include "pa_vdouble.h" @@ -16,10 +16,7 @@ #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 @@ -34,68 +31,51 @@ public: // Methoded 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); + double result=r.self->get_string()->size(); + r.write_no_lang(*new(pool) VDouble(pool, result)); } static void _int(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - bool convert_problem=false; Exception rethrow_me; int converted; - PTRY { + Value *default_code=params->size()>0? + default_code=¶ms->as_junction(0, "default must be int"):0; // (default) + try { converted=r.self->as_int(); + } catch(...) { // convert problem + if(!default_code) // we have a problem when no default + /*re*/throw; + else + converted=r.process_to_value(*default_code).as_int(); } - PCATCH(e) { // convert problem - if(convert_problem=params->size()==0) { // we have a problem when do not have default - rethrow_me=e; - converted=0; - } else - converted=params->as_int(0, "default must be int", r); // (default) - } - PEND_CATCH - if(convert_problem) - PTHROW(rethrow_me.type(), rethrow_me.code(), - rethrow_me.problem_source(), - rethrow_me.comment()); - - Value& result=*new(pool) VInt(pool, converted); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new(pool) VInt(pool, converted)); } static void _double(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - bool convert_problem=false; Exception rethrow_me; double converted; - PTRY { + Value *default_code=params->size()>0? + default_code=¶ms->as_junction(0, "default must be double"):0; // (default) + try { converted=r.self->as_double(); + } catch(...) { // convert problem + if(!default_code) // we have a problem when no default + /*re*/throw; + else + converted=r.process_to_value(*default_code).as_double(); } - PCATCH(e) { // convert problem - if(convert_problem=params->size()==0) { // we have a problem when do not have default - rethrow_me=e; - converted=0; - } else - converted=params->as_double(0, "default must be double", r); // (default) - } - PEND_CATCH - if(convert_problem) - PTHROW(rethrow_me.type(), rethrow_me.code(), - rethrow_me.problem_source(), - rethrow_me.comment()); - Value& result=*new(pool) VDouble(pool, converted); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new(pool) VDouble(pool, converted)); } /*not static*/void _string_format(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& fmt=params->as_junction(0, "fmt must be code"); + Value& fmt_maybe_code=params->get(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()); + char *buf=format(pool, r.self->as_double(), fmt.cstr()); String result(pool); result.APPEND_CLEAN(buf, 0, @@ -109,8 +89,8 @@ static void _left(Request& r, const Stri 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=static_cast(r.self)->string(); + r.write_assign_lang(string.mid(0, n)); } static void _right(Request& r, const String&, MethodParams *params) { @@ -118,18 +98,19 @@ static void _right(Request& r, const Str 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=static_cast(r.self)->string(); + r.write_assign_lang(string.mid(string.size()-n, string.size())); } static void _mid(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); + const String& string=*r.self->get_string(); - size_t p=(size_t)params->as_int(0, "p must be int", r); - size_t n=(size_t)params->as_int(1, "n must be int", r); + 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(); - 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) { @@ -137,61 +118,138 @@ static void _pos(Request& r, const Strin Value& substr=params->as_no_junction(0, "substr must not be code"); - const String& string=*static_cast(r.self)->get_string(); + const String& string=static_cast(r.self)->string(); r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string()))); } -static void split_list(Request& r, const String& method_name, MethodParams *params, +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(0, "delimiter must not be code"); + Value& delim_value=params->as_no_junction(paramIndex, "delimiter must not be code"); string.split(result, 0, delim_value.as_string()); } -static void _lsplit(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_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} + }; + + int result=0; + 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(result & o->checkBit) + throw Exception("parser.runtime", + options, + "conflicting split options"); + result |= o->setBit; + } + } - Array pieces(pool); - split_list(r, method_name, params, string, pieces); + return result; +} + +static Table *split_vertical(Request& r, const String& string, Array& pieces, bool right) { + Pool& pool=r.pool(); Array& columns=*new(pool) Array(pool); columns+=new(pool) String(pool, "piece"); 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; + if(right) { // right + for(int i=pieces.size(); --i>=0; ) { + Array& row=*new(pool) Array(pool); + row+=pieces.get(i); + table+=&row; + } + } else { // left + Array_iter i(pieces); + while(i.has_next()) { + Array& row=*new(pool) Array(pool); + row+=i.next(); + table+=&row; + } } - r.write_no_lang(*new(pool) VTable(pool, &table)); + + return &table; } -static void _rsplit(Request& r, const String& method_name, MethodParams *params) { +static Table *split_horizontal(Request& r, const String& string, Array& pieces, bool right) { Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_string(); - Array pieces(pool); - split_list(r, method_name, params, string, pieces); + Table& table=*new(pool) Table(pool, &string, 0 /* nameless */); + Array& row=*new(pool) Array(pool); + if(right) { // right + for(int i=pieces.size(); --i>=0; ) { + row+=pieces.get(i); + } + } else { // left + Array_iter i(pieces); + while(i.has_next()) { + 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()); - for(int i=pieces.size(); --i>=0; ) { - Array& row=*new(pool) Array(pool); - row+=pieces.get(i); - table+=&row; +static void split_with_options(Request& r, const String& method_name, MethodParams *params, + int bits) { + Pool& pool=r.pool(); + const String& string=*r.self->get_string(); + + Array pieces(pool); + split_list(r, method_name, params, 0, + string, pieces); + + if(!bits) { + const String *options=0; + if(params->size()>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; + if(horizontal) + table=split_horizontal(r, string, pieces, right); + else + table=split_vertical(r, string, pieces, right); + + r.write_no_lang(*new(pool) VTable(pool, 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 _lsplit(Request& r, const String& method_name, MethodParams *params) { + split_with_options(r, method_name, 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 search_action(Table& table, Array *row, int, int, void *) { +static void search_action(Table& table, Array *row, int, int, int, int, void *) { if(row) table+=row; } @@ -200,100 +258,94 @@ static void search_action(Table& table, struct Replace_action_info { Request *request; const String *origin; const String *src; String *dest; + VTable *vtable; Value *replacement_code; - const String *post_match; }; #endif -static void replace_action(Table& table, Array *row, int start, int finish, - void *info) { +/// @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) { 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 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 + const String& src=static_cast(r.self)->string(); + bool was_global; - bool matched=src.match(r.pcre_tables(), + bool matched=src.match( &method_name, 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); // table of pre/match/post+substrings + 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); } else { // replace - Value& replacement_code=params->as_junction(2, "replacement code must be code"); + const String& src=*r.self->get_string(); - String& dest=*new(pool) String(pool); + 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, &dest, - &replacement_code, - &src + &src, &result, + &vtable, + &replacement_code }; - src.match(r.pcre_tables(), + Temp_value_element temp_match_var( + *replacement_code.get_junction()->method_frame, + *match_var_name, &vtable); + src.match( &method_name, - r.process(regexp).as_string(), options, + r.process_to_string(regexp), options, &table, replace_action, &replace_action_info); - result=new(pool) VString(dest); + 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, String::Change_case_kind kind) { Pool& pool=r.pool(); - const String& src=*static_cast(r.self)->get_string(); + const String& src=static_cast(r.self)->string(); - r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(), - kind))); + r.write_assign_lang(src.change_case(pool, kind)); } static void _upper(Request& r, const String& method_name, MethodParams *params) { change_case(r, method_name, params, String::CC_UPPER); @@ -316,7 +368,7 @@ public: void add_column(void *ptr, size_t size) { if(got_column) - PTHROW(0, 0, + throw Exception("parser.runtime", &statement_string, "result must contain exactly one column"); got_column=true; @@ -325,7 +377,7 @@ public: void add_row() { /* ignore */ } void add_row_cell(void *ptr, size_t size) { if(got_cell) - PTHROW(0, 0, + throw Exception("parser.runtime", &statement_string, "result must not contain more then one row"); got_cell=true; @@ -343,52 +395,46 @@ public: }; #endif const String* sql_result_string(Request& r, const String& method_name, MethodParams *params, - Hash *&options) { + Hash *& options, Value *& default_code) { Pool& pool=r.pool(); - if(!r.connection) - PTHROW(0, 0, - &method_name, - "without connect"); - Value& statement=params->as_junction(0, "statement must be code"); 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_defined()) - if(options=voptions.get_hash()) { + if(!voptions.is_string()) + if(options=voptions.get_hash(&method_name)) { if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); + limit=(ulong)r.process_to_value(*vlimit).as_double(); if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); + 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"); + } } else - PTHROW(0, 0, + throw Exception("parser.runtime", &method_name, "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 String& statement_string=r.process_to_string(statement); const char *statement_cstr= - statement_string.cstr(String::UL_UNSPECIFIED, r.connection); + statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); 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()); + r.connection(&method_name)->query( + statement_cstr, offset, limit, + handlers, + statement_string); if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] @@ -400,50 +446,66 @@ static void _sql(Request& r, const Strin Pool& pool=r.pool(); Hash *options; - const String *string=sql_result_string(r, method_name, params, options); + Value *default_code; + const String *string=sql_result_string(r, method_name, 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); + if(!string) + string=new(pool) String(pool); } else - PTHROW(0, 0, + throw Exception("parser.runtime", &method_name, - "produced no result, but no options (no default) specified"); + "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(); + const String& src=*r.self->get_string(); Table *table=params->as_no_junction(0, "parameter must not be code").get_table(); if(!table) - PTHROW(0, 0, + throw Exception("parser.runtime", &method_name, "parameter must be table"); Dictionary dict(*table); - r.write_assign_lang(*new(pool) VString(src.replace(pool, dict))); + r.write_assign_lang(src.replace(pool, dict)); +} + +static void _save(Request& r, const String& method_name, MethodParams *params) { + const String& file_name=params->as_string(params->size()-1, + "file name must be string"); + + const String& src=static_cast(r.self)->string(); + + bool do_append=false; + if(params->size()>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::UL_UNSPECIFIED); + file_write(r.absolute(file_name), + buf, strlen(buf), true, do_append); } -// constructor -MString::MString(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), STRING_CLASS_NAME)); +static void _normalize(Request& r, const String& method_name, MethodParams * /*params*/) { + r.write_assign_lang(r.self->get_string()->join_chains(r.pool(), 0/*cstr*/)); +} +// constructor +MString::MString(Pool& apool) : Methoded(apool, "string") { // ^string.length[] add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0); @@ -462,16 +524,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); @@ -487,6 +553,12 @@ MString::MString(Pool& apool) : Methoded // ^string.replace[table] add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1); + + // ^string.save[file] + add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); + + // ^string.normalize[] + add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); } // global variable