--- parser3/src/classes/string.C 2003/11/20 16:34:23 1.129 +++ parser3/src/classes/string.C 2005/11/22 11:21:35 1.147 @@ -1,11 +1,11 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2003/11/20 16:34:23 $"; +static const char * const IDENT_STRING_C="$Date: 2005/11/22 11:21:35 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -36,6 +36,9 @@ 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 @@ -51,8 +54,6 @@ static void _length(Request& r, MethodPa static void _int(Request& r, MethodParams& params) { const String& self_string=GET_SELF(r, VString).string(); int converted; - Value* default_code=params.count()>0?¶ms.as_junction(0, "default must be int") - :0; // (default) try { if(self_string.is_empty()) throw Exception("parser.runtime", @@ -60,8 +61,8 @@ static void _int(Request& r, MethodParam "parameter is empty string, error converting"); converted=self_string.as_int(); } catch(...) { // convert problem - if(default_code) - converted=r.process_to_value(*default_code).as_int(); + if(params.count()>0) + converted=params.as_int(0, "default must be int", r); // (default) else rethrow; // we have a problem when no default } @@ -71,8 +72,6 @@ static void _int(Request& r, MethodParam static void _double(Request& r, MethodParams& params) { const String& self_string=GET_SELF(r, VString).string(); double converted; - Value* default_code=params.count()>0?¶ms.as_junction(0, "default must be double") - :0; // (default) try { if(self_string.is_empty()) throw Exception("parser.runtime", @@ -80,8 +79,8 @@ static void _double(Request& r, MethodPa "parameter is empty string, error converting"); converted=self_string.as_double(); } catch(...) { // convert problem - if(default_code) - converted=r.process_to_value(*default_code).as_double(); + if(params.count()>0) + converted=params.as_double(0, "default must be double", r); // (default) else rethrow; // we have a problem when no default } @@ -101,14 +100,25 @@ static void _double(Request& r, MethodPa } static void _left(Request& r, MethodParams& params) { - size_t n=(size_t)params.as_int(0, "n must be int", r); - + ssize_t sn=params.as_int(0, "n must be int", r); + if(sn<0) + throw Exception("parser.runtime", + 0, + "n(%d) must be >=0", sn); + size_t n=(size_t)sn; + const String& string=GET_SELF(r, VString).string(); r.write_assign_lang(string.mid(0, n)); } static void _right(Request& r, MethodParams& params) { - size_t n=(size_t)params.as_int(0, "n must be int", r); + ssize_t sn=(size_t)params.as_int(0, "n must be int", r); + if(sn<0) + throw Exception("parser.runtime", + 0, + "n(%d) must be >=0", sn); + size_t n=(size_t)sn; + const String& string=GET_SELF(r, VString).string(); size_t length=string.length(); @@ -118,11 +128,25 @@ static void _right(Request& r, MethodPar 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.length(); + ssize_t sbegin=params.as_int(0, "p must be int", r); + if(sbegin<0) + throw Exception("parser.runtime", + 0, + "p(%d) must be >=0", sbegin); + size_t begin=(size_t)sbegin; + + size_t end; + if(params.count()>1) { + ssize_t sn=params.as_int(1, "n must be int", r); + if(sn<0) + throw Exception("parser.runtime", + 0, + "n(%d) must be >=0", sn); + end=begin+(size_t)sn; + } else + end=string.length(); - r.write_assign_lang(string.mid(p, p+n)); + r.write_assign_lang(string.mid(begin, end)); } static void _pos(Request& r, MethodParams& params) { @@ -157,7 +181,7 @@ static int split_options(const String* o {"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; @@ -203,7 +227,7 @@ static Table& split_horizontal(ArrayStri Table& table=*new Table(Table::columns_type(0) /* nameless */); Table::element_type row(new ArrayString(pieces.count())); if(right) { // right - for(size_t i=pieces.count(); --i>=0; ) + for(int i=pieces.count(); --i>=0; ) *row+=pieces[i]; } else { // left for(Array_iterator i(pieces); i.has_next(); ) @@ -310,12 +334,13 @@ static void _match(Request& r, MethodPar String result; VTable* vtable=new VTable; - Replace_action_info info={0}; - info.request=&r; - info.src=&src; - info.dest=&result; - info.vtable=vtable; - info.replacement_code=&replacement_code; + Replace_action_info info={ + &r, + &src, + &result, + vtable, + &replacement_code + }; Temp_value_element temp_match_var( *replacement_code.get_junction()->method_frame, match_var_name, vtable); @@ -386,33 +411,50 @@ public: } }; #endif +extern String sql_bind_name; extern String sql_limit_name; extern String sql_offset_name; extern String sql_default_name; extern String sql_distinct_name; +extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); +extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); + const String* sql_result_string(Request& r, MethodParams& params, HashStringValue*& options, Value*& default_code) { Value& statement=params.as_junction(0, "statement must be code"); + HashStringValue* bind=0; ulong limit=0; ulong offset=0; default_code=0; if(params.count()>1) { 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)) + if(voptions.is_defined() && !voptions.is_string()) + if((options=voptions.get_hash())) { + int valid_options=0; + if(Value* vbind=options->get(sql_bind_name)) { + valid_options++; + bind=vbind->get_hash(); + } + if(Value* vlimit=options->get(sql_limit_name)) { + valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); - if(Value* voffset=options->get(sql_offset_name)) + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; offset=(ulong)r.process_to_value(*voffset).as_double(); - if(default_code=options->get(sql_default_name)) { - if(Junction* default_junction=default_code->get_junction()) - ;//default_junction->change_context(statement.get_junction()); - else + } + if((default_code=options->get(sql_default_name))) { + valid_options++; + if(!default_code->get_junction()) throw Exception("parser.runtime", 0, "default option must be code"); } + if(valid_options!=options->count()) + throw Exception("parser.runtime", + 0, + "called with invalid option"); } else throw Exception("parser.runtime", 0, @@ -420,16 +462,26 @@ const String* sql_result_string(Request& } else options=0; + SQL_Driver::Placeholder* placeholders=0; + uint placeholders_count=0; + if(bind) + placeholders_count=marshal_binds(*bind, placeholders); + Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); const char* statement_cstr= statement_string.cstr(String::L_UNSPECIFIED, r.connection()); String_sql_event_handlers handlers(statement_string, statement_cstr); r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + placeholders_count, placeholders, + offset, limit, handlers, statement_string); + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); + if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] @@ -495,6 +547,64 @@ static void _normalize(Request& r, Metho 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.length()) + 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' must 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()) + chars=schars.cstr(); + } + } + + r.write_assign_lang(src.trim(kind, chars)); +} + +static void _append(Request& r, MethodParams& params) { + // c=a+b + VString& va=GET_SELF(r, VString); + const String& a=va.string(); + const String& b=params.as_string(0, "parameter must be string"); + String& c=*new String(a); + c.append(b, String::L_PASS_APPENDED); + va.set_string(c); +} + +static void _base64(Request& r, MethodParams& params) { + if(params.count()) { + // decode + const char* cstr=params.as_string(0, "parameter must be string").cstr(); + void* decoded_cstr=0; + size_t decoded_size=0; + pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size); + if(decoded_cstr && decoded_size) + r.write_assign_lang(*new String(static_cast(decoded_cstr), decoded_size, true)); + } else { + // encode + VString& vself=GET_SELF(r, VString); + const char* cstr=vself.string().cstr(); + const char* encoded=pa_base64_encode(cstr, strlen(cstr)); + r.write_assign_lang(*new String(encoded, 0, true/*once ?param=base64(something) was needed*/)); + } +} + // constructor MString::MString(): Methoded("string") { @@ -540,7 +650,7 @@ MString::MString(): Methoded("string") { add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); // ^sql[query] - // ^sql[query][$.limit(1) $.offset(2) $.default[n/a]] + // ^sql[query][options hash] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); // ^string.replace[table] @@ -551,4 +661,14 @@ 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); + + // ^string.append[string] + add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1); + + // ^string.base64[] << encode + // ^string:base64[encoded string] << decode + add_native_method("base64", Method::CT_ANY, _base64, 0, 1); }