--- parser3/src/classes/string.C 2001/05/21 17:11:57 1.55 +++ parser3/src/classes/string.C 2001/10/23 14:43:44 1.85 @@ -2,10 +2,9 @@ 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.55 2001/05/21 17:11:57 parser Exp $ + $Id: string.C,v 1.85 2001/10/23 14:43:44 parser Exp $ */ #include "classes.h" @@ -16,6 +15,7 @@ #include "pa_vbool.h" #include "pa_string.h" #include "pa_sql_connection.h" +#include "pa_dictionary.h" // defines @@ -39,16 +39,40 @@ static void _length(Request& r, const St r.write_no_lang(result); } -static void _int(Request& r, const String& method_name, MethodParams *) { +static void _int(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& result=*new(pool) VInt(pool, r.self->as_int()); + int converted; + 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(*default_code).as_int(); + } + + Value& result=*new(pool) VInt(pool, converted); result.set_name(method_name); r.write_no_lang(result); } -static void _double(Request& r, const String& method_name, MethodParams *) { +static void _double(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& result=*new(pool) VDouble(pool, r.self->as_double()); + double converted; + 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(*default_code).as_double(); + } + + Value& result=*new(pool) VDouble(pool, converted); result.set_name(method_name); r.write_no_lang(result); } @@ -56,18 +80,22 @@ static void _double(Request& r, const St /*not static*/void _string_format(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& fmt=params->get_junction(0, "fmt must be code"); + Value& fmt=params->as_junction(0, "fmt must be code"); Temp_lang temp_lang(r, String::UL_PASS_APPENDED); char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().cstr()); - - r.write_no_lang(String(pool, buf)); + + String result(pool); + result.APPEND_CLEAN(buf, 0, + method_name.origin().file, + method_name.origin().line); + r.write_no_lang(result); } 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(); + 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))); @@ -76,7 +104,7 @@ static void _left(Request& r, const Stri 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(); + 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()))); @@ -85,17 +113,19 @@ static void _right(Request& r, const Str static void _mid(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t p=(size_t)r.process(params->get(0)).as_double(); - size_t n=(size_t)r.process(params->get(1)).as_double(); - const String& string=*static_cast(r.self)->get_string(); + + size_t p=(size_t)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(); + r.write_assign_lang(*new(pool) VString(string.mid(p, p+n))); } static void _pos(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& substr=params->get_no_junction(0, "substr must not be code"); + 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()))); @@ -104,7 +134,7 @@ static void _pos(Request& r, const Strin static void split_list(Request& r, const String& method_name, MethodParams *params, const String& string, Array& result) { - Value& delim_value=params->get_no_junction(0, "delimiter must not be code"); + Value& delim_value=params->as_no_junction(0, "delimiter must not be code"); string.split(result, 0, delim_value.as_string()); } @@ -113,13 +143,20 @@ static void _lsplit(Request& r, const St Pool& pool=r.pool(); const String& string=*static_cast(r.self)->get_string(); - Array& row=*new(pool) Array(pool); - split_list(r, method_name, params, string, row); + Array pieces(pool); + split_list(r, method_name, params, string, pieces); - Table& table=*new(pool) Table(pool, &string, - 0/*nameless*/, 1/*row preallocate(and only)*/); - table+=&row; + 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; + } r.write_no_lang(*new(pool) VTable(pool, &table)); } @@ -127,16 +164,19 @@ static void _rsplit(Request& r, const St Pool& pool=r.pool(); const String& string=*static_cast(r.self)->get_string(); - Array list(pool); - split_list(r, method_name, params, string, list); + Array pieces(pool); + split_list(r, method_name, params, string, pieces); - Array& row=*new(pool) Array(pool); - for(int i=list.size(); --i>=0; ) - row+=list.get(i); + Array& columns=*new(pool) Array(pool); + columns+=new(pool) String(pool, "piece"); Table& table=*new(pool) Table(pool, &string, - 0/*nameless*/, 1/*row preallocate(and only)*/); - table+=&row; + &columns, pieces.size()); + for(int i=pieces.size(); --i>=0; ) { + Array& row=*new(pool) Array(pool); + row+=pieces.get(i); + table+=&row; + } r.write_no_lang(*new(pool) VTable(pool, &table)); } @@ -146,13 +186,14 @@ static void search_action(Table& table, 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; }; +#endif static void replace_action(Table& table, Array *row, int start, int finish, void *info) { Replace_action_info& ai=*static_cast(info); @@ -170,9 +211,10 @@ static void replace_action(Table& table, vtable.set_name(*ai.origin); Junction *junction=ai.replacement_code->get_junction(); - junction->rcontext=/*must be some way to get to - outside world junction->root=*/&vtable; + 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("("); @@ -191,31 +233,31 @@ static void _match(Request& r, const Str Pool& pool=r.pool(); const String& src=*static_cast(r.self)->get_string(); - Value& regexp=params->get_no_junction(0, "regexp must not be code"); + Value& regexp=params->as_no_junction(0, "regexp must not be code"); const String *options= params->size()>1? - ¶ms->get_no_junction(1, "options must not be code").as_string():0; + ¶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 - if(src.match(r.pcre_tables, + bool was_global; + bool matched=src.match(r.pcre_tables(), &method_name, regexp.as_string(), options, &table, - search_action, 0)) { - // matched - if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings - table->size()==1) // just one row, not /g_lobal search - result=new(pool) VBool(pool, true); - else // table of pre/match/post+substrings - result=new(pool) VTable(pool, table); - } else // not matched [not global] - result=new(pool) VBool(pool, false); + 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 + else + result=new(pool) VBool(pool, matched); } else { // replace - Value& replacement_code=params->get_junction(2, "replacement code must be code"); + Value& replacement_code=params->as_junction(2, "replacement code must be code"); String& dest=*new(pool) String(pool); Replace_action_info replace_action_info={ @@ -224,7 +266,7 @@ static void _match(Request& r, const Str &replacement_code, &src }; - src.match(r.pcre_tables, + src.match(r.pcre_tables(), &method_name, r.process(regexp).as_string(), options, &table, @@ -240,7 +282,7 @@ static void change_case(Request& r, cons Pool& pool=r.pool(); const String& src=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables, + r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(), kind))); } static void _upper(Request& r, const String& method_name, MethodParams *params) { @@ -250,71 +292,150 @@ static void _lower(Request& r, const Str change_case(r, method_name, params, String::CC_LOWER); } -String& sql_result_string(Request& r, const String& method_name, MethodParams *params) { +#ifndef DOXYGEN +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) : + 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) + throw Exception(0, 0, + &statement_string, + "result must contain exactly one column"); + got_column=true; + } + void before_rows() { /* ignore */ } + void add_row() { /* ignore */ } + void add_row_cell(void *ptr, size_t size) { + if(got_cell) + throw Exception(0, 0, + &statement_string, + "result must not contain more then one row"); + got_cell=true; + + result->APPEND_TAINTED((const char *)ptr, size, statement_cstr, 0); + } + +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(); if(!r.connection) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "without connect"); - Value& statement=params->get_junction(0, "statement must be code"); + Value& statement=params->as_junction(0, "statement must be code"); + ulong limit=0; ulong offset=0; + default_code=0; if(params->size()>1) { - Value& offset_code=params->get_junction(1, "offset must be expression"); - offset=(ulong)r.process(offset_code).as_double(); - } + Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + if(voptions.is_defined()) + if(options=voptions.get_hash(&method_name)) { + 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(); + if(default_code=(Value *)options->get(*sql_default_name)) { + if(!default_code->get_junction()) + throw Exception(0, 0, + &method_name, + "default option must be code"); + } + } else + throw Exception(0, 0, + &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 char *statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection); - unsigned int sql_column_count; SQL_Driver::Cell *sql_columns; - unsigned long sql_row_count; SQL_Driver::Cell **sql_rows; - bool need_rethrow=false; Exception rethrow_me; - PTRY { + String_sql_event_handlers handlers(pool, statement_string, statement_cstr); + try { r.connection->query( - statement_cstr, offset, 0, - &sql_column_count, &sql_columns, - &sql_row_count, &sql_rows); - } - PCATCH(e) { // query problem - rethrow_me=e; need_rethrow=true; + statement_cstr, offset, limit, + handlers); + } catch(const Exception& e) { // query problem + // give more specific source [were url] + throw Exception(e.type(), e.code(), + &statement_string, + "%s", e.comment()); } - PEND_CATCH - if(need_rethrow) - PTHROW(rethrow_me.type(), rethrow_me.code(), - &statement_string, // setting more specific source [were url] - rethrow_me.comment()); - if(sql_column_count!=1) - PTHROW(0, 0, - &statement_string, - "result must contain only exactly column"); - - if(sql_row_count!=1) - PTHROW(0, 0, - &statement_string, - "result must contain only exactly row"); - - String& result=*new(pool) String(pool); - SQL_Driver::Cell& cell=sql_rows[0][0]; - result.APPEND_TAINTED( - (const char *)cell.ptr, cell.size, - statement_cstr, 0); - - return result; + if(!handlers.got_cell) + return 0; // no lines, caller should return second param[default value] + + return handlers.result; } static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VString& result=*new(pool) VString(sql_result_string(r, method_name, params)); + Hash *options; + Value *default_code; + const String *string=sql_result_string(r, method_name, params, options, default_code); + if(!string) { + if(default_code) { + string=r.process(*default_code).get_string(); + if(!string) + string=new(pool) String(pool); + } else + throw Exception(0, 0, + &method_name, + "produced no result, but no default option specified"); + } + VString& result=*new(pool) VString(*string); result.set_name(method_name); r.write_assign_lang(result); } +static void _replace(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + const String& src=*static_cast(r.self)->get_string(); + + Table *table=params->as_no_junction(0, "parameter must not be code").get_table(); + if(!table) + throw Exception(0, 0, + &method_name, + "parameter must be table"); + + Dictionary dict(*table); + r.write_assign_lang(*new(pool) VString(src.replace(pool, dict))); +} + +static void _save(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + Value& vfile_name=params->as_no_junction(0, + "file name must not be code"); + + const String& src=*static_cast(r.self)->get_string(); + + // write + file_write(pool, r.absolute(vfile_name.as_string()), + src.cstr(String::UL_AS_IS), src.size(), true); +} + // constructor MString::MString(Pool& apool) : Methoded(apool) { @@ -325,10 +446,11 @@ MString::MString(Pool& apool) : Methoded 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); @@ -338,7 +460,7 @@ 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); @@ -357,9 +479,15 @@ MString::MString(Pool& apool) : Methoded // ^string.tolower[] add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); - // ^string:sql[query] - // ^string:sql[query](offset) + // ^sql[query] + // ^sql[query][$.limit(1) $.offset(2) $.default[n/a]] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); + + // ^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, 1); } // global variable