--- parser3/src/include/pa_request.h 2002/02/08 08:30:13 1.121 +++ parser3/src/include/pa_request.h 2002/03/27 13:33:32 1.124 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_request.h,v 1.121 2002/02/08 08:30:13 paf Exp $ + $Id: pa_request.h,v 1.124 2002/03/27 13:33:32 paf Exp $ */ #ifndef PA_REQUEST_H @@ -142,8 +142,11 @@ public: } /// appending sure value, that would be converted to clean string void write_no_lang(Value& avalue) { - wcontext->write(avalue, - String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); + if(wcontext->get_in_expression()) + wcontext->write(avalue); + else + wcontext->write(avalue, + String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); } /// appending sure value, not VString void write_expr_result(Value& avalue) { @@ -193,10 +196,16 @@ public: /// $cookie:elements VCookie cookie; + //@{ request processing status + /// execution stack + Stack stack; /// contexts Value *self, *root, *rcontext; /// contexts WContext *wcontext; + /// exception stack trace + Stack exception_trace; + //@} /// 'MAIN' class conglomerat VStateless_class *main_class; @@ -212,17 +221,11 @@ private: // core data /// already used files to avoid cyclic uses Hash used_files; - /// execution stack - Stack stack; - /** endless execute(execute(... preventing counter @see ANTI_ENDLESS_EXECUTE_RECOURSION */ uint anti_endless_execute_recoursion; - /// stack trace - Stack trace; - private: // compile.C VStateless_class& real_compile(COMPILE_PARAMS);