--- parser3/src/include/pa_request.h 2001/12/14 12:53:47 1.113 +++ parser3/src/include/pa_request.h 2001/12/21 12:47:56 1.116 @@ -4,13 +4,12 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_request.h,v 1.113 2001/12/14 12:53:47 paf Exp $ + $Id: pa_request.h,v 1.116 2001/12/21 12:47:56 paf Exp $ */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#include "pa_config_includes.h" #include "pa_pool.h" #include "pa_hash.h" #include "pa_wcontext.h" @@ -26,7 +25,6 @@ #include "pa_vresponse.h" #include "pa_vcookie.h" #include "pa_sql_driver_manager.h" -#include "pa_transcoder.h" #ifdef RESOURCES_DEBUG #include @@ -51,6 +49,7 @@ class Temp_lang; class Methoded; +class VMethodFrame; /// Main workhorse. class Request : public Pooled { @@ -159,12 +158,6 @@ public: /// returns the mime type of 'user_file_name_cstr' const String& mime_type_of(const char *user_file_name_cstr); - /// transcoder [pcre_tables + byte->unicode & back] - const Transcoder* transcoder(); - - /// pcre_tables [up/low case & co] - const unsigned char *pcre_tables(); - public: /// info from web server @@ -219,9 +212,6 @@ private: // core data */ uint anti_endless_execute_recoursion; - /// charset->transcoder - Hash CTYPE; - /// stack trace Stack trace; @@ -231,12 +221,13 @@ private: // compile.C private: // execute.C - const String *execute_method(Value& aself, - const Method& method, bool return_cstr=true); - const String *execute_virtual_method(Value& aself, - const String& method_name, bool return_cstr=true); + const String *execute_method(Value& aself, const Method& method, + bool return_cstr); + const String& execute_method(VMethodFrame& amethodFrame, const Method& method); + const String *execute_virtual_method(Value& aself, const String& method_name); const String *execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, bool return_cstr=true); + const String& method_name, + bool return_cstr); Value *get_element();