--- parser3/src/classes/string.C 2015/10/08 23:14:56 1.221 +++ parser3/src/classes/string.C 2018/01/19 16:47:35 1.237 @@ -1,7 +1,7 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -20,7 +20,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.221 2015/10/08 23:14:56 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.237 2018/01/19 16:47:35 moko Exp $"; // class @@ -31,7 +31,7 @@ public: // global variable -DECLARE_CLASS_VAR(string, new MString, 0); +DECLARE_CLASS_VAR(string, new MString); // void class, inherited from string and thus should be inited afterwards @@ -42,7 +42,7 @@ public: // void global variable should be after string global variable -DECLARE_CLASS_VAR(void, new MVoid, 0); +DECLARE_CLASS_VAR(void, new MVoid); // defines for statics @@ -64,7 +64,7 @@ static const String match_var_name(MATCH static void _length(Request& r, MethodParams&) { double result=GET_SELF(r, VString).string().length(r.charsets.source()); - r.write_no_lang(*new VDouble(result)); + r.write(*new VDouble(result)); } static void _int(Request& r, MethodParams& params) { @@ -87,30 +87,27 @@ static void _int(Request& r, MethodParam } } - r.write_no_lang(*new VInt(converted)); + r.write(*new VInt(converted)); } static void _double(Request& r, MethodParams& params) { const String& self_string=GET_SELF(r, VString).string(); - double converted; if(self_string.is_empty()) { if(params.count()>0) - converted=params.as_double(0, "default must be double", r); // (default) + r.write(*new VDouble(params.as_double(0, "default must be double", r))); // (default) else throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified"); } else { try { - converted=self_string.as_double(); + r.write(*new VDouble(self_string.as_double())); } catch(...) { // convert problem if(params.count()>0) - converted=params.as_double(0, "default must be double", r); // (default) + r.write(*new VDouble(params.as_double(0, "default must be double", r))); // (default) else rethrow; // we have a problem when no default } } - - r.write_no_lang(*new VDouble(converted)); } static void _bool(Request& r, MethodParams& params) { @@ -140,7 +137,7 @@ static void _bool(Request& r, MethodPara } } - r.write_no_lang(VBool::get(converted)); + r.write(VBool::get(converted)); } /*not static*/void _string_format(Request& r, MethodParams& params) { @@ -151,13 +148,13 @@ static void _bool(Request& r, MethodPara const char* buf=format(r.get_self().as_double(), fmt.trim().cstrm()); - r.write_no_lang(String(buf)); + r.write(String(buf)); } static void _left(Request& r, MethodParams& params) { ssize_t sn=params.as_int(0, "n must be int", r); const String& string=GET_SELF(r, VString).string(); - r.write_assign_lang(sn<0 ? string : string.mid(r.charsets.source(), 0, (size_t)sn)); + r.write(sn<0 ? string : string.mid(r.charsets.source(), 0, (size_t)sn)); } static void _right(Request& r, MethodParams& params) { @@ -166,7 +163,7 @@ static void _right(Request& r, MethodPar size_t n=(size_t)sn; const String& string=GET_SELF(r, VString).string(); size_t length=string.length(r.charsets.source()); - r.write_assign_lang(n1){ offset=params.as_int(1, "n must be int", r); if(offset<0) - throw Exception(PARSER_RUNTIME, - 0, - "n(%d) must be >=0", offset); + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", offset); } - r.write_no_lang(*new VInt((int)string.pos(r.charsets.source(), substr.as_string(), (size_t)offset))); + r.write(*new VInt((int)string.pos(r.charsets.source(), substr.as_string(), (size_t)offset))); } -static void split_list(MethodParams& params, int paramIndex, - const String& string, - ArrayString& result) { +static void split_list(MethodParams& params, int paramIndex, const String& string, ArrayString& result) { Value& delim_value=params.as_no_junction(paramIndex, "delimiter must not be code"); - - size_t pos_after=0; - string.split(result, pos_after, delim_value.as_string()); + string.split(result, 0, delim_value.as_string()); } #define SPLIT_LEFT 0x0001 @@ -327,7 +318,7 @@ static void split_with_options(Request& Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name); - r.write_no_lang(*new VTable(&table)); + r.write(*new VTable(&table)); } static void _split(Request& r, MethodParams& params) { split_with_options(r, params, 0 /* maybe-determine from param #2 */); @@ -390,32 +381,24 @@ 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; } - Temp_lang temp_lang(r, String::L_PASS_APPENDED); const String& src=GET_SELF(r, VString).string(); 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_no_lang(*new VTable(table)); + r.write(*new VTable(table)); } else { - r.write_no_lang(*new VInt(matches_count)); + r.write(*new VInt(matches_count)); } } else { // replace @@ -457,7 +440,7 @@ static void _match(Request& r, MethodPar if(!matches_count && default_code) r.process_write(*default_code); else - r.write_assign_lang(result); + r.write(result); } } @@ -465,7 +448,7 @@ static void change_case(Request& r, Meth String::Change_case_kind kind) { const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(src.change_case(r.charsets.source(), kind)); + r.write(src.change_case(r.charsets.source(), kind)); } static void _upper(Request& r, MethodParams& params) { change_case(r, params, String::CC_UPPER); @@ -514,7 +497,7 @@ public: result=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */ ); return false; } catch(...) { - error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell"); + error=SQL_Error("exception occurred in String_sql_event_handlers::add_row_cell"); return true; } } @@ -544,11 +527,11 @@ const String* sql_result_string(Request& } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; - limit=(ulong)r.process_to_value(*vlimit).as_double(); + limit=(ulong)r.process(*vlimit).as_double(); } if(Value* voffset=options->get(sql_offset_name)) { valid_options++; - offset=(ulong)r.process_to_value(*voffset).as_double(); + offset=(ulong)r.process(*voffset).as_double(); } if((default_code=options->get(sql_default_name))) { valid_options++; @@ -562,9 +545,8 @@ const String* sql_result_string(Request& 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.untaint_cstr(r.flang, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection()); String_sql_event_handlers handlers(statement_string, statement_cstr); @@ -597,7 +579,7 @@ static void _sql(Request& r, MethodParam "produced no result, but no default option specified"); } - r.write_assign_lang(*string); + r.write(*string); } static void _replace(Request& r, MethodParams& params) { @@ -607,14 +589,14 @@ static void _replace(Request& r, MethodP // ^string.replace[table] Table* table=params.as_table(0, "param"); Dictionary dict(*table); - r.write_assign_lang(src.replace(dict)); + 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") ); - r.write_assign_lang(src.replace(dict)); + r.write(src.replace(dict)); } } @@ -629,7 +611,7 @@ static void _save(Request& r, MethodPara // ^file.save[filespec;$.charset[] $.append(true)] int valid_options=0; if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){ - asked_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER)); + asked_charset=&pa_charsets.get(vcharset_name->as_string()); valid_options++; } if(Value* vappend=options->get(MODE_APPEND)){ @@ -663,7 +645,7 @@ static void _save(Request& r, MethodPara static void _normalize(Request& r, MethodParams&) { const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(src); + r.write(src); } static void _trim(Request& r, MethodParams& params) { @@ -696,7 +678,7 @@ static void _trim(Request& r, MethodPara } } - r.write_assign_lang(src.trim(kind, chars, &r.charsets.source())); + r.write(src.trim(kind, chars, &r.charsets.source())); } static void _base64(Request& r, MethodParams& params) { @@ -711,7 +693,7 @@ static void _base64(Request& r, MethodPa if(HashStringValue* options=params.as_hash(1)) { int valid_options=0; if(Value* vstrict=options->get(BASE64_STRICT_OPTION_NAME)) { - strict=r.process_to_value(*vstrict).as_bool(); + strict=r.process(*vstrict).as_bool(); valid_options++; } if(valid_options!=options->count()) @@ -727,14 +709,14 @@ static void _base64(Request& r, MethodPa fix_line_breaks(decoded, length); if(length) - r.write_assign_lang(*new String(decoded, String::L_TAINTED)); + r.write(*new String(decoded, String::L_TAINTED)); } } else { // encode: ^str.base64[] 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, String::L_TAINTED/*once ?param=base64(something) was needed*/)); + r.write(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/)); } } @@ -742,24 +724,24 @@ static void _idna(Request& r, MethodPara if(&r.get_self() == string_class) { // decode: ^string:idna[encoded] const char* cstr=params.count() ? params.as_string(0, PARAMETER_MUST_BE_STRING).cstr() : ""; - r.write_assign_lang(*new String(pa_idna_decode(cstr, r.charsets.source()), String::L_TAINTED)); + r.write(*new String(pa_idna_decode(cstr, r.charsets.source()), String::L_TAINTED)); } else { // encode: ^str.idna[] VString& self=GET_SELF(r, VString); const char* cstr=self.string().cstr(); - r.write_assign_lang(*new String(pa_idna_encode(cstr, r.charsets.source()), String::L_TAINTED)); + r.write(*new String(pa_idna_encode(cstr, r.charsets.source()), String::L_TAINTED)); } } static void _js_escape(Request& r, MethodParams&){ const String& src=GET_SELF(r, VString).string(); - r.write_assign_lang(src.escape(r.charsets.source())); + r.write(src.escape(r.charsets.source())); } static void _js_unescape(Request& r, MethodParams& params){ const String& src=params.as_string(0, PARAMETER_MUST_BE_STRING); if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true)) - r.write_assign_lang(*new String(result, String::L_TAINTED)); + r.write(*new String(result, String::L_TAINTED)); } static void _unescape(Request& r, MethodParams& params){ @@ -772,7 +754,7 @@ static void _unescape(Request& r, Method if(HashStringValue* options=params.as_hash(2)) { int valid_options=0; if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){ - from_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER)); + from_charset=&pa_charsets.get(vcharset_name->as_string()); valid_options++; } if(valid_options!=options->count()) @@ -785,16 +767,23 @@ static void _unescape(Request& r, Method } else if(mode==UNESCAPE_MODE_URI){ mode_js=false; } else { - throw Exception(PARSER_RUNTIME, &mode, "is invalid mode, must be either '"UNESCAPE_MODE_JS"' or '"UNESCAPE_MODE_URI"'"); + throw Exception(PARSER_RUNTIME, &mode, "is invalid mode, must be either '" UNESCAPE_MODE_JS "' or '" UNESCAPE_MODE_URI "'"); } const char* unescaped=unescape_chars(src.cstr(), src.length(), from_charset, mode_js); if(*unescaped){ const String* result=new String(Charset::transcode(unescaped, *from_charset, r.charsets.source()), String::L_TAINTED); - r.write_assign_lang(*result); + r.write(*result); } } +static void _contains(Request& r, MethodParams& params) { + // empty or whitespace string is hash compatible + GET_SELF(r, VString).get_element(params.as_string(0, "key must be string")); + // ignoring result as it allways null + r.write(VBool::get(false)); +} + // constructor MString::MString(): Methoded("string") { @@ -830,12 +819,12 @@ MString::MString(): Methoded("string") { // ^string.split[delim][options] // ^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); - // ^string.rsplit[delim] - add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1); - + // old names for backward compatibility + // ^string.lsplit[delim] + add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1); + // ^string.rsplit[delim] + add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1); + // ^string.match[regexp][options] // ^string.match[regexp][options]{replacement-code} // ^string.match[regexp][options]{replacement-code}{code-if-nothing-is-found} @@ -880,4 +869,7 @@ MString::MString(): Methoded("string") { // ^string:unescape[js|uri;escaped;$.charset[...]] add_native_method("unescape", Method::CT_STATIC, _unescape, 2, 3); + + // ^string.contains[key] for hash compatibility + add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); }