--- parser3/src/classes/string.C 2001/04/03 14:38:58 1.26 +++ parser3/src/classes/string.C 2001/04/08 13:11:15 1.37 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: string.C,v 1.26 2001/04/03 14:38:58 paf Exp $ + $Id: string.C,v 1.37 2001/04/08 13:11:15 paf Exp $ */ #include "pa_request.h" @@ -14,6 +14,7 @@ #include "pa_vint.h" #include "pa_vtable.h" #include "pa_vbool.h" +#include "pa_string.h" // global var @@ -45,7 +46,7 @@ static void _double(Request& r, const St Value& fmt=*static_cast(params->get(0)); // forcing {this param type} - r.fail_if_junction_(false, fmt, method_name, "fmt must be junction"); + r.fail_if_junction_(false, fmt, method_name, "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()); @@ -59,7 +60,7 @@ static void _left(Request& r, const Stri size_t n=(size_t)r.process(*static_cast(params->get(0))).as_double(); const String& string=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(string.piece(0, n))); + r.write_assign_lang(*new(pool) VString(string.mid(0, n))); } static void _right(Request& r, const String&, Array *params) { @@ -68,7 +69,7 @@ static void _right(Request& r, const Str size_t n=(size_t)r.process(*static_cast(params->get(0))).as_double(); const String& string=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(string.piece(string.size()-n, string.size()))); + r.write_assign_lang(*new(pool) VString(string.mid(string.size()-n, string.size()))); } static void _mid(Request& r, const String&, Array *params) { @@ -78,7 +79,7 @@ static void _mid(Request& r, const Strin size_t n=(size_t)r.process(*static_cast(params->get(1))).as_double(); const String& string=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(string.piece(p, p+n))); + r.write_assign_lang(*new(pool) VString(string.mid(p, p+n))); } static void _pos(Request& r, const String& method_name, Array *params) { @@ -86,7 +87,7 @@ static void _pos(Request& r, const Strin Value& substr=*static_cast(params->get(0)); // forcing [this param type] - r.fail_if_junction_(true, substr, method_name, "substr must not be junction"); + r.fail_if_junction_(true, substr, method_name, "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()))); @@ -99,7 +100,7 @@ static void split_list(Request& r, const Value& delim_value=*static_cast(params->get(0)); // forcing [this param type] - r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be junction"); + r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be code"); string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1); } @@ -136,40 +137,106 @@ static void _rsplit(Request& r, const St r.write_no_lang(*new(pool) VTable(pool, &table)); } -/// ^string.match{regexp}[options] +static void search_action(Table& table, Array *row, int, int, void *) { + if(row) + table+=row; +} + +struct Replace_action_info { + Request *request; const String *origin; + const String *src; String *dest; + Value *replacement_code; + const String *post_match; +}; +static void replace_action(Table& table, Array *row, int start, int finish, + 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("-"); + // 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); + + Junction *junction=ai.replacement_code->get_junction(); + junction->rcontext=junction->root=&vtable; + Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false); + + /* + ai.dest->APPEND_CONST("("); + *ai.dest << *(String *)row->get(1/*match* /); + ai.dest->APPEND_CONST(")"); + */ + *ai.dest << replaced.as_string(); + } + ai.post_match=(String *)row->get(2/*post_match*/); + } else // end + *ai.dest << *ai.post_match; +} + +/** search/replace + ^string.match[regexp][options] + ^string.match[regexp][options]{replacement-code} +*/ static void _match(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); - const String& string=*static_cast(r.self)->get_string(); + const String& src=*static_cast(r.self)->get_string(); Value& regexp=*static_cast(params->get(0)); - // forcing {this param type} - r.fail_if_junction_(false, regexp, method_name, "regexp must be junction"); + // forcing [this param type] + r.fail_if_junction_(true, regexp, method_name, "regexp must not be code"); const String *options=0; if(params->size()>1) { Value& value=*static_cast(params->get(1)); // forcing {this param type} - r.fail_if_junction_(true, value, method_name, "options must not be junction"); + r.fail_if_junction_(true, value, method_name, "options must not be code"); options=&value.as_string(); } + Value *result; Temp_lang temp_lang(r, String::UL_PASS_APPENDED); Table *table; - Value *result; - if(string.match(&method_name, - r.process(regexp).as_string(), options, - &table)) { - // matched - if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings - table->size()==1) // just one row, not Global search - result=new(pool) VBool(pool, true); - else // table of match column+substring columns - result=new(pool) VTable(pool, table); - } else // not global & not matched - result=new(pool) VBool(pool, false); + if(params->size()<3) { // search + if(src.match(&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); + } else { // replace + Value& replacement_code=*static_cast(params->get(2)); + // forcing {this param type} + r.fail_if_junction_(false, replacement_code, + method_name, "replacement code must be code"); + String& dest=*new(pool) String(pool); + Replace_action_info replace_action_info={ + &r, &method_name, + &src, &dest, + &replacement_code, + &src + }; + src.match(&method_name, + r.process(regexp).as_string(), options, + &table, + replace_action, &replace_action_info); + result=new(pool) VString(dest); + } result->set_name(method_name); - r.write_no_lang(*result); + r.write_assign_lang(*result); } // initialize @@ -202,7 +269,8 @@ void initialize_string_class(Pool& pool, // ^string.rsplit[delim] vclass.add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1); - // ^string.match{regexp}[options] - vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2); + // ^string.match[regexp][options] + // ^string.match[regexp][options]{replacement-code} + vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3); }