--- parser3/src/classes/string.C 2018/01/10 23:04:57 1.236 +++ parser3/src/classes/string.C 2019/09/06 10:17:07 1.239 @@ -20,7 +20,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.236 2018/01/10 23:04:57 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.239 2019/09/06 10:17:07 moko Exp $"; // class @@ -172,9 +172,7 @@ static void _mid(Request& r, MethodParam 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); + throw Exception(PARSER_RUNTIME, 0, "p(%d) must be >=0", sbegin); size_t begin=(size_t)sbegin; size_t end; @@ -182,9 +180,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, - 0, - "n(%d) must be >=0", sn); + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", sn); end=begin+(size_t)sn; } else { length=string.length(r.charsets.source()); @@ -238,9 +234,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, - options, - "conflicting split options"); + throw Exception(PARSER_RUNTIME, options, "conflicting split options"); result |= o->setBit; } } @@ -286,8 +280,7 @@ static Table& split_horizontal(ArrayStri return table; } -static void split_with_options(Request& r, MethodParams& params, - int bits) { +static void split_with_options(Request& r, MethodParams& params, int bits) { const String& string=GET_SELF(r, VString).string(); size_t params_count=params.count(); @@ -298,7 +291,6 @@ static void split_with_options(Request& const String* options=0; if(params_count>1) options=¶ms.as_string(1, OPTIONS_MUST_NOT_BE_CODE); - bits=split_options(options); } @@ -309,9 +301,7 @@ static void split_with_options(Request& if(params_count>2){ column_name=¶ms.as_string(2, COLUMN_NAME_MUST_BE_STRING); if (horizontal && !column_name->is_empty()) - throw Exception(PARSER_RUNTIME, - column_name, - "column name can't be specified with horisontal split"); + throw Exception(PARSER_RUNTIME, column_name, "column name can't be specified with horisontal split"); } if(!column_name || column_name->is_empty()) column_name=new String("piece"); @@ -345,10 +335,7 @@ struct Replace_action_info { }; #endif /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this -static void replace_action(Table& table, ArrayString* row, - int prestart, int prefinish, - int poststart, int postfinish, - void *info) { +static void replace_action(Table& table, ArrayString* row, int prestart, int prefinish, int poststart, int postfinish, void *info) { Replace_action_info& ai=*static_cast(info); if(row) { // begin&middle // piece from last match['prestart'] to beginning of this match['prefinish'] @@ -381,15 +368,10 @@ static void _match(Request& r, MethodPar if(Value* value=regexp.as(VREGEX_TYPE)){ if(options && options->is_defined()) - throw Exception(PARSER_RUNTIME, - 0, - "you can not specify regex-object and options together" - ); + throw Exception(PARSER_RUNTIME, 0, "you can not specify regex-object and options together"); vregex=static_cast(value); } else { - vregex=new VRegex(r.charsets.source(), - ®exp.as_string(), - (options)?(&options->as_string()):0); + vregex=new VRegex(r.charsets.source(), ®exp.as_string(), (options) ? (&options->as_string()) : 0); vregex->study(); vrcleaner.vregex=vregex; } @@ -398,9 +380,7 @@ static void _match(Request& r, MethodPar int matches_count=0; if(params_count<3) { // search - Table* table=src.match(vregex, - search_action, 0, - matches_count); + Table* table=src.match(vregex, search_action, 0, matches_count); if(table){ r.write(*new VTable(table)); @@ -421,11 +401,9 @@ static void _match(Request& r, MethodPar if(replacement->is_defined()) replacement_code=replacement; } else if(!replacement->is_void()) - throw Exception(PARSER_RUNTIME, - 0, - "replacement option should be junction or string"); + throw Exception(PARSER_RUNTIME, 0, "replacement option should be junction or string"); - Value* default_code=(params_count==4)?¶ms.as_junction(3, "default value must be code"):0; + Value* default_code=(params_count==4) ? ¶ms.as_junction(3, "default value must be code") : 0; String result; VTable* vtable=new VTable; @@ -451,8 +429,7 @@ static void _match(Request& r, MethodPar } } -static void change_case(Request& r, MethodParams&, - String::Change_case_kind kind) { +static void change_case(Request& r, MethodParams&, String::Change_case_kind kind) { const String& src=GET_SELF(r, VString).string(); r.write(src.change_case(r.charsets.source(), kind)); @@ -481,9 +458,7 @@ public: bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) { if(got_column) { - error=SQL_Error(PARSER_RUNTIME, - //statement_string, - "result must contain exactly one column"); + error=SQL_Error(PARSER_RUNTIME, /*statement_string,*/ "result must contain exactly one column"); return true; } got_column=true; @@ -493,9 +468,7 @@ public: bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } bool add_row_cell(SQL_Error& error, const char* str, size_t) { if(got_cell) { - error=SQL_Error(PARSER_RUNTIME, - //statement_string, - "result must not contain more then one row"); + error=SQL_Error(PARSER_RUNTIME, /*statement_string,*/ "result must not contain more then one row"); return true; } @@ -510,11 +483,7 @@ 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); @@ -581,9 +550,7 @@ static void _sql(Request& r, MethodParam if(default_code) { string=&r.process_to_string(*default_code); } else - throw Exception(PARSER_RUNTIME, - 0, - "produced no result, but no default option specified"); + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } r.write(*string); @@ -599,10 +566,7 @@ static void _replace(Request& r, MethodP r.write(src.replace(dict)); } else { // ^string.replace[from-string;to-string] - Dictionary dict( - params.as_string(0, "from must be string"), - params.as_string(1, "to must be string") - ); + Dictionary dict(params.as_string(0, "from must be string"), params.as_string(1, "to must be string")); r.write(src.replace(dict)); } @@ -673,9 +637,7 @@ static void _trim(Request& r, MethodPara else if(params_count==1) chars=skind.cstr(); else - throw Exception(PARSER_RUNTIME, - &skind, - "'kind' must be one of " TRIM_START_OPTION ", " TRIM_BOTH_OPTION ", " TRIM_END_OPTION); + throw Exception(PARSER_RUNTIME, &skind, "'kind' must be one of " TRIM_START_OPTION ", " TRIM_BOTH_OPTION ", " TRIM_END_OPTION); } if(params_count>1) { @@ -710,9 +672,7 @@ static void _base64(Request& r, MethodPa pa_base64_decode(cstr, strlen(cstr), decoded, length, strict); if(decoded && length){ if(memchr((const char*)decoded, 0, length)) - throw Exception(PARSER_RUNTIME, - 0, - "Invalid \\x00 character found while decode to string. Decode it to file instead."); + throw Exception(PARSER_RUNTIME, 0, "Invalid \\x00 character found while decode to string. Decode it to file instead."); fix_line_breaks(decoded, length); if(length)