--- parser3/src/classes/string.C 2003/02/14 12:59:09 1.125.2.7 +++ parser3/src/classes/string.C 2004/03/01 08:54:16 1.136 @@ -1,11 +1,11 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/02/14 12:59:09 $"; +static const char * const IDENT_STRING_C="$Date: 2004/03/01 08:54:16 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -22,125 +22,126 @@ static const char* IDENT_STRING_C="$Date // class -class MString : public Methoded { +class MString: public Methoded { public: MString(); public: // Methoded bool used_directly() { return true; } }; - // global variable -MethodedPtr string_class(new MString); +DECLARE_CLASS_VAR(string, new MString, 0); + +// defines for statics + +#define MATCH_VAR_NAME "match" +#define TRIM_START_OPTION "start" +#define TRIM_BOTH_OPTION "both" +#define TRIM_END_OPTION "end" + +// statics + +static const String match_var_name(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(); - 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(*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, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).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?¶ms.as_junction(0, "default must be int") + :0; // (default) try { - if(!self_string || self_string->is_empty()) + if(self_string.is_empty()) throw Exception("parser.runtime", - method_name, + 0, "parameter is empty string, error converting"); - converted=self_string->as_int(); + converted=self_string.as_int(); } catch(...) { // convert problem - if(!default_code) // we have a problem when no default - rethrow; + if(default_code) + converted=r.process_to_value(*default_code).as_int(); else - converted=r.process_to_value(default_code)->as_int(); + rethrow; // we have a problem when no default } - r.write_no_lang(ValuePtr(new VInt(converted))); + r.write_no_lang(*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, 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?¶ms.as_junction(0, "default must be double") + :0; // (default) try { - if(!self_string || self_string->is_empty()) + if(self_string.is_empty()) throw Exception("parser.runtime", - method_name, + 0, "parameter is empty string, error converting"); - converted=self_string->as_double(); + converted=self_string.as_double(); } catch(...) { // convert problem - if(!default_code) // we have a problem when no default - rethrow; + if(default_code) + converted=r.process_to_value(*default_code).as_double(); else - converted=r.process_to_value(default_code)->as_double(); + rethrow; // we have a problem when no default } - r.write_no_lang(ValuePtr(new VDouble(converted))); + r.write_no_lang(*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, MethodParams& params) { - ValuePtr fmt_maybe_code=params[0]; + Value& 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.cstrm()); - String result; - result.APPEND_CLEAN(buf, 0, - method_name->origin().file, - method_name->origin().line); - r.write_no_lang(result); + r.write_no_lang(String(buf)); } -static void _left(Request& r, StringPtr /*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); - StringPtr string=GET_SELF(r, VString).string(); - r.write_assign_lang(*string->mid(0, n)); + 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, 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(); + size_t length=string.length(); + r.write_assign_lang(n1? - (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)); + r.write_assign_lang(string.mid(p, p+n)); } -static void _pos(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=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"); - StringPtr string=GET_SELF(r, VString).string(); - r.write_assign_lang(ValuePtr(new VInt(string->pos(*substr->as_string(&pool))))); + const String& string=GET_SELF(r, VString).string(); + r.write_assign_lang(*new VInt((int)string.pos(substr.as_string()))); } -static void split_list(Request& r, StringPtr 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"); +static void split_list(MethodParams& params, int paramIndex, + const String& string, + ArrayString& result) { + Value& delim_value=params.as_no_junction(paramIndex, "delimiter must not be code"); - string.split(result, 0, *delim_value->as_string(&pool)); + size_t pos_after=0; + string.split(result, pos_after, delim_value.as_string()); } #define SPLIT_LEFT 0x0001 @@ -148,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; @@ -159,14 +160,14 @@ static int split_options(StringPtr optio {"r", "R", SPLIT_RIGHT, SPLIT_LEFT}, {"h", "H", SPLIT_HORIZONTAL, SPLIT_VERTICAL}, {"v", "V", SPLIT_VERTICAL, SPLIT_HORIZONTAL}, - {0} + {0, 0, 0, 0} }; int result=0; - if(options) { + if(options) { for(Split_option *o=split_option; o->keyL; o++) - if(options->pos(o->keyL)>=0 - || (o->keyU && options->pos(o->keyU)>=0)) { + if(options->pos(o->keyL)!=STRING_NOT_FOUND + || (o->keyU && options->pos(o->keyU)!=STRING_NOT_FOUND)) { if(result & o->checkBit) throw Exception("parser.runtime", options, @@ -178,202 +179,187 @@ 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(ArrayString& pieces, bool right) { Table::columns_type columns(new ArrayString); - *columns+=StringPtr(new String("piece")); + *columns+=new String("piece"); - TablePtr table(new Table(string, columns, pieces.count())); + Table& table=*new Table(columns, pieces.count()); if(right) { // right for(int i=pieces.count(); --i>=0; ) { Table::element_type row(new ArrayString); *row+=pieces[i]; - *table+=row; + 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(); - *table+=row; + table+=row; } } return table; } -static TablePtr split_horizontal(Request& r, StringPtr string, ArrayString& pieces, bool right) { - Pool& pool=r.pool(); - - TablePtr table(new Table(string, Table::columns_type(0) /* nameless */)); +static Table& split_horizontal(ArrayString& pieces, bool right) { + Table& table=*new Table(Table::columns_type(0) /* nameless */); Table::element_type row(new ArrayString(pieces.count())); if(right) { // right - for(int i=pieces.count(); --i>=0; ) { + for(int i=pieces.count(); --i>=0; ) *row+=pieces[i]; - } } else { // left - Array_iterator i(pieces); - while(i.has_next()) { + for(Array_iterator i(pieces); i.has_next(); ) *row+=i.next(); - } } - *table+=row; + table+=row; return table; } -static void split_with_options(Request& r, StringPtr method_name, MethodParams& params, +static void split_with_options(Request& r, 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); + split_list(params, 0, string, pieces); if(!bits) { - StringPtr options(0); - if(params.count()>1) { - options=params.as_string(1, "options must not be code"); - } + const String* options=0; + if(params.count()>1) + options=¶ms.as_string(1, "options must not be code"); + bits=split_options(options); } bool right=(bits & SPLIT_RIGHT) != 0; bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; - TablePtr table=horizontal?split_horizontal(r, string, pieces, right) - :split_vertical(r, string, pieces, right); + Table& table=horizontal?split_horizontal(pieces, right) + :split_vertical(pieces, right); - r.write_no_lang(ValuePtr(new VTable(table))); + r.write_no_lang(*new VTable(&table)); } -static void _split(Request& r, StringPtr method_name, MethodParams& params) { - split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */); +static void _split(Request& r, MethodParams& params) { + split_with_options(r, params, 0 /* maybe-determine from param #2 */); } -static void _lsplit(Request& r, StringPtr method_name, MethodParams& params) { - split_with_options(r, method_name, params, SPLIT_LEFT); +static void _lsplit(Request& r, MethodParams& params) { + split_with_options(r, params, SPLIT_LEFT); } -static void _rsplit(Request& r, StringPtr method_name, MethodParams& params) { - split_with_options(r, method_name, params, SPLIT_RIGHT); +static void _rsplit(Request& r, MethodParams& params) { + split_with_options(r, 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; + table+=row; } #ifndef DOXYGEN struct Replace_action_info { - Request *request; - StringPtr origin; - StringPtr src; String* dest; - VTablePtr vtable; - ValuePtr replacement_code; + Request* request; + const String* src; String* dest; + VTable* vtable; + Value* 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, - 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'] if(prestart!=prefinish) *ai.dest << ai.src->mid(prestart, prefinish);//ai.dest->APPEND_CONST("-"); // store found parts in one-record VTable - if(table->count()) // middle - table->put(0, row); + if(table.count()) // middle + table.put(0, row); else // begin - *table+=row; + table+=row; { // execute 'replacement_code' in 'table' context ai.vtable->set_table(table); - *ai.dest << ai.request->process_to_string(ai.replacement_code); + *ai.dest << ai.request->process_to_string(*ai.replacement_code); } } else // end *ai.dest << ai.src->mid(poststart, postfinish); } /// @todo use pcre:study somehow -static void _match(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=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"); - StringPtr options= + const String* options= params.count()>1? - params.as_no_junction(1, "options must not be code")->as_string(&pool):StringPtr(0); + ¶ms.as_no_junction(1, "options must not be code").as_string():0; - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - StringPtr src=GET_SELF(r, VString).string(); + 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 - bool was_global; - TablePtr table=src->match(r.charsets.source(), - method_name, - *regexp->as_string(&pool), options, + Table* table=src.match(r.charsets.source(), + regexp.as_string(), options, search_action, 0, - &was_global); - 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 + just_matched); + Value* result; + if(table) + result=new VTable(table); // table of pre/match/post+substrings else - result=ValuePtr(new VBool(table)); - r.write_assign_lang(result); + result=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; - VTablePtr vtable(new VTable); - Replace_action_info info; - info.request=&r; - info.origin=method_name; - info.src=src; - info.dest=&result; - info.vtable=vtable; - info.replacement_code=replacement_code; + VTable* vtable=new VTable; + Replace_action_info info={ + &r, + &src, + &result, + vtable, + &replacement_code + }; Temp_value_element temp_match_var( - *replacement_code->get_junction()->method_frame, + *replacement_code.get_junction()->method_frame, match_var_name, vtable); - src->match(r.charsets.source(), - method_name, - *r.process_to_string(regexp), options, - replace_action, &info); + src.match(r.charsets.source(), + r.process_to_string(regexp), options, + 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, MethodParams&, 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) { - change_case(r, method_name, params, String::CC_UPPER); +static void _upper(Request& r, MethodParams& params) { + change_case(r, params, String::CC_UPPER); } -static void _lower(Request& r, StringPtr method_name, MethodParams& params) { - change_case(r, method_name, params, String::CC_LOWER); +static void _lower(Request& r, MethodParams& params) { + change_case(r, 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; + 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), - result(new String) {} + 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) { + bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) { if(got_column) { error=SQL_Error("parser.runtime", //statement_string, @@ -385,7 +371,7 @@ public: } bool before_rows(SQL_Error& /*error*/ ) { /* ignore */ return false; } bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } - bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + bool add_row_cell(SQL_Error& error, const char* str, size_t length) { if(got_cell) { error=SQL_Error("parser.runtime", //statement_string, @@ -395,7 +381,7 @@ public: try { got_cell=true; - result->APPEND_TAINTED((const char* )ptr, size, statement_cstr, 0); + result.append_know_length(str, length, String::L_TAINTED); return false; } catch(...) { error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell"); @@ -404,44 +390,44 @@ public: } }; #endif -StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params, - HashStringValue*& options, ValuePtr& default_code) { - Pool& pool=r.pool(); - - ValuePtr statement=params.as_junction(0, "statement must be code"); +extern String sql_limit_name; +extern String sql_offset_name; +extern String sql_default_name; +extern String sql_distinct_name; +const String* sql_result_string(Request& r, MethodParams& params, + HashStringValue*& options, Value*& default_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"); - if(!voptions->is_string()) - if(options=voptions->get_hash(method_name)) { - if(ValuePtr vlimit=options->get(sql_limit_name)) - limit=(ulong)r.process_to_value(vlimit)->as_double(); - if(ValuePtr 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()) - ;//default_junction->change_context(statement.get_junction()); - else + Value& voptions=params.as_no_junction(1, "options must be hash, not code"); + if(!voptions.is_string()) + if((options=voptions.get_hash())) { + if(Value* vlimit=options->get(sql_limit_name)) + limit=(ulong)r.process_to_value(*vlimit).as_double(); + 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(!default_code->get_junction()) throw Exception("parser.runtime", - method_name, + 0, "default option must be code"); } } else throw Exception("parser.runtime", - method_name, + 0, "options must be hash"); } else options=0; - Temp_lang temp_lang(r, String::UL_SQL); - StringPtr statement_string=r.process_to_string(statement); + 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); @@ -449,70 +435,98 @@ StringPtr sql_result_string(Request& r, if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] - return handlers.result; + return &handlers.result; } -static void _sql(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _sql(Request& r, MethodParams& params) { HashStringValue* options; - ValuePtr default_code; - StringPtr string=sql_result_string(r, method_name, params, options, default_code); + Value* default_code; + const String* string=sql_result_string(r, params, options, default_code); if(!string) { if(default_code) { - string=r.process_to_string(default_code); - if(!string) - string=StringPtr(new String); + string=&r.process_to_string(*default_code); } else throw Exception("parser.runtime", - method_name, + 0, "produced no result, but no default option specified"); } 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, MethodParams& params) { + const String& src=GET_SELF(r, VString).string(); - Table* table=params.as_no_junction(0, "parameter must not be code")->get_table(); + Table* table=params.as_no_junction(0, "parameter must not be code").get_table(); if(!table) throw Exception("parser.runtime", - method_name, + 0, "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)); + Dictionary dict(*table); + r.write_assign_lang(src.replace(dict)); } -static void _save(Request& r, StringPtr method_name, MethodParams& params) { - StringPtr file_name=params.as_string(params.count()-1, +static void _save(Request& r, 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"); - if(*mode=="append") + const String& mode=params.as_string(0, "mode must be string"); + if(mode=="append") do_append=true; else throw Exception("parser.runtime", - mode, + &mode, "unknown mode, must be 'append'"); } // write - CharPtr buf=src->cstr(String::UL_UNSPECIFIED, r.connection(StringPtr(0)/*no error if none*/)); + const char* buf=src.cstr(String::L_UNSPECIFIED, r.connection(false/*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, MethodParams&) { + const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(*src->join_chains(r.pool())); + r.write_assign_lang(src); +} + +static void _trim(Request& r, MethodParams& params) { + const String& src=GET_SELF(r, VString).string(); + + String::Trim_kind kind=String::TRIM_BOTH; + const char* chars=0; + if(params.count()>0) { + const String& skind=params.as_string(0, + "'where' must be string"); + if(skind==TRIM_START_OPTION) + kind=String::TRIM_START; + else if(skind==TRIM_END_OPTION) + kind=String::TRIM_END; + else if(skind==TRIM_BOTH_OPTION) + kind=String::TRIM_BOTH; + else + throw Exception("parser.runtime", + &skind, + "'kind' should be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION); + + if(params.count()>1) { + const String& schars=params.as_string(1, "'chars' must be string"); + if(!schars.length()) + throw Exception("parser.runtime", + 0, + "'chars' must not be empty"); + chars=schars.cstr(); + } + } + + r.write_assign_lang(src.trim(kind, chars)); } // constructor @@ -571,4 +585,7 @@ MString::MString(): Methoded("string") { // ^string.normalize[] add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); + + // ^string.trim[[start|both|end][;chars]] + add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); }