--- parser3/src/classes/string.C 2015/11/16 18:27:15 1.223 +++ parser3/src/classes/string.C 2016/10/26 15:44:49 1.232 @@ -20,7 +20,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.223 2015/11/16 18:27:15 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.232 2016/10/26 15:44:49 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 @@ -154,7 +154,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); 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_pass_lang(sn<0 ? string : string.mid(r.charsets.source(), 0, (size_t)sn)); } static void _right(Request& r, MethodParams& params) { @@ -163,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))); } -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 @@ -400,7 +394,6 @@ static void _match(Request& r, MethodPar vrcleaner.vregex=vregex; } - Temp_lang temp_lang(r, String::L_PASS_APPENDED); const String& src=GET_SELF(r, VString).string(); int matches_count=0; @@ -454,7 +447,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_pass_lang(result); } } @@ -462,7 +455,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_pass_lang(src.change_case(r.charsets.source(), kind)); } static void _upper(Request& r, MethodParams& params) { change_case(r, params, String::CC_UPPER); @@ -541,11 +534,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++; @@ -559,9 +552,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); @@ -594,7 +586,7 @@ static void _sql(Request& r, MethodParam "produced no result, but no default option specified"); } - r.write_assign_lang(*string); + r.write_pass_lang(*string); } static void _replace(Request& r, MethodParams& params) { @@ -604,14 +596,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_pass_lang(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_pass_lang(src.replace(dict)); } } @@ -626,7 +618,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)){ @@ -660,7 +652,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_pass_lang(src); } static void _trim(Request& r, MethodParams& params) { @@ -693,7 +685,7 @@ static void _trim(Request& r, MethodPara } } - r.write_assign_lang(src.trim(kind, chars, &r.charsets.source())); + r.write_pass_lang(src.trim(kind, chars, &r.charsets.source())); } static void _base64(Request& r, MethodParams& params) { @@ -708,7 +700,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()) @@ -724,14 +716,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_pass_lang(*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_pass_lang(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/)); } } @@ -739,24 +731,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_pass_lang(*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_pass_lang(*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_pass_lang(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_pass_lang(*new String(result, String::L_TAINTED)); } static void _unescape(Request& r, MethodParams& params){ @@ -769,7 +761,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()) @@ -782,16 +774,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_pass_lang(*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_no_lang(VBool::get(false)); +} + // constructor MString::MString(): Methoded("string") { @@ -877,4 +876,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); }