--- parser3/src/classes/table.C 2003/11/04 12:04:39 1.188 +++ parser3/src/classes/table.C 2003/11/20 16:34:23 1.192 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2003/11/04 12:04:39 $"; +static const char * const IDENT_TABLE_C="$Date: 2003/11/20 16:34:23 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -21,7 +21,7 @@ static const char* IDENT_TABLE_C="$Date: class MTable: public Methoded { public: // VStateless_class - Value* create_new_value() { return new VTable(); } + Value* create_new_value(Pool&) { return new VTable(); } public: MTable(); @@ -384,10 +384,10 @@ static void maybe_enclose( String& to, c if(encloser) { to<<*sencloser; // while we have 'encloser'... - for( size_t pos_before, pos_after=0; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; ) { + size_t pos_after=0; + for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before+1) { to<(ainfo); - return info.r->process_to_value(*info.expression_code).as_bool(); +static bool expression_is_true(Table&, Expression_is_true_info* info) { + return info->r->process_to_value(*info->expression_code).as_bool(); } static bool _locate_expression(Table& table, Table::Action_options o, Request& r, MethodParams& params) { @@ -775,7 +774,7 @@ static bool _locate_expression(Table& ta return table.table_first_that(expression_is_true, &info, o); } static bool _locate_name_value(Table& table, Table::Action_options o, - Request& r, MethodParams& params) { + Request&, MethodParams& params) { check_option_param(o.defined, params, 2, "locate by locate by name has parameters: name, value and, maybe, options"); const String& name=params.as_string(0, "column name must be string"); @@ -794,7 +793,7 @@ static void _locate(Request& r, MethodPa } -static void _flip(Request& r, MethodParams& params) { +static void _flip(Request& r, MethodParams&) { Table& old_table=GET_SELF(r, VTable).table(); Table& new_table=*new Table(0); if(size_t old_count=old_table.count())