--- parser3/src/classes/string.C 2004/03/01 08:54:16 1.136 +++ parser3/src/classes/string.C 2008/05/22 17:43:30 1.159 @@ -1,11 +1,11 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2004 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: 2004/03/01 08:54:16 $"; +static const char * const IDENT_STRING_C="$Date: 2008/05/22 17:43:30 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -54,17 +54,15 @@ 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", + throw Exception(PARSER_RUNTIME, 0, "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 } @@ -74,17 +72,15 @@ 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", + throw Exception(PARSER_RUNTIME, 0, "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 } @@ -92,27 +88,68 @@ static void _double(Request& r, MethodPa r.write_no_lang(*new VDouble(converted)); } +static void _bool(Request& r, MethodParams& params) { + const String& self_string=GET_SELF(r, VString).string(); + bool converted; + try { + if(self_string.is_empty()) + throw Exception(PARSER_RUNTIME, + 0, + "parameter is empty string, error converting"); + + try { + converted=self_string.as_bool(); + } catch(...) { + const String& lower_string=self_string.change_case(r.charsets.source(), String::CC_LOWER); + if(lower_string == "true"){ + converted=true; + } else if (lower_string == "false"){ + converted=false; + } else { + rethrow; + } + } + } catch(...) { // convert problem + if(params.count()>0) + converted=params.as_bool(0, "default must be bool", r); // (default) + else + rethrow; // we have a problem when no default + } + + r.write_no_lang(*new VBool(converted)); +} + /*not static*/void _string_format(Request& r, MethodParams& params) { Value& fmt_maybe_code=params[0]; // for some time due to stupid {} in original design const String& fmt=r.process_to_string(fmt_maybe_code); - const char* buf=format(r.get_self().as_double(), fmt.cstrm()); + const char* buf=format(r.get_self().as_double(), fmt.trim().cstrm()); r.write_no_lang(String(buf)); } 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(); r.write_assign_lang(n1? - (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) { @@ -169,7 +220,7 @@ static int split_options(const String* o 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", + throw Exception(PARSER_RUNTIME, options, "conflicting split options"); result |= o->setBit; @@ -179,9 +230,9 @@ static int split_options(const String* o return result; } -static Table& split_vertical(ArrayString& pieces, bool right) { +static Table& split_vertical(ArrayString& pieces, bool right, const String* column_name) { Table::columns_type columns(new ArrayString); - *columns+=new String("piece"); + *columns+=column_name; Table& table=*new Table(columns, pieces.count()); if(right) { // right @@ -234,8 +285,19 @@ static void split_with_options(Request& bool right=(bits & SPLIT_RIGHT) != 0; bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; - Table& table=horizontal?split_horizontal(pieces, right) - :split_vertical(pieces, right); + + const String* column_name=0; + if(params.count()>2){ + column_name=¶ms.as_string(2, COLUMN_NAME_MUST_BE_STRING); + if (horizontal && column_name->length()) + throw Exception(PARSER_RUNTIME, + column_name, + "column name can't be specified with horisontal split"); + } + if(!column_name || !column_name->length()) + column_name=new String("piece"); + + Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name); r.write_no_lang(*new VTable(&table)); } @@ -296,18 +358,19 @@ static void _match(Request& r, MethodPar Temp_lang temp_lang(r, String::L_PASS_APPENDED); const String& src=GET_SELF(r, VString).string(); - bool just_matched; + int matches_count=0; if(params.count()<3) { // search Table* table=src.match(r.charsets.source(), regexp.as_string(), options, search_action, 0, - just_matched); - Value* result; - if(table) - result=new VTable(table); // table of pre/match/post+substrings - else - result=new VBool(just_matched); - r.write_assign_lang(*result); + matches_count); + // r.write_assign_lang(*new VTable(table)); + if(table){ + r.write_assign_lang(*new VTable(table)); + } else { + r.write_assign_lang(*new VInt(matches_count)); + } + } else { // replace Value& replacement_code=params.as_junction(2, "replacement param must be code"); @@ -326,7 +389,7 @@ static void _match(Request& r, MethodPar src.match(r.charsets.source(), r.process_to_string(regexp), options, replace_action, &info, - just_matched); + matches_count); r.write_assign_lang(result); } } @@ -361,7 +424,7 @@ public: bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) { if(got_column) { - error=SQL_Error("parser.runtime", + error=SQL_Error(PARSER_RUNTIME, //statement_string, "result must contain exactly one column"); return true; @@ -373,7 +436,7 @@ public: bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } bool add_row_cell(SQL_Error& error, const char* str, size_t length) { if(got_cell) { - error=SQL_Error("parser.runtime", + error=SQL_Error(PARSER_RUNTIME, //statement_string, "result must not contain more then one row"); return true; @@ -390,48 +453,73 @@ 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(voptions.is_defined() && !voptions.is_string()) if((options=voptions.get_hash())) { - if(Value* vlimit=options->get(sql_limit_name)) + 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(!default_code->get_junction()) - throw Exception("parser.runtime", - 0, - "default option must be code"); + valid_options++; } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, + 0, + "called with invalid option"); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } 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] @@ -447,7 +535,7 @@ static void _sql(Request& r, MethodParam if(default_code) { string=&r.process_to_string(*default_code); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } @@ -458,9 +546,9 @@ static void _sql(Request& r, MethodParam 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, PARAM_MUST_NOT_BE_CODE).get_table(); if(!table) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "parameter must be table"); @@ -469,8 +557,7 @@ static void _replace(Request& r, MethodP } static void _save(Request& r, MethodParams& params) { - const String& file_name=params.as_string(params.count()-1, - "file name must be string"); + const String& file_name=params.as_string(params.count()-1, FILE_NAME_MUST_BE_STRING); const String& src=GET_SELF(r, VString).string(); @@ -480,7 +567,7 @@ static void _save(Request& r, MethodPara if(mode=="append") do_append=true; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &mode, "unknown mode, must be 'append'"); } @@ -505,30 +592,56 @@ static void _trim(Request& r, MethodPara 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(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()) - throw Exception("parser.runtime", - 0, - "'chars' must not be empty"); - chars=schars.cstr(); + 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(); + char* 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(decoded_cstr, decoded_size, true)); + } else { + // encode + VString& self=GET_SELF(r, VString); + const char* cstr=self.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") { @@ -541,6 +654,9 @@ MString::MString(): Methoded("string") { // ^string.double[] // ^string.double(default) add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); + // ^void.bool[] + // ^void.bool(default) + add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); // ^string.format{format} add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); @@ -557,7 +673,8 @@ MString::MString(): Methoded("string") { // ^string.split[delim] // ^string.split[delim][options] - add_native_method("split", Method::CT_DYNAMIC, _split, 1, 2); + // ^string.split[delim][options][column name] + add_native_method("split", Method::CT_DYNAMIC, _split, 1, 3); // old names for backward compatibility // ^string.lsplit[delim] add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1); @@ -574,7 +691,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] @@ -588,4 +705,11 @@ MString::MString(): Methoded("string") { // ^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); }