--- parser3/src/main/execute.C 2002/08/01 11:26:49 1.243 +++ parser3/src/main/execute.C 2002/08/12 10:32:52 1.248 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Id: execute.C,v 1.243 2002/08/01 11:26:49 paf Exp $"; +static const char* IDENT_EXECUTE_C="$Date: 2002/08/12 10:32:52 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -504,10 +504,6 @@ void Request::execute(const Array& ops) rcontext=wcontext=&frame; { - // take object or class from any wrappers - // and substitute class alias to the class they are called AS - Temp_alias temp_alias(*self->get_aliased(), *frame.junction.vclass); - const Method& method=*frame.junction.method; Method::Call_type call_type= called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; @@ -545,7 +541,7 @@ void Request::execute(const Array& ops) wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS if(const String *s=value->get_string()) @@ -848,9 +844,8 @@ void Request::execute(const Array& ops) } case OP_IS: { - //_asm int 3; b=POP(); a=POP(); - value=NEW VBool(pool(), b->as_string() == a->type()); + value=NEW VBool(pool(), a->as(b->as_string().cstr())!=0); PUSH(value); break; } @@ -950,7 +945,7 @@ StringOrValue Request::process(Value& in wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); @@ -980,7 +975,7 @@ const String& Request::execute_method(VM wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); // return return result; @@ -1007,24 +1002,23 @@ void Request::execute_method(Value& asel } local_frame.set_self(*self); root=rcontext=wcontext=&local_frame; + + // prevent non-string writes for better error reporting + if(return_string) + wcontext->write(local_frame); // execute! execute(*method.parser_code); // result const String *result=0; - if(return_string) { - /*if(Value *result_var_value=wcontext->get_element(*result_var_name)) - *return_string=&result_var_value->as_string(); - else - *return_string=&wcontext->as_string();*/ + if(return_string) *return_string=&wcontext->result().as_string(); - } wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); } void Request::execute_nonvirtual_method(VStateless_class& aclass,