--- parser3/src/main/execute.C 2002/01/31 12:00:42 1.210 +++ parser3/src/main/execute.C 2002/04/10 09:53:15 1.224 @@ -1,10 +1,10 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: execute.C,v 1.210 2002/01/31 12:00:42 paf Exp $ + $Id: execute.C,v 1.224 2002/04/10 09:53:15 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; @@ -38,12 +46,12 @@ char *opcode_name[]={ "GET_CLASS", "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", - "GET_ELEMENT", "GET_ELEMENT__WRITE", + "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_SWPOOL", "REDUCE_SWPOOL", "GET_METHOD_FRAME", "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "CALL", + "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", @@ -171,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"); @@ -213,6 +221,9 @@ void Request::execute(const Array& ops) } case OP_CONSTRUCT_EXPR: { + // see OP_PREPARE_TO_EXPRESSION + wcontext->set_in_expression(false); + value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); @@ -263,6 +274,9 @@ void Request::execute(const Array& ops) } case OP_WRITE_EXPR_RESULT: { + // see OP_PREPARE_TO_EXPRESSION + wcontext->set_in_expression(false); + value=POP(); write_expr_result(*value->as_expr_result()); break; @@ -277,22 +291,30 @@ void Request::execute(const Array& ops) break; } - case OP_GET_ELEMENT: + case OP_GET_ELEMENT_OR_OPERATOR: { - //_asm int 3; - value=get_element(); + // maybe they do ^object.method[] call, remember the fact + wcontext->set_somebody_entered_some_object(true); + //_asm int 3; + value=get_element(true); + PUSH(value); + break; + } + case OP_GET_ELEMENT: + { // maybe they do ^object.method[] call, remember the fact - // must be below get_element() call, it checks it wcontext->set_somebody_entered_some_object(true); + //_asm int 3; + value=get_element(false); PUSH(value); break; } case OP_GET_ELEMENT__WRITE: { - value=get_element(); + value=get_element(false); write_assign_lang(*value); break; } @@ -346,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()); @@ -368,6 +390,13 @@ void Request::execute(const Array& ops) wcontext->set_constructing(true); break; } + + case OP_PREPARE_TO_EXPRESSION: + { + wcontext->set_in_expression(true); + break; + } + case OP_CALL: { #ifdef DEBUG_EXECUTE @@ -390,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()); @@ -399,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 { @@ -418,6 +447,10 @@ void Request::execute(const Array& ops) } frame->set_self(*self); + + // see OP_PREPARE_TO_EXPRESSION + frame->set_in_expression(wcontext->get_in_expression()); + rcontext=wcontext=frame; { // take object or class from any wrappers @@ -444,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"); } @@ -454,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"); @@ -471,6 +504,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"); @@ -569,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"); } @@ -591,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"); } @@ -613,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"); } @@ -779,30 +817,28 @@ void Request::execute(const Array& ops) } default: - throw Exception(0,0, + throw Exception(0, 0, "invalid opcode %d", op.code); } } } -Value *Request::get_element() { +Value *Request::get_element(bool can_call_operator) { const String& name=POP_NAME(); Value *ncontext=POP(); - Value *value=ncontext->get_element(name); - // operators can not be in form... - if(!value && - !wcontext->get_somebody_entered_some_class () && // $class:xxx - !wcontext->get_somebody_entered_some_object()) // $object.xxx - // they can only be in form ^xxx or $xxx - if(Method* method=OP.get_method(name)) { // maybe operator? + Value *value=0; + if(can_call_operator) + if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST // as if that method were in self and we have normal dynamic method here Junction& junction=*NEW Junction(pool(), *root, self->get_class(), method, 0,0,0,0); value=NEW VJunction(junction); } + 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); @@ -819,10 +855,14 @@ Value *Request::get_element() { 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,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); @@ -868,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(); @@ -880,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,