--- parser3/src/classes/hash.C	2021/12/21 14:24:54	1.154
+++ parser3/src/classes/hash.C	2024/09/13 04:01:22	1.158
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "classes.h"
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.154 2021/12/21 14:24:54 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.158 2024/09/13 04:01:22 moko Exp $";
 
 // class
 
@@ -188,7 +188,7 @@ static void _create_or_add(Request& r, M
 		HashStringValue* self_hash=&(self.hash());
 		HashStringValue* src_hash;
 
-		if(VHashBase* src=static_cast<VHashBase*>(vsrc.as(VHASH_TYPE))) {
+		if(VHashBase* src=dynamic_cast<VHashBase*>(&vsrc)) {
 			src_hash=&(src->hash());
 
 			if(src_hash==self_hash) // same: doing nothing
@@ -238,19 +238,46 @@ 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_by_arg(HashStringValue::key_type key, HashStringValue::value_type, Copy_intersection_to_info *info) {
+	if(HashStringValue::value_type value=info->b->get(key))
+		info->dest->put_dont_replace(key, value);
+}
+
+static void copy_intersection_by_self(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);
 }
+
 static void _intersection(Request& r, MethodParams& params) {
 	Value& result=*new VHash;
-	// dest += b
+
+	bool order_by_arg=false;
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1, "options")) {
+			int valid_options=0;
+			if(Value* vorder=options->get("order")) {
+				const String &sorder=r.process(*vorder).as_string();
+				if(sorder == "arg")
+					order_by_arg=true;
+				else if(sorder != "self")
+					throw Exception(PARSER_RUNTIME, &sorder, "'order' must be 'self' or 'arg'");
+				valid_options++;
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+
 	if(HashStringValue* b=params.as_hash(0, "param")) {
-		Copy_intersection_to_info info={b, result.get_hash()};
-		GET_SELF(r, VHashBase).hash().for_each<Copy_intersection_to_info*>(copy_intersection_to, &info);
+		if(order_by_arg){
+			Copy_intersection_to_info info={&GET_SELF(r, VHashBase).hash(), result.get_hash()};
+			b->for_each<Copy_intersection_to_info*>(copy_intersection_by_arg, &info);
+		} else {
+			Copy_intersection_to_info info={b, result.get_hash()};
+			GET_SELF(r, VHashBase).hash().for_each<Copy_intersection_to_info*>(copy_intersection_by_self, &info);
+		}
 	}
 
-	// return result
 	r.write(result);
 }
 
@@ -761,8 +788,8 @@ MHash::MHash(): Methoded("hash")
 	add_native_method("sub", Method::CT_DYNAMIC, _sub, 1, 1);
 	// ^a.union[b] = hash
 	add_native_method("union", Method::CT_DYNAMIC, _union, 1, 1);
-	// ^a.intersection[b] = hash
-	add_native_method("intersection", Method::CT_DYNAMIC, _intersection, 1, 1);
+	// ^a.intersection[b][options hash] = hash
+	add_native_method("intersection", Method::CT_DYNAMIC, _intersection, 1, 2);
 	// ^a.intersects[b] = bool
 	add_native_method("intersects", Method::CT_DYNAMIC, _intersects, 1, 1);