--- parser3/src/include/pa_request.h 2001/02/25 08:50:12 1.13 +++ parser3/src/include/pa_request.h 2001/03/08 13:42:31 1.19 @@ -1,5 +1,5 @@ /* - $Id: pa_request.h,v 1.13 2001/02/25 08:50:12 paf Exp $ + $Id: pa_request.h,v 1.19 2001/03/08 13:42:31 paf Exp $ */ #ifndef PA_REQUEST_H @@ -14,14 +14,15 @@ #include "pa_vclass.h" #define MAIN_METHOD_NAME "main" -#define NAME_RUN "RUN" +#define RUN_NAME "RUN" +#define ROOT_NAME "ROOT" #ifndef NO_STRING_ORIGIN -# define COMPILE_PARAMS char *source, char *file -# define COMPILE(source, file) real_compile(source, file) +# define COMPILE_PARAMS char *source, String *name, char *file +# define COMPILE(source, name, file) real_compile(source, name, file) #else -# define COMPILE_PARAMS char *source -# define COMPILE(source, file) real_compile(source) +# define COMPILE_PARAMS char *source, String *name +# define COMPILE(source, name, file) real_compile(source, name) #endif class Local_request_exception; @@ -29,12 +30,7 @@ class Local_request_exception; class Request : public Pooled { public: - Request(Pool& apool) : Pooled(apool), - stack(apool), - fclasses(apool), - fclasses_array(apool) - { - } + Request(Pool& apool); ~Request() {} // global classes @@ -44,6 +40,10 @@ public: // core request processing void core(); +public: + + VClass root_class; // default base + private: // core data // classes @@ -57,9 +57,11 @@ private: // core data // execution stack Stack stack; -public: // core.C +public: - void use(char *file, String *name); + void use(char *file, String *alias); // core.C + Value& autocalc(Value& value, bool make_string); // execute.C + void write(Value& avalue); // execute.C private: // core.C