--- parser3/src/main/execute.C 2003/09/29 10:51:02 1.298 +++ parser3/src/main/execute.C 2005/07/26 12:43:05 1.308 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/09/29 10:51:02 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2005/07/26 12:43:05 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -105,7 +105,7 @@ void debug_dump(SAPI_Info& sapi_info, in void Request::execute(ArrayOperation& ops) { register Stack& stack=this->stack; // helps a lot on MSVC: 'esi' - const String* debug_name=0; Operation::Origin debug_origin; //bool is_debug_junction=false; + const String* debug_name=0; Operation::Origin debug_origin={0, 0, 0}; try{ #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "source----------------------------\n"); @@ -186,7 +186,42 @@ void Request::execute(ArrayOperation& op Value& value=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - ncontext.put_element(name, &value, false); + + // put_element can return property-setting-junction + if(const Junction* junction=ncontext.put_element(name, &value, false)) + if(junction!=PUT_ELEMENT_REPLACED_ELEMENT) { + // process it + ArrayString* params_names=junction->method->params_names; + int param_count=params_names? params_names->count(): 0; + if(param_count!=1) + throw Exception("parser.runtime", + 0, + "setter method must have one parameter (has %d parameters)", param_count); + + // TODO: move that to this::execute_method [fix it's param types] + VMethodFrame frame(*junction, method_frame/*caller*/); + frame.store_param(value); + + frame.set_self(frame.junction.self); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + rcontext=wcontext=&frame; + method_frame=&frame; + + // prevent non-string writes for better error reporting + wcontext->write(*method_frame); + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + // we don't need it StringOrValue result=wcontext->result(); + + method_frame=saved_method_frame; + wcontext=saved_wcontext; + rcontext=saved_rcontext; + } + break; } case OP_CONSTRUCT_EXPR: @@ -194,10 +229,16 @@ void Request::execute(ArrayOperation& op // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - Value& value=stack.pop().value(); + Value& expr=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - ncontext.put_element(name, &value.as_expr_result(), false); + Value& value=expr.as_expr_result(); + if(const Junction* junction=ncontext.put_element(name, &value, false)) + if(junction!=PUT_ELEMENT_REPLACED_ELEMENT) { + throw Exception("parser.runtime", + 0, + "TODO:paf -- $property(value)"); + } break; } case OP_CURLY_CODE__CONSTRUCT: @@ -216,7 +257,12 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - ncontext.put_element(name, &value, false); + if(const Junction* junction=ncontext.put_element(name, &value, false)) + if(junction!=PUT_ELEMENT_REPLACED_ELEMENT) + throw Exception("parser.runtime", + 0, + "property value can not be code, use [] or () brackets"); + break; } case OP_NESTED_CODE: @@ -328,7 +374,7 @@ void Request::execute(ArrayOperation& op case OP_STORE_PARAM: { Value& value=stack.pop().value(); - VMethodFrame& frame=stack.upper_value().method_frame(); + VMethodFrame& frame=stack.top_value().method_frame(); // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" frame.store_param(value); break; @@ -338,7 +384,7 @@ void Request::execute(ArrayOperation& op { // code ArrayOperation& local_ops=*i.next().ops; - VMethodFrame& frame=stack.upper_value().method_frame(); + VMethodFrame& frame=stack.top_value().method_frame(); #ifdef DEBUG_EXECUTE debug_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, local_ops); @@ -425,13 +471,14 @@ void Request::execute(ArrayOperation& op WContext *saved_wcontext=wcontext; VStateless_class& called_class=*frame.junction.self.get_class(); - Value* new_self=&get_self(); + Value* new_self; if(wcontext->get_constructing()) { wcontext->set_constructing(false); + new_self=&get_self(); if(frame.junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - if(Value* value=called_class.create_new_value()) { + if(Value* value=called_class.create_new_value(fpool)) { // some stateless_class creatable derivates new_self=value; } else @@ -472,7 +519,7 @@ void Request::execute(ArrayOperation& op *this, *frame.numbered_params()); // execute it } else // parser code, execute it - recoursion_checked_execute(/*frame.name(), */*method.parser_code); + recoursion_checked_execute(*method.parser_code); } else throw Exception("parser.runtime", 0, //&frame.name(), @@ -812,11 +859,10 @@ void Request::execute(ArrayOperation& op "invalid opcode %d", opcode); } } - } catch(...) { + } catch(const Exception&) { // record it to stack trace - //if(is_debug_junction) - if(debug_name) - exception_trace.push(Trace(debug_name, debug_origin)); + if(debug_name) + exception_trace.push(Trace(debug_name, debug_origin)); rethrow; } } @@ -829,8 +875,7 @@ Value& Request::get_element(Value& ncont Value* value=0; if(can_call_operator) { if(Method* method=main_class.get_method(name)) // looking operator of that name FIRST - value=new VJunction(new Junction( - main_class, method, 0,0,0, 0)); + value=new VJunction(new Junction(main_class, method)); } if(!value) { if(!wcontext->get_constructing() // not constructing @@ -877,65 +922,98 @@ value_ready: using the fact it's either string_ or value_ result requested to speed up checkes */ 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 + if(junction) { + if(junction->is_getter) { // is it a getter-junction? + // process it + + VMethodFrame frame(*junction, method_frame/*caller*/); + if(junction->method->params_names) + throw Exception("parser.runtime", + 0, + "getter method must have no parameters"); + + frame.set_self(frame.junction.self); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + rcontext=wcontext=&frame; + method_frame=&frame; + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + StringOrValue result=wcontext->result(); + + method_frame=saved_method_frame; + wcontext=saved_wcontext; + rcontext=saved_rcontext; + + return result; + } + + if(junction->code) { // is it a code-junction? + // process it + StringOrValue result; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); + debug_printf(sapi_info, "ja->\n"); #endif - if(!junction->method_frame) - throw Exception("parser.runtime", + if(!junction->method_frame) + throw Exception("parser.runtime", 0, "junction used outside of context"); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - method_frame=junction->method_frame; - rcontext=junction->rcontext; - - // for expression method params - // wcontext is set 0 - // using the fact in decision "which wwrapper to use" - bool using_code_frame=intercept_string && junction->wcontext; - if(using_code_frame) { - // almost plain wwrapper about junction wcontext, - // BUT intercepts string writes - VCodeFrame local(*junction->wcontext, junction->wcontext); - wcontext=&local; + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + method_frame=junction->method_frame; + rcontext=junction->rcontext; + + // for expression method params + // wcontext is set 0 + // using the fact in decision "which wwrapper to use" + bool using_code_frame=intercept_string && junction->wcontext; + if(using_code_frame) { + // almost plain wwrapper about junction wcontext, + // BUT intercepts string writes + VCodeFrame local(*junction->wcontext, junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + // CodeFrame soul: + // string writes were intercepted + // returning them as the result of getting code-junction + result.set_string(*wcontext->get_string()); + } else { + // plain wwrapper + WWrapper local(0/*empty*/, wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + result=wcontext->result(); + } + + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_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 - result.set_string(*wcontext->get_string()); - } else { - // plain wwrapper - WWrapper local(0/*empty*/, wcontext); - wcontext=&local; - - // execute it - recoursion_checked_execute(/*0/*result_name* /, */ *junction->code); - - result=wcontext->result(); - } - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-ja returned"); + debug_printf(sapi_info, "<-ja returned"); #endif - } else { - result.set_value(input_value); - } - return result; + return result; + } + + // it is then method-junction, do not explode it + // just return it as we do for usual objects + } + + return input_value; } StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { @@ -967,7 +1045,7 @@ const String* Request::execute_method(Va Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - Junction local_junction(aself, &method, 0,0,0, 0); + Junction local_junction(aself, &method); VMethodFrame local_frame(local_junction, method_frame/*caller*/); if(optional_param && local_frame.can_store_param()) { local_frame.store_param(*optional_param);