--- parser3/src/classes/hash.C 2012/02/28 05:07:44 1.112 +++ parser3/src/classes/hash.C 2015/03/12 08:18:18 1.121 @@ -1,12 +1,10 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT="$Id: hash.C,v 1.112 2012/02/28 05:07:44 moko Exp $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -18,6 +16,8 @@ static const char * const IDENT="$Id: ha #include "pa_vbool.h" #include "pa_vmethod_frame.h" +volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.121 2015/03/12 08:18:18 misha Exp $"; + // class class MHash: public Methoded { @@ -107,9 +107,9 @@ public: return false; } - bool add_row_cell(SQL_Error& error, const char *ptr, size_t ) { + bool add_row_cell(SQL_Error& error, const char *str, size_t ) { try { - String& cell=*new String(ptr, String::L_TAINTED /* no length as 0x00 can be inside */); + const String& cell=str?*new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):String::Empty; bool duplicate=false; if(one_bool_column) { @@ -192,23 +192,30 @@ VBool Hash_sql_event_handlers::only_one_ static void _create_or_add(Request& r, MethodParams& params) { if(params.count()) { Value& vsrc=params.as_no_junction(0, PARAM_MUST_BE_HASH); - if(HashStringValue* src=vsrc.get_hash()) { - VHash& self=GET_SELF(r, VHash); - HashStringValue* self_hash=&(self.hash()); - if(src==self_hash) // same: doing nothing + VHash& self=GET_SELF(r, VHash); + HashStringValue* src_hash; + HashStringValue* self_hash=&(self.hash()); + + if(VHash* src=static_cast(vsrc.as(VHASH_TYPE))) { + src_hash=&(src->hash_ro()); + + if(src_hash==self_hash) // same: doing nothing return; - src->for_each(copy_all_overwrite_to, self_hash); - if(VHash* vhash_src=static_cast(vsrc.as(VHASH_TYPE))) - if(Value* vdefault=vhash_src->get_default()) - if(vdefault->is_defined()) - self.set_default(vdefault); + if(Value* vdefault=src->get_default()) + if(vdefault->is_defined()) + self.set_default(vdefault); + } else { + src_hash=vsrc.get_hash(); } + + if(src_hash) + src_hash->for_each(copy_all_overwrite_to, self_hash); } } static void _sub(Request& r, MethodParams& params) { - if(HashStringValue* src=params.as_no_junction(0, PARAM_MUST_BE_HASH).get_hash()) { + if(HashStringValue* src=params.as_hash(0, "param")) { HashStringValue* self=&(GET_SELF(r, VHash).hash()); if(src==self) { // same: clearing self->clear(); @@ -228,7 +235,7 @@ static void _union(Request& r, MethodPar // dest = copy of self Value& result=*new VHash(GET_SELF(r, VHash).hash()); // dest += b - if(HashStringValue* src=params.as_no_junction(0, PARAM_MUST_BE_HASH).get_hash()) + if(HashStringValue* src=params.as_hash(0, "param")) src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result @@ -251,7 +258,7 @@ static void copy_intersection_to( static void _intersection(Request& r, MethodParams& params) { Value& result=*new VHash; // dest += b - if(HashStringValue* b=params.as_no_junction(0, PARAM_MUST_BE_HASH).get_hash()) { + if(HashStringValue* b=params.as_hash(0, "param")) { Copy_intersection_to_info info={b, result.get_hash()}; GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); } @@ -270,8 +277,14 @@ static bool intersects( static void _intersects(Request& r, MethodParams& params) { bool result=false; - if(HashStringValue* b=params.as_no_junction(0, PARAM_MUST_BE_HASH).get_hash()) - result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; + if(HashStringValue* b=params.as_hash(0, "param")) { + HashStringValue* self=&(GET_SELF(r, VHash).hash()); + if(b==self) { + r.write_no_lang(VBool::get(true)); + return; + } + result=self->first_that(intersects, b)!=0; + } // return result r.write_no_lang(VBool::get(result)); @@ -297,7 +310,7 @@ static void _sql(Request& r, MethodParam bool distinct=false; Table2hash_value_type value_type=C_HASH; if(params.count()>1) - if(HashStringValue* options=params.as_hash(1)) { + if(HashStringValue* options=params.as_hash(1, "sql options")) { int valid_options=0; if(Value* vbind=options->get(sql_bind_name)) { valid_options++; @@ -370,22 +383,24 @@ static void _keys(Request& r, MethodPara *columns+=keys_column_name; Table* table=new Table(columns); - GET_SELF(r, VHash).hash().for_each(keys_collector, table); + GET_SELF(r, VHash).hash_ro().for_each(keys_collector, table); r.write_no_lang(*new VTable(table)); } static void _count(Request& r, MethodParams&) { - r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash().count())); + r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash_ro().count())); } static void _delete(Request& r, MethodParams& params) { - - GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); + if(params.count()>0) + GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); + else + GET_SELF(r, VHash).hash().clear(); } static void _contains(Request& r, MethodParams& params) { - bool result=GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); + bool result=GET_SELF(r, VHash).hash_ro().contains(params.as_string(0, "key must be string")); r.write_no_lang(VBool::get(result)); } @@ -408,10 +423,10 @@ static bool one_foreach_cycle( Value& var_context=*info->var_context; if(info->key_var_name){ VString* vkey=new VString(*new String(akey, String::L_TAINTED)); - var_context.put_element(*info->key_var_name, vkey, false); + info->r->put_element(var_context, *info->key_var_name, vkey); } if(info->value_var_name) - var_context.put_element(*info->value_var_name, avalue, false); + info->r->put_element(var_context, *info->value_var_name, avalue); if(info->delim_maybe_code){ // delimiter set StringOrValue sv_processed=info->r->process(*info->body_code); @@ -449,19 +464,45 @@ static void _foreach(Request& r, MethodP }; VHash& self=GET_SELF(r, VHash); - HashStringValue& hash=self.hash(); + HashStringValue& hash=self.hash_ro(); VHash_lock lock(self); hash.first_that(one_foreach_cycle, &info); } +enum AtResultType { + AtResultTypeValue = 0, + AtResultTypeKey = 1, + AtResultTypeHash = 2 +}; + +inline Value& SingleElementHash(String::Body akey, Value* avalue) { + Value& result=*new VHash; + result.put_element(*new String(akey, String::L_TAINTED), avalue); + return result; +} + static void _at(Request& r, MethodParams& params) { - HashStringValue& hash=GET_SELF(r, VHash).hash(); + HashStringValue& hash=GET_SELF(r, VHash).hash_ro(); size_t count=hash.count(); int pos=0; + // misha@ + // I do not like that type is checked before whence. + // But I do not like the idea to move it after whence (where process_to_value can be called) even more. + AtResultType result_type=AtResultTypeValue; + if(params.count() > 1) { + const String& stype=params.as_string(1, "type must be string"); + if(stype == "key") + result_type=AtResultTypeKey; + else if(stype == "hash") + result_type=AtResultTypeHash; + else if(stype != "value") + throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'"); + } + Value& vwhence=*params.get(0); - if(vwhence.is_string()){ + if(vwhence.is_string()) { const String& swhence=*vwhence.get_string(); if(swhence == "last") pos=count-1; @@ -476,18 +517,54 @@ static void _at(Request& r, MethodParams } if(count && pos >= 0 && (size_t)pos < count){ - if(pos == 0) - r.write_assign_lang(*hash.first_value()); - else if((size_t)pos == count-1) - r.write_assign_lang(*hash.last_value()); - else - for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) - if(!pos){ - r.write_assign_lang(*i.value()); + switch(result_type) { + case AtResultTypeKey: + { + if(pos == 0) { + r.write_assign_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED))); + } else if((size_t)pos == count-1) { + r.write_assign_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED))); + } else { + for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) + if(!pos){ + r.write_assign_lang(*new VString(*new String(i.key(), String::L_TAINTED))); + break; + } + } + break; + } + case AtResultTypeValue: + { + if(pos == 0) { + r.write_assign_lang(*hash.first_value()); + } else if((size_t)pos == count-1) { + r.write_assign_lang(*hash.last_value()); + } else { + for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) + if(!pos){ + r.write_assign_lang(*i.value()); + break; + } + } + break; + } + case AtResultTypeHash: + { + if(pos == 0) { + r.write_no_lang(SingleElementHash(hash.first_key(), hash.first_value())); + } else if((size_t)pos == count-1) { + r.write_no_lang(SingleElementHash(hash.last_key(), hash.last_value())); + } else { + for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) + if(!pos){ + r.write_no_lang(SingleElementHash(i.key(), i.value())); + break; + } + } break; } + } } - } // constructor @@ -508,7 +585,7 @@ MHash::MHash(): Methoded("hash") add_native_method("intersects", Method::CT_DYNAMIC, _intersects, 1, 1); // ^a.delete[key] - add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1); + add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1); // ^a.contains[key] add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); @@ -527,7 +604,7 @@ MHash::MHash(): Methoded("hash") // ^hash.foreach[key;value]{code}[delim] add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1); - // ^hash._at[first|last] - // ^hash._at([-]offset) - add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 1); + // ^hash._at[first|last[;'key'|'value'|'hash']] + // ^hash._at([-+]offset)[['key'|'value'|'hash']] + add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2); }