--- parser3/src/main/execute.C 2008/06/16 12:44:57 1.321 +++ parser3/src/main/execute.C 2009/04/28 11:11:11 1.328 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2008/06/16 12:44:57 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/04/28 11:11:11 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -33,10 +33,26 @@ 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", - "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT_OR_OPERATOR", +#else + "GET_ELEMENT_OR_OPERATOR", +#endif + "GET_ELEMENT", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT", +#endif + "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT__WRITE", +#endif "OBJECT_POOL", "STRING_POOL", "STORE_PARAM", "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", @@ -70,9 +86,20 @@ void debug_printf(SAPI_Info& sapi_info, void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { Array_iterator i(ops); while(i.has_next()) { - OPCODE opcode=i.next().code; + OP::OPCODE opcode=i.next().code; - if(opcode==OP_VALUE || opcode==OP_STRING__WRITE) { + 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 +#endif + ) { Operation::Origin origin=i.next().origin; Value& value=*i.next().value; debug_printf(sapi_info, @@ -85,14 +112,14 @@ void debug_dump(SAPI_Info& sapi_info, in debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); switch(opcode) { - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: - case OP_CURLY_CODE__CONSTRUCT: - case OP_NESTED_CODE: - case OP_OBJECT_POOL: - case OP_STRING_POOL: - case OP_CALL: - case OP_CALL__WRITE: + 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: if(ArrayOperation* local_ops=i.next().ops) debug_dump(sapi_info, level+1, *local_ops); } @@ -113,15 +140,7 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, "execution-------------------------\n"); #endif for(Array_iterator i(ops); i.has_next(); ) { - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); - } - OPCODE opcode=i.next().code; + OP::OPCODE opcode=i.next().code; #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]); @@ -129,7 +148,7 @@ void Request::execute(ArrayOperation& op switch(opcode) { // param in next instruction - case OP_VALUE: + case OP::OP_VALUE: { debug_origin=i.next().origin; Value& value=*i.next().value; @@ -139,7 +158,32 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_GET_CLASS: + +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + case OP::OP_VALUE__GET_CLASS: + { + // maybe they do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + + debug_origin=i.next().origin; + Value& value=*i.next().value; + const String& name=*value.get_string(); + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + Value* class_value=classes().get(name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &name, + "class is undefined"); + + 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(); @@ -154,24 +198,24 @@ void Request::execute(ArrayOperation& op stack.push(*value); break; } - +#endif // OP_WITH - case OP_WITH_ROOT: + case OP::OP_WITH_ROOT: { stack.push(*method_frame); break; } - case OP_WITH_SELF: + case OP::OP_WITH_SELF: { stack.push(get_self()); break; } - case OP_WITH_READ: + case OP::OP_WITH_READ: { stack.push(*rcontext); break; } - case OP_WITH_WRITE: + case OP::OP_WITH_WRITE: { if(wcontext==method_frame) throw Exception(PARSER_RUNTIME, @@ -183,7 +227,7 @@ void Request::execute(ArrayOperation& op } // OTHER ACTIONS BUT WITHs - case OP_CONSTRUCT_VALUE: + case OP::OP_CONSTRUCT_VALUE: { Value& value=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; @@ -192,7 +236,7 @@ void Request::execute(ArrayOperation& op break; } - case OP_CONSTRUCT_EXPR: + case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); @@ -204,20 +248,22 @@ void Request::execute(ArrayOperation& op put_element(ncontext, name, value); break; } - case OP_CURLY_CODE__CONSTRUCT: + case OP::OP_CURLY_CODE__CONSTRUCT: { ArrayOperation& local_ops=*i.next().ops; #ifdef DEBUG_EXECUTE debug_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, local_ops); -#endif - Value& value=*new VJunction( +#endif + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, &local_ops); + wcontext->attach_junction(&value); + 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)) @@ -228,7 +274,7 @@ void Request::execute(ArrayOperation& op break; } - case OP_NESTED_CODE: + case OP::OP_NESTED_CODE: { ArrayOperation& local_ops=*i.next().ops; #ifdef DEBUG_EXECUTE @@ -238,13 +284,13 @@ void Request::execute(ArrayOperation& op stack.push(local_ops); break; } - case OP_WRITE_VALUE: + case OP::OP_WRITE_VALUE: { Value& value=stack.pop().value(); write_assign_lang(value); break; } - case OP_WRITE_EXPR_RESULT: + case OP::OP_WRITE_EXPR_RESULT: { Value& value=stack.pop().value(); write_no_lang(value.as_expr_result()); @@ -254,7 +300,7 @@ void Request::execute(ArrayOperation& op wcontext->set_in_expression(false); break; } - case OP_STRING__WRITE: + case OP::OP_STRING__WRITE: { i.next(); // ignore origin Value* value=i.next().value; @@ -264,8 +310,23 @@ void Request::execute(ArrayOperation& op write_no_lang(*value->get_string()); break; } - - case OP_GET_ELEMENT_OR_OPERATOR: + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + Value& value=get_element(*rcontext, name, true); + stack.push(value); + break; + } +#else + case OP::OP_GET_ELEMENT_OR_OPERATOR: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); @@ -273,7 +334,9 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_GET_ELEMENT: +#endif + + case OP::OP_GET_ELEMENT: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); @@ -282,7 +345,24 @@ void Request::execute(ArrayOperation& op break; } - case OP_GET_ELEMENT__WRITE: +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + Value& value=get_element(*rcontext, name, false); + stack.push(value); + break; + } +#endif + + + case OP::OP_GET_ELEMENT__WRITE: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); @@ -291,8 +371,23 @@ void Request::execute(ArrayOperation& op break; } +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; - case OP_OBJECT_POOL: +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + Value& value=get_element(*rcontext, name, false); + write_assign_lang(value); + break; + } +#endif + + case OP::OP_OBJECT_POOL: { ArrayOperation& local_ops=*i.next().ops; @@ -310,7 +405,7 @@ void Request::execute(ArrayOperation& op break; } - case OP_STRING_POOL: + case OP::OP_STRING_POOL: { ArrayOperation& local_ops=*i.next().ops; @@ -326,7 +421,7 @@ void Request::execute(ArrayOperation& op if(const String* string=wcontext->get_string()) value=new VString(*string); else - value=new VVoid; + value=VVoid::get(); stack.push(*value); wcontext=saved_wcontext; @@ -334,7 +429,7 @@ void Request::execute(ArrayOperation& op } // CALL - case OP_STORE_PARAM: + case OP::OP_STORE_PARAM: { Value& value=stack.pop().value(); VMethodFrame& frame=stack.top_value().method_frame(); @@ -342,8 +437,8 @@ void Request::execute(ArrayOperation& op frame.store_param(value); break; } - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: { // code ArrayOperation& local_ops=*i.next().ops; @@ -359,32 +454,38 @@ void Request::execute(ArrayOperation& op // hence, we zero junction.wcontext here, and later // in .process we would test that field // in decision "which wwrapper to use" - Value& value=*new VJunction( + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, - opcode==OP_EXPR_CODE__STORE_PARAM?0:wcontext, + opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, &local_ops); +#ifdef USE_DESTRUCTORS + value.set_temporal(true); +#else + if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) +#endif + wcontext->attach_junction(&value); // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 frame.store_param(value); break; } - case OP_PREPARE_TO_CONSTRUCT_OBJECT: + case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: { wcontext->set_constructing(true); break; } - case OP_PREPARE_TO_EXPRESSION: + case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); break; } - case OP_CALL: - case OP_CALL__WRITE: + case OP::OP_CALL: + case OP::OP_CALL__WRITE: { //is_debug_junction=true; ArrayOperation* local_ops=i.next().ops; @@ -428,7 +529,7 @@ void Request::execute(ArrayOperation& op stack.pop().value(); } WContext* result_wcontext=op_call(frame); - if(opcode==OP_CALL__WRITE) { + if(opcode==OP::OP_CALL__WRITE) { write_assign_lang(result_wcontext->result()); } else { // OP_CALL stack.push(result_wcontext->result().as_value()); @@ -438,84 +539,93 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, "<-returned"); #endif //is_debug_junction=false; + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } break; } // expression ops: unary - case OP_NEG: + case OP::OP_NEG: { Value& a=stack.pop().value(); Value& value=*new VDouble(-a.as_double()); stack.push(value); break; } - case OP_INV: + case OP::OP_INV: { Value& a=stack.pop().value(); Value& value=*new VDouble(~a.as_int()); stack.push(value); break; } - case OP_NOT: + case OP::OP_NOT: { Value& a=stack.pop().value(); - Value& value=*new VBool(!a.as_bool()); + Value& value=VBool::get(!a.as_bool()); stack.push(value); break; } - case OP_DEF: + case OP::OP_DEF: { Value& a=stack.pop().value(); - Value& value=*new VBool(a.is_defined()); + Value& value=VBool::get(a.is_defined()); stack.push(value); break; } - case OP_IN: + case OP::OP_IN: { Value& a=stack.pop().value(); const String& path=a.as_string(); - Value& value=*new VBool(request_info.uri && *request_info.uri && path.this_starts(request_info.uri)); + Value& value=VBool::get(request_info.uri && *request_info.uri && path.this_starts(request_info.uri)); stack.push(value); break; } - case OP_FEXISTS: + case OP::OP_FEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(file_exist(absolute(a.as_string()))); + Value& value=VBool::get(file_exist(absolute(a.as_string()))); stack.push(value); break; } - case OP_DEXISTS: + case OP::OP_DEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(dir_exists(absolute(a.as_string()))); + Value& value=VBool::get(dir_exists(absolute(a.as_string()))); stack.push(value); break; } // expression ops: binary - case OP_SUB: + case OP::OP_SUB: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VDouble(a.as_double() - b.as_double()); stack.push(value); break; } - case OP_ADD: + case OP::OP_ADD: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VDouble(a.as_double() + b.as_double()); stack.push(value); break; } - case OP_MUL: + case OP::OP_MUL: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VDouble(a.as_double() * b.as_double()); stack.push(value); break; } - case OP_DIV: + case OP::OP_DIV: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -533,7 +643,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_MOD: + case OP::OP_MOD: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -551,7 +661,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_INTDIV: + case OP::OP_INTDIV: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -569,7 +679,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_SL: + case OP::OP_BIN_SL: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -578,7 +688,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_SR: + case OP::OP_BIN_SR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -587,7 +697,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_AND: + case OP::OP_BIN_AND: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -596,7 +706,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_OR: + case OP::OP_BIN_OR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -605,7 +715,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_XOR: + case OP::OP_BIN_XOR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -614,7 +724,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_LOG_AND: + case OP::OP_LOG_AND: { ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; @@ -624,11 +734,11 @@ void Request::execute(ArrayOperation& op result=b.as_bool(); } else result=false; - Value& value=*new VBool(result); + Value& value=VBool::get(result); stack.push(value); break; } - case OP_LOG_OR: + case OP::OP_LOG_OR: { ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; @@ -639,111 +749,111 @@ void Request::execute(ArrayOperation& op Value& b=stack.pop().value(); result=b.as_bool(); } - Value& value=*new VBool(result); + Value& value=VBool::get(result); stack.push(value); break; } - case OP_LOG_XOR: + case OP::OP_LOG_XOR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_bool() ^ b.as_bool()); + Value& value=VBool::get(a.as_bool() ^ b.as_bool()); stack.push(value); break; } - case OP_NUM_LT: + case OP::OP_NUM_LT: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); - Value& value=*new VBool(a_doubleb_double); + Value& value=VBool::get(a_double>b_double); stack.push(value); break; } - case OP_NUM_LE: + case OP::OP_NUM_LE: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); - Value& value=*new VBool(a_double<=b_double); + Value& value=VBool::get(a_double<=b_double); stack.push(value); break; } - case OP_NUM_GE: + case OP::OP_NUM_GE: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); - Value& value=*new VBool(a_double>=b_double); + Value& value=VBool::get(a_double>=b_double); stack.push(value); break; } - case OP_NUM_EQ: + case OP::OP_NUM_EQ: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); - Value& value=*new VBool(a_double==b_double); + Value& value=VBool::get(a_double==b_double); stack.push(value); break; } - case OP_NUM_NE: + case OP::OP_NUM_NE: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); - Value& value=*new VBool(a_double!=b_double); + Value& value=VBool::get(a_double!=b_double); stack.push(value); break; } - case OP_STR_LT: + case OP::OP_STR_LT: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() < b.as_string()); + Value& value=VBool::get(a.as_string() < b.as_string()); stack.push(value); break; } - case OP_STR_GT: + case OP::OP_STR_GT: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() > b.as_string()); + Value& value=VBool::get(a.as_string() > b.as_string()); stack.push(value); break; } - case OP_STR_LE: + case OP::OP_STR_LE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() <= b.as_string()); + Value& value=VBool::get(a.as_string() <= b.as_string()); stack.push(value); break; } - case OP_STR_GE: + case OP::OP_STR_GE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() >= b.as_string()); + Value& value=VBool::get(a.as_string() >= b.as_string()); stack.push(value); break; } - case OP_STR_EQ: + case OP::OP_STR_EQ: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() == b.as_string()); + Value& value=VBool::get(a.as_string() == b.as_string()); stack.push(value); break; } - case OP_STR_NE: + case OP::OP_STR_NE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() != b.as_string()); + Value& value=VBool::get(a.as_string() != b.as_string()); stack.push(value); break; } - case OP_IS: + case OP::OP_IS: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.is(b.as_string().cstr())); + Value& value=VBool::get(a.is(b.as_string().cstr())); stack.push(value); break; } @@ -842,8 +952,11 @@ WContext* Request::op_call(VMethodFrame& Value& Request::get_element(Value& ncontext, const String& name, bool can_call_operator) { Value* value=0; if(can_call_operator) { - if(Method* method=main_class.get_method(name)) // looking operator of that name FIRST - value=new VJunction(main_class, method); + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) + method->junction_template=new VJunction(main_class, method); + return *method->junction_template; + } } if(!value) { if(!wcontext->get_constructing() // not constructing @@ -873,7 +986,7 @@ value_ready: if(value) value=&process_to_value(*value); // process possible code-junction else - value=new VVoid; + value=VVoid::get(); return *value; }