--- parser3/src/classes/hash.C	2002/12/09 11:07:39	1.52
+++ parser3/src/classes/hash.C	2003/04/25 11:39:54	1.56
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_HASH_C="$Date: 2002/12/09 11:07:39 $";
+static const char* IDENT_HASH_C="$Date: 2003/04/25 11:39:54 $";
 
 #include "classes.h"
 #include "pa_request.h"
@@ -46,39 +46,60 @@ public:
 		columns(pool),
 		row_index(0) {
 	}
-	void add_column(void *ptr, size_t size) {
-		String *column=new(pool) String(pool);
-		column->APPEND_TAINTED(
-			(const char *)ptr, size, 
-			statement_cstr, 0);
-		columns+=column;
+	bool add_column(SQL_Error& error, void *ptr, size_t size) {
+		try {
+			String *column=new(pool) String(pool);
+			column->APPEND_TAINTED(
+				(const char *)ptr, size, 
+				statement_cstr, 0);
+			columns+=column;
+
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column");
+			return true;
+		}
 	}
-	void before_rows() { 
-		if(columns.size()<=1)
-			throw SQL_Exception("parser.runtime",
+	bool before_rows(SQL_Error& error) { 
+		if(columns.size()<=1) {
+			error=SQL_Error("parser.runtime",
 				&method_name,
 				"column count must be more than 1 to create a hash");
+			return true;
+		}
+
+		return false;
 	}
-	void add_row() {
+	bool add_row(SQL_Error& /*error*/) {
 		column_index=0;
+		return false;
 	}
-	void add_row_cell(void *ptr, size_t size) {
-		String *cell=new(pool) String(pool);
-		if(size)
-			cell->APPEND_TAINTED(
-				(const char *)ptr, size, 
-				statement_cstr, row_index++);
-		if(column_index==0) {
-			VHash *row_vhash=new(pool) VHash(pool);
-			row_hash=row_vhash->get_hash(0);
-			if(rows_hash.put_dont_replace(*cell, row_vhash)) // put. existed?
-				if(!distinct)
-					throw SQL_Exception("parser.runtime",
-						cell,
-						"duplicate key");
-		} else
-			row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell));
-		column_index++;
+	bool add_row_cell(SQL_Error& error, void *ptr, size_t size) {
+		try {
+			String *cell=new(pool) String(pool);
+			if(size)
+				cell->APPEND_TAINTED(
+					(const char *)ptr, size, 
+					statement_cstr, row_index++);
+			if(column_index==0) {
+				VHash *row_vhash=new(pool) VHash(pool);
+				row_hash=row_vhash->get_hash(0);
+				if(rows_hash.put_dont_replace(*cell, row_vhash)) // put. existed?
+					if(!distinct) {
+						error=SQL_Error("parser.runtime",
+							cell,
+							"duplicate key");
+						return true;
+					}
+			} else
+				row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell));
+			column_index++;
+
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell");
+			return true;
+		}
 	}
 
 private:
@@ -98,15 +119,34 @@ static void copy_all_overwrite_to(const
 	Hash& dest=*static_cast<Hash *>(info);
 	dest.put(key, value);
 }
-static void _create_or_add(Request& r, const String& method_name, MethodParams *params) {
+static void _create_or_add(Request& r, const String& method_name, MethodParams *params, 
+			   bool is_create) {
 	Pool& pool=r.pool();
 	
 	if(params->size()) {
-		Value& vb=params->as_no_junction(0, "param must be hash");
-		if(Hash *b=vb.get_hash(&method_name))
-			b->for_each(copy_all_overwrite_to, &static_cast<VHash *>(r.get_self())->hash(&method_name));
+		Value& vb_maybehash=params->as_no_junction(0, "param must be hash");
+		if(VHash* vbh=static_cast<VHash*>(vb_maybehash.as("hash", false))) {
+			VHash& vah=*static_cast<VHash *>(r.get_self());
+
+			Hash& a=vah.hash(&method_name);
+			Hash& b=vbh->hash(&method_name);
+			b.for_each(copy_all_overwrite_to, &a);
+
+			if(is_create)
+				vah.set_default(vbh->get_default());
+		} else if(!vb_maybehash.is_string()) // allow ^hash::create[^rem{xxx}]
+			throw Exception("parser.runtime",
+				&method_name,
+				"param must be hash");
 	}
 }
+static void _create(Request& r, const String& method_name, MethodParams *params) {
+	_create_or_add(r, method_name, params, true);
+}
+static void _add(Request& r, const String& method_name, MethodParams *params) {
+	_create_or_add(r, method_name, params, false);
+}
+
 
 static void remove_key_from(const Hash::Key& key, Hash::Val *value, void *info) {
 	Hash& dest=*static_cast<Hash *>(info);
@@ -335,9 +375,9 @@ static void _foreach(Request& r, const S
 MHash::MHash(Pool& apool) : Methoded(apool, "hash") 
 {
 	// ^hash::create[[copy_from]]
-	add_native_method("create", Method::CT_DYNAMIC, _create_or_add, 0, 1);
+	add_native_method("create", Method::CT_DYNAMIC, _create, 0, 1);
 	// ^hash.add[add_from]
-	add_native_method("add", Method::CT_DYNAMIC, _create_or_add, 1, 1);
+	add_native_method("add", Method::CT_DYNAMIC, _add, 1, 1);
 	// ^hash.sub[sub_from]
 	add_native_method("sub", Method::CT_DYNAMIC, _sub, 1, 1);
 	// ^a.union[b] = hash