--- parser3/src/include/pa_request.h 2015/10/21 21:45:25 1.220 +++ parser3/src/include/pa_request.h 2016/07/20 17:01:48 1.225 @@ -1,14 +1,14 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.220 2015/10/21 21:45:25 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.225 2016/07/20 17:01:48 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -112,7 +112,7 @@ private: ///@{ core data /// classes - HashString fclasses; + HashString fclasses; /// already used files to avoid cyclic uses HashString used_files; @@ -180,8 +180,9 @@ public: ~Request(); /// global classes - HashString& classes() { return fclasses; } - Value* get_class(const String& name); + HashString& classes() { return fclasses; } + VStateless_class* get_class(const String& name); + void put_class(VStateless_class *aclass){ classes().put(aclass->type(), aclass); } /** core request processing @@ -197,7 +198,7 @@ public: void execute(ArrayOperation& ops); // execute.C void op_call(VMethodFrame &frame); void op_call_write(VMethodFrame &frame); - Value& construct(Value &class_value, const Method &method); + Value& construct(VStateless_class &class_value, const Method &method); /// execute ops with anti-recoursion check void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) {