--- parser3/src/classes/hash.C 2003/03/24 09:54:41 1.54.2.13.2.9 +++ parser3/src/classes/hash.C 2003/11/06 11:13:24 1.59 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_HASH_C="$Date: 2003/03/24 09:54:41 $"; +static const char* IDENT_HASH_C="$Date: 2003/11/06 11:13:24 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -55,9 +55,9 @@ public: row_hash(0), column_index(0) { } - bool add_column(SQL_Error& error, void *ptr, size_t size) { + bool add_column(SQL_Error& error, const char* str, size_t length) { try { - columns+=new String((const char* )ptr, size, true); + columns+=new String(str, length, true); return false; } catch(...) { error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); @@ -78,11 +78,11 @@ public: column_index=0; return false; } - bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) { try { String& cell=*new String; - if(size) - cell.append((const char* )ptr, size, String::L_TAINTED); + if(length) + cell.append_know_length(ptr, length, String::L_TAINTED); if(column_index==0) { VHash* row_vhash=new VHash; row_hash=&row_vhash->hash(); @@ -113,9 +113,9 @@ static void copy_all_overwrite_to( 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"); +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())); } @@ -127,8 +127,8 @@ static void remove_key_from( HashStringValue* dest) { dest->remove(key); } -static void _sub(Request& r, MethodParams* params) { - Value& vb=params->as_no_junction(0, "param must be hash"); +static void _sub(Request& r, MethodParams& params) { + 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()); } @@ -139,11 +139,11 @@ static void copy_all_dontoverwrite_to( HashStringValue* dest) { dest->put_dont_replace(key, value); } -static void _union(Request& r, MethodParams* params) { +static void _union(Request& r, MethodParams& params) { // dest = copy of self Value& result=*new VHash(GET_SELF(r, VHash).hash()); // dest += b - Value& vb=params->as_no_junction(0, "param must be hash"); + 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()); @@ -164,10 +164,10 @@ static void copy_intersection_to( if(info->b->get(key)) info->dest->put_dont_replace(key, value); } -static void _intersection(Request& r, MethodParams* params) { +static void _intersection(Request& r, MethodParams& params) { Value& result=*new VHash; // dest += b - Value& vb=params->as_no_junction(0, "param must be hash"); + 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); @@ -184,10 +184,10 @@ static bool intersects( return b->get(key)!=0; } -static void _intersects(Request& r, MethodParams* params) { +static void _intersects(Request& r, MethodParams& params) { bool result=false; - Value& vb=params->as_no_junction(0, "param must be hash"); + 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; @@ -196,18 +196,18 @@ static void _intersects(Request& r, Meth } -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) { - Value& statement=params->as_junction(0, "statement must be code"); +extern String sql_limit_name; +extern String sql_offset_name; +extern String sql_default_name; +extern String sql_distinct_name; +static void _sql(Request& r, MethodParams& params) { + Value& statement=params.as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; bool distinct=false; - if(params->count()>1) { - Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + if(params.count()>1) { + Value& voptions=params.as_no_junction(1, "options must be hash, not code"); if(!voptions.is_string()) if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; @@ -257,7 +257,7 @@ static void keys_collector( *row+=new String(key, String::L_TAINTED); *table+=row; } -static void _keys(Request& r, MethodParams* ) { +static void _keys(Request& r, MethodParams&) { Table::columns_type columns(new ArrayString); *columns+=new String("key"); Table* table=new Table(columns); @@ -267,13 +267,13 @@ static void _keys(Request& r, MethodPara r.write_no_lang(*new VTable(table)); } -static void _count(Request& r, MethodParams* ) { +static void _count(Request& r, MethodParams&) { r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash().count())); } -static void _delete(Request& r, MethodParams* params) { +static void _delete(Request& r, MethodParams& params) { - GET_SELF(r, VHash).hash().remove(params->as_string(0, "key must be string")); + GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); } #ifndef DOXYGEN @@ -306,13 +306,13 @@ static void one_foreach_cycle( } info->r->write_pass_lang(sv_processed); } -static void _foreach(Request& r, MethodParams* params) { - Foreach_info info; +static void _foreach(Request& r, MethodParams& params) { + Foreach_info info={0}; 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.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);