--- parser3/src/main/execute.C 2009/05/20 13:22:59 1.337 +++ parser3/src/main/execute.C 2010/10/21 15:25:07 1.367 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/05/20 13:22:59 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2010/10/21 15:25:07 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -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 @@ -46,6 +42,12 @@ char *opcode_name[]={ "GET_ELEMENT_OR_OPERATOR", #endif "GET_ELEMENT", + "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT", + "VALUE__GET_ELEMENT__WRITE", + "WITH_ROOT__VALUE__GET_ELEMENT", +#endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT "GET_OBJECT_ELEMENT", "GET_OBJECT_ELEMENT__WRITE", @@ -54,20 +56,24 @@ char *opcode_name[]={ "GET_OBJECT_VAR_ELEMENT", "GET_OBJECT_VAR_ELEMENT__WRITE", #endif -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - "VALUE__GET_ELEMENT", -#endif - "GET_ELEMENT__WRITE", -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - "VALUE__GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + "WITH_SELF__VALUE__GET_ELEMENT", + "WITH_SELF__VALUE__GET_ELEMENT__WRITE", #endif "OBJECT_POOL", "STRING_POOL", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "PREPARE_TO_CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", + "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - "ROOT_CONSTRUCT_EXPR", "ROOT_CONSTRUCT_VALUE", - "WRITE_CONSTRUCT_EXPR", "WRITE_CONSTRUCT_VALUE", + "WITH_ROOT__VALUE__CONSTRUCT_EXPR", + "WITH_ROOT__VALUE__CONSTRUCT_VALUE", + "WITH_WRITE__VALUE__CONSTRUCT_EXPR", + "WITH_WRITE__VALUE__CONSTRUCT_VALUE", + "WITH_SELF__VALUE__CONSTRUCT_EXPR", + "WITH_SELF__VALUE__CONSTRUCT_VALUE", #endif // expression ops: unary @@ -82,6 +88,18 @@ char *opcode_name[]={ "IS" }; +const char* debug_value_to_cstr(Value& value){ + const String* string=value.get_string(); + + if(string) + return string->cstr(); + else + if(value.is_bool()) + return value.as_bool()?"":""; + else + return ""; +} + void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); @@ -111,12 +129,6 @@ void debug_dump(SAPI_Info& sapi_info, in || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE #endif -#ifdef OPTIMIZE_BYTECODE_CONSTRUCT - || opcode==OP::OP_ROOT_CONSTRUCT_EXPR - || opcode==OP::OP_ROOT_CONSTRUCT_VALUE - || opcode==OP::OP_WRITE_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_CONSTRUCT_VALUE -#endif ){ i.next(); // skip origin Value& value1=*i.next().value; @@ -126,31 +138,62 @@ void debug_dump(SAPI_Info& sapi_info, in "%*s%s" " \"%s\" \"%s\"", level*4, "", opcode_name[opcode], - value1.get_string()->cstr(), value2.get_string()->cstr()); + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); continue; } #endif if( + opcode==OP::OP_CONSTRUCT_OBJECT + || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE + ){ + i.next(); // skip origin + Value& value1=*i.next().value; + i.next(); // skip origin + Value& value2=*i.next().value; + debug_printf(sapi_info, + "%*s%s" + " \"%s\" \"%s\"", + level*4, "", opcode_name[opcode], + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); + + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); + continue; + } + 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 || opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR + || opcode==OP::OP_WITH_ROOT__VALUE__GET_ELEMENT +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE #endif ) { Operation::Origin origin=i.next().origin; Value& value=*i.next().value; + debug_printf(sapi_info, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[opcode], - value.get_string()->cstr(), value.type()); + debug_value_to_cstr(value), value.type()); continue; } + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); switch(opcode) { @@ -158,7 +201,7 @@ void debug_dump(SAPI_Info& sapi_info, in 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_OBJECT_POOL: case OP::OP_STRING_POOL: case OP::OP_CALL: case OP::OP_CALL__WRITE: @@ -169,6 +212,7 @@ void debug_dump(SAPI_Info& sapi_info, in } #define DEBUG_PRINT_STR(str) debug_printf(sapi_info, str); #define DEBUG_PRINT_STRING(value) debug_printf(sapi_info, " \"%s\" ", value.cstr()); +#define DEBUG_PRINT_VALUE_AND_TYPE(value) debug_printf(sapi_info, " \"%s\" %s", debug_value_to_cstr(value), value.type()); #define DEBUG_PRINT_OPS(local_ops) \ debug_printf(sapi_info, \ " (%d)\n", local_ops?local_ops->count():0); \ @@ -177,6 +221,7 @@ void debug_dump(SAPI_Info& sapi_info, in #else #define DEBUG_PRINT_STR(str) #define DEBUG_PRINT_STRING(value) +#define DEBUG_PRINT_VALUE_AND_TYPE(value) #define DEBUG_PRINT_OPS(local_ops) #endif @@ -206,14 +251,12 @@ void Request::execute(ArrayOperation& op { debug_origin=i.next().origin; Value& value=*i.next().value; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" %s", value.get_string()->cstr(), value.type()); -#endif + + DEBUG_PRINT_VALUE_AND_TYPE(value) + stack.push(value); break; } - -#ifdef OPTIMIZE_BYTECODE_GET_CLASS case OP::OP_VALUE__GET_CLASS: { // maybe they do ^class:method[] call, remember the fact @@ -221,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, @@ -234,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: { @@ -279,98 +305,76 @@ void Request::execute(ArrayOperation& op } // OTHER ACTIONS BUT WITHs - case OP::OP_CONSTRUCT_VALUE: - { - Value& value=stack.pop().value(); - const String& name=stack.pop().string(); debug_name=&name; - Value& ncontext=stack.pop().value(); - put_element(ncontext, name, &value); - - break; - } #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - case OP::OP_ROOT_CONSTRUCT_EXPR: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - - i.next(); // skip origin - Value& expr=*i.next().value; - - DEBUG_PRINT_STRING(name) - - wcontext->set_in_expression(true); - - Value& value=expr.as_expr_result(); - put_element(*method_frame, name, &value); - break; - } +#define DO_CONSTRUCT(context, vvalue) { \ + debug_origin=i.next().origin; \ + const String& name=*i.next().value->get_string(); debug_name=&name; \ + DEBUG_PRINT_STRING(name) \ + Value& value=stack.pop().value(); \ + put_element( context, name, vvalue ); \ + break; \ + } +#define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value) +#define DO_CONSTRUCT_EXPR(context) { \ + wcontext->set_in_expression(false); \ + DO_CONSTRUCT(context, &value.as_expr_result()) \ + } - case OP::OP_WRITE_CONSTRUCT_EXPR: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: { if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); - - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - - i.next(); // skip origin - Value& expr=*i.next().value; - - DEBUG_PRINT_STRING(name) - - wcontext->set_in_expression(true); - - Value& value=expr.as_expr_result(); - put_element(*wcontext, name, &value); - break; + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_EXPR(*wcontext) } - case OP::OP_ROOT_CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_VALUE(*wcontext) + } - i.next(); // skip origin - Value& value=*i.next().value; + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) - DEBUG_PRINT_STRING(name) + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) - put_element(*method_frame, name, &value); - break; - } + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) - case OP::OP_WRITE_CONSTRUCT_VALUE: - { - if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); - - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) - i.next(); // skip origin - Value& value=*i.next().value; +#endif // OPTIMIZE_BYTECODE_CONSTRUCT - DEBUG_PRINT_STRING(name) + case OP::OP_CONSTRUCT_VALUE: + { +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=stack.pop().value(); +#else + Value& value=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); +#endif + put_element(ncontext, name, &value); - put_element(*wcontext, name, &value); break; } -#endif case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& expr=stack.pop().value(); +#else Value& expr=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); +#endif Value& value=expr.as_expr_result(); put_element(ncontext, name, &value); break; @@ -393,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, @@ -418,12 +422,11 @@ void Request::execute(ArrayOperation& op } case OP::OP_WRITE_EXPR_RESULT: { - Value& value=stack.pop().value(); - write_no_lang(value.as_expr_result()); - - // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); + + Value& value=stack.pop().value(); + wcontext->write(value.as_expr_result()); break; } case OP::OP_STRING__WRITE: @@ -490,8 +493,6 @@ void Request::execute(ArrayOperation& op Value& value=get_element(object, field_name); - i.next(); // skip last OP_GET_ELEMENT - if(opcode==OP::OP_GET_OBJECT_ELEMENT){ stack.push(value); } else { @@ -517,12 +518,10 @@ 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); - i.next(); // skip last OP_GET_ELEMENT - if(opcode==OP::OP_GET_OBJECT_VAR_ELEMENT){ stack.push(value); } else { @@ -541,6 +540,15 @@ void Request::execute(ArrayOperation& op break; } + case OP::OP_GET_ELEMENT__WRITE: + { + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name); + write_assign_lang(value); + break; + } + #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT case OP::OP_VALUE__GET_ELEMENT: { @@ -553,28 +561,48 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } -#endif - - case OP::OP_GET_ELEMENT__WRITE: + case OP::OP_VALUE__GET_ELEMENT__WRITE: { - const String& name=stack.pop().string(); debug_name=&name; - Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name); + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*rcontext, name); write_assign_lang(value); break; } -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - case OP::OP_VALUE__GET_ELEMENT__WRITE: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: { debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; DEBUG_PRINT_STRING(name) - Value& value=get_element(*rcontext, name); - write_assign_lang(value); + Value& value=get_element(*method_frame, name); + stack.push(value); + break; + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(get_self(), name); + + if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } break; } #endif @@ -586,7 +614,11 @@ void Request::execute(ArrayOperation& op WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; - WWrapper local(0/*empty*/, wcontext); +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(wcontext); +#else + WWrapper local(wcontext); +#endif wcontext=&local; execute(local_ops); @@ -602,18 +634,15 @@ void Request::execute(ArrayOperation& op ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(0 /*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; 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; @@ -642,29 +671,33 @@ void Request::execute(ArrayOperation& op rcontext, opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, &local_ops); -#ifdef USE_DESTRUCTORS - value.set_temporal(true); -#else +#ifndef USE_DESTRUCTORS if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) + wcontext->attach_junction(&value); #endif - wcontext->attach_junction(&value); // store param stack.push(value); break; } - case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: - { - wcontext->set_constructing(true); - break; - } - case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); break; } +#define METHOD_FRAME_ACTION(action) \ + if(local_ops){ \ + size_t first = stack.top_index(); \ + execute(*local_ops); \ + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ + action; \ + stack.set_top_index(first); \ + } else { \ + frame.empty_params(); \ + action; \ + } + case OP::OP_CALL: { ArrayOperation* local_ops=i.next().ops; @@ -687,19 +720,8 @@ void Request::execute(ArrayOperation& op value.type()); } - VMethodFrame frame(*junction, method_frame); - - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - + VMethodFrame frame(*junction->method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call(frame)); stack.push(frame.result().as_value()); DEBUG_PRINT_STR("<-returned") @@ -739,7 +761,7 @@ void Request::execute(ArrayOperation& op #ifdef OPTIMIZE_CALL const Method& method=*junction->method; - if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_FRAME){ + if(method.call_optimization==Method::CO_WITHOUT_FRAME){ if(local_ops){ // store param code goes here size_t first = stack.top_index(); execute(*local_ops); @@ -755,37 +777,15 @@ void Request::execute(ArrayOperation& op method.check_actual_numbered_params(junction->self, &method_params); method.native_code(*this, method_params); // execute it } - } else if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ - VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call_write(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call_write(frame); - } + } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + VMethodFrame frame(method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call_write(frame)); } else #endif // OPTIMIZE_CALL { - VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - write_assign_lang(frame.result()); + VMethodFrame frame(method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call(frame)); + write_pass_lang(frame.result()); } DEBUG_PRINT_STR("<-returned") @@ -801,6 +801,52 @@ void Request::execute(ArrayOperation& op break; } + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); debug_name=&class_name; + + DEBUG_PRINT_STRING(class_name) + + Value* class_value=get_class(class_name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &class_name, + "class is undefined"); + + debug_origin=i.next().origin; + Value& vconstructor_name=*i.next().value; + const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; + + DEBUG_PRINT_STRING(constructor_name) + + 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'", + class_value->get_class()->name_cstr()); + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + 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(); + + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); + + DEBUG_PRINT_STR("<-returned") + break; + } + // expression ops: unary case OP::OP_NEG: { @@ -1132,50 +1178,41 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; \ method_frame=saved_method_frame; -void Request::op_call(VMethodFrame& frame){ - const Junction &junction=frame.junction; - VStateless_class& called_class=*junction.self.get_class(); - Value* new_self; - - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); - if(junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - HashStringValue& new_object_fields=*new HashStringValue(); - if(new_self=called_class.create_new_value(fpool, new_object_fields)) { + +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); @@ -1186,26 +1223,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); @@ -1219,63 +1252,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_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 *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent - return *(value ? &process_to_value(*value) : VVoid::get()); - } - - Value* value=ncontext.get_element(name, ncontext, true); + 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 + Value *value=called_class->get_element(get_self(), name); + return *(value ? &process_to_value(*value) : VVoid::get()); + } - if(value && wcontext->get_constructing()) - 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* 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*/); - int param_count=frame.method_params_count(); + const Junction& junction = vjunction->junction(); + VConstructorFrame frame(*junction.method, method_frame /*caller*/, junction.self); - if(param_count!=1) - throw Exception(PARSER_RUNTIME, - 0, - "setter method must have ONE parameter (has %d parameters)", param_count); + size_t param_count=frame.method_params_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 @@ -1289,41 +1344,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*/); - int param_count=frame.method_params_count(); - - 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); - - 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? @@ -1334,8 +1360,8 @@ StringOrValue Request::process(Value& in if(!junction->method_frame) throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + 0, + "junction used outside of context"); SAVE_CONTEXT @@ -1359,7 +1385,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1386,36 +1412,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*/); - int param_count=frame.method_params_count(); - - 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); - - 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; } @@ -1456,7 +1453,7 @@ void Request::process_write(Value& input write_pass_lang(local.result()); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1477,55 +1474,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); + local_frame.write(local_frame); - // execute! - execute(*method.parser_code); + execute_method(local_frame); - // result - const String* result=0; - if(do_return_string) - result=&wcontext->result().as_string(); - - RESTORE_CONTEXT - - return result; + return do_return_string ? local_frame.get_string() : 0; } Request::Execute_nonvirtual_method_result @@ -1542,10 +1521,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; +} +