--- parser3/src/classes/Attic/root.C 2001/03/18 17:24:54 1.45 +++ parser3/src/classes/Attic/root.C 2001/03/26 10:36:52 1.50 @@ -3,16 +3,16 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: root.C,v 1.45 2001/03/18 17:24:54 paf Exp $ + $Id: root.C,v 1.50 2001/03/26 10:36:52 paf Exp $ */ -#include +#include "pa_config_includes.h" #include +#include "pa_common.h" #include "pa_request.h" #include "_root.h" #include "pa_vint.h" -#include "pa_common.h" static void _if(Request& r, const String& method_name, Array *params) { Value& condition_code=*static_cast(params->get(0)); @@ -74,7 +74,7 @@ static void _taint(Request& r, const Str method_name, "body must not be junction"); // set temporarily as-is language - Temp_lang temp_lang(r, String::Untaint_lang::AS_IS); + Temp_lang temp_lang(r, String::UL_AS_IS); String result(r.pool()); result.append( r.process(*vbody).as_string(), // process marking tainted with that lang @@ -99,7 +99,9 @@ static void _process(Request& r, const S VStateless_class& self_class=*r.self->get_class(); { // temporary zero @main so to maybe-replace it in processed code - Temp_method temp_method(self_class, *main_method_name, 0); + Temp_method temp_method_main(self_class, *main_method_name, 0); + // temporary zero @auto so it wouldn't be auto-called in Request::use_buf + Temp_method temp_method_auto(self_class, *auto_method_name, 0); // evaluate source to process const String& source= @@ -161,8 +163,7 @@ static void _use(Request& r, const Strin r.fail_if_junction_(true, vfile, method_name, "file name must not be junction"); - char *file=vfile.as_string().cstr(); - r.use_file(r.absolute(file)); + r.use_file(r.absolute(vfile.as_string())); } static void _for(Request& r, const String& method_name, Array *params) {