--- parser3/src/include/pa_request.h 2001/03/10 13:07:09 1.26 +++ parser3/src/include/pa_request.h 2001/03/11 08:02:05 1.35 @@ -1,5 +1,9 @@ /* - $Id: pa_request.h,v 1.26 2001/03/10 13:07:09 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan + + $Id: pa_request.h,v 1.35 2001/03/11 08:02:05 paf Exp $ */ #ifndef PA_REQUEST_H @@ -14,17 +18,18 @@ #include "pa_vclass.h" #define MAIN_METHOD_NAME "main" -#define RUN_NAME "RUN" +#define AUTO_METHOD_NAME "auto" +#define MAIN_CLASS_NAME "MAIN" -#define ROOT_NAME "ROOT" -#define ENV_NAME "ENV" +#define ROOT_CLASS_NAME "ROOT" +#define ENV_CLASS_NAME "ENV" #ifndef NO_STRING_ORIGIN -# define COMPILE_PARAMS char *source, String *name, char *file -# define COMPILE(source, name, file) real_compile(source, name, file) +# define COMPILE_PARAMS char *source, String *name, VClass *base_class, char *file +# define COMPILE(source, name, base_class, file) real_compile(source, name, base_class, file) #else -# define COMPILE_PARAMS char *source, String *name -# define COMPILE(source, name, file) real_compile(source, name) +# define COMPILE_PARAMS char *source, String *name, VClass *base_class +# define COMPILE(source, name, base_class, file) real_compile(source, name, base_class) #endif class Local_request_exception; @@ -42,8 +47,18 @@ public: // core request processing void core(); - void use(char *file, String *alias); // core.C - Value& autocalc(Value& value, const String *name=0, bool make_string=true); // execute.C + VClass *use(char *file, + String *name=0, + VClass *base_class=0, + bool fail_on_read_problem=true); // core.C + Value& autocalc( + Value& value, + const String *name=0, + bool make_string=true); // execute.C + + void write(const String& astring) { + wcontext->write(astring, String::Untaint_lang::NO); // write(const) = clean + } void write(Value& avalue) { // appending possible string, assigning untaint language @@ -80,6 +95,7 @@ private: // compile.C private: // execute.C + char *execute_static_method(VClass& vclass, String& method_name, bool return_cstr); void execute(const Array& ops); Value *get_element();