--- parser3/src/main/execute.C 2002/04/15 08:13:10 1.227 +++ parser3/src/main/execute.C 2002/04/18 10:51:01 1.236 @@ -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.227 2002/04/15 08:13:10 paf Exp $ + $Id: execute.C,v 1.236 2002/04/18 10:51:01 paf Exp $ */ #include "pa_opcode.h" @@ -45,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", - "OBJECT_POOL", - "STRING_POOL", + "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", @@ -119,6 +119,8 @@ void Request::execute(const Array& ops) debug_printf(pool(), "execution-------------------------\n"); #endif + const String *last_get_element_name=0; + Array_iter i(ops); while(i.has_next()) { Operation op; @@ -216,7 +218,6 @@ void Request::execute(const Array& ops) const String& name=POP_NAME(); Value *ncontext=POP(); ncontext->put_element(name, value); - value->set_name(name); break; } case OP_CONSTRUCT_EXPR: @@ -228,7 +229,6 @@ void Request::execute(const Array& ops) const String& name=POP_NAME(); Value *ncontext=POP(); ncontext->put_element(name, value->as_expr_result()); - value->set_name(name); break; } case OP_CURLY_CODE__CONSTRUCT: @@ -249,7 +249,6 @@ void Request::execute(const Array& ops) const String& name=POP_NAME(); Value *ncontext=POP(); ncontext->put_element(name, value); - value->set_name(name); break; } case OP_NESTED_CODE: @@ -265,20 +264,17 @@ void Request::execute(const Array& ops) case OP_WRITE_VALUE: { 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); + write_assign_lang(*value, last_get_element_name); 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: @@ -297,7 +293,7 @@ void Request::execute(const Array& ops) wcontext->set_somebody_entered_some_object(true); //_asm int 3; - value=get_element(true); + value=get_element(last_get_element_name, true); PUSH(value); break; } @@ -307,15 +303,15 @@ void Request::execute(const Array& ops) wcontext->set_somebody_entered_some_object(true); //_asm int 3; - value=get_element(false); + value=get_element(last_get_element_name, false); PUSH(value); break; } case OP_GET_ELEMENT__WRITE: { - value=get_element(false); - write_assign_lang(*value); + value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); + write_assign_lang(*value, last_get_element_name); break; } @@ -332,7 +328,7 @@ void Request::execute(const Array& ops) execute(*local_ops); - value=&wcontext->result(); + value=&wcontext->result().as_value(); flang=static_cast(reinterpret_cast(POP())); wcontext=static_cast(POP()); PUSH(value); @@ -342,7 +338,6 @@ void Request::execute(const Array& ops) case OP_STRING_POOL: { const Array *local_ops=reinterpret_cast(i.next()); - PUSH(wcontext); WWrapper local(pool(), 0 /*empty*/); @@ -374,11 +369,11 @@ void Request::execute(const Array& ops) Junction *junction=value->get_junction(); if(!junction) throw Exception("parser.runtime", - &value->name(), + last_get_element_name, "(%s) not a method or junction, can not call it", value->type()); - VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction); + VMethodFrame *frame=NEW VMethodFrame(pool(), *last_get_element_name, *junction); PUSH(frame); break; } @@ -403,6 +398,7 @@ void Request::execute(const Array& ops) } case OP_CALL: + case OP_CALL__WRITE: { #ifdef DEBUG_EXECUTE debug_printf(pool(), "->\n"); @@ -494,7 +490,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(); @@ -506,7 +502,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, last_get_element_name); + // 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 @@ -600,10 +604,6 @@ void Request::execute(const Array& ops) if(b_double == 0) { const String *problem_source=&b->as_string(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif throw Exception("number.zerodivision", problem_source, "Division by zero"); @@ -622,10 +622,6 @@ void Request::execute(const Array& ops) if(b_double == 0) { const String *problem_source=&b->as_string(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif throw Exception("number.zerodivision", problem_source, "Modulus by zero"); @@ -644,10 +640,6 @@ void Request::execute(const Array& ops) if(b_int == 0) { const String *problem_source=&b->as_string(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif throw Exception("number.zerodivision", problem_source, "Division by zero"); @@ -821,8 +813,9 @@ void Request::execute(const Array& ops) } } -Value *Request::get_element(bool can_call_operator) { - const String& name=POP_NAME(); +/// @test cache|prepare junctions +Value *Request::get_element(const String *& remember_name, bool can_call_operator) { + const String& name=POP_NAME(); remember_name=&name; Value *ncontext=POP(); Value *value=0; if(can_call_operator) @@ -835,11 +828,9 @@ 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 { + value=&process_to_value(*value); // process possible code-junction + else value=NEW VVoid(pool()); - value->set_name(name); - } return value; } @@ -855,11 +846,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, - void (*postexecute)(void *info), void *postexecute_info) { +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 @@ -886,41 +874,21 @@ void Request::process_internal( wcontext=&local; // execute it - recoursion_checked_execute(result_name, *junction->code); + recoursion_checked_execute(0/*result_name*/, *junction->code); - // maybe-postexecute something - if(postexecute) - postexecute(postexecute_info); - // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - 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); - } + result.set_string(*wcontext->get_string()); } else { // plain wwrapper WWrapper local(pool(), 0/*empty*/); wcontext=&local; // execute it - recoursion_checked_execute(result_name, *junction->code); + recoursion_checked_execute(0/*result_name*/, *junction->code); - // maybe-postexecute something - if(postexecute) - postexecute(postexecute_info); - - if(string_result) - *string_result=&wcontext->result().as_string(); - else { - *value_result=&wcontext->result(); - if(result_name) - (*value_result)->set_name(*result_name); - } + result=wcontext->result(); } wcontext=static_cast(POP()); @@ -932,14 +900,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, @@ -958,7 +921,13 @@ const String *Request::execute_method(Va execute(*method.parser_code); // result - const String *result=return_cstr ? &wcontext->as_string() : 0; + const String *result=0; + if(return_cstr) { + if(Value *result_var_value=wcontext->get_element(*result_var_name)) + result=&result_var_value->as_string(); + else + result=&wcontext->as_string(); + } wcontext=static_cast(POP()); rcontext=POP(); @@ -983,7 +952,7 @@ const String& Request::execute_method(VM execute(*method.parser_code); // result - const String& result=wcontext->as_string(); + const String& result=wcontext->result().as_string(); wcontext=static_cast(POP()); rcontext=POP();