--- parser3/src/main/execute.C 2001/05/04 11:08:09 1.151 +++ parser3/src/main/execute.C 2001/05/08 05:50:01 1.154 @@ -5,11 +5,11 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.151 2001/05/04 11:08:09 paf Exp $ + $Id: execute.C,v 1.154 2001/05/08 05:50:01 paf Exp $ */ #include "pa_config_includes.h" -#include "code.h" +#include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" #include "pa_vstring.h" @@ -372,7 +372,10 @@ void Request::execute(const Array& ops) read_class && read_class->is_or_derived_from(*called_class)) // yes self=rcontext; // class dynamic call else // no, not me or relative of mine (total stranger) - if(frame->is_constructor) { + // were are constructing something and + // our constructor is just method call + if(frame->is_constructor && + wcontext->somebody_entered_some_object()==1) { // this is a constructor call // some stateless_object creatable derivates if(Value *value=called_class->create_new_value(pool())) @@ -399,7 +402,7 @@ void Request::execute(const Array& ops) method.call_type==Method::CT_ANY || method.call_type==call_type) // allowed call type? if(method.native_code) { // native code? - method.check_actual_numbered_params( + method.check_actual_numbered_params(pool(), frame->junction.self, frame->name(), frame->numbered_params()); (*method.native_code)(