--- parser3/src/classes/hash.C	2011/05/19 06:58:40	1.110
+++ parser3/src/classes/hash.C	2012/06/08 11:44:01	1.114
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2011/05/19 06:58:40 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
@@ -18,6 +16,8 @@ static const char * const IDENT_HASH_C="
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.114 2012/06/08 11:44:01 misha Exp $";
+
 // class
 
 class MHash: public Methoded {
@@ -191,7 +191,7 @@ VBool Hash_sql_event_handlers::only_one_
 
 static void _create_or_add(Request& r, MethodParams& params) {
 	if(params.count()) {
-		Value& vsrc=params.as_no_junction(0, "param must be hash");
+		Value& vsrc=params.as_no_junction(0, PARAM_MUST_BE_HASH);
 		if(HashStringValue* src=vsrc.get_hash()) {
 			VHash& self=GET_SELF(r, VHash);
 			HashStringValue* self_hash=&(self.hash());
@@ -200,22 +200,15 @@ static void _create_or_add(Request& r, M
 			src->for_each<HashStringValue*>(copy_all_overwrite_to, self_hash);
 
 			if(VHash* vhash_src=static_cast<VHash*>(vsrc.as(VHASH_TYPE)))
-			{
 				if(Value* vdefault=vhash_src->get_default())
-				{
 					if(vdefault->is_defined())
-					{
 						self.set_default(vdefault);
-					}
-				}
-			}
 		}
 	}
 }
 
 static void _sub(Request& r, MethodParams& params) {
-	Value& vsrc=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* src=vsrc.get_hash()) {
+	if(HashStringValue* src=params.as_hash(0, "param")) {
 		HashStringValue* self=&(GET_SELF(r, VHash).hash());
 		if(src==self) { // same: clearing
 			self->clear();
@@ -235,8 +228,7 @@ static void _union(Request& r, MethodPar
 	// dest = copy of self
 	Value& result=*new VHash(GET_SELF(r, VHash).hash());
 	// dest += b
-	Value& vsrc=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* src=vsrc.get_hash())
+	if(HashStringValue* src=params.as_hash(0, "param"))
 		src->for_each<HashStringValue*>(copy_all_dontoverwrite_to, result.get_hash());
 
 	// return result
@@ -259,8 +251,7 @@ static void copy_intersection_to(
 static void _intersection(Request& r, MethodParams& params) {
 	Value& result=*new VHash;
 	// dest += b
-	Value& vb=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* b=vb.get_hash()) {
+	if(HashStringValue* b=params.as_hash(0, "param")) {
 		Copy_intersection_to_info info={b, result.get_hash()};
 		GET_SELF(r, VHash).hash().for_each<Copy_intersection_to_info*>(copy_intersection_to, &info);
 	}
@@ -279,8 +270,7 @@ static bool intersects(
 static void _intersects(Request& r, MethodParams& params) {
 	bool result=false;
 
-	Value& vb=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* b=vb.get_hash())
+	if(HashStringValue* b=params.as_hash(0, "param"))
 		result=GET_SELF(r, VHash).hash().first_that<HashStringValue*>(intersects, b)!=0;
 
 	// return result
@@ -307,7 +297,7 @@ static void _sql(Request& r, MethodParam
 	bool distinct=false;
 	Table2hash_value_type value_type=C_HASH;
 	if(params.count()>1)
-		if(HashStringValue* options=params.as_hash(1)) {
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
 			int valid_options=0;
 			if(Value* vbind=options->get(sql_bind_name)) {
 				valid_options++;