--- parser3/src/classes/hash.C	2001/07/23 12:41:47	1.12
+++ parser3/src/classes/hash.C	2001/10/11 11:52:55	1.20
@@ -2,12 +2,10 @@
 	Parser: @b hash parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: hash.C,v 1.12 2001/07/23 12:41:47 parser Exp $
+	$Id: hash.C,v 1.20 2001/10/11 11:52:55 parser Exp $
 */
-static const char *RCSId="$Id: hash.C,v 1.12 2001/07/23 12:41:47 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -34,18 +32,6 @@ public: // Methoded
 
 // methods
 
-static void _default(Request& r, const String&, MethodParams *params) { 
-	Pool& pool=r.pool();
-
-	VHash& vhash=*static_cast<VHash *>(r.self);
-	if(params->size())
-		vhash.set_default(params->get(0)); // info: may be code..
-	else {
-		Value *default_value=vhash.get_default();
-		r.write_assign_lang(default_value?*default_value:*new(pool) VVoid(pool));
-	}
-}
-
 #ifndef DOXYGEN
 class Hash_sql_event_handlers : public SQL_Driver_query_event_handlers {
 public:
@@ -103,6 +89,25 @@ private:
 };
 #endif
 
+static void copy_pair_to(const Hash::Key& key, Hash::Val *value, void *info) {
+	Hash& dest=*static_cast<Hash *>(info);
+	dest.put(key, value);
+}
+
+static void _create(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	
+	if(params->size()) {
+		Value& vsrc=params->as_no_junction(0, "copy_from must be hash");
+		if(Hash *src=vsrc.get_hash())
+			src->for_each(copy_pair_to, &static_cast<VHash *>(r.self)->hash());
+		else
+			PTHROW(0, 0,
+				&method_name,
+				"copy_from must be hash");
+	}
+}
+
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -171,20 +176,30 @@ static void _keys(Request& r, const Stri
 	r.write_no_lang(result);
 }
 
+static void _count(Request& r, const String& method_name, MethodParams *) {
+	Pool& pool=r.pool();
+
+	Value& value=*new(pool) VInt(pool, static_cast<VHash *>(r.self)->hash().size());
+	value.set_name(method_name);
+	r.write_no_lang(value);
+}
+
 // constructor
 
 MHash::MHash(Pool& apool) : Methoded(apool) {
 	set_name(*NEW String(pool(), HASH_CLASS_NAME));
 
-	// ^hash.default[]
-	// ^hash.default[hash]
-	add_native_method("default", Method::CT_DYNAMIC, _default, 0, 1);
+	// ^hash::create[[default value]]
+	add_native_method("create", Method::CT_DYNAMIC, _create, 0, 1);
 
 	// ^hash:sql[query][(count[;offset])]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
 
-	// ^hash.keys[]
-	add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 0);	
+	// ^hash._keys[]
+	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 0);	
+
+	// ^hash._count[]
+	add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0);	
 }
 
 // global variable