--- parser3/src/classes/string.C 2001/11/09 11:59:13 1.89 +++ parser3/src/classes/string.C 2002/04/15 11:34:24 1.102 @@ -1,10 +1,10 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: string.C,v 1.89 2001/11/09 11:59:13 paf Exp $ + $Id: string.C,v 1.102 2002/04/15 11:34:24 paf Exp $ */ #include "classes.h" @@ -50,7 +50,7 @@ static void _int(Request& r, const Strin if(!default_code) // we have a problem when no default /*re*/throw; else - converted=r.process(*default_code).as_int(); + converted=r.process_to_value(*default_code).as_int(); } Value& result=*new(pool) VInt(pool, converted); @@ -69,7 +69,7 @@ static void _double(Request& r, const St if(!default_code) // we have a problem when no default /*re*/throw; else - converted=r.process(*default_code).as_double(); + converted=r.process_to_value(*default_code).as_double(); } Value& result=*new(pool) VDouble(pool, converted); @@ -80,11 +80,11 @@ static void _double(Request& r, const St /*not static*/void _string_format(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& fmt=params->as_junction(0, "fmt must be code"); + Value& fmt_maybe_code=params->get(0); + // for some time due to stupid {} in original design + const String& fmt=r.process_to_string(fmt_maybe_code); - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - char *buf=format(pool, r.self->as_double(), - r.process(fmt).as_string().cstr(String::UL_UNSPECIFIED)); + char *buf=format(pool, r.self->as_double(), fmt.cstr()); String result(pool); result.APPEND_CLEAN(buf, 0, @@ -99,7 +99,7 @@ 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))); + r.write_assign_lang(string.mid(0, n)); } static void _right(Request& r, const String&, MethodParams *params) { @@ -108,7 +108,7 @@ 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()))); + r.write_assign_lang(string.mid(string.size()-n, string.size())); } static void _mid(Request& r, const String&, MethodParams *params) { @@ -120,7 +120,7 @@ static void _mid(Request& r, const Strin 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) { @@ -214,7 +214,7 @@ static void replace_action(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); - Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false); + const String& replaced=ai.request->process_to_string(*ai.replacement_code); junction->root->put_element(*match_var_name, saved_match_var_value); /* @@ -222,7 +222,7 @@ static void replace_action(Table& table, *ai.dest << *(String *)row->get(1/*match* /); ai.dest->APPEND_CONST(")"); */ - *ai.dest << replaced.as_string(); + *ai.dest << replaced; } ai.post_match=(String *)row->get(2/*post_match*/); } else // end @@ -240,42 +240,42 @@ static void _match(Request& r, const Str 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 bool was_global; - bool matched=src.match(r.pcre_tables(), + bool matched=src.match( &method_name, regexp.as_string(), options, &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 else result=new(pool) VBool(pool, matched); + result->set_name(method_name); + r.write_assign_lang(*result); } else { // replace - Value& replacement_code=params->as_junction(2, "replacement code must be code"); + Value& replacement_code=params->as_junction(2, "replacement param must be code"); - String& dest=*new(pool) String(pool); + String& result=*new(pool) String(pool); Replace_action_info replace_action_info={ &r, &method_name, - &src, &dest, + &src, &result, &replacement_code, &src }; - src.match(r.pcre_tables(), + src.match( &method_name, - r.process(regexp).as_string(), options, + 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, @@ -283,8 +283,7 @@ static void change_case(Request& r, cons Pool& pool=r.pool(); const String& src=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(), - 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); @@ -307,7 +306,7 @@ public: void add_column(void *ptr, size_t size) { if(got_column) - throw Exception(0, 0, + throw Exception("parser.runtime", &statement_string, "result must contain exactly one column"); got_column=true; @@ -316,7 +315,7 @@ public: void add_row() { /* ignore */ } void add_row_cell(void *ptr, size_t size) { if(got_cell) - throw Exception(0, 0, + throw Exception("parser.runtime", &statement_string, "result must not contain more then one row"); got_cell=true; @@ -337,11 +336,6 @@ const String* sql_result_string(Request& Hash *& options, Value *& default_code) { Pool& pool=r.pool(); - if(!r.connection) - throw Exception(0, 0, - &method_name, - "without connect"); - Value& statement=params->as_junction(0, "statement must be code"); ulong limit=0; @@ -352,34 +346,34 @@ const String* sql_result_string(Request& if(voptions.is_defined()) if(options=voptions.get_hash(&method_name)) { if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); + limit=(ulong)r.process_to_value(*vlimit).as_double(); if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); + offset=(ulong)r.process_to_value(*voffset).as_double(); if(default_code=(Value *)options->get(*sql_default_name)) { if(!default_code->get_junction()) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "default option must be code"); } } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "options must be hash"); } else options=0; Temp_lang temp_lang(r, String::UL_SQL); - const String& statement_string=r.process(statement).as_string(); + const String& statement_string=r.process_to_string(statement); const char *statement_cstr= - statement_string.cstr(String::UL_UNSPECIFIED, r.connection); + statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); String_sql_event_handlers handlers(pool, statement_string, statement_cstr); try { - r.connection->query( + r.connection(&method_name)->query( statement_cstr, offset, limit, handlers); } catch(const Exception& e) { // query problem // give more specific source [were url] - throw Exception(e.type(), e.code(), + throw Exception("sql.execute", &statement_string, "%s", e.comment()); } @@ -398,17 +392,16 @@ static void _sql(Request& r, const Strin const String *string=sql_result_string(r, method_name, params, options, default_code); if(!string) { if(default_code) { - string=r.process(*default_code).get_string(); + string=&r.process_to_string(*default_code); if(!string) string=new(pool) String(pool); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &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) { @@ -417,16 +410,15 @@ static void _replace(Request& r, const S Table *table=params->as_no_junction(0, "parameter must not be code").get_table(); if(!table) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "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) { - Pool& pool=r.pool(); const String& file_name=params->as_string(params->size()-1, "file name must be string"); @@ -438,14 +430,14 @@ static void _save(Request& r, const Stri if(mode=="append") do_append=true; else - throw Exception(0, 0, + throw Exception("parser.runtime", &mode, "unknown mode, must be 'append'"); } // write const char *buf=src.cstr(String::UL_UNSPECIFIED); - file_write(pool, r.absolute(file_name), + file_write(r.absolute(file_name), buf, strlen(buf), true, do_append); }