--- parser3/src/main/pa_request.C 2003/02/17 16:44:57 1.245.2.24 +++ parser3/src/main/pa_request.C 2003/03/03 13:44:26 1.245.2.28 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/02/17 16:44:57 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/03/03 13:44:26 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -16,6 +16,9 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vint.h" #include "pa_vmethod_frame.h" #include "pa_types.h" +#include "pa_venv.h" +#include "pa_vstatus.h" +#include "pa_vrequest.h" #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" @@ -79,7 +82,7 @@ VHashPtr exception2vhash(Pool& pool, con // Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, - uchar adefault_lang, bool status_allowed): + String_UL adefault_lang, bool status_allowed): // private fpool(apool), anti_endless_execute_recoursion(0), @@ -130,7 +133,7 @@ Request::Request(Pool& apool, SAPI_Info& /// methodless // env class classes().put(StringPtr(new String(ENV_CLASS_NAME)), - ValuePtr(new VEnv(asapi_info))); + ValuePtr(new VEnv(pool(), asapi_info))); // status class if(status_allowed) classes().put(StringPtr(new String(STATUS_CLASS_NAME)), @@ -425,7 +428,7 @@ t[9]-t[3] TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); Array_iterator tracei(exception_trace); while(tracei.has_next()) { - Table::element_type row; + Table::element_type row(new ArrayString); StringPtr name=tracei.next(); *row+=name; // name column @@ -433,9 +436,9 @@ t[9]-t[3] const String_fragment::Origin& origin=name->origin(); if(origin.file) { *row+=StringPtr(new String(origin.file, 0, true)); // file column - char *buf=(char *)malloc(MAX_NUMBER); - size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); - *row+=StringPtr(new String(buf, buf_size, true)); // line column + *row+=StringPtr(new String( + pool().format_integer(1+origin.line), + 0, true)); // line column } #endif *stack_trace+=row; @@ -453,7 +456,7 @@ t[9]-t[3] // doing that ugly // make up result: $origin $source $comment $type $code - char *buf=(char *)malloc(MAX_STRING); + char *buf=new(pool()) char[MAX_STRING]; size_t printed=0; if(StringPtr problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN @@ -554,12 +557,11 @@ VStateless_classPtr Request::use_buf(VSt // locate and execute possible @conf[] static VStringPtr vfilespec(new VString(filespec)); - const Method *method_called; - execute_nonvirtual_method(cclass, + Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, conf_method_name, vfilespec, - false/*no result needed*/, &method_called); - if(method_called) - configure_admin(cclass, method_called->name); + false/*no string result needed*/); + if(executed.method) + configure_admin(cclass, executed.method->name); // locate and execute possible @auto[] static execute_nonvirtual_method(cclass,