--- parser3/src/classes/string.C 2002/08/06 12:48:14 1.115 +++ parser3/src/classes/string.C 2002/12/09 12:19:16 1.124 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2002/08/06 12:48:14 $"; +static const char* IDENT_STRING_C="$Date: 2002/12/09 12:19:16 $"; #include "classes.h" #include "pa_request.h" @@ -16,6 +16,7 @@ static const char* IDENT_STRING_C="$Date #include "pa_string.h" #include "pa_sql_connection.h" #include "pa_dictionary.h" +#include "pa_vmethod_frame.h" // class @@ -30,17 +31,21 @@ public: // Methoded static void _length(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - double result=r.self->get_string()->size(); + double result=r.get_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(); + const String *self_string=r.get_self()->get_string(); int converted; - Value *default_code=params->size()>0? - default_code=¶ms->as_junction(0, "default must be int"):0; // (default) + Value *default_code=params->size()>0?¶ms->as_junction(0, "default must be int"):0; // (default) try { - converted=r.self->as_int(); + 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 /*re*/throw; @@ -52,11 +57,15 @@ static void _int(Request& r, const Strin static void _double(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); + const String *self_string=r.get_self()->get_string(); double converted; - Value *default_code=params->size()>0? - default_code=¶ms->as_junction(0, "default must be double"):0; // (default) + Value *default_code=params->size()>0?¶ms->as_junction(0, "default must be double"):0; // (default) try { - converted=r.self->as_double(); + 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 /*re*/throw; @@ -74,7 +83,7 @@ static void _double(Request& r, const St // for some time due to stupid {} in original design const String& fmt=r.process_to_string(fmt_maybe_code); - char *buf=format(pool, r.self->as_double(), fmt.cstr()); + char *buf=format(pool, r.get_self()->as_double(), fmt.cstr()); String result(pool); result.APPEND_CLEAN(buf, 0, @@ -88,7 +97,7 @@ 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)->string(); + const String& string=static_cast(r.get_self())->string(); r.write_assign_lang(string.mid(0, n)); } @@ -97,17 +106,17 @@ 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)->string(); + const String& string=static_cast(r.get_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(); + const String& string=*r.get_self()->get_string(); - size_t p=(size_t)params->as_int(0, "p 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)params->as_int(1, "n must be int", r):string.size(); + (size_t)max(0, params->as_int(1, "n must be int", r)):string.size(); r.write_assign_lang(string.mid(p, p+n)); } @@ -117,58 +126,135 @@ 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)->string(); + const String& string=static_cast(r.get_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=*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=*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.get_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, int, int, void *) { @@ -220,7 +306,7 @@ static void _match(Request& r, const Str Temp_lang temp_lang(r, String::UL_PASS_APPENDED); Table *table; if(params->size()<3) { // search - const String& src=static_cast(r.self)->string(); + const String& src=static_cast(r.get_self())->string(); bool was_global; bool matched=src.match( @@ -238,7 +324,7 @@ static void _match(Request& r, const Str result=new(pool) VBool(pool, matched); r.write_assign_lang(*result); } else { // replace - const String& src=*r.self->get_string(); + const String& src=*r.get_self()->get_string(); Value& replacement_code=params->as_junction(2, "replacement param must be code"); @@ -251,7 +337,7 @@ static void _match(Request& r, const Str &replacement_code }; Temp_value_element temp_match_var( - *replacement_code.get_junction()->root, + *replacement_code.get_junction()->method_frame, *match_var_name, &vtable); src.match( &method_name, @@ -265,7 +351,7 @@ static void _match(Request& r, const Str 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)->string(); + const String& src=static_cast(r.get_self())->string(); r.write_assign_lang(src.change_case(pool, kind)); } @@ -280,7 +366,7 @@ static void _lower(Request& r, const Str class String_sql_event_handlers : public SQL_Driver_query_event_handlers { public: String_sql_event_handlers(Pool& apool, - const String& astatement_string, const char *astatement_cstr) : + const String& astatement_string, const char *astatement_cstr): pool(apool), statement_string(astatement_string), statement_cstr(astatement_cstr), @@ -288,23 +374,34 @@ public: result=new(pool) String(pool); } - void add_column(void *ptr, size_t size) { - if(got_column) - throw Exception("parser.runtime", + bool add_column(SQL_Error& error, void *ptr, size_t size) { + 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) - throw Exception("parser.runtime", + 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) { + 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_TAINTED((const char *)ptr, size, statement_cstr, 0); + return false; + } catch(...) { + error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell"); + return true; + } } private: @@ -335,7 +432,7 @@ const String* sql_result_string(Request& 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()); + ;//default_junction->change_context(statement.get_junction()); else throw Exception("parser.runtime", &method_name, @@ -353,16 +450,10 @@ const String* sql_result_string(Request& const char *statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); String_sql_event_handlers handlers(pool, statement_string, statement_cstr); - try { - r.connection(&method_name)->query( - statement_cstr, offset, limit, - handlers); - } catch(const Exception& e) { // query problem - // give more specific source [were url] - throw Exception("sql.execute", - &statement_string, - "%s", e.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] @@ -392,7 +483,7 @@ static void _sql(Request& r, const Strin static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& src=*r.self->get_string(); + const String& src=*r.get_self()->get_string(); Table *table=params->as_no_junction(0, "parameter must not be code").get_table(); if(!table) @@ -408,7 +499,7 @@ static void _save(Request& r, const Stri const String& file_name=params->as_string(params->size()-1, "file name must be string"); - const String& src=static_cast(r.self)->string(); + const String& src=static_cast(r.get_self())->string(); bool do_append=false; if(params->size()>1) { @@ -422,13 +513,13 @@ static void _save(Request& r, const Stri } // write - const char *buf=src.cstr(String::UL_UNSPECIFIED); + const char *buf=src.cstr(String::UL_UNSPECIFIED, r.connection(0/*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.self->get_string()->join_chains(r.pool(), 0/*cstr*/)); + r.write_assign_lang(r.get_self()->get_string()->join_chains(r.pool(), 0/*cstr*/)); } // constructor @@ -457,11 +548,15 @@ MString::MString(Pool& apool) : Methoded // ^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);