--- parser3/src/classes/hash.C 2001/09/26 10:32:25 1.19 +++ parser3/src/classes/hash.C 2001/10/11 12:04:19 1.21 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: hash.C,v 1.19 2001/09/26 10:32:25 parser Exp $ + $Id: hash.C,v 1.21 2001/10/11 12:04:19 parser Exp $ */ #include "classes.h" @@ -89,6 +89,21 @@ private: }; #endif +static void copy_pair_to(const Hash::Key& key, Hash::Val *value, void *info) { + Hash& dest=*static_cast(info); + dest.put(key, value); +} + +static void _create_or_append(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(r.self)->hash()); + } +} + static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -170,6 +185,11 @@ static void _count(Request& r, const Str MHash::MHash(Pool& apool) : Methoded(apool) { set_name(*NEW String(pool(), HASH_CLASS_NAME)); + // ^hash::create[[copy_from]] + add_native_method("create", Method::CT_DYNAMIC, _create_or_append, 0, 1); + // ^hash::append[[copy_from]] + add_native_method("append", Method::CT_DYNAMIC, _create_or_append, 1, 1); + // ^hash:sql[query][(count[;offset])] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);