--- parser3/src/classes/hash.C 2016/07/14 17:06:30 1.129 +++ 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.129 2016/07/14 17:06:30 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; } } @@ -193,11 +193,11 @@ 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); - VHash& self=GET_SELF(r, VHash); - HashStringValue* src_hash; + VHashBase& self=GET_SELF(r, VHashBase); HashStringValue* self_hash=&(self.hash()); + HashStringValue* src_hash; - if(VHash* src=static_cast(vsrc.as(VHASH_TYPE))) { + if(VHashBase* src=static_cast(vsrc.as(VHASH_TYPE))) { src_hash=&(src->hash()); if(src_hash==self_hash) // same: doing nothing @@ -210,36 +210,35 @@ 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()); } } static void _sub(Request& r, MethodParams& params) { if(HashStringValue* src=params.as_hash(0, "param")) { - HashStringValue* self=&(GET_SELF(r, VHash).hash()); + HashStringValue* self=&(GET_SELF(r, VHashBase).hash()); if(src==self) { // same: clearing self->clear(); return; } - src->for_each(remove_key_from, self); + for(HashStringValue::Iterator i(*src); i; i.next()) + self->remove(i.key()); } } -static void copy_all_dontoverwrite_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - HashStringValue* dest) { +static void copy_all_dontoverwrite_to(HashStringValue::key_type key, HashStringValue::value_type value, HashStringValue* dest) { dest->put_dont_replace(key, value); } static void _union(Request& r, MethodParams& params) { // dest = copy of self - Value& result=*new VHash(GET_SELF(r, VHash).hash()); + Value& result=*new VHash(GET_SELF(r, VHashBase).hash()); // dest += b if(HashStringValue* src=params.as_hash(0, "param")) src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result - r.write_no_lang(result); + r.write(result); } #ifndef DOXYGEN @@ -248,10 +247,7 @@ struct Copy_intersection_to_info { HashStringValue* dest; }; #endif -static void copy_intersection_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - Copy_intersection_to_info *info) { +static void copy_intersection_to(HashStringValue::key_type key, HashStringValue::value_type value, Copy_intersection_to_info *info) { if(info->b->get(key)) info->dest->put_dont_replace(key, value); } @@ -260,17 +256,14 @@ static void _intersection(Request& r, Me // dest += b 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); + GET_SELF(r, VHashBase).hash().for_each(copy_intersection_to, &info); } // return result - r.write_no_lang(result); + r.write(result); } -static bool intersects( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - HashStringValue* b) { +static bool intersects( HashStringValue::key_type key, HashStringValue::value_type /*value*/, HashStringValue* b) { return b->get(key)!=0; } @@ -278,16 +271,16 @@ static void _intersects(Request& r, Meth bool result=false; if(HashStringValue* b=params.as_hash(0, "param")) { - HashStringValue* self=&(GET_SELF(r, VHash).hash()); + 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)); } @@ -318,19 +311,19 @@ static void _sql(Request& r, MethodParam } 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(Value* vdistinct=options->get(sql_distinct_name)) { valid_options++; - distinct=r.process_to_value(*vdistinct).as_bool(); + distinct=r.process(*vdistinct).as_bool(); } if(Value* vvalue_type=options->get(sql_value_type_name)) { valid_options++; - value_type=get_value_type(r.process_to_value(*vvalue_type)); + value_type=get_value_type(r.process(*vvalue_type)); } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); @@ -341,11 +334,10 @@ static void _sql(Request& r, MethodParam 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()); - HashStringValue& hash=GET_SELF(r, VHash).hash(); + HashStringValue& hash=GET_SELF(r, VHashBase).hash(); hash.clear(); Hash_sql_event_handlers handlers( statement_string, statement_cstr, @@ -364,10 +356,7 @@ static void _sql(Request& r, MethodParam unmarshal_bind_updates(*bind, placeholders_count, placeholders); } -static void keys_collector( - HashStringValue::key_type key, - HashStringValue::value_type, - Table *table) { +static void keys_collector(HashStringValue::key_type key, HashStringValue::value_type, Table *table) { Table::element_type row(new ArrayString(1)); *row+=new String(key, String::L_TAINTED); *table+=row; @@ -383,27 +372,27 @@ 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, 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, VHash).hash().count())); + r.write(*new VInt(GET_SELF(r, VHashBase).hash().count())); } static void _delete(Request& r, MethodParams& params) { if(params.count()>0) - GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); + GET_SELF(r, VHashBase).hash().remove(params.as_string(0, "key must be string")); else - GET_SELF(r, VHash).hash().clear(); + GET_SELF(r, VHashBase).hash().clear(); } static void _contains(Request& r, MethodParams& params) { - VHash& self=GET_SELF(r, VHash); + 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) { @@ -412,14 +401,13 @@ static void _foreach(Request& r, MethodP 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* delim_maybe_code=params.count()>3?¶ms[3]:0; Value& caller=*r.get_method_frame()->caller(); 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(); + HashStringValue& hash=GET_SELF(r, VHashBase).hash(); if(delim_maybe_code){ // delimiter set bool need_delim=false;; @@ -432,20 +420,20 @@ static void _foreach(Request& r, MethodP 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); + Value& sv_processed=r.process(*body_code); + 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 { @@ -459,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; } } @@ -509,16 +496,13 @@ 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; VMethodFrame* context=r.get_method_frame()->caller(); - VHash& self=GET_SELF(r, VHash); - HashStringValue& hash=self.hash(); + HashStringValue& hash=GET_SELF(r, VHashBase).hash(); int count=hash.count(); Hash_seq_item* seq=new(PointerFreeGC) Hash_seq_item[count]; @@ -531,7 +515,7 @@ static void _sort(Request& r, MethodPara if(value_var) r.put_element(*context, *value_var, i.value()); - Value& value=r.process_to_value(key_maker); + Value& value=r.process(key_maker); if(pos==0) // determining key values type by first one key_values_are_strings=value.is_string(); @@ -546,7 +530,7 @@ static void _sort(Request& r, MethodPara if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) for(pos=0; pos 1) { const String& stype=params.as_string(1, "type must be string"); @@ -584,7 +568,7 @@ static void _at(Request& r, MethodParams throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'"); } - Value& vwhence=*params.get(0); + Value& vwhence=params[0]; if(vwhence.is_string()) { const String& swhence=*vwhence.get_string(); if(swhence == "last") @@ -594,7 +578,7 @@ static void _at(Request& r, MethodParams &swhence, "whence must be 'first', 'last' or expression"); } else { - pos=r.process_to_value(vwhence).as_int(); + pos=r.process(vwhence).as_int(); if(pos < 0) pos+=count; } @@ -605,15 +589,15 @@ static void _at(Request& r, MethodParams { #ifdef HASH_ORDER if(pos == 0) { - r.write_assign_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_assign_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_assign_lang(*new VString(*new String(i.key(), String::L_TAINTED))); + r.write(*new VString(*new String(i.key(), String::L_TAINTED))); break; } } @@ -623,15 +607,15 @@ static void _at(Request& r, MethodParams { #ifdef HASH_ORDER if(pos == 0) { - r.write_assign_lang(*hash.first_value()); + r.write(*hash.first_value()); } else if((size_t)pos == count-1) { - r.write_assign_lang(*hash.last_value()); + r.write(*hash.last_value()); } else #endif { for(HashStringValue::Iterator i(hash); i; i.next(), pos-- ) if(!pos){ - r.write_assign_lang(*i.value()); + r.write(*i.value()); break; } } @@ -641,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; } }