--- parser3/src/main/execute.C 2009/04/15 04:50:28 1.324 +++ parser3/src/main/execute.C 2009/04/21 09:26:29 1.326 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/04/15 04:50:28 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/04/21 09:26:29 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -210,14 +210,16 @@ void Request::execute(ArrayOperation& op #ifdef DEBUG_EXECUTE debug_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, local_ops); -#endif - Value& value=*new VJunction( +#endif + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, &local_ops); + wcontext->attach_junction(&value); + const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) @@ -359,12 +361,18 @@ void Request::execute(ArrayOperation& op // hence, we zero junction.wcontext here, and later // in .process we would test that field // in decision "which wwrapper to use" - Value& value=*new VJunction( + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, &local_ops); +#ifdef USE_DESTRUCTORS + value.set_temporal(true); +#else + if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) +#endif + wcontext->attach_junction(&value); // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 frame.store_param(value); @@ -842,8 +850,11 @@ WContext* Request::op_call(VMethodFrame& Value& Request::get_element(Value& ncontext, const String& name, bool can_call_operator) { Value* value=0; if(can_call_operator) { - if(Method* method=main_class.get_method(name)) // looking operator of that name FIRST - value=new VJunction(main_class, method); + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) + method->junction_template=new VJunction(main_class, method); + return *method->junction_template; + } } if(!value) { if(!wcontext->get_constructing() // not constructing