--- parser3/src/main/execute.C 2002/02/20 12:40:24 1.221 +++ parser3/src/main/execute.C 2002/04/10 09:53:15 1.224 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: execute.C,v 1.221 2002/02/20 12:40:24 paf Exp $ + $Id: execute.C,v 1.224 2002/04/10 09:53:15 paf Exp $ */ #include "pa_opcode.h" @@ -179,7 +179,7 @@ void Request::execute(const Array& ops) const String& name=POP_NAME(); value=static_cast(classes().get(name)); if(!value) - throw Exception(0,0, + throw Exception("parser.runtime", &name, "class is undefined"); @@ -368,7 +368,7 @@ void Request::execute(const Array& ops) // not a code-junction Junction *junction=value->get_junction(); if(!junction) - throw Exception(0, 0, + throw Exception("parser.runtime", &value->name(), "(%s) not a method or junction, can not call it", value->type()); @@ -419,7 +419,7 @@ void Request::execute(const Array& ops) // some stateless_class creatable derivates self=value; } else - throw Exception(0, 0, + throw Exception("parser.runtime", &frame->name(), "is not a constructor, system class '%s' can be constructed only implicitly", called_class->name().cstr()); @@ -428,7 +428,7 @@ void Request::execute(const Array& ops) String::UL_CLEAN // not used, always an object, not string ); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &frame->name(), "method is static and can not be used as constructor"); } else { @@ -477,7 +477,7 @@ void Request::execute(const Array& ops) { // anti_endless_execute_recoursion if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { anti_endless_execute_recoursion=0; // give @exception a chance - throw Exception(0, 0, + throw Exception("parser.runtime", &frame->name(), "call canceled - endless recursion detected"); } @@ -487,11 +487,11 @@ void Request::execute(const Array& ops) } } catch(...) { // record it to stack trace - trace.push((void *)&frame->name()); + exception_trace.push((void *)&frame->name()); /*re*/throw; } } else - throw Exception(0, 0, + throw Exception("parser.runtime", &frame->name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); @@ -607,7 +607,7 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - throw Exception(0, 0, + throw Exception("number.zerodivision", problem_source, "Division by zero"); } @@ -629,7 +629,7 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - throw Exception(0, 0, + throw Exception("number.zerodivision", problem_source, "Modulus by zero"); } @@ -651,7 +651,7 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - throw Exception(0, 0, + throw Exception("number.zerodivision", problem_source, "Division by zero"); } @@ -817,7 +817,7 @@ void Request::execute(const Array& ops) } default: - throw Exception(0,0, + throw Exception(0, 0, "invalid opcode %d", op.code); } @@ -838,7 +838,7 @@ Value *Request::get_element(bool can_cal if(!value) value=ncontext->get_element(name); if(value) - value=&process(*value, &name); // process possible code-junction + value=&process_to_value(*value, &name); // process possible code-junction else { value=NEW VVoid(pool()); value->set_name(name); @@ -855,10 +855,14 @@ Value *Request::get_element(bool can_cal they want any result[string|object] nothing goes to wcontext. used in @c (expression) params evaluation + + using the fact it's either string_ or value_ result requested to speed up checkes */ -Value& Request::process(Value& value, const String *name, bool intercept_string) { - Value *result; - Junction *junction=value.get_junction(); +void Request::process_internal( + Value& input_value, const String *result_name, + bool intercept_string, + const String **string_result, Value **value_result) { + Junction *junction=input_value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE @@ -892,8 +896,8 @@ Value& Request::process(Value& value, co { // anti_endless_execute_recoursion if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { anti_endless_execute_recoursion=0; // give @exception a chance - throw Exception(0, 0, - name, + throw Exception("parser.runtime", + result_name, "junction evaluation canceled - endless recursion detected"); } execute(*junction->code); @@ -904,9 +908,19 @@ Value& Request::process(Value& value, co // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - result=NEW VString(*frame->get_string()); - } else - result=&frame->result(); + if(string_result) + *string_result=frame->get_string(); + else + *value_result=NEW VString(*frame->get_string()); + } else { + if(string_result) + *string_result=&frame->result().as_string(); + else { + *value_result=&frame->result(); + if(result_name) + (*value_result)->set_name(*result_name); + } + } wcontext=static_cast(POP()); rcontext=POP(); @@ -916,12 +930,15 @@ Value& Request::process(Value& value, co #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); #endif - } else - result=&value; - - if(name) - result->set_name(*name); - return *result; + } else { + if(string_result) // they asked for string_result + *string_result=&input_value.as_string(); + else {// they asked for value_result + *value_result=&input_value; + if(result_name) + (*value_result)->set_name(*result_name); + } + } } const String *Request::execute_method(Value& aself, const Method& method,