--- parser3/src/classes/hash.C	2001/07/23 12:41:47	1.12
+++ parser3/src/classes/hash.C	2001/09/17 14:46:49	1.16
@@ -5,9 +5,9 @@
 
 	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.16 2001/09/17 14:46:49 parser Exp $
 */
-static const char *RCSId="$Id: hash.C,v 1.12 2001/07/23 12:41:47 parser Exp $"; 
+static const char *RCSId="$Id: hash.C,v 1.16 2001/09/17 14:46:49 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -15,6 +15,7 @@ static const char *RCSId="$Id: hash.C,v
 #include "pa_vvoid.h"
 #include "pa_sql_connection.h"
 #include "pa_vtable.h"
+#include "pa_vint.h"
 
 // defines
 
@@ -34,18 +35,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:
@@ -171,20 +160,27 @@ 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: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