--- parser3/src/main/execute.C 2003/03/24 11:52:57 1.295.2.27.2.7 +++ parser3/src/main/execute.C 2008/06/16 12:44:57 1.321 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/03/24 11:52:57 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2008/06/16 12:44:57 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -23,8 +23,7 @@ static const char* IDENT_EXECUTE_C="$Dat #include "pa_vimage.h" #include "pa_wwrapper.h" -// #define DEBUG_EXECUTE -#define PA_DEBUG_NO_STACK_TRACE +//#define DEBUG_EXECUTE #ifdef DEBUG_EXECUTE char *opcode_name[]={ @@ -68,23 +67,24 @@ void debug_printf(SAPI_Info& sapi_info, va_end(args); } -void debug_dump(SAPI_Info& sapi_info, , int level, ArrayOperation& ops) { +void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { Array_iterator i(ops); while(i.has_next()) { - Operation& op=i.next(); + OPCODE opcode=i.next().code; - if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - Value* value=i.next().value; + if(opcode==OP_VALUE || opcode==OP_STRING__WRITE) { + Operation::Origin origin=i.next().origin; + Value& value=*i.next().value; debug_printf(sapi_info, "%*s%s" " \"%s\" %s", - level*4, "", opcode_name[op.code], - value->get_string()->cstr().get(), value->type()); + level*4, "", opcode_name[opcode], + value.get_string()->cstr(), value.type()); continue; } - debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[op.code]); + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); - switch(op.code) { + switch(opcode) { case OP_CURLY_CODE__STORE_PARAM: case OP_EXPR_CODE__STORE_PARAM: case OP_CURLY_CODE__CONSTRUCT: @@ -93,7 +93,7 @@ void debug_dump(SAPI_Info& sapi_info, , case OP_STRING_POOL: case OP_CALL: case OP_CALL__WRITE: - if(ArrayOperation* local_ops=i.next().ops.get()) + if(ArrayOperation* local_ops=i.next().ops) debug_dump(sapi_info, level+1, *local_ops); } } @@ -103,41 +103,38 @@ void debug_dump(SAPI_Info& sapi_info, , // Request void Request::execute(ArrayOperation& ops) { -// _asm int 3; + register Stack& stack=this->stack; // helps a lot on MSVC: 'esi' + + const String* debug_name=0; Operation::Origin debug_origin={0, 0, 0}; + try{ #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "source----------------------------\n"); debug_dump(sapi_info, 0, ops); debug_printf(sapi_info, "execution-------------------------\n"); #endif - Array_iterator i(ops); - Value* value; - Value* a; Value* b; - - const String* name; - Value* ncontext; - - ArrayOperation* local_ops; - - while(i.has_next()) { + 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; - Operation op=i.next(); #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[op.code]); + debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]); #endif - switch(op.code) { + switch(opcode) { // param in next instruction case OP_VALUE: { - value=i.next().value; + debug_origin=i.next().origin; + Value& value=*i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" %s", value->get_string()->cstr().get(), value->type()); + debug_printf(sapi_info, " \"%s\" %s", value.get_string()->cstr(), value.type()); #endif stack.push(value); break; @@ -147,51 +144,52 @@ void Request::execute(ArrayOperation& op // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); - name=stack.pop().string(); - value=classes().get(*name); + const String& name=stack.pop().string(); + Value* value=classes().get(name); if(!value) - throw Exception("parser.runtime", - name, + throw Exception(PARSER_RUNTIME, + &name, "class is undefined"); - stack.push(value); + stack.push(*value); break; } // OP_WITH case OP_WITH_ROOT: { - stack.push(method_frame); + stack.push(*method_frame); break; } case OP_WITH_SELF: { - stack.push(&get_self()); + stack.push(get_self()); break; } case OP_WITH_READ: { - stack.push(rcontext); + stack.push(*rcontext); break; } case OP_WITH_WRITE: { if(wcontext==method_frame) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); - stack.push(wcontext); + stack.push(*wcontext); break; } // OTHER ACTIONS BUT WITHs case OP_CONSTRUCT_VALUE: { - value=stack.pop().value; - name=stack.pop().string(); - ncontext=stack.pop().value; - ncontext->put_element(*name, value, false); + 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; } case OP_CONSTRUCT_EXPR: @@ -199,51 +197,57 @@ void Request::execute(ArrayOperation& op // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - value=stack.pop().value; - name=stack.pop().string(); - ncontext=stack.pop().value; - ncontext->put_element(*name, value->as_expr_result(), false); + Value& expr=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=expr.as_expr_result(); + put_element(ncontext, name, value); break; } case OP_CURLY_CODE__CONSTRUCT: { - local_ops=i.next().ops; + 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); + debug_printf(sapi_info, " (%d)\n", local_ops.count()); + debug_dump(sapi_info, 1, local_ops); #endif - value=new VJunction(new Junction( + Value& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, - local_ops)); + &local_ops); - name=stack.pop().string(); - ncontext=stack.pop().value; - ncontext->put_element(*name, value, false); + 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)) + 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: { - local_ops=i.next().ops; + 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); + debug_printf(sapi_info, " (%d)\n", local_ops.count()); + debug_dump(sapi_info, 1, local_ops); #endif stack.push(local_ops); break; } case OP_WRITE_VALUE: { - value=stack.pop().value; - write_assign_lang(*value); + Value& value=stack.pop().value(); + write_assign_lang(value); break; } case OP_WRITE_EXPR_RESULT: { - value=stack.pop().value; - write_no_lang(*value->as_expr_result()); + Value& value=stack.pop().value(); + write_no_lang(value.as_expr_result()); // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION @@ -252,9 +256,10 @@ void Request::execute(ArrayOperation& op } case OP_STRING__WRITE: { - value=i.next().value; + i.next(); // ignore origin + Value* value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr().get()); + debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr()); #endif write_no_lang(*value->get_string()); break; @@ -262,28 +267,34 @@ void Request::execute(ArrayOperation& op case OP_GET_ELEMENT_OR_OPERATOR: { - value=get_element(true); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name, true); stack.push(value); break; } case OP_GET_ELEMENT: { - value=get_element(false); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name, false); stack.push(value); break; } case OP_GET_ELEMENT__WRITE: { - value=get_element(false); - write_assign_lang(*value); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name, false); + write_assign_lang(value); break; } case OP_OBJECT_POOL: { - local_ops=i.next().ops; + ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; @@ -291,55 +302,55 @@ void Request::execute(ArrayOperation& op WWrapper local(0/*empty*/, wcontext); wcontext=&local; - execute(*local_ops); + execute(local_ops); - value=&wcontext->result().as_value(); + stack.push(wcontext->result().as_value()); flang=saved_lang; wcontext=saved_wcontext; - stack.push(value); break; } case OP_STRING_POOL: { - local_ops=i.next().ops; + ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; WWrapper local(0 /*empty*/, wcontext); wcontext=&local; - execute(*local_ops); + execute(local_ops); + Value* value; // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext if(const String* string=wcontext->get_string()) value=new VString(*string); else value=new VVoid; + stack.push(*value); wcontext=saved_wcontext; - stack.push(value); break; } // CALL case OP_STORE_PARAM: { - value=stack.pop().value; - VMethodFrame *frame=stack.top_value().method_frame; + Value& value=stack.pop().value(); + VMethodFrame& frame=stack.top_value().method_frame(); // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" - frame->store_param(*value); + frame.store_param(value); break; } case OP_CURLY_CODE__STORE_PARAM: case OP_EXPR_CODE__STORE_PARAM: { // code - local_ops=i.next().ops; - VMethodFrame *frame=stack.top_value().method_frame; + ArrayOperation& local_ops=*i.next().ops; + VMethodFrame& frame=stack.top_value().method_frame(); #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops->count()); - debug_dump(sapi_info, 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops.count()); + debug_dump(sapi_info, 1, local_ops); #endif // when they evaluate expression parameter, // the object expression result @@ -348,15 +359,15 @@ 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=new VJunction(new Junction( + Value& value=*new VJunction( get_self(), 0, method_frame, rcontext, - op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops)); + opcode==OP_EXPR_CODE__STORE_PARAM?0:wcontext, + &local_ops); // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 - frame->store_param(*value); + frame.store_param(value); break; } @@ -375,7 +386,8 @@ void Request::execute(ArrayOperation& op case OP_CALL: case OP_CALL__WRITE: { - local_ops=i.next().ops; + //is_debug_junction=true; + ArrayOperation* local_ops=i.next().ops; #ifdef DEBUG_EXECUTE debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0); if(local_ops) @@ -383,14 +395,20 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, "->\n"); #endif - value=stack.pop().value; + Value& value=stack.pop().value(); - Junction* junction=value->get_junction(); - if(!junction) - throw Exception("parser.runtime", - 0, - "(%s) not a method or junction, can not call it", - value->type()); + Junction* junction=value.get_junction(); + if(!junction) { + if(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", + value.type()); + } /* no check needed, code compiled the way that that's impossible // check: // that this is method-junction, not a code-junction @@ -398,155 +416,79 @@ void Request::execute(ArrayOperation& op // $junction{code} // ^junction[] if(!junction->method) - throw Exception("parser.runtime", - - "(%s) is code junction, can not call it", - value->type()); + 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 + 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=&get_self(); - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); - if(frame.junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - - if(Value* value=called_class.create_new_value()) { - // 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? -#ifndef PA_DEBUG_NO_STACK_TRACE - try { -#endif - 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.name(), */frame.numbered_params()); // execute it - } else // parser code, execute it - recoursion_checked_execute(/*frame.name(), */*method.parser_code); -#ifndef PA_DEBUG_NO_STACK_TRACE - } catch(...) { - // record it to stack trace - exception_trace.push(frame.name()); - rethrow; - } -#endif - } else - throw Exception("parser.runtime", - 0, //&frame.name(), - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); - + stack.pop().value(); } - StringOrValue result=wcontext->result(); - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - - if(op.code==OP_CALL__WRITE) { - write_assign_lang(result); + WContext* result_wcontext=op_call(frame); + if(opcode==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 + //is_debug_junction=false; break; } // expression ops: unary case OP_NEG: { - a=stack.pop().value; - value=new VDouble(-a->as_double()); + Value& a=stack.pop().value(); + Value& value=*new VDouble(-a.as_double()); stack.push(value); break; } case OP_INV: { - a=stack.pop().value; - value=new VDouble(~a->as_int()); + Value& a=stack.pop().value(); + Value& value=*new VDouble(~a.as_int()); stack.push(value); break; } case OP_NOT: { - a=stack.pop().value; - value=new VBool(!a->as_bool()); + Value& a=stack.pop().value(); + Value& value=*new VBool(!a.as_bool()); stack.push(value); break; } case OP_DEF: { - a=stack.pop().value; - value=new VBool(a->is_defined()); + Value& a=stack.pop().value(); + Value& value=*new VBool(a.is_defined()); stack.push(value); break; } case OP_IN: { - a=stack.pop().value; - const String& path=a->as_string(); - value=new VBool(request_info.uri && path.this_starts(request_info.uri)); + 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)); stack.push(value); break; } case OP_FEXISTS: { - a=stack.pop().value; - value=new VBool(file_readable(absolute(a->as_string()))); + Value& a=stack.pop().value(); + Value& value=*new VBool(file_exist(absolute(a.as_string()))); stack.push(value); break; } case OP_DEXISTS: { - a=stack.pop().value; - value=new VBool(dir_readable(absolute(a->as_string()))); + Value& a=stack.pop().value(); + Value& value=*new VBool(dir_exists(absolute(a.as_string()))); stack.push(value); break; } @@ -554,254 +496,254 @@ void Request::execute(ArrayOperation& op // expression ops: binary case OP_SUB: { - b=stack.pop().value; a=stack.pop().value; - value=new VDouble(a->as_double() - b->as_double()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VDouble(a->as_double() + b->as_double()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VDouble(a->as_double() * b->as_double()); + 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: { - b=stack.pop().value; a=stack.pop().value; + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - double a_double=a->as_double(); - double b_double=b->as_double(); + double a_double=a.as_double(); + double b_double=b.as_double(); if(b_double == 0) { - //const String* problem_source=b->as_string(); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", 0, //problem_source, "Division by zero"); } - value=new VDouble(a_double / b_double); + Value& value=*new VDouble(a_double / b_double); stack.push(value); break; } case OP_MOD: { - b=stack.pop().value; a=stack.pop().value; + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - double a_double=a->as_double(); - double b_double=b->as_double(); + double a_double=a.as_double(); + double b_double=b.as_double(); if(b_double == 0) { - //const String* problem_source=b->as_string(); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", 0, //problem_source, "Modulus by zero"); } - value=new VDouble(fmod(a_double, b_double)); + Value& value=*new VDouble(fmod(a_double, b_double)); stack.push(value); break; } case OP_INTDIV: { - b=stack.pop().value; a=stack.pop().value; + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - int a_int=a->as_int(); - int b_int=b->as_int(); + int a_int=a.as_int(); + int b_int=b.as_int(); if(b_int == 0) { - //const String* problem_source=b->as_string(); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", 0, //problem_source, "Division by zero"); } - value=new VInt(a_int / b_int); + Value& value=*new VInt(a_int / b_int); stack.push(value); break; } case OP_BIN_SL: { - b=stack.pop().value; a=stack.pop().value; - value=new VInt( - a->as_int() << - b->as_int()); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() << + b.as_int()); stack.push(value); break; } case OP_BIN_SR: { - b=stack.pop().value; a=stack.pop().value; - value=new VInt( - a->as_int() >> - b->as_int()); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() >> + b.as_int()); stack.push(value); break; } case OP_BIN_AND: { - b=stack.pop().value; a=stack.pop().value; - value=new VInt( - a->as_int() & - b->as_int()); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() & + b.as_int()); stack.push(value); break; } case OP_BIN_OR: { - b=stack.pop().value; a=stack.pop().value; - value=new VInt( - a->as_int() | - b->as_int()); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() | + b.as_int()); stack.push(value); break; } case OP_BIN_XOR: { - b=stack.pop().value; a=stack.pop().value; - value=new VInt( - a->as_int() ^ - b->as_int()); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() ^ + b.as_int()); stack.push(value); break; } case OP_LOG_AND: { - local_ops=stack.pop().ops; a=stack.pop().value; + ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; - if(a->as_bool()) { - execute(*local_ops); - b=stack.pop().value; - result=b->as_bool(); + if(a.as_bool()) { + execute(local_ops); + Value& b=stack.pop().value(); + result=b.as_bool(); } else result=false; - value=new VBool(result); + Value& value=*new VBool(result); stack.push(value); break; } case OP_LOG_OR: { - local_ops=stack.pop().ops; a=stack.pop().value; + ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; - if(a->as_bool()) + if(a.as_bool()) result=true; else { - execute(*local_ops); - b=stack.pop().value; - result=b->as_bool(); + execute(local_ops); + Value& b=stack.pop().value(); + result=b.as_bool(); } - value=new VBool(result); + Value& value=*new VBool(result); stack.push(value); break; } case OP_LOG_XOR: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_bool() ^ b->as_bool()); + 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: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=new VBool(result < 0.0); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=*new VBool(a_doubleas_double() - b->as_double(); - value=new VBool(result > 0.0); + 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); stack.push(value); break; } case OP_NUM_LE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=new VBool(result <= 0.0); + 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); stack.push(value); break; } case OP_NUM_GE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=new VBool(result >= 0.0); + 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); stack.push(value); break; } case OP_NUM_EQ: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=new VBool(result == 0.0); + 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); stack.push(value); break; } case OP_NUM_NE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=new VBool(result != 0.0); + 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); stack.push(value); break; } case OP_STR_LT: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_string() < b->as_string()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_string() > b->as_string()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_string() <= b->as_string()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_string() >= b->as_string()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_string() == b->as_string()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->as_string() != b->as_string()); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=new VBool(a->is(b->as_string().cstr())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VBool(a.is(b.as_string().cstr())); stack.push(value); break; } @@ -809,46 +751,122 @@ void Request::execute(ArrayOperation& op default: throw Exception(0, 0, - "invalid opcode %d", op.code); + "invalid opcode %d", opcode); } } + } catch(const Exception&) { + // record it to stack trace + if(debug_name) + exception_trace.push(Trace(debug_name, debug_origin)); + rethrow; + } } +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 */ -Value* Request::get_element(bool can_call_operator) { - const String& name=*stack.pop().string(); //remember_name=name; - Value* ncontext=stack.pop().value; - Value* value; +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, 0,0,0, 0)); + value=new VJunction(main_class, method); } if(!value) { if(!wcontext->get_constructing() // not constructing && wcontext->get_somebody_entered_some_class() ) // ^class:method - if(VStateless_class *called_class=ncontext->get_class()) + if(VStateless_class *called_class=ncontext.get_class()) if(VStateless_class *read_class=rcontext->get_class()) 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", + if(junction->self.get_class()!=&ncontext) + throw Exception(PARSER_RUNTIME, &name, "constructor must be declared in class '%s'", - ncontext->get_class()->name_cstr()); + ncontext.get_class()->name_cstr()); } value_ready: @@ -857,7 +875,44 @@ value_ready: else value=new VVoid; - return value; + return *value; +} + +void Request::put_element(Value& ncontext, const String& name, Value& value) { + // put_element can return property-setting-junction + 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; + int param_count=params_names? params_names->count(): 0; + if(param_count!=1) + throw Exception(PARSER_RUNTIME, + 0, + "setter method must have ONE parameter (has %d parameters)", param_count); + + VMethodFrame frame(junction, method_frame/*caller*/); + frame.store_param(value); + + frame.set_self(frame.junction.self); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + rcontext=wcontext=&frame; + method_frame=&frame; + + // 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 + // we don't need it StringOrValue result=wcontext->result(); + + method_frame=saved_method_frame; + wcontext=saved_wcontext; + rcontext=saved_rcontext; + } } /** @param intercept_string @@ -872,68 +927,107 @@ value_ready: using the fact it's either string_ or value_ result requested to speed up checkes */ StringOrValue Request::process(Value& input_value, bool intercept_string) { - StringOrValue result; Junction* junction=input_value.get_junction(); - if(junction && junction->code) { // is it a code-junction? - // process it + if(junction) { + if(junction->is_getter) { // is it a getter-junction? + 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->auto_name && param_count) + frame.store_param(*new VString(*junction->auto_name)); + + frame.set_self(frame.junction.self); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + rcontext=wcontext=&frame; + method_frame=&frame; + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + StringOrValue result=wcontext->result(); + + method_frame=saved_method_frame; + wcontext=saved_wcontext; + rcontext=saved_rcontext; + + return result; + } + + if(junction->code) { // is it a code-junction? + // process it + StringOrValue result; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); + debug_printf(sapi_info, "ja->\n"); #endif - if(!junction->method_frame) - throw Exception("parser.runtime", + if(!junction->method_frame) + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - method_frame=junction->method_frame; - rcontext=junction->rcontext; - - // for expression method params - // wcontext is set 0 - // 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); - wcontext=&local; + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + method_frame=junction->method_frame; + rcontext=junction->rcontext; + + // for expression method params + // wcontext is set 0 + // 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 + + VCodeFrame local(*junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + // CodeFrame soul: + result=wcontext->result(); + } else { + // plain wwrapper + WWrapper local(0/*empty*/, wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + result=wcontext->result(); + } + + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; - // execute it - recoursion_checked_execute(/*0/*result_name* /, */ *junction->code); - - // CodeFrame soul: - // string writes were intercepted - // returning them as the result of getting code-junction - result.set_string(*wcontext->get_string()); - } else { - // plain wwrapper - WWrapper local(0/*empty*/, wcontext); - wcontext=&local; - - // execute it - recoursion_checked_execute(/*0/*result_name* /, */ *junction->code); - - result=wcontext->result(); - } - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-ja returned"); + debug_printf(sapi_info, "<-ja returned"); #endif - } else { - result.set_value(input_value); - } - return result; + return result; + } + + // it is then method-junction, do not explode it + // just return it as we do for usual objects + } + + return input_value; } -const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { +StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; @@ -945,7 +1039,7 @@ const String& Request::execute_method(VM execute(*method.parser_code); // result - const String& result=wcontext->result().as_string(); + StringOrValue result=wcontext->result(); wcontext=saved_wcontext; rcontext=saved_rcontext; @@ -956,14 +1050,15 @@ const String& Request::execute_method(VM } const String* Request::execute_method(Value& aself, - const Method& method, VString* optional_param, - bool do_return_string) { + const Method& method, VString* optional_param, + bool do_return_string) { + VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - Junction local_junction(aself, &method, 0,0,0, 0); - VMethodFrame local_frame(/*method.name, */local_junction, method_frame/*caller*/); + Junction local_junction(aself, &method); + VMethodFrame local_frame(local_junction, method_frame/*caller*/); if(optional_param && local_frame.can_store_param()) { local_frame.store_param(*optional_param); local_frame.fill_unspecified_params(); @@ -992,13 +1087,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; }