--- parser3/src/classes/string.C 2001/07/13 12:13:50 1.62 +++ parser3/src/classes/string.C 2001/10/09 07:06:00 1.78 @@ -2,10 +2,10 @@ 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 $ */ -static const char *RCSId="$Id: string.C,v 1.62 2001/07/13 12:13:50 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -15,6 +15,7 @@ static const char *RCSId="$Id: string.C, #include "pa_vbool.h" #include "pa_string.h" #include "pa_sql_connection.h" +#include "pa_dictionary.h" // defines @@ -38,16 +39,52 @@ 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()); + bool convert_problem=false; Exception rethrow_me; + int converted; + PTRY { + converted=r.self->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); } -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()); + bool convert_problem=false; Exception rethrow_me; + double converted; + PTRY { + converted=r.self->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); } @@ -59,14 +96,18 @@ static void _double(Request& r, const St 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))); @@ -75,7 +116,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()))); @@ -84,8 +125,8 @@ 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(); + 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); const String& string=*static_cast(r.self)->get_string(); r.write_assign_lang(*new(pool) VString(string.mid(p, p+n))); @@ -120,10 +161,10 @@ static void _lsplit(Request& r, const St Table& table=*new(pool) Table(pool, &string, &columns, pieces.size()); - int size=pieces.quick_size(); - for(int i=0; i(info); @@ -179,9 +221,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("("); @@ -210,17 +253,19 @@ static void _match(Request& r, const Str Temp_lang temp_lang(r, String::UL_PASS_APPENDED); Table *table; if(params->size()<3) { // search - bool matched=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); + search_action, 0, + &was_global); // 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, matched); - else // table of pre/match/post+substrings - result=new(pool) VTable(pool, table); + // 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->as_junction(2, "replacement code must be code"); @@ -231,7 +276,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, @@ -247,7 +292,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) { @@ -257,7 +302,48 @@ static void _lower(Request& r, const Str change_case(r, method_name, params, String::CC_LOWER); } -const 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) + PTHROW(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) + PTHROW(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) { Pool& pool=r.pool(); if(!r.connection) @@ -267,20 +353,33 @@ const String* sql_result_string(Request& Value& statement=params->as_junction(0, "statement must be code"); - ulong offset=(ulong)(params->size()>2?params->as_int(2, r):0); + ulong limit=0; + ulong offset=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(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"); + } 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; + String_sql_event_handlers handlers(pool, statement_string, statement_cstr); bool need_rethrow=false; Exception rethrow_me; PTRY { r.connection->query( - statement_cstr, offset, 0, - &sql_column_count, &sql_columns, - &sql_row_count, &sql_rows); + statement_cstr, offset, limit, + handlers); } PCATCH(e) { // query problem rethrow_me=e; need_rethrow=true; @@ -291,44 +390,54 @@ const String* sql_result_string(Request& &statement_string, // setting more specific source [were url] rethrow_me.comment()); - if(sql_column_count!=1) - PTHROW(0, 0, - &statement_string, - "result must contain exactly one column"); - - if(!sql_row_count) - return 0; // no lines, should return second param[default value] - - if(sql_row_count>1) - PTHROW(0, 0, - &statement_string, - "result must not contain more then one row"); + if(!handlers.got_cell) + return 0; // no lines, caller should return second param[default value] - 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; + return handlers.result; } static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String *string=sql_result_string(r, method_name, params); + Hash *options; + const String *string=sql_result_string(r, method_name, params, options); if(!string) { - Value& default_code=params->as_junction(1, "default result must code"); - Value& processed_code=r.process(default_code); - string=processed_code.get_string(); - if(!string) - string=empty_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"); + } else + PTHROW(0, 0, + &method_name, + "produced no result, but no options (no default) 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) + PTHROW(0, 0, + &method_name, + "parameter must be table"); + + Dictionary dict(*table); + r.write_assign_lang(*new(pool) VString(src.replace(pool, dict))); +} // constructor MString::MString(Pool& apool) : Methoded(apool) { @@ -339,10 +448,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); @@ -371,9 +481,12 @@ MString::MString(Pool& apool) : Methoded // ^string.tolower[] add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); - // ^string:sql[query]{default} - // ^string:sql[query]{default}(offset) - add_native_method("sql", Method::CT_STATIC, _sql, 2, 3); + // ^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); } // global variable