--- parser3/src/include/pa_request.h 2001/03/09 04:47:27 1.21 +++ parser3/src/include/pa_request.h 2001/03/10 13:07:09 1.26 @@ -1,5 +1,5 @@ /* - $Id: pa_request.h,v 1.21 2001/03/09 04:47:27 paf Exp $ + $Id: pa_request.h,v 1.26 2001/03/10 13:07:09 paf Exp $ */ #ifndef PA_REQUEST_H @@ -15,7 +15,9 @@ #define MAIN_METHOD_NAME "main" #define RUN_NAME "RUN" + #define ROOT_NAME "ROOT" +#define ENV_NAME "ENV" #ifndef NO_STRING_ORIGIN # define COMPILE_PARAMS char *source, String *name, char *file @@ -40,9 +42,24 @@ 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 + + void write(Value& avalue) { + // appending possible string, assigning untaint language + wcontext->write(avalue, lang); + } + public: + + // default base + VClass root_class; + // $ENV:fields here + VClass env_class; - VClass root_class; // default base + // contexts + Value *self, *root, *rcontext; + WContext *wcontext; private: // core data @@ -53,17 +70,6 @@ private: // core data // execution stack Stack stack; -public: - - void use(char *file, String *alias); // core.C - Value& autocalc(Value& value, bool make_string=true); // execute.C - -public: - - // contexts - Value *self, *root, *rcontext; - WContext *wcontext; - private: // core.C char *execute_MAIN(); @@ -78,9 +84,13 @@ private: // execute.C Value *get_element(); -}; +private: // lang&raw + + String::Untaint_lang lang; -// core func -void core(); +private: // lang&raw manipulation + + // TODO +}; #endif