--- parser3/src/classes/hash.C 2003/03/24 10:21:28 1.54.2.13.2.10 +++ parser3/src/classes/hash.C 2003/04/04 10:38:26 1.55 @@ -1,15 +1,13 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_HASH_C="$Date: 2003/03/24 10:21:28 $"; +static const char* IDENT_HASH_C="$Date: 2003/04/04 10:38:26 $"; #include "classes.h" -#include "pa_vmethod_frame.h" - #include "pa_request.h" #include "pa_vhash.h" #include "pa_vvoid.h" @@ -20,44 +18,42 @@ static const char* IDENT_HASH_C="$Date: // class -class MHash: public Methoded { +class MHash : public Methoded { public: // VStateless_class - Value* create_new_value() { return new VHash(); } + Value *create_new_value(Pool& pool) { return new(pool) VHash(pool); } public: - MHash(); + MHash(Pool& pool); public: // Methoded bool used_directly() { return true; } }; -// global variable - -DECLARE_CLASS_VAR(hash, new MHash, 0); - // methods #ifndef DOXYGEN class Hash_sql_event_handlers: public SQL_Driver_query_event_handlers { - const String& statement_string; const char* statement_cstr; - bool distinct; - HashStringValue& rows_hash; - HashStringValue* row_hash; - int column_index; - ArrayString columns; public: - Hash_sql_event_handlers( - const String& astatement_string, const char* astatement_cstr, + Hash_sql_event_handlers(Pool& apool, const String& amethod_name, + const String& astatement_string, const char *astatement_cstr, bool adistinct, - HashStringValue& arows_hash): - statement_string(astatement_string), statement_cstr(astatement_cstr), + Hash& arows_hash): + pool(apool), + method_name(amethod_name), + statement_string(astatement_string), + statement_cstr(astatement_cstr), distinct(adistinct), rows_hash(arows_hash), - row_hash(0), - column_index(0) { + columns(pool), + row_index(0) { } bool add_column(SQL_Error& error, void *ptr, size_t size) { try { - columns+=new String((const char* )ptr, size, true); + 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"); @@ -65,9 +61,9 @@ public: } } bool before_rows(SQL_Error& error) { - if(columns.count()<=1) { + if(columns.size()<=1) { error=SQL_Error("parser.runtime", - /*method_name,*/ + &method_name, "column count must be more than 1 to create a hash"); return true; } @@ -80,21 +76,23 @@ public: } bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { try { - String& cell=*new String; + String *cell=new(pool) String(pool); if(size) - cell.append((const char* )ptr, size, String::L_TAINTED); + cell->APPEND_TAINTED( + (const char *)ptr, size, + statement_cstr, row_index++); if(column_index==0) { - VHash* row_vhash=new VHash; - row_hash=&row_vhash->hash(); - if(rows_hash.put_dont_replace(cell, row_vhash)) // put. existed? + 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,*/ + cell, "duplicate key"); return true; } } else - row_hash->put(*columns[column_index], new VString(cell)); + row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell)); column_index++; return false; @@ -104,176 +102,221 @@ public: } } +private: + Pool& pool; + const String& method_name; + const String& statement_string; const char *statement_cstr; + bool distinct; + Hash& rows_hash; + Hash *row_hash; + int column_index; + Array columns; + int row_index; }; #endif -static void copy_all_overwrite_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - HashStringValue* dest) { - dest->put(key, value); -} -static void _create_or_add(Request& r, MethodParams* params) { - if(params->count()) { - Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - b->for_each(copy_all_overwrite_to, &(GET_SELF(r, VHash).hash())); +static void copy_all_overwrite_to(const Hash::Key& key, Hash::Val *value, void *info) { + Hash& dest=*static_cast(info); + dest.put(key, value); +} +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_maybehash=params->as_no_junction(0, "param must be hash"); + if(VHash* vbh=static_cast(vb_maybehash.as("hash", false))) { + VHash& vah=*static_cast(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 + 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( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - HashStringValue* dest) { - dest->remove(key); +static void remove_key_from(const Hash::Key& key, Hash::Val *value, void *info) { + Hash& dest=*static_cast(info); + dest.remove(key); } -static void _sub(Request& r, MethodParams* params) { +static void _sub(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - b->for_each(remove_key_from, &GET_SELF(r, VHash).hash()); + if(Hash *b=vb.get_hash(&method_name)) + b->for_each(remove_key_from, &static_cast(r.get_self())->hash(&method_name)); } -static void copy_all_dontoverwrite_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - HashStringValue* dest) { - dest->put_dont_replace(key, value); +static void copy_all_dontoverwrite_to(const Hash::Key& key, Hash::Val *value, void *info) { + Hash& dest=*static_cast(info); + dest.put_dont_replace(key, value); } -static void _union(Request& r, MethodParams* params) { +static void _union(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + // dest = copy of self - Value& result=*new VHash(GET_SELF(r, VHash).hash()); + Hash& dest=*new(pool) Hash(static_cast(r.get_self())->hash(&method_name)); // dest += b Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - b->for_each(copy_all_dontoverwrite_to, result.get_hash()); + if(Hash *b=vb.get_hash(&method_name)) + b->for_each(copy_all_dontoverwrite_to, &dest); // return result + Value& result=*new(pool) VHash(pool, dest); r.write_no_lang(result); } #ifndef DOXYGEN struct Copy_intersection_to_info { - HashStringValue* b; - HashStringValue* dest; + Hash *b; + Hash *dest; }; #endif -static void copy_intersection_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - Copy_intersection_to_info *info) { - if(info->b->get(key)) - info->dest->put_dont_replace(key, value); + +static void copy_intersection_to(const Hash::Key& key, Hash::Val *value, void *info) { + Copy_intersection_to_info& i=*static_cast(info); + + if(i.b->get(key)) + i.dest->put_dont_replace(key, value); } -static void _intersection(Request& r, MethodParams* params) { - Value& result=*new VHash; +static void _intersection(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + // dest = copy of self + Hash& dest=*new(pool) Hash(pool); // dest += b Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) { - Copy_intersection_to_info info={b, result.get_hash()}; - GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); + if(Hash *b=vb.get_hash(&method_name)) { + Copy_intersection_to_info info={ + b, + &dest + }; + static_cast(r.get_self())->hash(&method_name).for_each(copy_intersection_to, &info); } // return result - r.write_no_lang(result); + r.write_no_lang(*new(pool) VHash(pool, dest)); } -static bool intersects( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - HashStringValue* b) { - return b->get(key)!=0; +static void *intersects(const Hash::Key& key, Hash::Val *value, void *info) { + return static_cast(info)->get(key); } -static void _intersects(Request& r, MethodParams* params) { - bool result=false; +static void _intersects(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + bool yes=false; + // dest = copy of self + Hash& dest=*new(pool) Hash(pool); + // dest += b Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; + if(Hash *b=vb.get_hash(&method_name)) + yes=static_cast(r.get_self())->hash(&method_name).first_that(intersects, b)!=0; // return result - r.write_no_lang(*new VBool(result)); + r.write_no_lang(*new(pool) VBool(pool, yes)); } -extern const String sql_limit_name; -extern const String sql_offset_name; -extern const String sql_default_name; -extern const String sql_distinct_name; -static void _sql(Request& r, MethodParams* params) { +static void _sql(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + Value& statement=params->as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; bool distinct=false; - if(params->count()>1) { + if(params->size()>1) { Value& voptions=params->as_no_junction(1, "options must be hash, not code"); if(!voptions.is_string()) - if(HashStringValue* options=voptions.get_hash()) { + if(Hash *options=voptions.get_hash(&method_name)) { int valid_options=0; - if(Value* vlimit=options->get(sql_limit_name)) { + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) { valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); } - if(Value* voffset=options->get(sql_offset_name)) { + if(Value *voffset=(Value *)options->get(*sql_offset_name)) { valid_options++; offset=(ulong)r.process_to_value(*voffset).as_double(); } - if(Value* vdistinct=options->get(sql_distinct_name)) { + if(Value *vdistinct=(Value *)options->get(*sql_distinct_name)) { valid_options++; distinct=r.process_to_value(*vdistinct).as_bool(); } - if(valid_options!=options->count()) + if(valid_options!=options->size()) throw Exception("parser.runtime", - 0, + &method_name, "called with invalid option"); } else throw Exception("parser.runtime", - 0, + &method_name, "options must be hash"); } - Temp_lang temp_lang(r, String::L_SQL); + Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process_to_string(statement); - const char* statement_cstr= - statement_string.cstr(String::L_UNSPECIFIED, r.connection()); - HashStringValue& hash=GET_SELF(r, VHash).hash(); + const char *statement_cstr= + statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); + Hash& hash=static_cast(r.get_self())->hash(&method_name); hash.clear(); - Hash_sql_event_handlers handlers( + Hash_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr, distinct, hash); - r.connection()->query( + + r.connection(&method_name)->query( statement_cstr, offset, limit, handlers, statement_string); } -static void keys_collector( - HashStringValue::key_type key, - HashStringValue::value_type value, - Table *table) { - Table::element_type row(new ArrayString); - *row+=new String(key, String::L_TAINTED); - *table+=row; +static void keys_collector(const Hash::Key& key, Hash::Val *value, void *info) { + Table& table=*static_cast(info); + Pool& pool=table.pool(); + + Array& row=*new(pool) Array(pool); + row+=&key; + table+=&row; } -static void _keys(Request& r, MethodParams* ) { - Table::columns_type columns(new ArrayString); - *columns+=new String("key"); - Table* table=new Table(columns); +static void _keys(Request& r, const String& method_name, MethodParams *) { + Pool& pool=r.pool(); + + Array& columns=*new(pool) Array(pool); + columns+=new(pool) String(pool, "key"); + Table& table=*new(pool) Table(pool, &method_name, &columns); - GET_SELF(r, VHash).hash().for_each(keys_collector, table); + static_cast(r.get_self())->hash(&method_name).for_each(keys_collector, &table); - r.write_no_lang(*new VTable(table)); + r.write_no_lang(*new(pool) VTable(pool, &table)); } -static void _count(Request& r, MethodParams* ) { - r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash().count())); +static void _count(Request& r, const String& method_name, MethodParams *) { + Pool& pool=r.pool(); + + r.write_no_lang( + *new(pool) VInt(pool, static_cast(r.get_self())->hash(&method_name).size())); } -static void _delete(Request& r, MethodParams* params) { +static void _delete(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); - GET_SELF(r, VHash).hash().remove(params->as_string(0, "key must be string")); + static_cast(r.get_self())->hash(&method_name).remove(params->as_string(0, "key must be string")); } #ifndef DOXYGEN @@ -281,54 +324,62 @@ struct Foreach_info { Request *r; const String* key_var_name; const String* value_var_name; - Value* body_code; - Value* delim_maybe_code; + Value *body_code; + Value *delim_maybe_code; - VString* vkey; + VString *vkey; bool need_delim; }; #endif -static void one_foreach_cycle( - HashStringValue::key_type akey, - HashStringValue::value_type avalue, - Foreach_info *info) { - info->vkey->set_string(*new String(akey, String::L_TAINTED)); - Value& ncontext=*info->r->get_method_frame()->caller(); - ncontext.put_element(*info->key_var_name, info->vkey, false); - ncontext.put_element(*info->value_var_name, avalue, false); - - StringOrValue sv_processed=info->r->process(*info->body_code); - const String* s_processed=sv_processed.get_string(); - if(info->delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body - if(info->need_delim) // need delim & iteration produced string? - info->r->write_pass_lang(info->r->process(*info->delim_maybe_code)); - info->need_delim=true; + +static void one_foreach_cycle(const Hash::Key& akey, Hash::Val *avalue, + void *info) { + Foreach_info& i=*static_cast(info); + + i.vkey->set_string(akey); + Value& ncontext=*i.r->get_method_frame()->caller(); + ncontext.put_element(*i.key_var_name, i.vkey, false); + ncontext.put_element(*i.value_var_name, static_cast(avalue), false); + + StringOrValue sv_processed=i.r->process(*i.body_code); + const String *s_processed=sv_processed.get_string(); + if(i.delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + if(i.need_delim) // need delim & iteration produced string? + i.r->write_pass_lang(i.r->process(*i.delim_maybe_code)); + i.need_delim=true; } - info->r->write_pass_lang(sv_processed); + i.r->write_pass_lang(sv_processed); } -static void _foreach(Request& r, MethodParams* params) { - Foreach_info info; - info.r=&r; - info.key_var_name=¶ms->as_string(0, "key-var name must be string"); - info.value_var_name=¶ms->as_string(1, "value-var name must be string"); - info.body_code=¶ms->as_junction(2, "body must be code"); - info.delim_maybe_code=params->count()>3?params->get(3):0; - info.vkey=new VString; - - VHash& self=GET_SELF(r, VHash); - HashStringValue& hash=self.hash(); +static void _foreach(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + const String& key_var_name=params->as_string(0, "key-var name must be string"); + const String& value_var_name=params->as_string(1, "value-var name must be string"); + Value& body_code=params->as_junction(2, "body must be code"); + Value *delim_maybe_code=params->size()>3?¶ms->get(3):0; + + Foreach_info info={ + &r, + &key_var_name, &value_var_name, + &body_code, + delim_maybe_code, + + new(pool) VString(pool), + false + }; + VHash& self=*static_cast(r.get_self()); + Hash& hash=self.hash(&method_name); VHash_lock lock(self); hash.for_each(one_foreach_cycle, &info); } // constructor -MHash::MHash(): Methoded("hash") +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 @@ -353,3 +404,13 @@ MHash::MHash(): Methoded("hash") // ^hash.foreach[key;value]{code}[delim] add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1); } + +// global variable + +Methoded *hash_class; + +// creator + +Methoded *MHash_create(Pool& pool) { + return hash_class=new(pool) MHash(pool); +}