--- parser3/src/classes/hashfile.C 2003/11/20 16:34:23 1.32 +++ parser3/src/classes/hashfile.C 2005/07/28 11:23:01 1.34 @@ -1,12 +1,12 @@ /** @file Parser: @b hashfile parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT="$Id: hashfile.C,v 1.32 2003/11/20 16:34:23 paf Exp $"; +static const char * const IDENT="$Id: hashfile.C,v 1.34 2005/07/28 11:23:01 paf Exp $"; #include "classes.h" @@ -19,7 +19,7 @@ static const char * const IDENT="$Id: ha class MHashfile : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& apool) { return new VHashfile(apool); } + Value *create_new_value(Pool& apool, HashStringValue&) { return new VHashfile(apool); } public: MHashfile(); @@ -84,8 +84,8 @@ static void one_foreach_cycle(const Stri Foreach_info& info=*static_cast(ainfo); info.vkey->set_string(*new String(key, String::L_TAINTED)); info.vvalue->set_string(value); - info.var_context->put_element(*info.key_var_name, info.vkey, false); - info.var_context->put_element(*info.value_var_name, info.vvalue, false); + info.var_context->put_element(*info.var_context, *info.key_var_name, info.vkey, false); + info.var_context->put_element(*info.var_context, *info.value_var_name, info.vvalue, false); StringOrValue sv_processed=info.r->process(*info.body_code); const String* s_processed=sv_processed.get_string();