--- parser3/src/main/execute.C 2002/02/18 15:21:01 1.219 +++ parser3/src/main/execute.C 2002/04/11 13:33:39 1.225 @@ -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.219 2002/02/18 15:21:01 paf Exp $ + $Id: execute.C,v 1.225 2002/04/11 13:33:39 paf Exp $ */ #include "pa_opcode.h" @@ -24,6 +24,14 @@ #include "pa_wwrapper.h" //#define DEBUG_EXECUTE +//#define DEBUG_STRING_APPENDS_VS_EXPANDS + + +#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS +ulong wcontext_result_size=0; +#endif + + const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; @@ -103,6 +111,18 @@ void debug_dump(Pool& pool, int level, c #define POP_NAME() static_cast(stack.pop())->as_string() #define POP_CODE() static_cast(stack.pop()) +void Request::recoursion_checked_execute(const String *name, 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("parser.runtime", + name, + "call canceled - endless recursion detected"); + } + execute(ops); // execute it + anti_endless_execute_recoursion--; +} + void Request::execute(const Array& ops) { // _asm int 3; #ifdef DEBUG_EXECUTE @@ -171,7 +191,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"); @@ -360,7 +380,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()); @@ -411,7 +431,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()); @@ -420,7 +440,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 { @@ -466,24 +486,16 @@ void Request::execute(const Array& ops) frame->name(), frame->numbered_params()); // execute it } else { // parser code root=frame; - { // 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, - &frame->name(), - "call canceled - endless recursion detected"); - } - execute(*method.parser_code); // execute it - anti_endless_execute_recoursion--; - } + // execute it + recoursion_checked_execute(&frame->name(), *method.parser_code); } } 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"); @@ -496,6 +508,11 @@ void Request::execute(const Array& ops) root=POP(); self=static_cast(POP()); +#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS + if(const String *s=value->get_string()) + wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row); +#endif + PUSH(value); #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-returned"); @@ -594,7 +611,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"); } @@ -616,7 +633,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"); } @@ -638,7 +655,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"); } @@ -804,7 +821,7 @@ void Request::execute(const Array& ops) } default: - throw Exception(0,0, + throw Exception(0, 0, "invalid opcode %d", op.code); } @@ -825,7 +842,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); @@ -842,10 +859,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 @@ -856,7 +877,10 @@ Value& Request::process(Value& value, co PUSH(rcontext); PUSH(wcontext); - WContext *frame; + self=&junction->self; + root=junction->root; + rcontext=junction->rcontext; + // for expression method params // wcontext is set 0 // using the fact in decision "which wwrapper to use" @@ -864,36 +888,38 @@ Value& Request::process(Value& value, co if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - frame=NEW VCodeFrame(pool(), *junction->wcontext); - } else { - // plain wwrapper - frame=NEW WWrapper(pool(), 0/*empty*/); - } - - //frame->set_name(value.name()); - wcontext=frame; - self=&junction->self; - root=junction->root; - rcontext=junction->rcontext; + VCodeFrame local(pool(), *junction->wcontext); + wcontext=&local; - { // 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, - "junction evaluation canceled - endless recursion detected"); - } - execute(*junction->code); - anti_endless_execute_recoursion--; - } + // execute it + recoursion_checked_execute(result_name, *junction->code); - if(using_code_frame) { // 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=wcontext->get_string(); + else { + *value_result=NEW VString(*wcontext->get_string()); + if(result_name) + (*value_result)->set_name(*result_name); + } + } else { + // plain wwrapper + WWrapper local(pool(), 0/*empty*/); + wcontext=&local; + + // execute it + recoursion_checked_execute(result_name, *junction->code); + + if(string_result) + *string_result=&wcontext->result().as_string(); + else { + *value_result=&wcontext->result(); + if(result_name) + (*value_result)->set_name(*result_name); + } + } wcontext=static_cast(POP()); rcontext=POP(); @@ -903,12 +929,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,