--- parser3/src/main/execute.C 2005/07/26 12:54:09 1.309 +++ parser3/src/main/execute.C 2009/04/21 09:26:29 1.326 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2004 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: 2005/07/26 12:54:09 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/04/21 09:26:29 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -70,9 +70,9 @@ 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) { Operation::Origin origin=i.next().origin; Value& value=*i.next().value; debug_printf(sapi_info, @@ -85,14 +85,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,13 +113,15 @@ 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]); @@ -127,7 +129,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; @@ -137,7 +139,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_GET_CLASS: + case OP::OP_GET_CLASS: { // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); @@ -145,7 +147,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); Value* value=classes().get(name); if(!value) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &name, "class is undefined"); @@ -154,25 +156,25 @@ void Request::execute(ArrayOperation& op } // 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", + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); @@ -181,7 +183,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; @@ -190,7 +192,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); @@ -202,31 +204,33 @@ 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(new Junction( +#endif + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, - &local_ops)); + &local_ops); + + wcontext->attach_junction(&value); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - if(const Junction* junction=ncontext.put_element(name, &value, false)) - if(junction!=PUT_ELEMENT_REPLACED_ELEMENT) - throw Exception("parser.runtime", + if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) + throw Exception(PARSER_RUNTIME, 0, "property value can not be code, use [] or () brackets"); break; } - case OP_NESTED_CODE: + case OP::OP_NESTED_CODE: { ArrayOperation& local_ops=*i.next().ops; #ifdef DEBUG_EXECUTE @@ -236,13 +240,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()); @@ -252,7 +256,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; @@ -263,7 +267,7 @@ void Request::execute(ArrayOperation& op break; } - case OP_GET_ELEMENT_OR_OPERATOR: + case OP::OP_GET_ELEMENT_OR_OPERATOR: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); @@ -271,7 +275,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_GET_ELEMENT: + case OP::OP_GET_ELEMENT: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); @@ -280,7 +284,7 @@ void Request::execute(ArrayOperation& op break; } - case OP_GET_ELEMENT__WRITE: + case OP::OP_GET_ELEMENT__WRITE: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); @@ -290,7 +294,7 @@ void Request::execute(ArrayOperation& op } - case OP_OBJECT_POOL: + case OP::OP_OBJECT_POOL: { ArrayOperation& local_ops=*i.next().ops; @@ -308,7 +312,7 @@ void Request::execute(ArrayOperation& op break; } - case OP_STRING_POOL: + case OP::OP_STRING_POOL: { ArrayOperation& local_ops=*i.next().ops; @@ -324,7 +328,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; @@ -332,7 +336,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(); @@ -340,8 +344,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; @@ -357,32 +361,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(new Junction( + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, - opcode==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - &local_ops)); + 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; @@ -398,11 +408,11 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { if(value.is("void")) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "undefined method"); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, can not call it", value.type()); @@ -414,92 +424,24 @@ void Request::execute(ArrayOperation& op // $junction{code} // ^junction[] if(!junction->method) - throw Exception("parser.runtime", - + throw Exception(PARSER_RUNTIME, "is '%s', it is code junction, can not call it", value.type()); */ - VMethodFrame frame(*junction, method_frame/*caller*/); + VMethodFrame frame(*junction, method_frame); if(local_ops){ // store param code goes here stack.push(frame); // argument for *STORE_PARAM ops execute(*local_ops); stack.pop().value(); } - frame.fill_unspecified_params(); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - VStateless_class& called_class=*frame.junction.self.get_class(); - Value* new_self; - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); - new_self=&get_self(); - if(frame.junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - - if(Value* value=called_class.create_new_value(fpool)) { - // some stateless_class creatable derivates - new_self=value; - } 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 - throw Exception("parser.runtime", - 0, //&frame.name(), - "method is static and can not be used as constructor"); - } else - new_self=&frame.junction.self; - - frame.set_self(*new_self); - - // see OP_PREPARE_TO_EXPRESSION - frame.set_in_expression(wcontext->get_in_expression()); - - rcontext=wcontext=&frame; - { - const Method& method=*frame.junction.method; - Method::Call_type call_type= - &called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; - if( - method.call_type==Method::CT_ANY || - method.call_type==call_type) { // allowed call type? - method_frame=&frame; - if(method.native_code) { // native code? - method.check_actual_numbered_params( - frame.junction.self, - /*frame.name(), */frame.numbered_params()); - method.native_code( - *this, - *frame.numbered_params()); // execute it - } else // parser code, execute it - recoursion_checked_execute(*method.parser_code); - } else - throw Exception("parser.runtime", - 0, //&frame.name(), - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); - - } - StringOrValue result=wcontext->result(); - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - - if(opcode==OP_CALL__WRITE) { - write_assign_lang(result); + WContext* result_wcontext=op_call(frame); + if(opcode==OP::OP_CALL__WRITE) { + write_assign_lang(result_wcontext->result()); } else { // OP_CALL - stack.push(result.as_value()); + stack.push(result_wcontext->result().as_value()); } - + #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "<-returned"); #endif @@ -508,35 +450,35 @@ void Request::execute(ArrayOperation& op } // 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()); stack.push(value); break; } - case OP_DEF: + case OP::OP_DEF: { Value& a=stack.pop().value(); Value& value=*new VBool(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(); @@ -544,44 +486,44 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_FEXISTS: + case OP::OP_FEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(file_readable(absolute(a.as_string()))); + Value& value=*new VBool(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_readable(absolute(a.as_string()))); + Value& value=*new VBool(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(); @@ -599,7 +541,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(); @@ -617,7 +559,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(); @@ -635,7 +577,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( @@ -644,7 +586,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( @@ -653,7 +595,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( @@ -662,7 +604,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( @@ -671,7 +613,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( @@ -680,7 +622,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; @@ -694,7 +636,7 @@ void Request::execute(ArrayOperation& op 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; @@ -709,14 +651,14 @@ void Request::execute(ArrayOperation& op 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()); 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(); @@ -724,7 +666,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_NUM_GT: + case OP::OP_NUM_GT: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -732,7 +674,7 @@ void Request::execute(ArrayOperation& op 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(); @@ -740,7 +682,7 @@ void Request::execute(ArrayOperation& op 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(); @@ -748,7 +690,7 @@ void Request::execute(ArrayOperation& op 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(); @@ -756,7 +698,7 @@ void Request::execute(ArrayOperation& op 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(); @@ -764,49 +706,49 @@ void Request::execute(ArrayOperation& op 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()); 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()); 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()); 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()); 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()); 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()); 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())); @@ -828,6 +770,79 @@ void Request::execute(ArrayOperation& op } } +WContext* Request::op_call(VMethodFrame& frame){ + frame.fill_unspecified_params(); + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + VStateless_class& called_class=*frame.junction.self.get_class(); + Value* new_self; + if(wcontext->get_constructing()) { + wcontext->set_constructing(false); + new_self=&get_self(); + if(frame.junction.method->call_type!=Method::CT_STATIC) { + // this is a constructor call + HashStringValue& new_object_fields=*new HashStringValue(); + if(Value* value=called_class.create_new_value(fpool, new_object_fields)) { + // some stateless_class creatable derivates + new_self=value; + } 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 + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "method is static and can not be used as constructor"); + } else + new_self=&frame.junction.self; + + frame.set_self(*new_self); + + // see OP_PREPARE_TO_EXPRESSION + frame.set_in_expression(wcontext->get_in_expression()); + + rcontext=wcontext=&frame; + { + const Method& method=*frame.junction.method; + Method::Call_type call_type=&called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; + if( + method.call_type==Method::CT_ANY || + method.call_type==call_type) { // allowed call type? + method_frame=&frame; + if(method.native_code) { // native code? + method.check_actual_numbered_params( + frame.junction.self, + /*frame.name(), */frame.numbered_params()); + method.native_code( + *this, + *frame.numbered_params()); // execute it + } else // parser code, execute it + recoursion_checked_execute(*method.parser_code); + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "is not allowed to be called %s", + call_type==Method::CT_STATIC?"statically":"dynamically"); + } + + WContext *result_wcontext=wcontext; + // StringOrValue result=wcontext->result(); + + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + + return result_wcontext; +} + + /** @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any @@ -835,8 +850,11 @@ void Request::execute(ArrayOperation& op 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(new Junction(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 @@ -846,17 +864,17 @@ Value& Request::get_element(Value& ncont 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=base->get_element(name, *base, false); // virtual-up lookup starting from parent + value=base->get_element(name, *base, true); // virtual-up lookup starting from parent goto value_ready; } } if(!value) - value=ncontext.get_element(name, ncontext, false); + value=ncontext.get_element(name, ncontext, true); if(value && wcontext->get_constructing()) if(Junction* junction=value->get_junction()) { if(junction->self.get_class()!=&ncontext) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &name, "constructor must be declared in class '%s'", ncontext.get_class()->name_cstr()); @@ -866,24 +884,25 @@ value_ready: if(value) value=&process_to_value(*value); // process possible code-junction else - value=new VVoid; + value=VVoid::get(); return *value; } void Request::put_element(Value& ncontext, const String& name, Value& value) { // put_element can return property-setting-junction - if(const Junction* junction=ncontext.put_element(name, &value, false)) - if(junction!=PUT_ELEMENT_REPLACED_ELEMENT) { + if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { + const Junction& junction=vjunction->junction(); // process it - ArrayString* params_names=junction->method->params_names; + ArrayString* params_names=junction.method->params_names; int param_count=params_names? params_names->count(): 0; if(param_count!=1) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); - VMethodFrame frame(*junction, method_frame/*caller*/); + VMethodFrame frame(junction, method_frame/*caller*/); frame.store_param(value); frame.set_self(frame.junction.self); @@ -895,7 +914,7 @@ void Request::put_element(Value& ncontex rcontext=wcontext=&frame; method_frame=&frame; - // prevent non-string writes for better error reporting + // prevent non-string writes for better error reporting [setters are not expected to return anything] wcontext->write(*method_frame); recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it @@ -922,13 +941,21 @@ StringOrValue Request::process(Value& in Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - // process it + int param_count=junction->method->params_names?junction->method->params_names->count():0; + if(junction->auto_name){ // default getter + if(param_count>1) + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + } else if(param_count) + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); VMethodFrame frame(*junction, method_frame/*caller*/); - if(junction->method->params_names) - throw Exception("parser.runtime", - 0, - "getter method must have no parameters"); + + if(junction->auto_name && param_count) + frame.store_param(*new VString(*junction->auto_name)); frame.set_self(frame.junction.self); @@ -957,7 +984,7 @@ StringOrValue Request::process(Value& in #endif if(!junction->method_frame) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); @@ -973,18 +1000,16 @@ StringOrValue Request::process(Value& in // using the fact in decision "which wwrapper to use" bool using_code_frame=intercept_string && junction->wcontext; if(using_code_frame) { - // almost plain wwrapper about junction wcontext, - // BUT intercepts string writes - VCodeFrame local(*junction->wcontext, junction->wcontext); + // almost plain wwrapper about junction wcontext + + VCodeFrame local(*junction->wcontext); wcontext=&local; // execute it recoursion_checked_execute(*junction->code); // CodeFrame soul: - // string writes were intercepted - // returning them as the result of getting code-junction - result.set_string(*wcontext->get_string()); + result=wcontext->result(); } else { // plain wwrapper WWrapper local(0/*empty*/, wcontext); @@ -1038,6 +1063,7 @@ StringOrValue Request::execute_method(VM const String* Request::execute_method(Value& aself, const Method& method, VString* optional_param, bool do_return_string) { + VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; @@ -1072,13 +1098,13 @@ const String* Request::execute_method(Va Request::Execute_nonvirtual_method_result Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString* optional_param, + const String& method_name, + VString* optional_param, bool do_return_string) { Execute_nonvirtual_method_result result; result.method=aclass.get_method(method_name); if(result.method) - result.string=execute_method(aclass, *result.method, optional_param, - do_return_string); + result.string=execute_method(aclass, *result.method, optional_param, do_return_string); return result; }