--- parser3/src/main/execute.C 2009/05/20 13:22:59 1.337 +++ parser3/src/main/execute.C 2009/05/24 07:34:10 1.342 @@ -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: 2009/05/24 07:34:10 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -66,8 +66,39 @@ char *opcode_name[]={ "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - "ROOT_CONSTRUCT_EXPR", "ROOT_CONSTRUCT_VALUE", - "WRITE_CONSTRUCT_EXPR", "WRITE_CONSTRUCT_VALUE", + "ROOT_CONSTRUCT_EXPR", + "ROOT_ELEMENT_CONSTRUCT_EXPR", + "ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR", + "ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR", + + "ROOT_CONSTRUCT_VALUE", + "ROOT_ELEMENT_CONSTRUCT_VALUE", + "ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE", + "ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE", + + "WRITE_CONSTRUCT_EXPR", + "WRITE_ELEMENT_CONSTRUCT_EXPR", + "WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR", + "WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR", + + "WRITE_CONSTRUCT_VALUE", + "WRITE_ELEMENT_CONSTRUCT_VALUE", + "WRITE_OBJECT_ELEMENT_CONSTRUCT_VALUE", + "WRITE_OBJECT_VAR_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", #endif // expression ops: unary @@ -82,6 +113,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); @@ -113,9 +156,23 @@ void debug_dump(SAPI_Info& sapi_info, in #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 @@ -126,7 +183,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 @@ -141,14 +198,28 @@ 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_CONSTRUCT + || opcode==OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR + || opcode==OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR + + || opcode==OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE + || opcode==OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE + + || opcode==OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR + || opcode==OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR + + || opcode==OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_VALUE + || opcode==OP::OP_WRITE_OBJECT_VAR_ELEMENT_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]); @@ -169,6 +240,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 +249,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 @@ -196,6 +269,8 @@ 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 @@ -206,9 +281,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; } @@ -290,78 +365,253 @@ void Request::execute(ArrayOperation& op } #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) - i.next(); // skip origin - Value& expr=*i.next().value; + debug_origin=i.next().origin; + Value& value=*i.next().value; + + if( + opcode == OP::OP_WRITE_CONSTRUCT_EXPR + || opcode == OP::OP_ROOT_CONSTRUCT_EXPR + ){ + 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_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) - wcontext->set_in_expression(true); + 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); - Value& value=expr.as_expr_result(); - put_element(*method_frame, name, &value); + if( + opcode == OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR + || opcode == OP::OP_ROOT_ELEMENT_CONSTRUCT_EXPR + ){ + 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_CONSTRUCT_EXPR: + case OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR: + case OP::OP_WRITE_OBJECT_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_OBJECT_ELEMENT_CONSTRUCT_EXPR: + case OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE: + { debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; + DEBUG_PRINT_STRING(name) - i.next(); // skip origin - Value& expr=*i.next().value; + i.next(); // skip OP_GET_OBJECT_ELEMENT + debug_origin=i.next().origin; + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; + DEBUG_PRINT_STRING(context_name) - DEBUG_PRINT_STRING(name) + Value& object=get_element(*rcontext, context_name); - wcontext->set_in_expression(true); + debug_origin=i.next().origin; + const String& field_name=*i.next().value->get_string(); debug_name=&field_name; + DEBUG_PRINT_STRING(field_name) - Value& value=expr.as_expr_result(); - put_element(*wcontext, name, &value); + Value& value=get_element(object, field_name); + + if( + opcode == OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR + || opcode == OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR + ){ + 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_ROOT_CONSTRUCT_VALUE: + case OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR: + case OP::OP_WRITE_OBJECT_VAR_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_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR: + case OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE: { debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; + DEBUG_PRINT_STRING(name) - i.next(); // skip origin - Value& value=*i.next().value; + i.next(); // skip OP_GET_OBJECT_VAR_ELEMENT + debug_origin=i.next().origin; + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; + DEBUG_PRINT_STRING(context_name) - DEBUG_PRINT_STRING(name) + Value& object=get_element(*rcontext, context_name); - put_element(*method_frame, name, &value); - break; - } + debug_origin=i.next().origin; + const String& var_name=*i.next().value->get_string(); debug_name=&var_name; + DEBUG_PRINT_STRING(var_name) - case OP::OP_WRITE_CONSTRUCT_VALUE: + const String* field_name=get_element(*rcontext, var_name).get_string(); + Value& value=get_element(object, *field_name); + + if( + opcode == OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR + || opcode == OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR + ){ + 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: + { debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; - i.next(); // skip origin - Value& value=*i.next().value; - DEBUG_PRINT_STRING(name) - put_element(*wcontext, name, &value); + debug_origin=i.next().origin; + const String& method_name=*i.next().value->get_string(); debug_name=&method_name; + + DEBUG_PRINT_STRING(method_name) + + bool is_expr=(opcode==OP::OP_WRITE_CALL_CONSTRUCT_EXPR || opcode==OP::OP_ROOT_CALL_CONSTRUCT_EXPR); + if(is_expr) + wcontext->set_in_expression(true); + + 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(is_expr){ + wcontext->set_in_expression(false); + 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"); + } + break; } -#endif +#endif // OPTIMIZE_BYTECODE_CALL_CONSTRUCT case OP::OP_CONSTRUCT_EXPR: {