--- parser3/src/classes/string.C 2001/08/28 09:27:42 1.71 +++ parser3/src/classes/string.C 2001/11/09 12:09:53 1.90 @@ -2,10 +2,10 @@ Parser: @b string parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) + $Id: string.C,v 1.90 2001/11/09 12:09:53 paf Exp $ */ -static const char *RCSId="$Id: string.C,v 1.71 2001/08/28 09:27:42 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -39,16 +39,40 @@ static void _length(Request& r, const St r.write_no_lang(result); } -static void _int(Request& r, const String& method_name, MethodParams *) { +static void _int(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& result=*new(pool) VInt(pool, r.self->as_int()); + int converted; + Value *default_code=params->size()>0? + default_code=¶ms->as_junction(0, "default must be int"):0; // (default) + try { + converted=r.self->as_int(); + } catch(...) { // convert problem + if(!default_code) // we have a problem when no default + /*re*/throw; + else + converted=r.process(*default_code).as_int(); + } + + Value& result=*new(pool) VInt(pool, converted); result.set_name(method_name); r.write_no_lang(result); } -static void _double(Request& r, const String& method_name, MethodParams *) { +static void _double(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& result=*new(pool) VDouble(pool, r.self->as_double()); + double converted; + Value *default_code=params->size()>0? + default_code=¶ms->as_junction(0, "default must be double"):0; // (default) + try { + converted=r.self->as_double(); + } catch(...) { // convert problem + if(!default_code) // we have a problem when no default + /*re*/throw; + else + converted=r.process(*default_code).as_double(); + } + + Value& result=*new(pool) VDouble(pool, converted); result.set_name(method_name); r.write_no_lang(result); } @@ -59,7 +83,8 @@ static void _double(Request& r, const St Value& fmt=params->as_junction(0, "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()); + char *buf=format(pool, r.self->as_double(), + r.process(fmt).as_string().cstr(String::UL_UNSPECIFIED, r.connection)); String result(pool); result.APPEND_CLEAN(buf, 0, @@ -71,7 +96,7 @@ static void _double(Request& r, const St static void _left(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t n=(size_t)r.process(params->get(0)).as_double(); + 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))); @@ -80,7 +105,7 @@ static void _left(Request& r, const Stri static void _right(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t n=(size_t)r.process(params->get(0)).as_double(); + 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()))); @@ -89,10 +114,12 @@ static void _right(Request& r, const Str static void _mid(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t p=(size_t)r.process(params->get(0)).as_double(); - size_t n=(size_t)r.process(params->get(1)).as_double(); - const String& string=*static_cast(r.self)->get_string(); + + size_t p=(size_t)params->as_int(0, "p must be int", r); + 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))); } @@ -160,13 +187,14 @@ static void search_action(Table& table, table+=row; } -/// used by string: _match / replace_action +#ifndef DOXYGEN struct Replace_action_info { Request *request; const String *origin; const String *src; String *dest; Value *replacement_code; const String *post_match; }; +#endif static void replace_action(Table& table, Array *row, int start, int finish, void *info) { Replace_action_info& ai=*static_cast(info); @@ -217,7 +245,7 @@ static void _match(Request& r, const Str Table *table; if(params->size()<3) { // search bool was_global; - bool matched=src.match(r.pcre_tables, + bool matched=src.match(r.pcre_tables(), &method_name, regexp.as_string(), options, &table, @@ -239,7 +267,7 @@ static void _match(Request& r, const Str &replacement_code, &src }; - src.match(r.pcre_tables, + src.match(r.pcre_tables(), &method_name, r.process(regexp).as_string(), options, &table, @@ -255,7 +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, + r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(), kind))); } static void _upper(Request& r, const String& method_name, MethodParams *params) { @@ -279,7 +307,7 @@ public: void add_column(void *ptr, size_t size) { if(got_column) - PTHROW(0, 0, + throw Exception(0, 0, &statement_string, "result must contain exactly one column"); got_column=true; @@ -288,7 +316,7 @@ public: void add_row() { /* ignore */ } void add_row_cell(void *ptr, size_t size) { if(got_cell) - PTHROW(0, 0, + throw Exception(0, 0, &statement_string, "result must not contain more then one row"); got_cell=true; @@ -306,11 +334,11 @@ public: }; #endif const String* sql_result_string(Request& r, const String& method_name, MethodParams *params, - Hash *&options) { + Hash *& options, Value *& default_code) { Pool& pool=r.pool(); if(!r.connection) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "without connect"); @@ -318,17 +346,25 @@ const String* sql_result_string(Request& ulong limit=0; ulong offset=0; + default_code=0; if(params->size()>1) { - Value& options_param=params->as_no_junction(1, "options must be hash, not code"); - if(options=options_param.get_hash()) { - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); - if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); - } else - PTHROW(0, 0, - &method_name, - "options must be hash"); + Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + 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(); + if(Value *voffset=(Value *)options->get(*sql_offset_name)) + offset=(ulong)r.process(*voffset).as_double(); + if(default_code=(Value *)options->get(*sql_default_name)) { + if(!default_code->get_junction()) + throw Exception(0, 0, + &method_name, + "default option must be code"); + } + } else + throw Exception(0, 0, + &method_name, + "options must be hash"); } else options=0; @@ -337,20 +373,16 @@ const String* sql_result_string(Request& const char *statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection); String_sql_event_handlers handlers(pool, statement_string, statement_cstr); - bool need_rethrow=false; Exception rethrow_me; - PTRY { + try { r.connection->query( statement_cstr, offset, limit, handlers); + } catch(const Exception& e) { // query problem + // give more specific source [were url] + throw Exception(e.type(), e.code(), + &statement_string, + "%s", e.comment()); } - PCATCH(e) { // query problem - rethrow_me=e; need_rethrow=true; - } - PEND_CATCH - if(need_rethrow) - PTHROW(rethrow_me.type(), rethrow_me.code(), - &statement_string, // setting more specific source [were url] - rethrow_me.comment()); if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] @@ -362,25 +394,17 @@ static void _sql(Request& r, const Strin Pool& pool=r.pool(); Hash *options; - const String *string=sql_result_string(r, method_name, params, options); + Value *default_code; + const String *string=sql_result_string(r, method_name, params, options, default_code); if(!string) { - if(options) { - if(Value *vdefault=(Value *)options->get(*sql_default_name)) { - if(!vdefault->get_junction()) - PTHROW(0, 0, - &method_name, - "default option must be code"); - string=r.process(*vdefault).get_string(); - if(!string) - string=empty_string; - } else - PTHROW(0, 0, - &method_name, - "produced no result, but no default option specified"); + if(default_code) { + string=r.process(*default_code).get_string(); + if(!string) + string=new(pool) String(pool); } else - PTHROW(0, 0, + throw Exception(0, 0, &method_name, - "produced no result, but no options (no default) specified"); + "produced no result, but no default option specified"); } VString& result=*new(pool) VString(*string); result.set_name(method_name); @@ -393,13 +417,38 @@ static void _replace(Request& r, const S Table *table=params->as_no_junction(0, "parameter must not be code").get_table(); if(!table) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "parameter must be table"); Dictionary dict(*table); r.write_assign_lang(*new(pool) VString(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"); + + const String& src=*static_cast(r.self)->get_string(); + + bool do_append=false; + if(params->size()>1) { + const String& mode=params->as_string(0, "mode must be string"); + if(mode=="append") + do_append=true; + else + throw Exception(0, 0, + &mode, + "unknown mode, must be 'append'"); + } + + // write + const char *buf=src.cstr(String::UL_UNSPECIFIED); + file_write(pool, r.absolute(file_name), + buf, strlen(buf), true, do_append); +} + // constructor MString::MString(Pool& apool) : Methoded(apool) { @@ -410,10 +459,11 @@ MString::MString(Pool& apool) : Methoded add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0); // ^string.int[] - add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0); - + // ^string.int(default) + add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); // ^string.double[] - add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0); + // ^string.double(default) + add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); // ^string.format{format} add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); @@ -423,7 +473,7 @@ MString::MString(Pool& apool) : Methoded // ^string.right(n) add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1); // ^string.mid(p;n) - add_native_method("mid", Method::CT_DYNAMIC, _mid, 2, 2); + add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2); // ^string.pos[substr] add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1); @@ -448,6 +498,9 @@ MString::MString(Pool& apool) : Methoded // ^string.replace[table] add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1); + + // ^string.save[file] + add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); } // global variable