--- parser3/src/include/pa_request.h 2009/04/29 03:26:38 1.190 +++ parser3/src/include/pa_request.h 2009/05/04 09:26:08 1.192 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char * const IDENT_REQUEST_H="$Date: 2009/04/29 03:26:38 $"; +static const char * const IDENT_REQUEST_H="$Date: 2009/05/04 09:26:08 $"; #include "pa_pool.h" #include "pa_hash.h" @@ -105,11 +105,11 @@ private: element_type bottom_value() { return get(bottom_index()); } void clear() { - ftop=fbottom=0; + fused=fbottom=0; } bool is_empty() { - return ftop==fbottom; + return fused==fbottom; } const element_type extract_origin(const String*& problem_source); @@ -201,7 +201,8 @@ public: /// executes ops void execute(ArrayOperation& ops); // execute.C - WContext* op_call(VMethodFrame& frame); + void op_call(VMethodFrame &frame); + void op_call_write(VMethodFrame &frame); /// execute ops with anti-recoursion check void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) { // anti_endless_execute_recoursion @@ -231,6 +232,7 @@ public: /// processes any code-junction there may be inside of @a value StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C + void process_write(Value& input_value); // execute.C //@{ convinient helpers const String& process_to_string(Value& input_value) { return process(input_value, true/*intercept_string*/).as_string(); @@ -400,7 +402,7 @@ private: // compile.C private: // execute.C void put_element(Value& ncontext, const String& name, Value* value); - Value& get_element(Value& ncontext, const String& name, bool can_call_operator); + Value& get_element(Value& ncontext, const String& name); private: // defaults