|
|
| version 1.245.2.24, 2003/02/17 16:44:57 | version 1.245.2.27, 2003/02/21 11:13:01 |
|---|---|
| Line 16 static const char* IDENT_REQUEST_C="$Dat | Line 16 static const char* IDENT_REQUEST_C="$Dat |
| #include "pa_vint.h" | #include "pa_vint.h" |
| #include "pa_vmethod_frame.h" | #include "pa_vmethod_frame.h" |
| #include "pa_types.h" | #include "pa_types.h" |
| #include "pa_venv.h" | |
| #include "pa_vstatus.h" | |
| #include "pa_vrequest.h" | |
| #include "pa_vtable.h" | #include "pa_vtable.h" |
| #include "pa_vfile.h" | #include "pa_vfile.h" |
| #include "pa_dictionary.h" | #include "pa_dictionary.h" |
| Line 130 Request::Request(Pool& apool, SAPI_Info& | Line 133 Request::Request(Pool& apool, SAPI_Info& |
| /// methodless | /// methodless |
| // env class | // env class |
| classes().put(StringPtr(new String(ENV_CLASS_NAME)), | classes().put(StringPtr(new String(ENV_CLASS_NAME)), |
| ValuePtr(new VEnv(asapi_info))); | ValuePtr(new VEnv(pool(), asapi_info))); |
| // status class | // status class |
| if(status_allowed) | if(status_allowed) |
| classes().put(StringPtr(new String(STATUS_CLASS_NAME)), | classes().put(StringPtr(new String(STATUS_CLASS_NAME)), |
| Line 425 t[9]-t[3] | Line 428 t[9]-t[3] |
| TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); | TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); |
| Array_iterator<StringPtr> tracei(exception_trace); | Array_iterator<StringPtr> tracei(exception_trace); |
| while(tracei.has_next()) { | while(tracei.has_next()) { |
| Table::element_type row; | Table::element_type row(new ArrayString); |
| StringPtr name=tracei.next(); | StringPtr name=tracei.next(); |
| *row+=name; // name column | *row+=name; // name column |
| Line 433 t[9]-t[3] | Line 436 t[9]-t[3] |
| const String_fragment::Origin& origin=name->origin(); | const String_fragment::Origin& origin=name->origin(); |
| if(origin.file) { | if(origin.file) { |
| *row+=StringPtr(new String(origin.file, 0, true)); // file column | *row+=StringPtr(new String(origin.file, 0, true)); // file column |
| char *buf=(char *)malloc(MAX_NUMBER); | *row+=StringPtr(new String( |
| size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); | pool().format_integer(1+origin.line), |
| *row+=StringPtr(new String(buf, buf_size, true)); // line column | 0, true)); // line column |
| } | } |
| #endif | #endif |
| *stack_trace+=row; | *stack_trace+=row; |
| Line 453 t[9]-t[3] | Line 456 t[9]-t[3] |
| // doing that ugly | // doing that ugly |
| // make up result: $origin $source $comment $type $code | // 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; | size_t printed=0; |
| if(StringPtr problem_source=e.problem_source()) { | if(StringPtr problem_source=e.problem_source()) { |
| #ifndef NO_STRING_ORIGIN | #ifndef NO_STRING_ORIGIN |
| Line 554 VStateless_classPtr Request::use_buf(VSt | Line 557 VStateless_classPtr Request::use_buf(VSt |
| // locate and execute possible @conf[] static | // locate and execute possible @conf[] static |
| VStringPtr vfilespec(new VString(filespec)); | VStringPtr vfilespec(new VString(filespec)); |
| const Method *method_called; | Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, |
| execute_nonvirtual_method(cclass, | |
| conf_method_name, vfilespec, | conf_method_name, vfilespec, |
| false/*no result needed*/, &method_called); | false/*no string result needed*/); |
| if(method_called) | if(executed.method) |
| configure_admin(cclass, method_called->name); | configure_admin(cclass, executed.method->name); |
| // locate and execute possible @auto[] static | // locate and execute possible @auto[] static |
| execute_nonvirtual_method(cclass, | execute_nonvirtual_method(cclass, |