--- parser3/src/include/pa_request.h 2009/07/29 05:01:46 1.196 +++ parser3/src/include/pa_request.h 2010/08/30 10:49:05 1.204 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char * const IDENT_REQUEST_H="$Date: 2009/07/29 05:01:46 $"; +static const char * const IDENT_REQUEST_H="$Date: 2010/08/30 10:49:05 $"; #include "pa_pool.h" #include "pa_hash.h" @@ -122,6 +122,7 @@ private: /// already used files to avoid cyclic uses HashString used_files; + HashString searched_along_class_path; /// list of all used files, Operation::file_no = index to it Array file_list; @@ -189,6 +190,7 @@ public: /// global classes HashString& classes() { return fclasses; } + Value* get_class(const String& name); /** core request processing @@ -204,7 +206,8 @@ public: void execute(ArrayOperation& ops); // execute.C void op_call(VMethodFrame &frame); void op_call_write(VMethodFrame &frame); - void op_call(VMethodFrame &frame, bool constructing); + Value& construct(Value &class_value, const Method &method); + /// execute ops with anti-recoursion check void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) { // anti_endless_execute_recoursion @@ -218,21 +221,26 @@ public: anti_endless_execute_recoursion--; } + /// + void use_file_directly(VStateless_class& aclass, + const String& file_spec, + bool fail_on_read_problem=true, + bool fail_on_file_absence=true); + /// compiles the file, maybe forcing it's class @a name and @a base_class. void use_file(VStateless_class& aclass, - const String& file_name, - const String* main_alias=0, - bool ignore_class_path=false, - bool fail_on_read_problem=true, - bool fail_on_file_absence=true); // pa_request.C + const String& file_name, + const String* use_filespec); + /// compiles a @a source buffer void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, - int line_no_offset=0); // pa_request.C + int line_no_offset=0); /// processes any code-junction there may be inside of @a value + StringOrValue process_getter(Junction& junction); // execute.C StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C void process_write(Value& input_value); // execute.C //@{ convinient helpers @@ -243,7 +251,8 @@ public: return process(input_value, intercept_string).as_value(); } //@} - + const String* get_method_filename(const Method* method); // execute.C + const String* get_used_filename(uint file_no); #define DEFINE_DUAL(modification) \ void write_##modification##_lang(StringOrValue dual) { \ @@ -359,8 +368,9 @@ public: // status read methods /// for @main[] const String* execute_virtual_method(Value& aself, const String& method_name); - /// for @postprocess[body] - StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); + /// executes parser method, use op_call(frame) to execute native method + void execute_method(VMethodFrame& aframe); + //{ for @conf[filespec] and @auto[filespec] and parser://method/call const String* execute_method(Value& aself, const Method& method, Value* optional_param, @@ -529,12 +539,6 @@ public: // defines for externs -#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding" -#define CONTENT_DISPOSITION_NAME "content-disposition" -#define CONTENT_DISPOSITION_ATTACHMENT "attachment" -#define CONTENT_DISPOSITION_INLINE "inline" -#define CONTENT_DISPOSITION_FILENAME_NAME "filename" - #define EXCEPTION_HANDLED_PART_NAME "handled" @@ -544,12 +548,6 @@ extern const String main_method_name; extern const String auto_method_name; extern const String body_name; -extern const String content_transfer_encoding_name; -extern const String content_disposition_name; -extern const String content_disposition_attachment; -extern const String content_disposition_inline; -extern const String content_disposition_filename_name; - extern const String exception_type_part_name; extern const String exception_source_part_name; extern const String exception_comment_part_name;