--- parser3/src/classes/string.C 2002/04/10 09:53:14 1.99 +++ parser3/src/classes/string.C 2002/04/24 13:17:13 1.111 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: string.C,v 1.99 2002/04/10 09:53:14 paf Exp $ + $Id: string.C,v 1.111 2002/04/24 13:17:13 paf Exp $ */ #include "classes.h" @@ -17,10 +17,6 @@ #include "pa_sql_connection.h" #include "pa_dictionary.h" -// defines - -#define STRING_CLASS_NAME "string" - // class class MString : public Methoded { @@ -34,9 +30,8 @@ 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) { @@ -52,10 +47,7 @@ static void _int(Request& r, const Strin else converted=r.process_to_value(*default_code).as_int(); } - - 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) { @@ -72,9 +64,7 @@ static void _double(Request& r, const St converted=r.process_to_value(*default_code).as_double(); } - 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) { @@ -98,8 +88,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) { @@ -107,20 +97,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=*static_cast(r.self)->get_string(); + const String& string=*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))); + r.write_assign_lang(string.mid(p, p+n)); } static void _pos(Request& r, const String& method_name, MethodParams *params) { @@ -128,7 +117,7 @@ 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()))); } @@ -142,7 +131,7 @@ static void split_list(Request& r, const static void _lsplit(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_string(); + const String& string=*r.self->get_string(); Array pieces(pool); split_list(r, method_name, params, string, pieces); @@ -163,7 +152,7 @@ static void _lsplit(Request& r, const St static void _rsplit(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_string(); + const String& string=*r.self->get_string(); Array pieces(pool); split_list(r, method_name, params, string, pieces); @@ -182,7 +171,7 @@ static void _rsplit(Request& r, const St r.write_no_lang(*new(pool) VTable(pool, &table)); } -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; } @@ -191,59 +180,48 @@ 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); - const String& replaced=ai.request->process_to_string(*ai.replacement_code, ai.origin); - 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; + *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( &method_name, @@ -251,40 +229,45 @@ static void _match(Request& r, const Str &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 + const String& src=*r.self->get_string(); + Value& replacement_code=params->as_junction(2, "replacement param must be code"); - String& dest=*new(pool) String(pool); + 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 }; + Temp_value_element temp_match_var( + *replacement_code.get_junction()->root, + *match_var_name, &vtable); src.match( &method_name, 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, - 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); @@ -351,7 +334,9 @@ const String* sql_result_string(Request& if(Value *voffset=(Value *)options->get(*sql_offset_name)) offset=(ulong)r.process_to_value(*voffset).as_double(); if(default_code=(Value *)options->get(*sql_default_name)) { - if(!default_code->get_junction()) + 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"); @@ -401,14 +386,13 @@ static void _sql(Request& r, const Strin &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); + + 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) @@ -417,14 +401,14 @@ static void _replace(Request& r, const S "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)->get_string(); + const String& src=static_cast(r.self)->string(); bool do_append=false; if(params->size()>1) { @@ -443,12 +427,13 @@ static void _save(Request& r, const Stri buf, strlen(buf), true, do_append); } -// constructor - -MString::MString(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), STRING_CLASS_NAME)); +static void _optimize(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); @@ -495,6 +480,9 @@ MString::MString(Pool& apool) : Methoded // ^string.save[file] add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); + + // ^string.optimize[] + add_native_method("optimize", Method::CT_DYNAMIC, _optimize, 0, 0); } // global variable