--- parser3/src/classes/hash.C	2020/12/29 13:56:18	1.147
+++ parser3/src/classes/hash.C	2021/12/21 14:24:54	1.154
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.147 2020/12/29 13:56:18 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.154 2021/12/21 14:24:54 moko Exp $";
 
 // class
 
@@ -622,6 +622,7 @@ static void _at(Request& r, MethodParams
 extern String table_reverse_name;
 
 static void _select(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");
 	Value& vcondition=params.as_expression(2, "condition must be number, bool or expression");
@@ -634,6 +635,7 @@ static void _select(Request& r, MethodPa
 
 	int limit=source_hash.count();
 	bool reverse=false;
+	bool copy_default=false;
 
 	if(params.count()>3)
 		if(HashStringValue* options=params.as_hash(3)) {
@@ -646,6 +648,10 @@ static void _select(Request& r, MethodPa
 				valid_options++;
 				reverse=r.process(*vreverse).as_bool();
 			}
+			if(Value* vcopy_default=options->get(sql_default_name)) {
+				valid_options++;
+				copy_default=r.process(*vcopy_default).as_bool();
+			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
@@ -653,6 +659,7 @@ static void _select(Request& r, MethodPa
 	HashStringValue& result_hash=*new HashStringValue();
 
 	if(limit>0){
+
 #ifdef HASH_ORDER
 		if(reverse){
 			for(HashStringValue::ReverseIterator i(source_hash); i; i.prev()){
@@ -661,7 +668,12 @@ static void _select(Request& r, MethodPa
 				if(value_var_name)
 					r.put_element(caller, *value_var_name, i.value());
 
-				if(r.process(vcondition).as_bool()){
+				bool condition=r.process(vcondition).as_bool();
+
+				if(r.check_skip_break())
+					break;
+
+				if(condition){
 					result_hash.put(i.key(), i.value());
 					if(!--limit)
 						break;
@@ -677,7 +689,12 @@ static void _select(Request& r, MethodPa
 				if(value_var_name)
 					r.put_element(caller, *value_var_name, i.value());
 
-				if(r.process(vcondition).as_bool()){
+				bool condition=r.process(vcondition).as_bool();
+
+				if(r.check_skip_break())
+					break;
+
+				if(condition){
 					result_hash.put(i.key(), i.value());
 					if(!--limit)
 						break;
@@ -686,11 +703,17 @@ static void _select(Request& r, MethodPa
 		}
 	}
 
-	r.write(*new VHash(result_hash));
+	VHash *result=new VHash(result_hash);
+	if(copy_default){
+		result->set_default(GET_SELF(r, VHashBase).get_default());
+	}
+
+	r.write(*result);
 }
 
 static void _reverse(Request& r, MethodParams& params) {
-	HashStringValue& source_hash=GET_SELF(r, VHashBase).hash();
+	VHashBase& self=GET_SELF(r, VHashBase);
+	HashStringValue& source_hash=self.hash();
 	HashStringValue& result_hash=*new HashStringValue();
 
 #ifdef HASH_ORDER
@@ -700,9 +723,32 @@ static void _reverse(Request& r, MethodP
 	for(HashStringValue::Iterator i(source_hash); i; i.next() )
 		result_hash.put(i.key(), i.value());
 #endif
-	r.write(*new VHash(result_hash));
+
+	VHashBase& result=*new VHash(result_hash);
+	if(Value* vdefault=self.get_default())
+		result.set_default(vdefault);
+
+	r.write(result);
+}
+
+
+static void _rename(Request& r, MethodParams& params) {
+	HashStringValue& hash=GET_SELF(r, VHashBase).hash();
+
+	if(params.count()>1){
+		const String& key_from=params.as_string(0, "from key must be string");
+		const String& key_to=params.as_string(1, "to key must be string");
+
+		hash.rename(key_from, key_to);
+	} else {
+		HashStringValue* names=params.as_hash(0,"single parameter");
+
+		for(HashStringValue::Iterator i(*names); i; i.next())
+			hash.rename(i.key(), i.value()->as_string());
+	}
 }
 
+
 // constructor
 
 MHash::MHash(): Methoded("hash") 
@@ -754,6 +800,10 @@ MHash::MHash(): Methoded("hash")
 	// ^hash._at([-+]offset)[['key'|'value'|'hash']]
 	add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2);
 
+	// ^hash.rename[from;to]
+	// ^hash.rename[ $.from[to] ... ]
+	add_native_method("rename", Method::CT_DYNAMIC, _rename, 1, 2);
+
 #ifdef FEATURE_GET_ELEMENT4CALL
 	// aliases without "_"
 	add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1);