--- parser3/src/classes/hash.C	2015/03/12 08:18:18	1.121
+++ 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 <paf@design.ru> (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.129 2016/07/14 17:06:30 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,14 +198,13 @@ static void _create_or_add(Request& r, M
 		HashStringValue* self_hash=&(self.hash());
 
 		if(VHash* src=static_cast<VHash*>(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();
 		}
@@ -383,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<Table*>(keys_collector, table);
+	GET_SELF(r, VHash).hash().for_each<Table*>(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,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=&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* body_code=&params.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,
-		&params.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<Foreach_info*>(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 {
@@ -481,8 +479,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<const Hash_seq_item *>(a)->value.c_str,
+		static_cast<const Hash_seq_item *>(b)->value.c_str
+	);
+}
+static int sort_cmp_double(const void *a, const void *b) {
+	double va=static_cast<const Hash_seq_item *>(a)->value.d;
+	double vb=static_cast<const Hash_seq_item *>(b)->value.d;
+	if(va<vb)
+		return -1;
+	else if(va>vb)
+		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<count; pos++)
+			if(*seq[pos].value.c_str)
+				seq[pos].value.c_str=Charset::transcode(seq[pos].value.c_str, r.charsets.source(), UTF8_charset).cstr();
+
+	// sort keys
+	qsort(seq, count, sizeof(Hash_seq_item), key_values_are_strings?sort_cmp_string:sort_cmp_double);
+
+	// reorder hash as required in 'seq'
+	hash.order_clear();
+	if(reverse)
+		for(pos=count-1; pos>=0; pos--)
+			hash.order_next(seq[pos].hash_pair);
+	else
+		for(pos=0; pos<count; pos++)
+			hash.order_next(seq[pos].hash_pair);
+
+	delete[] seq;
+#endif
+}
+
 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;
@@ -520,11 +603,14 @@ static void _at(Request& r, MethodParams
 		switch(result_type) {
 			case AtResultTypeKey:
 				{
+#ifdef HASH_ORDER
 					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 {
+					} 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)));
@@ -535,11 +621,14 @@ static void _at(Request& r, MethodParams
 				}
 			case AtResultTypeValue:
 				{
+#ifdef HASH_ORDER
 					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 {
+					} else
+#endif
+					{
 						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
 							if(!pos){
 								r.write_assign_lang(*i.value());
@@ -550,11 +639,14 @@ static void _at(Request& r, MethodParams
 				}
 			case AtResultTypeHash:
 				{
+#ifdef HASH_ORDER
 					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 {
+					} else
+#endif
+					{
 						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
 							if(!pos){
 								r.write_no_lang(SingleElementHash(i.key(), i.value()));
@@ -596,15 +688,27 @@ MHash::MHash(): Methoded("hash")
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
 	// ^hash._keys[[column name]]
-	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 1);	
+	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 1);
 
 	// ^hash._count[]
-	add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0);	
+	add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0);
 
 	// ^hash.foreach[key;value]{code}[delim]
 	add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1);
 
+	// ^hash.sort[key;value]{string-key-maker}[[asc|desc]]
+	// ^hash.sort[key;value](numeric-key-maker)[[asc|desc]]
+	add_native_method("sort", Method::CT_DYNAMIC, _sort, 2+1, 2+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);
+
+#ifdef FEATURE_GET_ELEMENT4CALL
+	// aliases without "_"
+	add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1);
+	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);
+	add_native_method("at", Method::CT_DYNAMIC, _at, 1, 2);
+#endif
+
 }