--- parser3/src/main/execute.C 2002/04/10 09:53:15 1.224 +++ parser3/src/main/execute.C 2002/04/16 08:41:05 1.232 @@ -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.224 2002/04/10 09:53:15 paf Exp $ + $Id: execute.C,v 1.232 2002/04/16 08:41:05 paf Exp $ */ #include "pa_opcode.h" @@ -23,7 +23,7 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -//#define DEBUG_EXECUTE +#define DEBUG_EXECUTE //#define DEBUG_STRING_APPENDS_VS_EXPANDS @@ -33,8 +33,6 @@ ulong wcontext_result_size=0; -const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; - #ifdef DEBUG_EXECUTE char *opcode_name[]={ // literals @@ -47,11 +45,11 @@ char *opcode_name[]={ "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", - "CREATE_EWPOOL", "REDUCE_EWPOOL", - "CREATE_SWPOOL", "REDUCE_SWPOOL", + "OBJECT_POOL", "STRING_POOL", "GET_METHOD_FRAME", "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", + "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "CALL", "CALL__WRITE", // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", @@ -99,6 +97,8 @@ void debug_dump(Pool& pool, int level, c case OP_EXPR_CODE__STORE_PARAM: case OP_CURLY_CODE__CONSTRUCT: case OP_NESTED_CODE: + case OP_OBJECT_POOL: + case OP_STRING_POOL: const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } @@ -266,19 +266,16 @@ void Request::execute(const Array& ops) { value=POP(); write_assign_lang(*value); - - // forget the fact they've entered some ^object.method[]. - // see OP_GET_ELEMENT - wcontext->set_somebody_entered_some_object(false); break; } case OP_WRITE_EXPR_RESULT: { + value=POP(); + write_no_lang(*value->as_expr_result()); + + // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - - value=POP(); - write_expr_result(*value->as_expr_result()); break; } case OP_STRING__WRITE: @@ -320,31 +317,35 @@ void Request::execute(const Array& ops) } - case OP_CREATE_EWPOOL: + case OP_OBJECT_POOL: { + const Array *local_ops=reinterpret_cast(i.next()); + PUSH(wcontext); PUSH((void *)flang); flang=String::UL_PASS_APPENDED; - wcontext=NEW WWrapper(pool(), 0 /*empty*/); - break; - } - case OP_REDUCE_EWPOOL: - { - value=&wcontext->result(); + WWrapper local(pool(), 0 /*empty*/); + wcontext=&local; + + execute(*local_ops); + + value=&wcontext->result().as_value(); flang=static_cast(reinterpret_cast(POP())); wcontext=static_cast(POP()); PUSH(value); break; } - case OP_CREATE_SWPOOL: + case OP_STRING_POOL: { + const Array *local_ops=reinterpret_cast(i.next()); + PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /*empty*/); - break; - } - case OP_REDUCE_SWPOOL: - { + WWrapper local(pool(), 0 /*empty*/); + wcontext=&local; + + execute(*local_ops); + // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext const String *string=wcontext->get_string(); @@ -398,6 +399,7 @@ void Request::execute(const Array& ops) } case OP_CALL: + case OP_CALL__WRITE: { #ifdef DEBUG_EXECUTE debug_printf(pool(), "->\n"); @@ -474,16 +476,8 @@ 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("parser.runtime", - &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 @@ -497,7 +491,7 @@ void Request::execute(const Array& ops) call_type==Method::CT_STATIC?"statically":"dynamically"); } - value=&wcontext->result(); + StringOrValue result=wcontext->result(); wcontext=static_cast(POP()); rcontext=POP(); @@ -509,7 +503,15 @@ void Request::execute(const Array& ops) wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row); #endif - PUSH(value); + if(op.code==OP_CALL__WRITE) { + write_assign_lang(result); + // forget the fact they've entered some ^object.method[]. + // see OP_GET_ELEMENT + wcontext->set_somebody_entered_some_object(false); + } else { // OP_CALL + PUSH(&result.as_value()); + } + #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-returned"); #endif @@ -824,6 +826,7 @@ void Request::execute(const Array& ops) } } +/// @test cache|prepare junctions Value *Request::get_element(bool can_call_operator) { const String& name=POP_NAME(); Value *ncontext=POP(); @@ -837,9 +840,10 @@ Value *Request::get_element(bool can_cal } if(!value) value=ncontext->get_element(name); - if(value) - value=&process_to_value(*value, &name); // process possible code-junction - else { + if(value) { + value=&process_to_value(*value); // process possible code-junction + value->update_name(name); + } else { value=NEW VVoid(pool()); value->set_name(name); } @@ -858,10 +862,8 @@ Value *Request::get_element(bool can_cal using the fact it's either string_ or value_ result requested to speed up checkes */ -void Request::process_internal( - Value& input_value, const String *result_name, - bool intercept_string, - const String **string_result, Value **value_result) { +StringOrValue Request::process(Value& input_value, bool intercept_string) { + StringOrValue result; Junction *junction=input_value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it @@ -873,7 +875,10 @@ void Request::process_internal( 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" @@ -881,45 +886,25 @@ void Request::process_internal( 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("parser.runtime", - result_name, - "junction evaluation canceled - endless recursion detected"); - } - execute(*junction->code); - anti_endless_execute_recoursion--; - } - - if(using_code_frame) { + // execute it + recoursion_checked_execute(0/*result_name*/, *junction->code); + // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - if(string_result) - *string_result=frame->get_string(); - else - *value_result=NEW VString(*frame->get_string()); + result.set_string(*wcontext->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); - } + // plain wwrapper + WWrapper local(pool(), 0/*empty*/); + wcontext=&local; + + // execute it + recoursion_checked_execute(0/*result_name*/, *junction->code); + + result=wcontext->result(); } wcontext=static_cast(POP()); @@ -931,14 +916,9 @@ void Request::process_internal( debug_printf(pool(), "<-ja returned"); #endif } 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); - } + result.set_value(input_value); } + return result; } const String *Request::execute_method(Value& aself, const Method& method, @@ -950,7 +930,8 @@ const String *Request::execute_method(Va // initialize contexts root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself); + WWrapper local(pool(), &aself); + wcontext=&local; // execute! execute(*method.parser_code);