--- parser3/src/classes/hash.C 2004/06/22 14:12:57 1.71 +++ parser3/src/classes/hash.C 2008/05/14 10:19:04 1.83 @@ -1,11 +1,11 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HASH_C="$Date: 2004/06/22 14:12:57 $"; +static const char * const IDENT_HASH_C="$Date: 2008/05/14 10:19:04 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C=" class MHash: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VHash(); } + Value* create_new_value(Pool&, HashStringValue&) { return new VHash(); } public: MHash(); @@ -34,6 +34,10 @@ public: // Methoded DECLARE_CLASS_VAR(hash, new MHash, 0); +// externs + +extern String cycle_data_name; + // methods #ifndef DOXYGEN @@ -69,7 +73,7 @@ public: } bool before_rows(SQL_Error& error) { if(columns.count()<1) { - error=SQL_Error("parser.runtime", "no columns"); + error=SQL_Error(PARSER_RUNTIME, "no columns"); return true; } only_one_column=columns.count()==1; @@ -96,7 +100,7 @@ public: row_hash->put(*columns[column_index], new VString(cell)); if(duplicate & !distinct) { - error=SQL_Error("parser.runtime", "duplicate key"); + error=SQL_Error(PARSER_RUNTIME, "duplicate key"); return true; } @@ -113,30 +117,30 @@ VBool Hash_sql_event_handlers::only_one_ #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& vsrc=params.as_no_junction(0, "param must be hash"); if(HashStringValue* src=vsrc.get_hash()) { - HashStringValue* self=&(GET_SELF(r, VHash).hash()); - if(src==self) // same: doing nothing + VHash& self=GET_SELF(r, VHash); + HashStringValue* self_hash=&(self.hash()); + if(src==self_hash) // same: doing nothing return; - src->for_each(copy_all_overwrite_to, self); + src->for_each(copy_all_overwrite_to, self_hash); + + if(VHash* vhash_src=static_cast(vsrc.as(VHASH_TYPE, false))) + { + if(Value* vdefault=vhash_src->get_default()) + { + if(vdefault->is_defined()) + { + self.set_default(vdefault); + } + } + } } } } -static void remove_key_from( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - HashStringValue* dest) { - dest->remove(key); -} static void _sub(Request& r, MethodParams& params) { Value& vsrc=params.as_no_junction(0, "param must be hash"); if(HashStringValue* src=vsrc.get_hash()) { @@ -145,7 +149,7 @@ static void _sub(Request& r, MethodParam self->clear(); return; } - src->for_each(remove_key_from, self); + src->for_each(remove_key_from, self); } } @@ -161,7 +165,7 @@ static void _union(Request& r, MethodPar // dest += b Value& vsrc=params.as_no_junction(0, "param must be hash"); if(HashStringValue* src=vsrc.get_hash()) - src->for_each(copy_all_dontoverwrite_to, result.get_hash()); + src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result r.write_no_lang(result); @@ -186,7 +190,7 @@ static void _intersection(Request& r, Me 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); + GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); } // return result @@ -205,7 +209,7 @@ static void _intersects(Request& r, Meth 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; + result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; // return result r.write_no_lang(*new VBool(result)); @@ -217,6 +221,8 @@ extern String sql_limit_name; extern String sql_offset_name; extern String sql_default_name; extern String sql_distinct_name; +extern String sql_value_type_name; +extern Table2hash_value_type get_value_type(Value& vvalue_type); extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); @@ -227,9 +233,10 @@ static void _sql(Request& r, MethodParam ulong limit=0; ulong offset=0; bool distinct=false; + Table2hash_value_type value_type=C_HASH; if(params.count()>1) { Value& voptions=params.as_no_junction(1, "options must be hash, not code"); - if(!voptions.is_string()) + if(voptions.is_defined() && !voptions.is_string()) if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; if(Value* vbind=options->get(sql_bind_name)) { @@ -248,12 +255,16 @@ static void _sql(Request& r, MethodParam valid_options++; distinct=r.process_to_value(*vdistinct).as_bool(); } + if(Value* vvalue_type=options->get(sql_value_type_name)) { + valid_options++; + value_type=get_value_type(r.process_to_value(*vvalue_type)); + } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } @@ -275,7 +286,7 @@ static void _sql(Request& r, MethodParam hash); r.connection()->query( statement_cstr, - 0, 0, + placeholders_count, placeholders, offset, limit, handlers, statement_string); @@ -295,7 +306,7 @@ static void keys_collector( static void _keys(Request& r, MethodParams& params) { const String* keys_column_name; if(params.count()>0) - keys_column_name=¶ms.as_string(0, "column name must be string"); + keys_column_name=¶ms.as_string(0, COLUMN_NAME_MUST_BE_STRING); else keys_column_name=new String("key"); @@ -303,7 +314,7 @@ static void _keys(Request& r, MethodPara *columns+=keys_column_name; Table* table=new Table(columns); - GET_SELF(r, VHash).hash().for_each(keys_collector, table); + GET_SELF(r, VHash).hash().for_each(keys_collector, table); r.write_no_lang(*new VTable(table)); } @@ -317,6 +328,12 @@ static void _delete(Request& r, MethodPa GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); } +static void _contains(Request& r, MethodParams& params) { + + bool result = GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); + r.write_no_lang(*new VBool(result)); +} + #ifndef DOXYGEN struct Foreach_info { Request *r; @@ -329,25 +346,34 @@ struct Foreach_info { bool need_delim; }; #endif -static void one_foreach_cycle( +static bool 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); + ncontext.put_element(ncontext, *info->key_var_name, info->vkey, false); + ncontext.put_element(ncontext, *info->value_var_name, avalue, false); StringOrValue sv_processed=info->r->process(*info->body_code); + Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING); + 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; + else + info->need_delim=true; } + info->r->write_pass_lang(sv_processed); + + return lskip==Request::SKIP_BREAK; } static void _foreach(Request& r, MethodParams& params) { + Temp_hash_value + cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + Foreach_info info={ &r, ¶ms.as_string(0, "key-var name must be string"), @@ -361,7 +387,7 @@ static void _foreach(Request& r, MethodP VHash& self=GET_SELF(r, VHash); HashStringValue& hash=self.hash(); VHash_lock lock(self); - hash.for_each(one_foreach_cycle, &info); + hash.first_that(one_foreach_cycle, &info); } // constructor @@ -384,7 +410,12 @@ MHash::MHash(): Methoded("hash") // ^a.delete[key] add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1); - // ^hash:sql[query][options hash] + // ^a.contains[key] + add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); + // backward + add_native_method("contain", Method::CT_DYNAMIC, _contains, 1, 1); + + // ^hash::sql[query][options hash] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); // ^hash._keys[[column name]]