--- parser3/src/classes/string.C 2001/04/28 08:43:48 1.41 +++ parser3/src/classes/string.C 2001/07/09 16:13:17 1.60 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: string.C,v 1.41 2001/04/28 08:43:48 paf Exp $ */ +static const char *RCSId="$Id: string.C,v 1.60 2001/07/09 16:13:17 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -15,6 +14,7 @@ #include "pa_vtable.h" #include "pa_vbool.h" #include "pa_string.h" +#include "pa_sql_connection.h" // defines @@ -25,34 +25,37 @@ class MString : public Methoded { public: MString(Pool& pool); - bool used_directly() { return false; } +public: // Methoded + bool used_directly() { return true; } }; // methods -static void _length(Request& r, const String&, MethodParams *) { +static void _length(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VDouble(pool, r.self->get_string()->size()); - r.write_no_lang(value); + Value& result=*new(pool) VDouble(pool, r.self->get_string()->size()); + result.set_name(method_name); + r.write_no_lang(result); } -static void _int(Request& r, const String&, MethodParams *) { +static void _int(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, (int)r.self->as_double()); - r.write_no_lang(value); + 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, const String&, MethodParams *) { +static void _double(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VDouble(pool, r.self->as_double()); - r.write_no_lang(value); + Value& result=*new(pool) VDouble(pool, r.self->as_double()); + result.set_name(method_name); + r.write_no_lang(result); } -/// ^string.format{format} /*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()); @@ -91,7 +94,7 @@ static void _mid(Request& r, const Strin 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()))); @@ -100,11 +103,9 @@ static void _pos(Request& r, const Strin static void split_list(Request& r, const String& method_name, MethodParams *params, const String& string, Array& result) { - Pool& pool=r.pool(); + Value& delim_value=params->as_no_junction(0, "delimiter must not be code"); - Value& delim_value=params->get_no_junction(0, "delimiter must not be code"); - - string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1); + string.split(result, 0, delim_value.as_string()); } static void _lsplit(Request& r, const String& method_name, MethodParams *params) { @@ -158,7 +159,7 @@ static void replace_action(Table& table, // 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("-"); - // store found parts in one-record Vtable + // store found parts in one-record VTable if(table.size()) // middle table.put(0, row); else // begin @@ -168,7 +169,8 @@ static void replace_action(Table& table, vtable.set_name(*ai.origin); Junction *junction=ai.replacement_code->get_junction(); - junction->rcontext=junction->root=&vtable; + junction->rcontext=/*must be some way to get to + outside world junction->root=*/&vtable; Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false); /* @@ -183,39 +185,34 @@ static void replace_action(Table& table, *ai.dest << *ai.post_match; } -/** search/replace - ^string.match[regexp][options] - ^string.match[regexp][options]{replacement-code} -*/ +/// @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->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 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); + // 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); } 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={ @@ -235,6 +232,86 @@ static void _match(Request& r, const Str 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(); + + 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) { + change_case(r, method_name, params, String::CC_UPPER); +} +static void _lower(Request& r, const String& method_name, MethodParams *params) { + change_case(r, method_name, params, String::CC_LOWER); +} + +String& sql_result_string(Request& r, const String& method_name, MethodParams *params) { + 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 offset=0; + if(params->size()>1) { + Value& offset_code=params->as_junction(1, "offset must be expression"); + offset=(ulong)r.process(offset_code).as_double(); + } + + 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 { + 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; + } + 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 exactly one column"); + + if(sql_row_count!=1) + PTHROW(0, 0, + &statement_string, + "result must contain exactly one 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; +} + +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)); + result.set_name(method_name); + r.write_assign_lang(result); +} + // constructor MString::MString(Pool& apool) : Methoded(apool) { @@ -271,6 +348,15 @@ MString::MString(Pool& apool) : Methoded // ^string.match[regexp][options] // ^string.match[regexp][options]{replacement-code} add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3); + + // ^string.toupper[] + add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0); + // ^string.tolower[] + add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); + + // ^string:sql[query] + // ^string:sql[query](offset) + add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } // global variable