--- parser3/src/classes/hashfile.C 2009/07/29 05:01:33 1.50 +++ parser3/src/classes/hashfile.C 2013/10/17 22:26:10 1.55 @@ -1,12 +1,10 @@ /** @file Parser: @b hashfile parser class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT="$Id: hashfile.C,v 1.50 2009/07/29 05:01:33 misha Exp $"; - #include "classes.h" #include "pa_request.h" @@ -14,16 +12,15 @@ static const char * const IDENT="$Id: ha #include "pa_vhashfile.h" #include "pa_vhash.h" +volatile const char * IDENT_HASHFILE_C="$Id: hashfile.C,v 1.55 2013/10/17 22:26:10 moko Exp $"; + // class class MHashfile : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& apool, HashStringValue*) { return new VHashfile(apool); } - + Value *create_new_value(Pool& apool) { return new VHashfile(apool); } public: MHashfile(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -96,17 +93,17 @@ struct Foreach_info { }; #endif static bool one_foreach_cycle( - const String::Body key, - const String& value, - void* ainfo) { + const String::Body key, + const String& value, + void* ainfo) { Foreach_info& info=*static_cast(ainfo); if(info.key_var_name){ VString* vkey=new VString(*new String(key, String::L_TAINTED)); - info.var_context->put_element(*info.var_context, *info.key_var_name, vkey, false); + info.r->put_element(*info.var_context, *info.key_var_name, vkey); } if(info.value_var_name){ VString* vvalue=new VString(value); - info.var_context->put_element(*info.var_context, *info.value_var_name, vvalue, false); + info.r->put_element(*info.var_context, *info.value_var_name, vvalue); } StringOrValue sv_processed=info.r->process(*info.body_code);