--- parser3/src/classes/string.C 2003/02/20 14:53:34 1.125.2.10 +++ parser3/src/classes/string.C 2003/03/20 14:19:08 1.125.2.15.2.6 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/02/20 14:53:34 $"; +static const char* IDENT_STRING_C="$Date: 2003/03/20 14:19:08 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -31,7 +31,7 @@ public: // Methoded // global variable -MethodedPtr string_class(new MString); +DECLARE_CLASS_VAR(string, new MString, 0); // defines for statics @@ -39,19 +39,17 @@ MethodedPtr string_class(new MString); // statics -static StringPtr match_var_name(new String(MATCH_VAR_NAME)); +static const String& match_var_name(new String(MATCH_VAR_NAME)); // methods -static void _length(Request& r, StringPtr method_name, MethodParams* ) { - Pool& pool=r.pool(); - double result=GET_SELF(r, VString).string()->size(); +static void _length(Request& r, const String& method_name, MethodParams* ) { + double result=GET_SELF(r, VString).string()->length(); r.write_no_lang(ValuePtr(new VDouble(result))); } -static void _int(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); - StringPtr self_string=r.get_self()->get_string(&pool); +static void _int(Request& r, const String& method_name, MethodParams* params) { + const String& self_string=r.get_self()->get_string(&pool); int converted; ValuePtr default_code=params->count()>0?params->as_junction(0, "default must be int") :ValuePtr(0); // (default) @@ -70,9 +68,8 @@ static void _int(Request& r, StringPtr m r.write_no_lang(ValuePtr(new VInt(converted))); } -static void _double(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); - StringPtr self_string=GET_SELF(r, VString).string(); +static void _double(Request& r, const String& method_name, 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) @@ -92,14 +89,13 @@ static void _double(Request& r, StringPt r.write_no_lang(ValuePtr(new VDouble(converted))); } -/*not static*/void _string_format(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +/*not static*/void _string_format(Request& r, const String& method_name, MethodParams* params) { ValuePtr fmt_maybe_code=(*params)[0]; // for some time due to stupid {} in original design - StringPtr fmt=r.process_to_string(fmt_maybe_code); + 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,43 +104,41 @@ static void _double(Request& r, StringPt r.write_no_lang(result); } -static void _left(Request& r, StringPtr /*method_name*/, MethodParams* params) { +static void _left(Request& r, const String& /*method_name*/, MethodParams* params) { size_t n=(size_t)params->as_int(0, "n must be int", r); - StringPtr string=GET_SELF(r, VString).string(); + const String& string=GET_SELF(r, VString).string(); r.write_assign_lang(*string->mid(0, n)); } -static void _right(Request& r, StringPtr /*method_name*/, MethodParams* params) { +static void _right(Request& r, const String& /*method_name*/, MethodParams* params) { size_t n=(size_t)params->as_int(0, "n must be int", r); - StringPtr string=GET_SELF(r, VString).string(); - r.write_assign_lang(*string->mid(string->size()-n, string->size())); + const String& string=GET_SELF(r, VString).string(); + r.write_assign_lang(*string->mid(string->length()-n, string->length())); } -static void _mid(Request& r, StringPtr /*method_name*/, MethodParams* params) { - StringPtr string=GET_SELF(r, VString).string(); +static void _mid(Request& r, const String& /*method_name*/, 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, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _pos(Request& r, const String& method_name, MethodParams* params) { ValuePtr substr=params->as_no_junction(0, "substr must not be code"); - StringPtr string=GET_SELF(r, VString).string(); + const String& string=GET_SELF(r, VString).string(); r.write_assign_lang(ValuePtr(new VInt(string->pos(*substr->as_string(&pool))))); } -static void split_list(Request& r, StringPtr method_name, +static void split_list(Request& r, const String& method_name, MethodParams* params, int paramIndex, String& string, ArrayString& result) { - Pool& pool=r.pool(); ValuePtr delim_value=params->as_no_junction(paramIndex, "delimiter must not be code"); string.split(result, 0, *delim_value->as_string(&pool)); @@ -155,7 +149,7 @@ static void split_list(Request& r, Strin #define SPLIT_HORIZONTAL 0x0100 #define SPLIT_VERTICAL 0x1000 -static int split_options(StringPtr options) { +static int split_options(const String& options) { struct Split_option { const char* keyL; const char* keyU; @@ -185,13 +179,12 @@ static int split_options(StringPtr optio return result; } -static TablePtr split_vertical(Request& r, StringPtr string, ArrayString& pieces, bool right) { - Pool& pool=r.pool(); +static Table* split_vertical(Request& r, const String& string, ArrayString& pieces, bool right) { Table::columns_type columns(new ArrayString); - *columns+=StringPtr(new String("piece")); + *columns+=String* (new String("piece")); - TablePtr table(new Table(string, columns, pieces.count())); + Table* table(new Table(string, columns, pieces.count())); if(right) { // right for(int i=pieces.count(); --i>=0; ) { Table::element_type row(new ArrayString); @@ -199,7 +192,7 @@ static TablePtr split_vertical(Request& *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(); @@ -210,17 +203,16 @@ static TablePtr split_vertical(Request& return table; } -static TablePtr split_horizontal(Request& r, StringPtr string, ArrayString& pieces, bool right) { - Pool& pool=r.pool(); +static Table* split_horizontal(Request& r, const String& string, ArrayString& pieces, bool right) { - TablePtr table(new Table(string, Table::columns_type(0) /* nameless */)); + Table* table(new Table(string, Table::columns_type(0) /* nameless */)); Table::element_type row(new ArrayString(pieces.count())); if(right) { // right for(int i=pieces.count(); --i>=0; ) { *row+=pieces[i]; } } else { // left - Array_iterator i(pieces); + Array_iterator i(pieces); while(i.has_next()) { *row+=i.next(); } @@ -230,16 +222,15 @@ static TablePtr split_horizontal(Request return table; } -static void split_with_options(Request& r, StringPtr method_name, MethodParams* params, +static void split_with_options(Request& r, const String& method_name, MethodParams* params, int bits) { - Pool& pool=r.pool(); - StringPtr string=GET_SELF(r, VString).string(); + const String& string=GET_SELF(r, VString).string(); ArrayString pieces; split_list(r, method_name, params, 0, *string, pieces); if(!bits) { - StringPtr options(0); + const String& options(0); if(params->count()>1) { options=params->as_string(1, "options must not be code"); } @@ -248,22 +239,22 @@ static void split_with_options(Request& bool right=(bits & SPLIT_RIGHT) != 0; bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; - TablePtr table=horizontal?split_horizontal(r, string, pieces, right) + Table* table=horizontal?split_horizontal(r, string, pieces, right) :split_vertical(r, string, pieces, right); r.write_no_lang(ValuePtr(new VTable(table))); } -static void _split(Request& r, StringPtr method_name, MethodParams* params) { +static void _split(Request& r, const String& method_name, MethodParams* params) { split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */); } -static void _lsplit(Request& r, StringPtr method_name, MethodParams* params) { +static void _lsplit(Request& r, const String& method_name, MethodParams* params) { split_with_options(r, method_name, params, SPLIT_LEFT); } -static void _rsplit(Request& r, StringPtr method_name, MethodParams* params) { +static void _rsplit(Request& r, const String& method_name, MethodParams* params) { split_with_options(r, method_name, params, SPLIT_RIGHT); } -static void search_action(TablePtr table, Table::element_type row, int, int, int, int, void *) { +static void search_action(Table* table, Table::element_type row, int, int, int, int, void *) { if(row) *table+=row; } @@ -271,14 +262,14 @@ static void search_action(TablePtr table #ifndef DOXYGEN struct Replace_action_info { Request *request; - StringPtr origin; - StringPtr src; String* dest; - VTablePtr vtable; + const String& origin; + const String& src; String* dest; + VTable* vtable; ValuePtr replacement_code; }; #endif /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this -static void replace_action(TablePtr table, ArrayStringPtr row, +static void replace_action(Table* table, ArrayString& row, int prestart, int prefinish, int poststart, int postfinish, void *info) { @@ -302,36 +293,33 @@ static void replace_action(TablePtr tabl } /// @todo use pcre:study somehow -static void _match(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _match(Request& r, const String& method_name, MethodParams* params) { ValuePtr regexp=params->as_no_junction(0, "regexp must not be code"); - StringPtr options= + const String& options= params->count()>1? - params->as_no_junction(1, "options must not be code")->as_string(&pool):StringPtr(0); + params->as_no_junction(1, "options must not be code")->as_string(&pool):0; Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - StringPtr src=GET_SELF(r, VString).string(); + const String& src=GET_SELF(r, VString).string(); + bool just_matched; if(params->count()<3) { // search - bool was_global; - TablePtr table=src->match(r.charsets.source(), + Table* table=src->match(r.charsets.source(), method_name, *regexp->as_string(&pool), options, search_action, 0, - &was_global); + just_matched); ValuePtr result; - // matched - // not (just matched[3=pre/match/post], no substrings) or Global search - if(table->columns()->count()>3 || was_global) - result=ValuePtr(new VTable(table/*TODO: clone this when table would be stacked!*/)); // table of pre/match/post+substrings + if(table) + result=ValuePtr(new VTable(table)); // table of pre/match/post+substrings else - result=ValuePtr(new VBool(table)); + result=ValuePtr(new VBool(just_matched)); r.write_assign_lang(result); } else { // replace ValuePtr replacement_code=params->as_junction(2, "replacement param must be code"); String result; - VTablePtr vtable(new VTable); + VTable* vtable(new VTable); Replace_action_info info; info.request=&r; info.origin=method_name; @@ -345,39 +333,38 @@ static void _match(Request& r, StringPtr src->match(r.charsets.source(), method_name, *r.process_to_string(regexp), options, - replace_action, &info); + replace_action, &info, + just_matched); r.write_assign_lang(result); } } -static void change_case(Request& r, StringPtr method_name, MethodParams* params, +static void change_case(Request& r, const String& method_name, MethodParams* params, String::Change_case_kind kind) { - Pool& pool=r.pool(); - StringPtr src=GET_SELF(r, VString).string(); + 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, StringPtr method_name, MethodParams* params) { +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, StringPtr method_name, MethodParams* params) { +static void _lower(Request& r, const String& method_name, MethodParams* params) { change_case(r, method_name, params, String::CC_LOWER); } #ifndef DOXYGEN class String_sql_event_handlers: public SQL_Driver_query_event_handlers { - //Pool& pool; - StringPtr statement_string; const char* statement_cstr; + const String& statement_string; const char* statement_cstr; bool got_column; public: bool got_cell; - StringPtr result; + const String& result; public: - String_sql_event_handlers(//Pool& apool, - StringPtr astatement_string, const char* astatement_cstr): - //pool(apool), - statement_string(astatement_string), - statement_cstr(astatement_cstr), + String_sql_event_handlers( + const String& astatement_string, const char* astatement_cstr): + statement_string(astatement_string), statement_cstr(astatement_cstr), + got_column(false), + got_cell(false), result(new String) {} bool add_column(SQL_Error& error, void *ptr, size_t size) { @@ -411,13 +398,12 @@ public: } }; #endif -extern StringPtr sql_limit_name; -extern StringPtr sql_offset_name; -extern StringPtr sql_default_name; -extern StringPtr sql_distinct_name; -StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams* params, +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) { - Pool& pool=r.pool(); ValuePtr statement=params->as_junction(0, "statement must be code"); @@ -448,9 +434,9 @@ StringPtr sql_result_string(Request& r, options=0; Temp_lang temp_lang(r, String::UL_SQL); - StringPtr statement_string=r.process_to_string(statement); + 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::UL_UNSPECIFIED, r.connection(method_name)); String_sql_event_handlers handlers(statement_string, statement_cstr); r.connection(method_name)->query( statement_cstr, offset, limit, @@ -463,17 +449,16 @@ StringPtr sql_result_string(Request& r, return handlers.result; } -static void _sql(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _sql(Request& r, const String& method_name, MethodParams* params) { HashStringValue* options; ValuePtr default_code; - StringPtr string=sql_result_string(r, method_name, params, options, default_code); + const String& string=sql_result_string(r, method_name, params, options, default_code); if(!string) { if(default_code) { string=r.process_to_string(default_code); if(!string) - string=StringPtr(new String); + string=String* (new String); } else throw Exception("parser.runtime", method_name, @@ -483,9 +468,8 @@ static void _sql(Request& r, StringPtr m r.write_assign_lang(*string); } -static void _replace(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); - StringPtr src=GET_SELF(r, VString).string(); +static void _replace(Request& r, const String& method_name, MethodParams* params) { + const String& src=GET_SELF(r, VString).string(); Table* table=params->as_no_junction(0, "parameter must not be code")->get_table(); if(!table) @@ -493,19 +477,20 @@ static void _replace(Request& r, StringP method_name, "parameter must be table"); - Dictionary dict2(TablePtr(table), 1/*am not sure why using the =default parameter causes compile errors in replace*/ ); - r.write_assign_lang(*src->replace(pool, dict2)); + 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(dict2)); } -static void _save(Request& r, StringPtr method_name, MethodParams* params) { - StringPtr file_name=params->as_string(params->count()-1, +static void _save(Request& r, const String& method_name, MethodParams* params) { + const String& file_name=params->as_string(params->count()-1, "file name must be string"); - StringPtr src=GET_SELF(r, VString).string(); + const String& src=GET_SELF(r, VString).string(); bool do_append=false; if(params->count()>1) { - StringPtr mode=params->as_string(0, "mode must be string"); + const String& mode=params->as_string(0, "mode must be string"); if(*mode=="append") do_append=true; else @@ -515,13 +500,13 @@ static void _save(Request& r, StringPtr } // write - CharPtr buf=src->cstr(String::UL_UNSPECIFIED, r.connection(StringPtr(0)/*no error if none*/)); + const char* buf=src->cstr(String::UL_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, StringPtr method_name, MethodParams* /*params*/) { - StringPtr src=GET_SELF(r, VString).string(); +static void _normalize(Request& r, const String& method_name, MethodParams* /*params*/) { + const String& src=GET_SELF(r, VString).string(); r.write_assign_lang(*src->join_chains(r.pool())); }