--- parser3/src/include/pa_request.h 2003/04/02 14:16:17 1.160.2.37.2.16 +++ parser3/src/include/pa_request.h 2003/04/02 16:05:19 1.160.2.37.2.17 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/04/02 14:16:17 $"; +static const char* IDENT_REQUEST_H="$Date: 2003/04/02 16:05:19 $"; #include "pa_hash.h" #include "pa_wcontext.h" @@ -45,25 +45,7 @@ class Request: public PA_Object { friend class Request_context_saver; friend class Temp_request_self; - ///@{ core data - - /// classes - HashStringValue fclasses; - - /// already used files to avoid cyclic uses - Hash used_files; - /// list of all used files, Operation::file_no = index to it - Array file_list; - - /** endless execute(execute(... preventing counter - @see ANTI_ENDLESS_EXECUTE_RECOURSION - */ - uint anti_endless_execute_recoursion; - - ///@} - union StackItem { - private: Value* fvalue; ArrayOperation* fops; VMethodFrame* fmethod_frame; @@ -84,14 +66,42 @@ class Request: public PA_Object { StackItem(VMethodFrame& amethod_frame): fmethod_frame(&amethod_frame) {} }; + class Trace { + const String* fname; + Operation::Info forigin; + public: + Trace(const String* aname, Operation::Info aorigin): + fname(aname), forigin(aorigin) {} + + const String* name() { return fname; } + Operation::Info origin() { return forigin; } + }; + + ///@{ core data + + /// classes + HashStringValue fclasses; + + /// already used files to avoid cyclic uses + Hash used_files; + /// list of all used files, Operation::file_no = index to it + Array file_list; + + /** endless execute(execute(... preventing counter + @see ANTI_ENDLESS_EXECUTE_RECOURSION + */ + uint anti_endless_execute_recoursion; + + ///@} + /// execution stack Stack stack; + /// exception stack trace + Stack exception_trace; public: //@{ request processing status - /// exception stack trace - //Stack exception_trace; /// contexts VMethodFrame* method_frame; Value* rcontext; @@ -321,7 +331,7 @@ private: // execute.C /// for @main[] const String* execute_virtual_method(Value& aself, const String& method_name); - Value& get_element(bool can_call_operator); + Value& get_element(Value& ncontext, const String& name, bool can_call_operator); private: // defaults