--- parser3/src/main/execute.C 2009/04/28 11:11:11 1.328 +++ parser3/src/main/execute.C 2009/05/01 11:41:14 1.331 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/04/28 11:11:11 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/05/01 11:41:14 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -54,7 +54,6 @@ char *opcode_name[]={ "VALUE__GET_ELEMENT__WRITE", #endif "OBJECT_POOL", "STRING_POOL", - "STORE_PARAM", "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", @@ -232,7 +231,7 @@ void Request::execute(ArrayOperation& op Value& value=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - put_element(ncontext, name, value); + put_element(ncontext, name, &value); break; } @@ -245,7 +244,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); Value& value=expr.as_expr_result(); - put_element(ncontext, name, value); + put_element(ncontext, name, &value); break; } case OP::OP_CURLY_CODE__CONSTRUCT: @@ -320,8 +319,12 @@ void Request::execute(ArrayOperation& op #ifdef DEBUG_EXECUTE debug_printf(sapi_info, " \"%s\" ", name.cstr()); #endif - - Value& value=get_element(*rcontext, name, true); + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) method->junction_template=new VJunction(main_class, method); + stack.push(*method->junction_template); + break; + } + Value& value=get_element(*rcontext, name); stack.push(value); break; } @@ -330,7 +333,12 @@ void Request::execute(ArrayOperation& op { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name, true); + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) method->junction_template=new VJunction(main_class, method); + stack.push(*method->junction_template); + break; + } + Value& value=get_element(ncontext, name); stack.push(value); break; } @@ -340,7 +348,7 @@ void Request::execute(ArrayOperation& op { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name, false); + Value& value=get_element(ncontext, name); stack.push(value); break; } @@ -355,7 +363,7 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, " \"%s\" ", name.cstr()); #endif - Value& value=get_element(*rcontext, name, false); + Value& value=get_element(*rcontext, name); stack.push(value); break; } @@ -366,7 +374,7 @@ void Request::execute(ArrayOperation& op { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name, false); + Value& value=get_element(ncontext, name); write_assign_lang(value); break; } @@ -381,7 +389,7 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, " \"%s\" ", name.cstr()); #endif - Value& value=get_element(*rcontext, name, false); + Value& value=get_element(*rcontext, name); write_assign_lang(value); break; } @@ -429,20 +437,11 @@ void Request::execute(ArrayOperation& op } // CALL - case OP::OP_STORE_PARAM: - { - Value& value=stack.pop().value(); - 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; - } case OP::OP_CURLY_CODE__STORE_PARAM: case OP::OP_EXPR_CODE__STORE_PARAM: { // code ArrayOperation& local_ops=*i.next().ops; - 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); @@ -468,7 +467,7 @@ void Request::execute(ArrayOperation& op wcontext->attach_junction(&value); // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 - frame.store_param(value); + stack.push(value); break; } @@ -523,12 +522,19 @@ void Request::execute(ArrayOperation& op */ VMethodFrame frame(*junction, method_frame); + WContext* result_wcontext; + if(local_ops){ // store param code goes here - stack.push(frame); // argument for *STORE_PARAM ops + size_t first = stack.top_index(); execute(*local_ops); - stack.pop().value(); + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + result_wcontext=op_call(frame); + stack.set_top_index(first); + } else { + frame.empty_params(); + result_wcontext=op_call(frame); } - WContext* result_wcontext=op_call(frame); + if(opcode==OP::OP_CALL__WRITE) { write_assign_lang(result_wcontext->result()); } else { // OP_CALL @@ -872,11 +878,18 @@ void Request::execute(ArrayOperation& op } } -WContext* Request::op_call(VMethodFrame& frame){ - frame.fill_unspecified_params(); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; +#define SAVE_CONTEXT \ + VMethodFrame *saved_method_frame=method_frame; \ + Value* saved_rcontext=rcontext; \ WContext *saved_wcontext=wcontext; + +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + rcontext=saved_rcontext; \ + method_frame=saved_method_frame; + +WContext* Request::op_call(VMethodFrame& frame){ + SAVE_CONTEXT VStateless_class& called_class=*frame.junction.self.get_class(); Value* new_self; @@ -937,9 +950,7 @@ WContext* Request::op_call(VMethodFrame& WContext *result_wcontext=wcontext; // StringOrValue result=wcontext->result(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT return result_wcontext; } @@ -949,69 +960,48 @@ WContext* Request::op_call(VMethodFrame& @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any */ -Value& Request::get_element(Value& ncontext, const String& name, bool can_call_operator) { - Value* value=0; - if(can_call_operator) { - if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST - if(!method->junction_template) - method->junction_template=new VJunction(main_class, method); - return *method->junction_template; - } - } - if(!value) { - if(!wcontext->get_constructing() // not constructing - && wcontext->get_somebody_entered_some_class() ) // ^class:method +Value& Request::get_element(Value& ncontext, const String& name) { + if(!wcontext->get_constructing() // not constructing + && wcontext->get_somebody_entered_some_class() ) // ^class:method if(VStateless_class *called_class=ncontext.get_class()) if(VStateless_class *read_class=rcontext->get_class()) if(read_class->derived_from(*called_class)) // current derived from called if(Value* base=get_self().base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls - value=base->get_element(name, *base, true); // virtual-up lookup starting from parent - goto value_ready; + Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls + Value *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent + return *(value ? &process_to_value(*value) : VVoid::get()); } - } - if(!value) - value=ncontext.get_element(name, ncontext, true); + + Value* value=ncontext.get_element(name, ncontext, true); if(value && wcontext->get_constructing()) - if(Junction* junction=value->get_junction()) { + if(Junction* junction=value->get_junction()) if(junction->self.get_class()!=&ncontext) throw Exception(PARSER_RUNTIME, &name, "constructor must be declared in class '%s'", ncontext.get_class()->name_cstr()); - } - -value_ready: - if(value) - value=&process_to_value(*value); // process possible code-junction - else - value=VVoid::get(); - return *value; + return *(value ? &process_to_value(*value) : VVoid::get()); } -void Request::put_element(Value& ncontext, const String& name, Value& value) { +void Request::put_element(Value& ncontext, const String& name, Value* value) { // put_element can return property-setting-junction - if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(const VJunction* vjunction=ncontext.put_element(ncontext, name, value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { - const Junction& junction=vjunction->junction(); // process it - ArrayString* params_names=junction.method->params_names; - int param_count=params_names? params_names->count(): 0; + VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); + int param_count=frame.method_params_count(); + if(param_count!=1) throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); - VMethodFrame frame(junction, method_frame/*caller*/); - frame.store_param(value); - + frame.store_params(&value, 1); frame.set_self(frame.junction.self); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT rcontext=wcontext=&frame; method_frame=&frame; @@ -1022,9 +1012,7 @@ void Request::put_element(Value& ncontex 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; + RESTORE_CONTEXT } } @@ -1043,27 +1031,27 @@ StringOrValue Request::process(Value& in Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - int param_count=junction->method->params_names?junction->method->params_names->count():0; - if(junction->auto_name){ // default getter - if(param_count>1) - throw Exception(PARSER_RUNTIME, - 0, - "default getter method can't have more then 1 parameter (has %d parameters)", param_count); - } else if(param_count) - throw Exception(PARSER_RUNTIME, - 0, - "getter method must have no parameters (has %d parameters)", param_count); - VMethodFrame frame(*junction, method_frame/*caller*/); + int param_count=frame.method_params_count(); - if(junction->auto_name && param_count) - frame.store_param(*new VString(*junction->auto_name)); + if(param_count){ + if(junction->auto_name){ // default getter + if(param_count==1){ + Value *param=new VString(*junction->auto_name); + frame.store_params(¶m, 1); + } else + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + } else + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); + } // no need for else frame.empty_params() frame.set_self(frame.junction.self); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT rcontext=wcontext=&frame; method_frame=&frame; @@ -1071,9 +1059,7 @@ StringOrValue Request::process(Value& in 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; + RESTORE_CONTEXT return result; } @@ -1090,9 +1076,7 @@ StringOrValue Request::process(Value& in 0, "junction used outside of context"); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT method_frame=junction->method_frame; rcontext=junction->rcontext; @@ -1123,9 +1107,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "<-ja returned"); @@ -1141,9 +1123,7 @@ StringOrValue Request::process(Value& in } StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT // initialize contexts rcontext=wcontext=method_frame=&amethod_frame; @@ -1154,27 +1134,24 @@ StringOrValue Request::execute_method(VM // result StringOrValue result=wcontext->result(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT // return return result; } const String* Request::execute_method(Value& aself, - const Method& method, VString* optional_param, - bool do_return_string) { + const Method& method, Value* optional_param, + bool do_return_string) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT 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); - local_frame.fill_unspecified_params(); + if(optional_param && local_frame.method_params_count()>0) { + local_frame.store_params(&optional_param, 1); + } else { + local_frame.empty_params(); } local_frame.set_self(aself); rcontext=wcontext=method_frame=&local_frame; @@ -1191,18 +1168,16 @@ const String* Request::execute_method(Va if(do_return_string) result=&wcontext->result().as_string(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT return result; } Request::Execute_nonvirtual_method_result Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, - VString* optional_param, - bool do_return_string) { + const String& method_name, + VString* optional_param, + bool do_return_string) { Execute_nonvirtual_method_result result; result.method=aclass.get_method(method_name); if(result.method) @@ -1211,7 +1186,7 @@ Request::execute_nonvirtual_method(VStat } const String* Request::execute_virtual_method(Value& aself, - const String& method_name) { + const String& method_name) { if(Value* value=aself.get_element(method_name, aself, false)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method)