--- parser3/src/classes/hash.C 2016/10/26 15:44:49 1.136 +++ parser3/src/classes/hash.C 2017/05/17 14:22:11 1.142 @@ -1,7 +1,7 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2015 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) */ @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.136 2016/10/26 15:44:49 moko Exp $"; +volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.142 2017/05/17 14:22:11 moko Exp $"; // class @@ -61,11 +61,11 @@ public: statement_cstr(astatement_cstr), distinct(adistinct), rows_hash(arows_hash), - value_type(avalue_type), row_value(0), column_index(0), - one_bool_column(false), columns(*new ArrayString), + one_bool_column(false), + value_type(avalue_type), empty(0) { } @@ -74,7 +74,7 @@ public: columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */); return false; } catch(...) { - error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); + error=SQL_Error("exception occurred in Hash_sql_event_handlers::add_column"); return true; } } @@ -180,7 +180,7 @@ public: column_index++; return false; } catch(...) { - error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell"); + error=SQL_Error("exception occurred in Hash_sql_event_handlers::add_row_cell"); return true; } } @@ -210,7 +210,8 @@ static void _create_or_add(Request& r, M } if(src_hash) - src_hash->for_each(copy_all_overwrite_to, self_hash); + for(HashStringValue::Iterator i(*src_hash); i; i.next()) + self_hash->put(i.key(), i.value()); } } @@ -221,7 +222,8 @@ static void _sub(Request& r, MethodParam self->clear(); return; } - src->for_each(remove_key_from, self); + for(HashStringValue::Iterator i(*src); i; i.next()) + self->remove(i.key()); } } @@ -236,7 +238,7 @@ static void _union(Request& r, MethodPar src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result - r.write_no_lang(result); + r.write(result); } #ifndef DOXYGEN @@ -258,7 +260,7 @@ static void _intersection(Request& r, Me } // return result - r.write_no_lang(result); + r.write(result); } static bool intersects( HashStringValue::key_type key, HashStringValue::value_type /*value*/, HashStringValue* b) { @@ -271,14 +273,14 @@ static void _intersects(Request& r, Meth if(HashStringValue* b=params.as_hash(0, "param")) { HashStringValue* self=&(GET_SELF(r, VHashBase).hash()); if(b==self) { - r.write_no_lang(VBool::get(true)); + r.write(VBool::get(true)); return; } result=self->first_that(intersects, b)!=0; } // return result - r.write_no_lang(VBool::get(result)); + r.write(VBool::get(result)); } @@ -372,11 +374,11 @@ static void _keys(Request& r, MethodPara GET_SELF(r, VHashBase).hash().for_each(keys_collector, table); - r.write_no_lang(*new VTable(table)); + r.write(*new VTable(table)); } static void _count(Request& r, MethodParams&) { - r.write_no_lang(*new VInt(GET_SELF(r, VHashBase).hash().count())); + r.write(*new VInt(GET_SELF(r, VHashBase).hash().count())); } static void _delete(Request& r, MethodParams& params) { @@ -390,7 +392,7 @@ static void _contains(Request& r, Method VHashBase& self=GET_SELF(r, VHashBase); 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)); + r.write(VBool::get(result)); } static void _foreach(Request& r, MethodParams& params) { @@ -419,19 +421,19 @@ static void _foreach(Request& r, MethodP r.put_element(caller, *value_var_name, i.value()); Value& sv_processed=r.process(*body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + TempSkip4Delimiter skip(r); 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)); + r.write(r.process(*delim_maybe_code)); else need_delim=true; } - r.write_pass_lang(sv_processed); + r.write(sv_processed); - if(lskip==Request::SKIP_BREAK) + if(skip.check_break()) break; } } else { @@ -445,9 +447,8 @@ static void _foreach(Request& r, MethodP 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) + if(r.check_skip_break()) break; } } @@ -495,9 +496,7 @@ static void _sort(Request& r, MethodPara 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"); Value& key_maker=params.as_junction(2, "key-maker must be code"); - bool reverse=params.count()>3/*..[desc|asc|]*/? - reverse=params.as_no_junction(3, "order must not be code").as_string()=="desc": - false; // default=asc + bool reverse=params.count()>3 /*..[desc|asc|]*/ && params.as_no_junction(3, "order must not be code").as_string()=="desc"; // default=asc const String* key_var=key_var_name.is_empty()? 0 : &key_var_name; const String* value_var=value_var_name.is_empty()? 0 : &value_var_name; @@ -590,15 +589,15 @@ static void _at(Request& r, MethodParams { #ifdef HASH_ORDER if(pos == 0) { - r.write_pass_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED))); + r.write(*new VString(*new String(hash.first_key(), String::L_TAINTED))); } else if((size_t)pos == count-1) { - r.write_pass_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED))); + r.write(*new VString(*new String(hash.last_key(), String::L_TAINTED))); } else #endif { for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) if(!pos){ - r.write_pass_lang(*new VString(*new String(i.key(), String::L_TAINTED))); + r.write(*new VString(*new String(i.key(), String::L_TAINTED))); break; } } @@ -608,15 +607,15 @@ static void _at(Request& r, MethodParams { #ifdef HASH_ORDER if(pos == 0) { - r.write_pass_lang(*hash.first_value()); + r.write(*hash.first_value()); } else if((size_t)pos == count-1) { - r.write_pass_lang(*hash.last_value()); + r.write(*hash.last_value()); } else #endif { for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) if(!pos){ - r.write_pass_lang(*i.value()); + r.write(*i.value()); break; } } @@ -626,15 +625,15 @@ static void _at(Request& r, MethodParams { #ifdef HASH_ORDER if(pos == 0) { - r.write_no_lang(SingleElementHash(hash.first_key(), hash.first_value())); + r.write(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())); + r.write(SingleElementHash(hash.last_key(), hash.last_value())); } else #endif { for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) if(!pos){ - r.write_no_lang(SingleElementHash(i.key(), i.value())); + r.write(SingleElementHash(i.key(), i.value())); break; } }