--- parser3/src/classes/string.C 2003/03/18 15:14:14 1.125.2.15.2.1 +++ parser3/src/classes/string.C 2003/03/24 11:05:27 1.125.2.15.2.12 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/03/18 15:14:14 $"; +static const char* IDENT_STRING_C="$Date: 2003/03/24 11:05:27 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -39,22 +39,20 @@ DECLARE_CLASS_VAR(string, new MString, 0 // statics -static const String& match_var_name(new String(MATCH_VAR_NAME)); +static const String match_var_name(MATCH_VAR_NAME); // methods -static void _length(Request& r, const String& method_name, MethodParams* ) { - =r.pool(); - double result=GET_SELF(r, VString).string()->size(); - r.write_no_lang(ValuePtr(new VDouble(result))); +static void _length(Request& r, MethodParams* ) { + double result=GET_SELF(r, VString).string()->length(); + r.write_no_lang(Value*(new VDouble(result))); } -static void _int(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); - const String& self_string=r.get_self()->get_string(&pool); +static void _int(Request& r, MethodParams* params) { + const String& self_string=r.get_self()->get_string(); int converted; - ValuePtr default_code=params->count()>0?params->as_junction(0, "default must be int") - :ValuePtr(0); // (default) + Value* default_code=params->count()>0?params->as_junction(0, "default must be int") + :0; // (default) try { if(!self_string || self_string->is_empty()) throw Exception("parser.runtime", @@ -67,15 +65,14 @@ static void _int(Request& r, const Strin else converted=r.process_to_value(default_code)->as_int(); } - r.write_no_lang(ValuePtr(new VInt(converted))); + r.write_no_lang(Value*(new VInt(converted))); } -static void _double(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); +static void _double(Request& r, MethodParams* params) { const String& self_string=GET_SELF(r, VString).string(); double converted; - ValuePtr default_code=params->count()>0?params->as_junction(0, "default must be double") - :ValuePtr(0); // (default) + Value* default_code=params->count()>0?params->as_junction(0, "default must be double") + :0; // (default) try { if(!self_string || self_string->is_empty()) throw Exception("parser.runtime", @@ -89,17 +86,16 @@ static void _double(Request& r, const St converted=r.process_to_value(default_code)->as_double(); } - r.write_no_lang(ValuePtr(new VDouble(converted))); + r.write_no_lang(Value*(new VDouble(converted))); } -/*not static*/void _string_format(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); +/*not static*/void _string_format(Request& r, MethodParams* params) { - ValuePtr fmt_maybe_code=(*params)[0]; + Value* fmt_maybe_code=(*params)[0]; // for some time due to stupid {} in original design const String& fmt=r.process_to_string(fmt_maybe_code); - const char *buf=format(pool, r.get_self()->as_double(), fmt->cstr()); + const char* buf=format(r.get_self()->as_double(), fmt->cstr()); String result; result.APPEND_CLEAN(buf, 0, @@ -108,46 +104,44 @@ static void _double(Request& r, const St r.write_no_lang(result); } -static void _left(Request& r, const String& /*method_name*/, MethodParams* params) { +static void _left(Request& r, MethodParams* params) { size_t n=(size_t)params->as_int(0, "n must be int", r); const String& string=GET_SELF(r, VString).string(); r.write_assign_lang(*string->mid(0, n)); } -static void _right(Request& r, const String& /*method_name*/, MethodParams* params) { +static void _right(Request& r, MethodParams* params) { size_t n=(size_t)params->as_int(0, "n must be int", r); const String& string=GET_SELF(r, VString).string(); - r.write_assign_lang(*string->mid(string->size()-n, string->size())); + r.write_assign_lang(*string->mid(string->length()-n, string->length())); } -static void _mid(Request& r, const String& /*method_name*/, MethodParams* params) { +static void _mid(Request& r, MethodParams* params) { const String& string=GET_SELF(r, VString).string(); size_t p=(size_t)max(0, params->as_int(0, "p must be int", r)); size_t n=params->count()>1? - (size_t)max(0, params->as_int(1, "n must be int", r)):string->size(); + (size_t)max(0, params->as_int(1, "n must be int", r)):string->length(); r.write_assign_lang(*string->mid(p, p+n)); } -static void _pos(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); - ValuePtr substr=params->as_no_junction(0, "substr must not be code"); +static void _pos(Request& r, MethodParams* params) { + Value* substr=params->as_no_junction(0, "substr must not be code"); const String& string=GET_SELF(r, VString).string(); - r.write_assign_lang(ValuePtr(new VInt(string->pos(*substr->as_string(&pool))))); + r.write_assign_lang(Value*(new VInt(string->pos(*substr->as_string())))); } -static void split_list(Request& r, const String& method_name, +static void split_list(Request& r, MethodParams* params, int paramIndex, String& string, ArrayString& result) { - =r.pool(); - ValuePtr delim_value=params->as_no_junction(paramIndex, "delimiter must not be code"); + Value* delim_value=params->as_no_junction(paramIndex, "delimiter must not be code"); - string.split(result, 0, *delim_value->as_string(&pool)); + string.split(result, 0, *delim_value->as_string()); } #define SPLIT_LEFT 0x0001 @@ -186,7 +180,6 @@ static int split_options(const String& o } static Table* split_vertical(Request& r, const String& string, ArrayString& pieces, bool right) { - =r.pool(); Table::columns_type columns(new ArrayString); *columns+=String* (new String("piece")); @@ -199,7 +192,7 @@ static Table* split_vertical(Request& r, *table+=row; } } else { // left - Array_iterator i(pieces); + Array_iterator i(pieces); while(i.has_next()) { Table::element_type row(new ArrayString); *row+=i.next(); @@ -211,7 +204,6 @@ static Table* split_vertical(Request& r, } static Table* split_horizontal(Request& r, const String& string, ArrayString& pieces, bool right) { - =r.pool(); Table* table(new Table(string, Table::columns_type(0) /* nameless */)); Table::element_type row(new ArrayString(pieces.count())); @@ -220,7 +212,7 @@ static Table* split_horizontal(Request& *row+=pieces[i]; } } else { // left - Array_iterator i(pieces); + Array_iterator i(pieces); while(i.has_next()) { *row+=i.next(); } @@ -230,9 +222,8 @@ static Table* split_horizontal(Request& return table; } -static void split_with_options(Request& r, const String& method_name, MethodParams* params, +static void split_with_options(Request& r, MethodParams* params, int bits) { - =r.pool(); const String& string=GET_SELF(r, VString).string(); ArrayString pieces; @@ -251,15 +242,15 @@ static void split_with_options(Request& Table* table=horizontal?split_horizontal(r, string, pieces, right) :split_vertical(r, string, pieces, right); - r.write_no_lang(ValuePtr(new VTable(table))); + r.write_no_lang(*new VTable(table)); } -static void _split(Request& r, const String& method_name, MethodParams* params) { +static void _split(Request& r, MethodParams* params) { split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */); } -static void _lsplit(Request& r, const String& method_name, MethodParams* params) { +static void _lsplit(Request& r, MethodParams* params) { split_with_options(r, method_name, params, SPLIT_LEFT); } -static void _rsplit(Request& r, const String& method_name, MethodParams* params) { +static void _rsplit(Request& r, MethodParams* params) { split_with_options(r, method_name, params, SPLIT_RIGHT); } @@ -270,18 +261,17 @@ static void search_action(Table* table, #ifndef DOXYGEN struct Replace_action_info { - Request *request; - const String& origin; - const String& src; String* dest; + Request* request; + const String* src; String* dest; VTable* vtable; - ValuePtr replacement_code; + Value* replacement_code; }; #endif /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this -static void replace_action(Table* table, ArrayString& row, - int prestart, int prefinish, - int poststart, int postfinish, - void *info) { +static void replace_action(Table* table, ArrayString* 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['prestart'] to beginning of this match['prefinish'] @@ -298,35 +288,34 @@ static void replace_action(Table* table, *ai.dest << ai.request->process_to_string(ai.replacement_code); } } else // end - *ai.dest << ai.src->mid(poststart, postfinish); + *ai.dest << ai.src.mid(poststart, postfinish); } /// @todo use pcre:study somehow -static void _match(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); - ValuePtr regexp=params->as_no_junction(0, "regexp must not be code"); +static void _match(Request& r, MethodParams* params) { + Value& regexp=params->as_no_junction(0, "regexp must not be code"); const String& options= params->count()>1? - params->as_no_junction(1, "options must not be code")->as_string(&pool):0; + params->as_no_junction(1, "options must not be code")->as_string():0; - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); + Temp_lang temp_lang(r, String::L_PASS_APPENDED); const String& src=GET_SELF(r, VString).string(); bool just_matched; if(params->count()<3) { // search - Table* table=src->match(r.charsets.source(), + Table* table=src.match(r.charsets.source(), method_name, - *regexp->as_string(&pool), options, + *regexp->as_string(), options, search_action, 0, just_matched); - ValuePtr result; + Value* result; if(table) - result=ValuePtr(new VTable(table)); // table of pre/match/post+substrings + result=Value*(new VTable(table)); // table of pre/match/post+substrings else - result=ValuePtr(new VBool(just_matched)); + result=Value*(new VBool(just_matched)); r.write_assign_lang(result); } else { // replace - ValuePtr replacement_code=params->as_junction(2, "replacement param must be code"); + Value* replacement_code=params->as_junction(2, "replacement param must be code"); String result; VTable* vtable(new VTable); @@ -349,17 +338,16 @@ static void _match(Request& r, const Str } } -static void change_case(Request& r, const String& method_name, MethodParams* params, +static void change_case(Request& r, MethodParams* params, String::Change_case_kind kind) { - =r.pool(); const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(*src->change_case(pool, r.charsets.source(), kind)); + r.write_assign_lang(src.change_case(r.charsets.source(), kind)); } -static void _upper(Request& r, const String& method_name, MethodParams* params) { +static void _upper(Request& r, MethodParams* params) { change_case(r, method_name, params, String::CC_UPPER); } -static void _lower(Request& r, const String& method_name, MethodParams* params) { +static void _lower(Request& r, MethodParams* params) { change_case(r, method_name, params, String::CC_LOWER); } @@ -413,25 +401,24 @@ extern const String& sql_limit_name; extern const String& sql_offset_name; extern const String& sql_default_name; extern const String& sql_distinct_name; -const String& sql_result_string(Request& r, const String& method_name, MethodParams* params, - HashStringValue*& options, ValuePtr& default_code) { - =r.pool(); +const String& sql_result_string(Request& r, MethodParams* params, + HashStringValue*& options, Value*& default_code) { - ValuePtr statement=params->as_junction(0, "statement must be code"); + Value* statement=params->as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; - default_code=ValuePtr(0); + default_code=0; if(params->count()>1) { - ValuePtr voptions=params->as_no_junction(1, "options must be hash, not code"); + Value* voptions=params->as_no_junction(1, "options must be hash, not code"); if(!voptions->is_string()) - if(options=voptions->get_hash(method_name)) { - if(ValuePtr vlimit=options->get(sql_limit_name)) + if(options=voptions->get_hash()) { + if(Value* vlimit=options->get(sql_limit_name)) limit=(ulong)r.process_to_value(vlimit)->as_double(); - if(ValuePtr voffset=options->get(sql_offset_name)) + if(Value* voffset=options->get(sql_offset_name)) offset=(ulong)r.process_to_value(voffset)->as_double(); if(default_code=options->get(sql_default_name)) { - if(JunctionPtr default_junction=default_code->get_junction()) + if(Junction* default_junction=default_code->get_junction()) ;//default_junction->change_context(statement.get_junction()); else throw Exception("parser.runtime", @@ -445,12 +432,12 @@ const String& sql_result_string(Request& } else options=0; - Temp_lang temp_lang(r, String::UL_SQL); + Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); const char* statement_cstr= - statement_string->cstr(pool, String::UL_UNSPECIFIED, r.connection(method_name)); + statement_string->cstr(String::L_UNSPECIFIED, r.connection()); String_sql_event_handlers handlers(statement_string, statement_cstr); - r.connection(method_name)->query( + r.connection()->query( statement_cstr, offset, limit, handlers, statement_string); @@ -461,11 +448,10 @@ const String& sql_result_string(Request& return handlers.result; } -static void _sql(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); +static void _sql(Request& r, MethodParams* params) { HashStringValue* options; - ValuePtr default_code; + Value* default_code; const String& string=sql_result_string(r, method_name, params, options, default_code); if(!string) { if(default_code) { @@ -481,8 +467,7 @@ static void _sql(Request& r, const Strin r.write_assign_lang(*string); } -static void _replace(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); +static void _replace(Request& r, MethodParams* params) { const String& src=GET_SELF(r, VString).string(); Table* table=params->as_no_junction(0, "parameter must not be code")->get_table(); @@ -493,10 +478,10 @@ static void _replace(Request& r, const S Table* tp(table); Dictionary dict2(tp, 1/*am not sure why using the =default parameter causes compile errors in replace*/ ); - r.write_assign_lang(*src->replace(pool, dict2)); + r.write_assign_lang(*src->replace(dict2)); } -static void _save(Request& r, const String& method_name, MethodParams* params) { +static void _save(Request& r, MethodParams* params) { const String& file_name=params->as_string(params->count()-1, "file name must be string"); @@ -514,12 +499,12 @@ static void _save(Request& r, const Stri } // write - const char* buf=src->cstr(String::UL_UNSPECIFIED, r.connection(0/*no error if none*/)); + const char* buf=src->cstr(String::L_UNSPECIFIED, r.connection(0/*no error if none*/)); file_write(r.absolute(file_name), buf, strlen(buf), true, do_append); } -static void _normalize(Request& r, const String& method_name, MethodParams* /*params*/) { +static void _normalize(Request& r, MethodParams* /*params*/) { const String& src=GET_SELF(r, VString).string(); r.write_assign_lang(*src->join_chains(r.pool()));