--- parser3/src/main/execute.C 2009/05/23 06:41:11 1.340 +++ parser3/src/main/execute.C 2009/06/04 09:31:38 1.345 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/05/23 06:41:11 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/06/04 09:31:38 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -61,39 +61,21 @@ char *opcode_name[]={ #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT "VALUE__GET_ELEMENT__WRITE", #endif +#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", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - "ROOT_CONSTRUCT_EXPR", - "ROOT_ELEMENT_CONSTRUCT_EXPR", - - - "ROOT_CONSTRUCT_VALUE", - "ROOT_ELEMENT_CONSTRUCT_VALUE", - - - "WRITE_CONSTRUCT_EXPR", - "WRITE_ELEMENT_CONSTRUCT_EXPR", - - - "WRITE_CONSTRUCT_VALUE", - "WRITE_ELEMENT_CONSTRUCT_VALUE", -#endif - -#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT - "ROOT_CALL_CONSTRUCT_EXPR", - //"ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR", - - "ROOT_CALL_CONSTRUCT_VALUE", - //"ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE", - - "WRITE_CALL_CONSTRUCT_EXPR", - //"WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR", - - "WRITE_CALL_CONSTRUCT_VALUE", - //"WRITE_CALL_OBJECT_ELEMENT_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 @@ -108,6 +90,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); @@ -137,26 +131,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_ELEMENT_CONSTRUCT_EXPR - - || opcode==OP::OP_ROOT_CONSTRUCT_VALUE - || opcode==OP::OP_ROOT_ELEMENT_CONSTRUCT_VALUE - - || opcode==OP::OP_WRITE_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR - - || opcode==OP::OP_WRITE_CONSTRUCT_VALUE - || opcode==OP::OP_WRITE_ELEMENT_CONSTRUCT_VALUE -#endif -#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT - || opcode==OP::OP_ROOT_CALL_CONSTRUCT_EXPR - || opcode==OP::OP_ROOT_CALL_CONSTRUCT_VALUE - - || opcode==OP::OP_WRITE_CALL_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_CALL_CONSTRUCT_VALUE -#endif ){ i.next(); // skip origin Value& value1=*i.next().value; @@ -166,7 +140,7 @@ 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 @@ -181,14 +155,27 @@ void debug_dump(SAPI_Info& sapi_info, in || opcode==OP::OP_VALUE__GET_ELEMENT__WRITE || opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR #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]); @@ -209,6 +196,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); \ @@ -217,6 +205,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 @@ -236,8 +225,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 @@ -248,9 +235,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; } @@ -321,196 +308,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: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + 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 } + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: + { + bool is_expr=(opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR); - 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) + if(is_expr) + wcontext->set_in_expression(false); 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.is_void()?new VString():&value); - } - break; - } - - case OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_WRITE_ELEMENT_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_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=stack.pop().value(); - Value& value=get_element(*rcontext, source_var_name); + put_element( + (opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE)?*method_frame: + (opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE)?get_self():*wcontext, + name, + is_expr?&value.as_expr_result():/*value.is_void()?new VString():*/&value + ); - 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.is_void()?new VString():&value); - } break; } #endif // OPTIMIZE_BYTECODE_CONSTRUCT -#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT - case OP::OP_WRITE_CALL_CONSTRUCT_EXPR: - case OP::OP_WRITE_CALL_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_CALL_CONSTRUCT_EXPR: - case OP::OP_ROOT_CALL_CONSTRUCT_VALUE: + case OP::OP_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) - - 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); - } - - // CALL - Operation call_op=i.next(); - ArrayOperation* local_ops=i.next().ops; - - DEBUG_PRINT_OPS(local_ops) - DEBUG_PRINT_STR("->\n") - - 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()); - } - - 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); - } - - DEBUG_PRINT_STR("<-returned") - - if(call_op.code==OP::OP_CALL__WRITE){ - write_assign_lang(frame.result()); - } else { - Value& value=frame.result().as_value(); - - 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); - } - } - - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); - } +#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_CALL_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; @@ -630,8 +497,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 { @@ -661,8 +526,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 { @@ -719,6 +582,26 @@ void Request::execute(ArrayOperation& op } #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 + case OP::OP_OBJECT_POOL: { ArrayOperation& local_ops=*i.next().ops; @@ -782,12 +665,10 @@ 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;