--- parser3/src/main/execute.C 2002/10/31 16:35:33 1.291 +++ parser3/src/main/execute.C 2003/03/18 09:53:01 1.295.4.2 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/10/31 16:35:33 $"; +static const char* IDENT_EXECUTE_C="$Date: 2003/03/18 09:53:01 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -100,6 +100,7 @@ void debug_dump(Pool& pool, int level, c case OP_OBJECT_POOL: case OP_STRING_POOL: case OP_CALL: + case OP_CALL__WRITE: const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } @@ -123,6 +124,11 @@ void Request::execute(const Array& ops) Array_iter i(ops); while(i.has_next()) { + if(interrupted()) + throw Exception("parser.interrupted", + 0, + "execution stopped"); + Operation op; op.cast=i.next(); #ifdef DEBUG_EXECUTE @@ -381,6 +387,8 @@ void Request::execute(const Array& ops) case OP_CALL: case OP_CALL__WRITE: { +// pool().collect_garbage(); + Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " (%d)\n", local_ops->size()); @@ -460,6 +468,16 @@ void Request::execute(const Array& ops) method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? try { + { + char buf[MAX_STRING]; + const String& name=frame.name(); + snprintf(buf, MAX_STRING, "%s(%d): %s", + name.origin().file?name.origin().file:"unknown", + name.origin().line, + name.cstr()); + pool().log_high_watermark(buf); + } + method_frame=&frame; if(method.native_code) { // native code? method.check_actual_numbered_params( @@ -824,7 +842,10 @@ void Request::execute(const Array& ops) } } -/// @todo cache|prepare junctions +/** + @todo cache|prepare junctions + @bug ^superbase:method would dynamically call ^base:method if there is any +*/ Value *Request::get_element(const String *& remember_name, bool can_call_operator) { const String& name=POP_NAME(); remember_name=&name; Value *ncontext=POP(); @@ -861,7 +882,7 @@ Value *Request::get_element(const String value_ready: if(value) - value=&process_to_value(*value); // process possible code-junction + value=&process_to_value(*value); // process possible code-junction else value=NEW VVoid(pool());