--- parser3/src/classes/hash.C 2015/10/15 18:12:29 1.124 +++ parser3/src/classes/hash.C 2016/07/14 17:06:30 1.129 @@ -1,7 +1,7 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.124 2015/10/15 18:12:29 moko Exp $"; +volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.129 2016/07/14 17:06:30 moko Exp $"; // class @@ -31,7 +31,7 @@ public: // global variable -DECLARE_CLASS_VAR(hash, new MHash, 0); +DECLARE_CLASS_VAR(hash, new MHash); // methods @@ -198,14 +198,13 @@ static void _create_or_add(Request& r, M HashStringValue* self_hash=&(self.hash()); if(VHash* src=static_cast(vsrc.as(VHASH_TYPE))) { - src_hash=&(src->hash_ro()); + src_hash=&(src->hash()); if(src_hash==self_hash) // same: doing nothing return; if(Value* vdefault=src->get_default()) - if(vdefault->is_defined()) - self.set_default(vdefault); + self.set_default(vdefault); } else { src_hash=vsrc.get_hash(); } @@ -384,13 +383,13 @@ static void _keys(Request& r, MethodPara *columns+=keys_column_name; Table* table=new Table(columns); - GET_SELF(r, VHash).hash_ro().for_each(keys_collector, table); + GET_SELF(r, VHash).hash().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_ro().count())); + r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash().count())); } static void _delete(Request& r, MethodParams& params) { @@ -401,73 +400,71 @@ static void _delete(Request& r, MethodPa } static void _contains(Request& r, MethodParams& params) { - bool result=GET_SELF(r, VHash).hash_ro().contains(params.as_string(0, "key must be string")); + VHash& self=GET_SELF(r, VHash); + const String& key_name=params.as_string(0, "key must be string"); + bool result=SYMBOLS_EQ(key_name,_DEFAULT_SYMBOL) ? (self.get_default() != 0) : self.hash().contains(key_name); r.write_no_lang(VBool::get(result)); } -#ifndef DOXYGEN -struct Foreach_info { - Request *r; - const String* key_var_name; - const String* value_var_name; - Value* body_code; - Value* delim_maybe_code; - - Value* var_context; - bool need_delim; -}; -#endif -static bool one_foreach_cycle( - HashStringValue::key_type akey, - HashStringValue::value_type avalue, - Foreach_info *info) { - Value& var_context=*info->var_context; - if(info->key_var_name){ - VString* vkey=new VString(*new String(akey, String::L_TAINTED)); - info->r->put_element(var_context, *info->key_var_name, vkey); - } - if(info->value_var_name) - 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); - Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING); - - const String* s_processed=sv_processed.get_string(); - if(s_processed && !s_processed->is_empty()) { // we have body - if(info->need_delim) // need delim & iteration produced string? - info->r->write_pass_lang(info->r->process(*info->delim_maybe_code)); - else - info->need_delim=true; - } - info->r->write_pass_lang(sv_processed); - return lskip==Request::SKIP_BREAK; - } else { - info->r->process_write(*info->body_code); - Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING); - return lskip==Request::SKIP_BREAK; - } -} static void _foreach(Request& r, MethodParams& params) { InCycle temp(r); - const String& key_var_name=params.as_string(0, "key-var name must be string"); - const String& value_var_name=params.as_string(1, "value-var name must be string"); + const String* key_var_name=¶ms.as_string(0, "key-var name must be string"); + const String* value_var_name=¶ms.as_string(1, "value-var name must be string"); + Value* body_code=¶ms.as_junction(2, "body must be code"); + Value* delim_maybe_code=params.count()>3?params.get(3):0; + Value& caller=*r.get_method_frame()->caller(); - Foreach_info info={ - &r, - key_var_name.is_empty()? 0 : &key_var_name, - value_var_name.is_empty()? 0 : &value_var_name, - ¶ms.as_junction(2, "body must be code"), - /*delimiter*/params.count()>3?params.get(3):0, - /*var_context*/r.get_method_frame()->caller(), - false - }; + if(key_var_name->is_empty()) key_var_name=0; + if(value_var_name->is_empty()) value_var_name=0; VHash& self=GET_SELF(r, VHash); - HashStringValue& hash=self.hash_ro(); - VHash_lock lock(self); - hash.first_that(one_foreach_cycle, &info); + HashStringValue& hash=self.hash(); + + if(delim_maybe_code){ // delimiter set + bool need_delim=false;; + for(HashStringValue::Iterator i(hash); i; i.next()){ + if(key_var_name){ + VString* vkey=new VString(*new String(i.key(), String::L_TAINTED)); + r.put_element(caller, *key_var_name, vkey); + } + + if(value_var_name) + r.put_element(caller, *value_var_name, i.value()); + + StringOrValue sv_processed=r.process(*body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + + const String* s_processed=sv_processed.get_string(); + if(s_processed && !s_processed->is_empty()) { // we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + else + need_delim=true; + } + + r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; + } + } else { + for(HashStringValue::Iterator i(hash); i; i.next()){ + if(key_var_name){ + VString* vkey=new VString(*new String(i.key(), String::L_TAINTED)); + r.put_element(caller, *key_var_name, vkey); + } + + if(value_var_name) + r.put_element(caller, *value_var_name, i.value()); + + r.process_write(*body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + + if(lskip==Request::SKIP_BREAK) + break; + } + } } enum AtResultType { @@ -521,9 +518,8 @@ static void _sort(Request& r, MethodPara VMethodFrame* context=r.get_method_frame()->caller(); VHash& self=GET_SELF(r, VHash); - HashStringValue& hash=self.hash_ro(); + HashStringValue& hash=self.hash(); int count=hash.count(); - VHash_lock lock(self); Hash_seq_item* seq=new(PointerFreeGC) Hash_seq_item[count]; int pos=0; @@ -569,7 +565,7 @@ static void _sort(Request& r, MethodPara } static void _at(Request& r, MethodParams& params) { - HashStringValue& hash=GET_SELF(r, VHash).hash_ro(); + HashStringValue& hash=GET_SELF(r, VHash).hash(); size_t count=hash.count(); int pos=0;