--- parser3/src/main/execute.C 2009/05/23 05:23:03 1.338 +++ parser3/src/main/execute.C 2009/06/14 00:34:04 1.349 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/05/23 05:23:03 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/06/14 00:34:04 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -46,6 +46,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,36 +60,26 @@ 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", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", +#endif + "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - "ROOT_CONSTRUCT_EXPR", - "ROOT_ELEMENT_CONSTRUCT_EXPR", - "ROOT_CALL_CONSTRUCT_EXPR", - - - "ROOT_CONSTRUCT_VALUE", - "ROOT_ELEMENT_CONSTRUCT_VALUE", - "ROOT_CALL_CONSTRUCT_VALUE", - - - "WRITE_CONSTRUCT_EXPR", - "WRITE_ELEMENT_CONSTRUCT_EXPR", - "WRITE_CALL_CONSTRUCT_EXPR", - - - "WRITE_CONSTRUCT_VALUE", - "WRITE_ELEMENT_CONSTRUCT_VALUE", - "WRITE_CALL_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 @@ -98,6 +94,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); @@ -127,23 +135,23 @@ 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_ELEMENT_CONSTRUCT_EXPR - || opcode==OP::OP_ROOT_CALL_CONSTRUCT_EXPR - - || opcode==OP::OP_ROOT_CONSTRUCT_VALUE - || opcode==OP::OP_ROOT_ELEMENT_CONSTRUCT_VALUE - || opcode==OP::OP_ROOT_CALL_CONSTRUCT_VALUE - - || opcode==OP::OP_WRITE_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_CALL_CONSTRUCT_EXPR - - || opcode==OP::OP_WRITE_CONSTRUCT_VALUE - || opcode==OP::OP_WRITE_ELEMENT_CONSTRUCT_VALUE - || opcode==OP::OP_WRITE_CALL_CONSTRUCT_VALUE + ){ + 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)); + continue; + } #endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + if( + opcode==OP::OP_CONSTRUCT_OBJECT + || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE ){ i.next(); // skip origin Value& value1=*i.next().value; @@ -153,7 +161,10 @@ 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)); + + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); continue; } #endif @@ -167,17 +178,32 @@ void debug_dump(SAPI_Info& sapi_info, in || 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) { @@ -185,7 +211,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: @@ -196,6 +222,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); \ @@ -204,6 +231,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 @@ -223,8 +251,6 @@ void Request::execute(ArrayOperation& op for(Array_iterator i(ops); i.has_next(); ) { OP::OPCODE opcode=i.next().code; - bool with_root=true; - #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]); #endif @@ -235,9 +261,9 @@ 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; } @@ -308,190 +334,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_WRITE_CONSTRUCT_EXPR: - case OP::OP_WRITE_CONSTRUCT_VALUE: - { - if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); - with_root=false; - // don't stop here. continue in the next block - } - - case OP::OP_ROOT_CONSTRUCT_EXPR: - case OP::OP_ROOT_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - - DEBUG_PRINT_STRING(name) - - debug_origin=i.next().origin; - Value& value=*i.next().value; - - if( - opcode == OP::OP_WRITE_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_CONSTRUCT_EXPR - ){ - wcontext->set_in_expression(true); - put_element( (with_root)?*method_frame:*wcontext, name, &value.as_expr_result()); - } else { - put_element( (with_root)?*method_frame:*wcontext, 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_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_WRITE_ELEMENT_CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: { if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); - with_root=false; - // don't stop here. continue in the next block + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_EXPR(*wcontext) } - case OP::OP_ROOT_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_ROOT_ELEMENT_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - - DEBUG_PRINT_STRING(name) - - debug_origin=i.next().origin; - const String& source_var_name=*i.next().value->get_string(); debug_name=&source_var_name; - - DEBUG_PRINT_STRING(source_var_name) - - Value& value=get_element(*rcontext, source_var_name); - - if( - opcode == OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_ELEMENT_CONSTRUCT_EXPR - ){ - wcontext->set_in_expression(true); - put_element( (with_root)?*method_frame:*wcontext, name, &value.as_expr_result()); - } else { - put_element( (with_root)?*method_frame:*wcontext, name, &value); - } - break; - } - - case OP::OP_WRITE_CALL_CONSTRUCT_EXPR: - case OP::OP_WRITE_CALL_CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: { if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); - with_root=false; - // don't stop here. continue in the next block + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_VALUE(*wcontext) } - case OP::OP_ROOT_CALL_CONSTRUCT_EXPR: - case OP::OP_ROOT_CALL_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - - DEBUG_PRINT_STRING(name) - - debug_origin=i.next().origin; - const String& method_name=*i.next().value->get_string(); debug_name=&method_name; - - DEBUG_PRINT_STRING(method_name) + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) - Value* vjunction; - if(Method* method=main_class.get_method(method_name)){ // looking operator of that name FIRST - if(!method->junction_template) - method->junction_template=new VJunction(main_class, method); - vjunction=method->junction_template; - } else { - vjunction=&get_element(*rcontext, method_name); - } + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) - // CALL - i.next(); // ignore OP_CALL|OP_CALL__WRITE, they are redundant... - ArrayOperation* local_ops=i.next().ops; - - DEBUG_PRINT_OPS(local_ops) - DEBUG_PRINT_STR("->\n") + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) - Junction* junction=vjunction->get_junction(); - if(!junction) { - if(vjunction->is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); - else - throw Exception(PARSER_RUNTIME, - 0, - "is '%s', not a method or junction, can not call it", - vjunction->type()); - } + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) - 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); - } - - Value& value=frame.result().as_value(); - - DEBUG_PRINT_STR("<-returned") - - if( - opcode == OP::OP_WRITE_CALL_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_CALL_CONSTRUCT_EXPR - ){ - wcontext->set_in_expression(true); - put_element( (with_root)?*method_frame:*wcontext, name, &value.as_expr_result()); - } else { - put_element( (with_root)?*method_frame:*wcontext, name, &value); - } +#endif // OPTIMIZE_BYTECODE_CONSTRUCT - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); - } + 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); break; } -#endif // OPTIMIZE_BYTECODE_CONSTRUCT 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; @@ -611,8 +523,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 { @@ -642,8 +552,6 @@ void Request::execute(ArrayOperation& op 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 { @@ -662,6 +570,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: { @@ -674,28 +591,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 @@ -707,7 +644,11 @@ void Request::execute(ArrayOperation& op WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(0/*empty*/, wcontext); +#else WWrapper local(0/*empty*/, wcontext); +#endif wcontext=&local; execute(local_ops); @@ -763,22 +704,22 @@ 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; } +#ifndef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: { wcontext->set_constructing(true); break; } +#endif case OP::OP_PREPARE_TO_EXPRESSION: { @@ -906,11 +847,91 @@ void Request::execute(ArrayOperation& op frame.empty_params(); op_call(frame); } - write_assign_lang(frame.result()); + write_pass_lang(frame.result()); + } + + DEBUG_PRINT_STR("<-returned") + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } + break; + } + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + // maybe they do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); + + DEBUG_PRINT_STRING(class_name) + + Value* class_value=classes().get(class_name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &class_name, + "class is undefined"); + + wcontext->set_constructing(true); + + 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) + + Value& constructor_value=get_element(*class_value, constructor_name); + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Junction* junction=constructor_value.get_junction(); + if(!junction) { + if(constructor_value.is("void")) + throw Exception(PARSER_RUNTIME, + 0, + "undefined method"); + else + throw Exception(PARSER_RUNTIME, + 0, + "is '%s', not a method or junction, can not call it", + constructor_value.type()); + } else { + 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); + } + + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); } DEBUG_PRINT_STR("<-returned") + +/* if(get_skip()) return; if(get_interrupted()) { @@ -919,8 +940,10 @@ void Request::execute(ArrayOperation& op 0, "execution stopped"); } +*/ break; } +#endif // OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT // expression ops: unary case OP::OP_NEG: @@ -1262,8 +1285,7 @@ void Request::op_call(VMethodFrame& fram 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)) { + if(new_self=called_class.create_new_value(fpool, 0 /*creating fields only in VClass*/)) { // some stateless_class creatable derivates } else throw Exception(PARSER_RUNTIME,