--- parser3/src/main/execute.C 2002/10/31 15:01:54 1.290 +++ parser3/src/main/execute.C 2002/11/22 16:16:33 1.294 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/10/31 15:01:54 $"; +static const char* IDENT_EXECUTE_C="$Date: 2002/11/22 16:16:33 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -123,6 +123,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 @@ -824,14 +829,16 @@ 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(); Value *value=0; if(can_call_operator) { if(Method* method=main_class.get_method(name)) { // looking operator of that name FIRST - // as if that method were in self and we have normal dynamic method here Junction& junction=*NEW Junction(pool(), main_class, method, 0,0,0,0); value=NEW VJunction(junction); @@ -852,9 +859,17 @@ Value *Request::get_element(const String if(!value) value=ncontext->get_element(name, *ncontext, false); + if(value && wcontext->get_constructing()) + if(Junction *junction=value->get_junction()) { + if(junction->self.get_class()!=ncontext) + throw Exception("parser.runtime", + &name, + "constructor must be declared in class %s", ncontext->get_class()->name_cstr()); + } + 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());