--- parser3/src/classes/hash.C 2001/10/11 12:43:28 1.22 +++ parser3/src/classes/hash.C 2001/11/01 14:59:57 1.26 @@ -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.22 2001/10/11 12:43:28 parser Exp $ + $Id: hash.C,v 1.26 2001/11/01 14:59:57 paf Exp $ */ #include "classes.h" @@ -14,6 +14,7 @@ #include "pa_sql_connection.h" #include "pa_vtable.h" #include "pa_vbool.h" +#include "pa_vmethod_frame.h" // defines @@ -56,7 +57,7 @@ public: } void before_rows() { if(columns.size()<=1) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "column count must be more than 1 to create a hash"); } @@ -71,7 +72,7 @@ public: statement_cstr, row_index++); if(column_index==0) { VHash *row_vhash=new(pool) VHash(pool); - row_hash=row_vhash->get_hash(); + row_hash=row_vhash->get_hash(0); rows_hash.put(*cell, row_vhash); } else row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell)); @@ -100,21 +101,21 @@ static void _create_or_add(Request& r, c if(params->size()) { Value& vb=params->as_no_junction(0, "param must be hash"); - if(Hash *b=vb.get_hash()) + if(Hash *b=vb.get_hash(&method_name)) b->for_each(copy_all_overwrite_to, &static_cast(r.self)->hash()); } } static void remove_key_from(const Hash::Key& key, Hash::Val *value, void *info) { Hash& dest=*static_cast(info); - dest.put(key, 0); + dest.remove(key); } 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(Hash *b=vb.get_hash()) + if(Hash *b=vb.get_hash(&method_name)) b->for_each(remove_key_from, &static_cast(r.self)->hash()); } @@ -130,7 +131,7 @@ static void _union(Request& r, const Str Hash& dest=*new(pool) Hash(static_cast(r.self)->hash()); // dest += b Value& vb=params->as_no_junction(0, "param must be hash"); - if(Hash *b=vb.get_hash()) + if(Hash *b=vb.get_hash(&method_name)) b->for_each(copy_all_dontoverwrite_to, &dest); // return result @@ -160,7 +161,7 @@ static void _intersection(Request& r, co Hash& dest=*new(pool) Hash(pool); // dest += b Value& vb=params->as_no_junction(0, "param must be hash"); - if(Hash *b=vb.get_hash()) { + if(Hash *b=vb.get_hash(&method_name)) { Copy_intersection_to_info info={ b, &dest @@ -187,7 +188,7 @@ static void _intersects(Request& r, cons Hash& dest=*new(pool) Hash(pool); // dest += b Value& vb=params->as_no_junction(0, "param must be hash"); - if(Hash *b=vb.get_hash()) + if(Hash *b=vb.get_hash(&method_name)) yes=static_cast(r.self)->hash().first_that(intersects, b)!=0; // return result @@ -201,7 +202,7 @@ static void _sql(Request& r, const Strin Pool& pool=r.pool(); if(!r.connection) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "without connect"); @@ -227,20 +228,10 @@ static void _sql(Request& r, const Strin hash.clear(); Hash_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr, hash); - bool need_rethrow=false; Exception rethrow_me; - PTRY { - r.connection->query( - statement_cstr, offset, limit, - handlers); - } - PCATCH(e) { // query problem - rethrow_me=e; need_rethrow=true; - } - PEND_CATCH - if(need_rethrow) - PTHROW(rethrow_me.type(), rethrow_me.code(), - &statement_string, // setting more specific source [were url] - rethrow_me.comment()); + + r.connection->query( + statement_cstr, offset, limit, + handlers); } static void keys_collector(const Hash::Key& key, Hash::Val *value, void *info) { @@ -273,6 +264,63 @@ static void _count(Request& r, const Str r.write_no_lang(result); } +static void _delete(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + static_cast(r.self)->hash().remove(params->as_string(0, "key must be string")); +} + +#ifndef DOXYGEN +struct Foreach_info { + Request *r; + const String* key_var_name; + const String* value_var_name; + Value *body_code; + Value *delim_maybe_code; + + Value *var_context; + VString *vkey; + bool need_delim; +}; +#endif + +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); + i.var_context->put_element(*i.key_var_name, i.vkey); + i.var_context->put_element(*i.value_var_name, static_cast(avalue)); + + Value& processed_body=i.r->process(*i.body_code); + if(i.delim_maybe_code) { // delimiter set? + const String *string=processed_body.get_string(); + if(i.need_delim && string && string->size()) // need delim & iteration produced string? + i.r->write_pass_lang(i.r->process(*i.delim_maybe_code)); + i.need_delim=true; + } + i.r->write_pass_lang(processed_body); +} +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, + + body_code.get_junction()->wcontext, + new(pool) VString(pool), + false + }; + static_cast(r.self)->hash().for_each(one_foreach_cycle, &info); +} + // constructor MHash::MHash(Pool& apool) : Methoded(apool) { @@ -291,6 +339,9 @@ MHash::MHash(Pool& apool) : Methoded(apo // ^a.intersects[b] = bool add_native_method("intersects", Method::CT_DYNAMIC, _intersects, 1, 1); + // ^a.delete[key] + add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1); + // ^hash:sql[query][(count[;offset])] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3); @@ -299,6 +350,12 @@ MHash::MHash(Pool& apool) : Methoded(apo // ^hash._count[] add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0); + + // ^hash.foreach[key;value]{code}[delim] + Array *for_each_locals=NEW Array(pool(), 2); + *for_each_locals += NEW String(pool(), "key"); + + add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1); } // global variable