--- parser3/src/classes/hash.C 2015/03/12 08:18:18 1.121 +++ parser3/src/classes/hash.C 2016/07/04 17:26:23 1.127 @@ -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) */ @@ -9,6 +9,7 @@ #include "pa_vmethod_frame.h" #include "pa_request.h" +#include "pa_charsets.h" #include "pa_vhash.h" #include "pa_vvoid.h" #include "pa_sql_connection.h" @@ -16,7 +17,7 @@ #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 $"; +volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.127 2016/07/04 17:26:23 moko Exp $"; // class @@ -30,7 +31,7 @@ public: // global variable -DECLARE_CLASS_VAR(hash, new MHash, 0); +DECLARE_CLASS_VAR(hash, new MHash); // methods @@ -197,7 +198,7 @@ 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; @@ -383,13 +384,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) { @@ -400,7 +401,7 @@ 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")); + bool result=GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); r.write_no_lang(VBool::get(result)); } @@ -464,8 +465,7 @@ static void _foreach(Request& r, MethodP }; VHash& self=GET_SELF(r, VHash); - HashStringValue& hash=self.hash_ro(); - VHash_lock lock(self); + HashStringValue& hash=self.hash(); hash.first_that(one_foreach_cycle, &info); } @@ -481,8 +481,93 @@ inline Value& SingleElementHash(String:: return result; } +#ifndef DOXYGEN +struct Hash_seq_item { + HashStringValue::Pair *hash_pair; + union { + const char *c_str; + double d; + } value; +}; +#endif +static int sort_cmp_string(const void *a, const void *b) { + return strcmp( + static_cast(a)->value.c_str, + static_cast(b)->value.c_str + ); +} +static int sort_cmp_double(const void *a, const void *b) { + double va=static_cast(a)->value.d; + double vb=static_cast(b)->value.d; + if(vavb) + return +1; + else + return 0; +} +static void _sort(Request& r, MethodParams& params){ +#ifdef HASH_ORDER + 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 + + 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(); + int count=hash.count(); + + Hash_seq_item* seq=new(PointerFreeGC) Hash_seq_item[count]; + int pos=0; + bool key_values_are_strings=true; + + for(HashStringValue::Iterator i(hash); i; i.next(), pos++ ){ + if(key_var) + r.put_element(*context, *key_var, new VString(*new String(i.key(), String::L_TAINTED))); + if(value_var) + r.put_element(*context, *value_var, i.value()); + + Value& value=r.process_to_value(key_maker); + if(pos==0) // determining key values type by first one + key_values_are_strings=value.is_string(); + + seq[pos].hash_pair=i.pair(); + if(key_values_are_strings) + seq[pos].value.c_str=value.as_string().cstr(); + else + seq[pos].value.d=value.as_expr_result().as_double(); + } + + // @todo: handle this elsewhere + if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) + for(pos=0; pos=0; pos--) + hash.order_next(seq[pos].hash_pair); + else + for(pos=0; pos