--- parser3/src/main/execute.C 2005/07/15 06:16:41 1.307 +++ parser3/src/main/execute.C 2008/06/16 12:44:57 1.321 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2005/07/15 06:16:41 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2008/06/16 12:44:57 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -113,6 +113,8 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, "execution-------------------------\n"); #endif for(Array_iterator i(ops); i.has_next(); ) { + if(get_skip()) + return; if(get_interrupted()) { set_interrupted(false); throw Exception("parser.interrupted", @@ -145,7 +147,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); Value* value=classes().get(name); if(!value) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &name, "class is undefined"); @@ -172,7 +174,7 @@ void Request::execute(ArrayOperation& op case OP_WITH_WRITE: { if(wcontext==method_frame) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); @@ -186,7 +188,8 @@ 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(ncontext, name, value); + break; } case OP_CONSTRUCT_EXPR: @@ -194,10 +197,11 @@ 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(); + put_element(ncontext, name, value); break; } case OP_CURLY_CODE__CONSTRUCT: @@ -207,16 +211,21 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, local_ops); #endif - Value& value=*new VJunction(new Junction( + Value& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, - &local_ops)); + &local_ops); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - ncontext.put_element(name, &value, false); + if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) + throw Exception(PARSER_RUNTIME, + 0, + "property value can not be code, use [] or () brackets"); + break; } case OP_NESTED_CODE: @@ -350,12 +359,12 @@ void Request::execute(ArrayOperation& op // hence, we zero junction.wcontext here, and later // in .process we would test that field // in decision "which wwrapper to use" - Value& value=*new VJunction(new Junction( + Value& value=*new VJunction( get_self(), 0, method_frame, rcontext, opcode==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - &local_ops)); + &local_ops); // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 frame.store_param(value); @@ -391,11 +400,11 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { if(value.is("void")) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "undefined method"); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, can not call it", value.type()); @@ -407,92 +416,24 @@ void Request::execute(ArrayOperation& op // $junction{code} // ^junction[] if(!junction->method) - throw Exception("parser.runtime", - + throw Exception(PARSER_RUNTIME, "is '%s', it is code junction, can not call it", value.type()); */ - VMethodFrame frame(*junction, method_frame/*caller*/); + VMethodFrame frame(*junction, method_frame); if(local_ops){ // store param code goes here stack.push(frame); // argument for *STORE_PARAM ops execute(*local_ops); stack.pop().value(); } - frame.fill_unspecified_params(); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - VStateless_class& called_class=*frame.junction.self.get_class(); - 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(fpool)) { - // some stateless_class creatable derivates - new_self=value; - } else - throw Exception("parser.runtime", - 0, //&frame.name(), - "is not a constructor, system class '%s' can be constructed only implicitly", - called_class.name().cstr()); - - frame.write(*new_self, - String::L_CLEAN // not used, always an object, not string - ); - } else - throw Exception("parser.runtime", - 0, //&frame.name(), - "method is static and can not be used as constructor"); - } else - new_self=&frame.junction.self; - - frame.set_self(*new_self); - - // see OP_PREPARE_TO_EXPRESSION - frame.set_in_expression(wcontext->get_in_expression()); - - rcontext=wcontext=&frame; - { - const Method& method=*frame.junction.method; - Method::Call_type call_type= - &called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; - if( - method.call_type==Method::CT_ANY || - method.call_type==call_type) { // allowed call type? - method_frame=&frame; - if(method.native_code) { // native code? - method.check_actual_numbered_params( - frame.junction.self, - /*frame.name(), */frame.numbered_params()); - method.native_code( - *this, - *frame.numbered_params()); // execute it - } else // parser code, execute it - recoursion_checked_execute(*method.parser_code); - } else - throw Exception("parser.runtime", - 0, //&frame.name(), - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); - - } - StringOrValue result=wcontext->result(); - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - + WContext* result_wcontext=op_call(frame); if(opcode==OP_CALL__WRITE) { - write_assign_lang(result); + write_assign_lang(result_wcontext->result()); } else { // OP_CALL - stack.push(result.as_value()); + stack.push(result_wcontext->result().as_value()); } - + #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "<-returned"); #endif @@ -540,14 +481,14 @@ void Request::execute(ArrayOperation& op case OP_FEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(file_readable(absolute(a.as_string()))); + Value& value=*new VBool(file_exist(absolute(a.as_string()))); stack.push(value); break; } case OP_DEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(dir_readable(absolute(a.as_string()))); + Value& value=*new VBool(dir_exists(absolute(a.as_string()))); stack.push(value); break; } @@ -821,6 +762,79 @@ 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; + WContext *saved_wcontext=wcontext; + + VStateless_class& called_class=*frame.junction.self.get_class(); + 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 + HashStringValue& new_object_fields=*new HashStringValue(); + if(Value* value=called_class.create_new_value(fpool, new_object_fields)) { + // some stateless_class creatable derivates + new_self=value; + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "is not a constructor, system class '%s' can be constructed only implicitly", + called_class.name().cstr()); + + frame.write(*new_self, + String::L_CLEAN // not used, always an object, not string + ); + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "method is static and can not be used as constructor"); + } else + new_self=&frame.junction.self; + + frame.set_self(*new_self); + + // see OP_PREPARE_TO_EXPRESSION + frame.set_in_expression(wcontext->get_in_expression()); + + rcontext=wcontext=&frame; + { + const Method& method=*frame.junction.method; + Method::Call_type call_type=&called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; + if( + method.call_type==Method::CT_ANY || + method.call_type==call_type) { // allowed call type? + method_frame=&frame; + if(method.native_code) { // native code? + method.check_actual_numbered_params( + frame.junction.self, + /*frame.name(), */frame.numbered_params()); + method.native_code( + *this, + *frame.numbered_params()); // execute it + } else // parser code, execute it + recoursion_checked_execute(*method.parser_code); + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "is not allowed to be called %s", + call_type==Method::CT_STATIC?"statically":"dynamically"); + } + + WContext *result_wcontext=wcontext; + // StringOrValue result=wcontext->result(); + + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + + return result_wcontext; +} + + /** @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any @@ -829,7 +843,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)); + value=new VJunction(main_class, method); } if(!value) { if(!wcontext->get_constructing() // not constructing @@ -839,17 +853,17 @@ Value& Request::get_element(Value& ncont 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, false); // virtual-up lookup starting from parent + value=base->get_element(name, *base, true); // virtual-up lookup starting from parent goto value_ready; } } if(!value) - value=ncontext.get_element(name, ncontext, false); + value=ncontext.get_element(name, ncontext, true); if(value && wcontext->get_constructing()) if(Junction* junction=value->get_junction()) { if(junction->self.get_class()!=&ncontext) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &name, "constructor must be declared in class '%s'", ncontext.get_class()->name_cstr()); @@ -864,6 +878,43 @@ value_ready: return *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(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; + 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.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 [setters are not expected to return anything] + 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; + } +} + /** @param intercept_string - true: they want result=string value, @@ -879,13 +930,21 @@ StringOrValue Request::process(Value& in Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - // process it + 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*/); - if(junction->method->params_names) - throw Exception("parser.runtime", - 0, - "getter method must have no parameters"); + + if(junction->auto_name && param_count) + frame.store_param(*new VString(*junction->auto_name)); frame.set_self(frame.junction.self); @@ -914,7 +973,7 @@ StringOrValue Request::process(Value& in #endif if(!junction->method_frame) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); @@ -930,18 +989,16 @@ StringOrValue Request::process(Value& in // 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); + // almost plain wwrapper about junction wcontext + + VCodeFrame local(*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()); + result=wcontext->result(); } else { // plain wwrapper WWrapper local(0/*empty*/, wcontext); @@ -995,6 +1052,7 @@ StringOrValue Request::execute_method(VM const String* Request::execute_method(Value& aself, const Method& method, VString* optional_param, bool do_return_string) { + VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; @@ -1029,13 +1087,13 @@ const String* Request::execute_method(Va Request::Execute_nonvirtual_method_result Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString* optional_param, + 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) - result.string=execute_method(aclass, *result.method, optional_param, - do_return_string); + result.string=execute_method(aclass, *result.method, optional_param, do_return_string); return result; }