--- parser3/src/main/execute.C 2009/08/01 04:58:38 1.353 +++ parser3/src/main/execute.C 2012/07/28 20:10:58 1.370 @@ -1,12 +1,10 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/08/01 04:58:38 $"; - #include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" @@ -23,6 +21,8 @@ static const char * const IDENT_EXECUTE_ #include "pa_vimage.h" #include "pa_wwrapper.h" +volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.370 2012/07/28 20:10:58 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; + //#define DEBUG_EXECUTE #ifdef DEBUG_EXECUTE @@ -33,11 +33,7 @@ char *opcode_name[]={ // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", -#ifdef OPTIMIZE_BYTECODE_GET_CLASS "VALUE__GET_CLASS", -#else - "GET_CLASS", -#endif "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -167,9 +163,7 @@ void debug_dump(SAPI_Info& sapi_info, in if( opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE -#ifdef OPTIMIZE_BYTECODE_GET_CLASS || opcode==OP::OP_VALUE__GET_CLASS -#endif #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT__WRITE @@ -263,8 +257,6 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - -#ifdef OPTIMIZE_BYTECODE_GET_CLASS case OP::OP_VALUE__GET_CLASS: { // maybe they do ^class:method[] call, remember the fact @@ -272,11 +264,11 @@ void Request::execute(ArrayOperation& op debug_origin=i.next().origin; Value& value=*i.next().value; - const String& name=*value.get_string(); + const String& name=*value.get_string(); debug_name=&name; DEBUG_PRINT_STRING(name) - Value* class_value=classes().get(name); + Value* class_value=get_class(name); if(!class_value) throw Exception(PARSER_RUNTIME, &name, @@ -285,23 +277,6 @@ void Request::execute(ArrayOperation& op stack.push(*class_value); break; } -#else - case OP::OP_GET_CLASS: - { - // maybe they do ^class:method[] call, remember the fact - wcontext->set_somebody_entered_some_class(); - - const String& name=stack.pop().string(); - Value* value=classes().get(name); - if(!value) - throw Exception(PARSER_RUNTIME, - &name, - "class is undefined"); - - stack.push(*value); - break; - } -#endif // OP_WITH case OP::OP_WITH_ROOT: { @@ -422,7 +397,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(const VJunction* vjunction=ncontext.put_element(name, &value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) throw Exception(PARSER_RUNTIME, 0, @@ -543,7 +518,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(var_name) - const String* field=get_element(*rcontext, var_name).get_string(); + const String* field=&get_element(*rcontext, var_name).as_string(); Value& value=get_element(object, *field); @@ -664,13 +639,10 @@ void Request::execute(ArrayOperation& op execute(local_ops); - Value* value; // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - if(const String* string=wcontext->get_string()) - value=new VString(*string); - else - value=VVoid::get(); + const String* string=wcontext->get_string(); + Value* value=string ? new VString(*string) : new VString(); stack.push(*value); wcontext=saved_wcontext; @@ -748,9 +720,14 @@ void Request::execute(ArrayOperation& op value.type()); } - VMethodFrame frame(*junction, method_frame); - METHOD_FRAME_ACTION(op_call(frame, false)); - stack.push(frame.result().as_value()); + Value *result; + { + VMethodFrame frame(*junction->method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call(frame)); + result=&frame.result().as_value(); + // VMethodFrame desctructor deletes junctions in stack params here + } + stack.push(*result); DEBUG_PRINT_STR("<-returned") @@ -806,13 +783,13 @@ void Request::execute(ArrayOperation& op method.native_code(*this, method_params); // execute it } } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ - VMethodFrame frame(*junction, method_frame); + VMethodFrame frame(method, method_frame, junction->self); METHOD_FRAME_ACTION(op_call_write(frame)); } else #endif // OPTIMIZE_CALL { - VMethodFrame frame(*junction, method_frame); - METHOD_FRAME_ACTION(op_call(frame, false)); + VMethodFrame frame(method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call(frame)); write_pass_lang(frame.result()); } @@ -834,11 +811,11 @@ void Request::execute(ArrayOperation& op { debug_origin=i.next().origin; Value& vclass_name=*i.next().value; - const String& class_name=*vclass_name.get_string(); + const String& class_name=*vclass_name.get_string(); debug_name=&class_name; DEBUG_PRINT_STRING(class_name) - Value* class_value=classes().get(class_name); + Value* class_value=get_class(class_name); if(!class_value) throw Exception(PARSER_RUNTIME, &class_name, @@ -850,10 +827,8 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(constructor_name) - Value& constructor_value=get_element(*class_value, constructor_name); - - Junction* junction=constructor_value.get_junction(); - if(!junction || junction->self.get_class()!=class_value) + Junction* constructor_junction=get_element(*class_value, constructor_name).get_junction(); + if(!constructor_junction) throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", @@ -863,12 +838,20 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_OPS(local_ops) DEBUG_PRINT_STR("->\n") - VMethodFrame frame(*junction, method_frame); - METHOD_FRAME_ACTION(op_call(frame, true /* constructing */)); + Value *result; + { + Value& object=construct(*class_value, *constructor_junction->method); + VConstructorFrame frame(*constructor_junction->method, method_frame, object); + METHOD_FRAME_ACTION(op_call(frame)); + object.enable_default_setter(); + result=&frame.result().as_value(); + // VMethodFrame desctructor deletes junctions in stack params here + } + if(opcode==OP::OP_CONSTRUCT_OBJECT) - stack.push(frame.result().as_value()); + stack.push(*result); else - write_pass_lang(frame.result()); + write_pass_lang(*result); DEBUG_PRINT_STR("<-returned") break; @@ -1205,48 +1188,41 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; \ method_frame=saved_method_frame; -void Request::op_call(VMethodFrame& frame, bool constructing){ - const Junction &junction=frame.junction; - VStateless_class& called_class=*junction.self.get_class(); - Value* new_self; - - if(constructing) { - if(junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - if(new_self=called_class.create_new_value(fpool, 0 /*creating fields only in VClass*/)) { + +Value& Request::construct(Value &class_value, const Method &method){ + VStateless_class& called_class=*class_value.get_class(); + + if(method.call_type!=Method::CT_STATIC) { + // this is a constructor call + if(Value* result=called_class.create_new_value(fpool)) { // some stateless_class creatable derivates - } 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 + return *result; + } else throw Exception(PARSER_RUNTIME, 0, //&frame.name(), + "is not a constructor, system class '%s' can be constructed only implicitly", + called_class.name().cstr()); + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), "method is static and can not be used as constructor"); - } else - new_self=&junction.self; - - frame.set_self(*new_self); +} +void Request::op_call(VMethodFrame& frame){ // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); SAVE_CONTEXT - rcontext=wcontext=&frame; - method_frame=&frame; + rcontext=wcontext=method_frame=&frame; - const Method& method=*junction.method; - Method::Call_type call_type=&called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; + Value& self=frame.self(); + const Method& method=frame.method; + Method::Call_type call_type=self.get_class()==&self ? Method::CT_STATIC : Method::CT_DYNAMIC; if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? if(method.native_code) { // native code? - method.check_actual_numbered_params(junction.self, frame.numbered_params()); + method.check_actual_numbered_params(self, frame.numbered_params()); method.native_code(*this, *frame.numbered_params()); // execute it } else // parser code, execute it recoursion_checked_execute(*method.parser_code); @@ -1257,26 +1233,22 @@ void Request::op_call(VMethodFrame& fram call_type==Method::CT_STATIC?"statically":"dynamically"); RESTORE_CONTEXT - //return &frame; } void Request::op_call_write(VMethodFrame& frame){ - const Junction &junction=frame.junction; - - frame.set_self(junction.self); - VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; rcontext=&frame; method_frame=&frame; - const Method& method=*junction.method; - Method::Call_type call_type=junction.self.get_class()==&junction.self ? Method::CT_STATIC : Method::CT_DYNAMIC; + Value& self=frame.self(); + const Method& method=frame.method; + Method::Call_type call_type=self.get_class()==&self ? Method::CT_STATIC : Method::CT_DYNAMIC; if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? if(method.native_code) { // native code? - method.check_actual_numbered_params(junction.self, frame.numbered_params()); + method.check_actual_numbered_params(self, frame.numbered_params()); method.native_code(*this, *frame.numbered_params()); // execute it } else // parser code, execute it recoursion_checked_execute(*method.parser_code); @@ -1290,54 +1262,85 @@ void Request::op_call_write(VMethodFrame method_frame=saved_method_frame; } -/** - @bug ^superbase:method would dynamically call ^base:method if there is any -*/ Value& Request::get_element(Value& ncontext, const String& name) { if(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 *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent - return *(value ? &process_to_value(*value) : VVoid::get()); - } + if(read_class->derived_from(*called_class)){ // current derived from called + Value *value=called_class->get_element(get_self(), name); + return *(value ? &process_to_value(*value) : VVoid::get()); + } - Value* value=ncontext.get_element(name, ncontext, true); + Value* value=ncontext.get_element(name); return *(value ? &process_to_value(*value) : VVoid::get()); } 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(name, value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { - // process it - VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); + const Junction& junction = vjunction->junction(); + VConstructorFrame frame(*junction.method, method_frame /*caller*/, junction.self); size_t 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); - frame.store_params(&value, 1); - frame.set_self(frame.junction.self); + if(junction.auto_name){ + // default setter + if(param_count!=2) + throw Exception(PARSER_RUNTIME, + 0, + "default setter method must have TWO parameters (has %d parameters)", param_count); + + Value* params[2] = { new VString(*junction.auto_name), value }; + frame.store_params(params, 2); + + Temp_disable_default_setter temp(junction.self); + execute_method(frame); + } else { + // setter + if(param_count!=1) + throw Exception(PARSER_RUNTIME, + 0, + "setter method must have ONE parameter (has %d parameters)", param_count); - SAVE_CONTEXT + frame.store_params(&value, 1); + execute_method(frame); + } + } +} - rcontext=wcontext=&frame; - method_frame=&frame; +StringOrValue Request::process_getter(Junction& junction) { + VMethodFrame frame(*junction.method, method_frame/*caller*/, junction.self); + size_t param_count=frame.method_params_count(); + + if(junction.auto_name){ + // default getter + Value *param; - // prevent non-string writes for better error reporting [setters are not expected to return anything] - wcontext->write(*method_frame); + if(param_count){ + if(param_count>1) + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + param=new VString(*junction.auto_name); + frame.store_params(¶m, 1); + } // no need for else frame.empty_params() - recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it - // we don't need it StringOrValue result=wcontext->result(); + Temp_disable_default_getter temp(junction.self); + execute_method(frame); + } else { + // getter + if(param_count!=0) + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); + + // no need for frame.empty_params() + execute_method(frame); + } - RESTORE_CONTEXT - } + return frame.result(); } /** @param intercept_string @@ -1351,40 +1354,12 @@ void Request::put_element(Value& ncontex using the fact it's either string_ or value_ result requested to speed up checkes */ + StringOrValue Request::process(Value& input_value, bool intercept_string) { Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - VMethodFrame frame(*junction, method_frame/*caller*/); - - if(size_t param_count=frame.method_params_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); - - SAVE_CONTEXT - - rcontext=wcontext=&frame; - method_frame=&frame; - - recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it - StringOrValue result=wcontext->result(); - - RESTORE_CONTEXT - - return result; + return process_getter(*junction); } if(junction->code) { // is it a code-junction? @@ -1447,35 +1422,7 @@ void Request::process_write(Value& input Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - VMethodFrame frame(*junction, method_frame/*caller*/); - - if(size_t param_count=frame.method_params_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); - - SAVE_CONTEXT - - rcontext=wcontext=&frame; - method_frame=&frame; - - recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it - - RESTORE_CONTEXT - - write_pass_lang(frame.result()); + write_pass_lang(process_getter(*junction)); return; } @@ -1537,55 +1484,37 @@ void Request::process_write(Value& input write_pass_lang(input_value); } -StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { +void Request::execute_method(VMethodFrame& aframe) { SAVE_CONTEXT // initialize contexts - rcontext=wcontext=method_frame=&amethod_frame; + rcontext=wcontext=method_frame=&aframe; // execute! - execute(*method.parser_code); - - // result - StringOrValue result=wcontext->result(); + recoursion_checked_execute(*aframe.method.parser_code); RESTORE_CONTEXT - - // return - return result; } const String* Request::execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string) { - SAVE_CONTEXT - - Junction local_junction(aself, &method); - VMethodFrame local_frame(local_junction, method_frame/*caller*/); + VMethodFrame local_frame(method, method_frame/*caller*/, aself); + 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; // prevent non-string writes for better error reporting if(do_return_string) - wcontext->write(local_frame); - - // execute! - execute(*method.parser_code); + local_frame.write(local_frame); - // result - const String* result=0; - if(do_return_string) - result=&wcontext->result().as_string(); + execute_method(local_frame); - RESTORE_CONTEXT - - return result; + return do_return_string ? local_frame.get_string() : 0; } Request::Execute_nonvirtual_method_result @@ -1602,10 +1531,74 @@ Request::execute_nonvirtual_method(VStat const String* Request::execute_virtual_method(Value& aself, const String& method_name) { - if(Value* value=aself.get_element(method_name, aself, false)) + if(Value* value=aself.get_element(method_name)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) return execute_method(aself, *method, 0/*no params*/, true); return 0; } + +const String* Request::get_method_filename(const Method* method){ + if(ArrayOperation* code=method->parser_code) + if(code){ + Operation::Origin origin={0, 0, 0}; + Array_iterator i(*code); + while( i.has_next() ){ + switch( i.next().code ){ + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__CONSTRUCT: + case OP::OP_NESTED_CODE: + case OP::OP_OBJECT_POOL: + case OP::OP_STRING_POOL: + case OP::OP_CALL: + case OP::OP_CALL__WRITE: + { + i.next(); // skip local ops + i.next(); // skip next opcode + // continue execution + } + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + case OP::OP_VALUE: + case OP::OP_STRING__WRITE: + case OP::OP_VALUE__GET_CLASS: +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT: + case OP::OP_GET_OBJECT_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: + case OP::OP_VALUE__GET_ELEMENT__WRITE: + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: +#endif + { + origin=i.next().origin; + break; + } + } + if(origin.file_no) + return get_used_filename(origin.file_no); + } + } + return 0; +} +