--- parser3/src/classes/hash.C	2022/08/22 20:03:12	1.155
+++ 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.155 2022/08/22 20:03:12 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
@@ -252,15 +252,15 @@ static void copy_intersection_by_self(Ha
 static void _intersection(Request& r, MethodParams& params) {
 	Value& result=*new VHash;
 
-	bool order_by_arg=true;
+	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 == "self")
-					order_by_arg=false;
-				else if(sorder != "arg")
+				if(sorder == "arg")
+					order_by_arg=true;
+				else if(sorder != "self")
 					throw Exception(PARSER_RUNTIME, &sorder, "'order' must be 'self' or 'arg'");
 				valid_options++;
 			}