--- parser3/src/classes/string.C 2007/02/03 18:08:38 1.151 +++ parser3/src/classes/string.C 2008/05/22 17:43:30 1.159 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2007/02/03 18:08:38 $"; +static const char * const IDENT_STRING_C="$Date: 2008/05/22 17:43:30 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -56,7 +56,7 @@ static void _int(Request& r, MethodParam int converted; 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(); @@ -74,7 +74,7 @@ static void _double(Request& r, MethodPa double converted; 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(); @@ -93,10 +93,22 @@ static void _bool(Request& r, MethodPara bool converted; 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_bool(); + + 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) @@ -113,7 +125,7 @@ static void _bool(Request& r, MethodPara // 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)); } @@ -121,7 +133,7 @@ static void _bool(Request& r, MethodPara static void _left(Request& r, MethodParams& params) { ssize_t sn=params.as_int(0, "n must be int", r); if(sn<0) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", sn); size_t n=(size_t)sn; @@ -133,12 +145,11 @@ static void _left(Request& r, MethodPara static void _right(Request& r, MethodParams& params) { ssize_t sn=(size_t)params.as_int(0, "n must be int", r); if(sn<0) - throw Exception("parser.runtime", + 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(n=0", sbegin); size_t begin=(size_t)sbegin; @@ -158,7 +169,7 @@ static void _mid(Request& r, MethodParam if(params.count()>1) { ssize_t sn=params.as_int(1, "n must be int", r); if(sn<0) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", sn); end=begin+(size_t)sn; @@ -209,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; @@ -219,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 @@ -274,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)); } @@ -336,19 +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); - r.write_assign_lang(*new VTable(table)); + 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"); @@ -367,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); } } @@ -402,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; @@ -414,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; @@ -468,11 +490,11 @@ const String* sql_result_string(Request& valid_options++; } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } else @@ -513,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"); } @@ -524,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"); @@ -535,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(); @@ -546,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'"); } @@ -579,7 +600,7 @@ static void _trim(Request& r, MethodPara else if(skind==TRIM_BOTH_OPTION) kind=String::TRIM_BOTH; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &skind, "'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION); @@ -597,7 +618,7 @@ static void _append(Request& r, MethodPa // 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"); + 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); @@ -606,7 +627,7 @@ static void _append(Request& r, MethodPa static void _base64(Request& r, MethodParams& params) { if(params.count()) { // decode - const char* cstr=params.as_string(0, "parameter must be string").cstr(); + 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); @@ -652,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);