--- parser3/src/main/execute.C 2003/02/17 10:44:55 1.295.2.11 +++ parser3/src/main/execute.C 2003/04/02 09:32:11 1.295.2.27.2.12 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/02/17 10:44:55 $"; +static const char* IDENT_EXECUTE_C="$Date: 2003/04/02 09:32:11 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -23,15 +23,8 @@ static const char* IDENT_EXECUTE_C="$Dat #include "pa_vimage.h" #include "pa_wwrapper.h" -//#define DEBUG_EXECUTE -//#define DEBUG_STRING_APPENDS_VS_EXPANDS - - -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS -ulong wcontext_result_size=0; -#endif - - +// #define DEBUG_EXECUTE +#define PA_DEBUG_NO_STACK_TRACE #ifdef DEBUG_EXECUTE char *opcode_name[]={ @@ -78,15 +71,15 @@ 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()) { - Operation& op=i.next(); + Operation op=i.next(); if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - ValuePtr value=i.next().value; + Value& value=i.next().value; debug_printf(sapi_info, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[op.code], - value->get_string(0)->cstr().get(), value->type()); + value.get_string()->cstr(), value.type()); continue; } debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[op.code]); @@ -99,59 +92,43 @@ void debug_dump(SAPI_Info& sapi_info, in case OP_OBJECT_POOL: case OP_STRING_POOL: case OP_CALL: - ArrayOperation& local_ops=*i.next().ops; - debug_dump(sapi_info, level+1, local_ops); + case OP_CALL__WRITE: + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); } } } #endif -/*#define stack.push(value) stack.push(value.get()) -#define stack.pop().value static_cast(stack.pop()) - -#define stack.push(value) stack.push(value) -#define stack.pop().string static_cast(stack.pop())->as_string(&pool()).get() -#define POP_CODE() static_cast(stack.pop()) -*/ // Request void Request::execute(ArrayOperation& ops) { -// _asm int 3; + register Stack& stack=this->stack; // helps a lot on MSVC: 'esi' + #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "source----------------------------\n"); debug_dump(sapi_info, 0, ops); debug_printf(sapi_info, "execution-------------------------\n"); #endif - StringPtr last_get_element_name(0); - - Array_iterator i(ops); - while(i.has_next()) { - if(interrupted()) + for(Array_iterator i(ops); i.has_next(); ) { + if(get_interrupted()) { + set_interrupted(false); throw Exception("parser.interrupted", - Exception::undefined_source, + 0, "execution stopped"); - - Operation& op=i.next(); + } + OPCODE opcode=i.next().code; #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 - ValuePtr value; - ValuePtr a; ValuePtr b; - //ArrayOperationPtr b_code; - - StringPtr name; - Value* ncontext; - - ArrayOperationPtr local_ops; - - switch(op.code) { + switch(opcode) { // param in next instruction case OP_VALUE: { - value=i.next().value; + Value& value=*i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" %s", value->get_string(0)->cstr().get(), value->type()); + debug_printf(sapi_info, " \"%s\" %s", value.get_string()->cstr(), value.type()); #endif stack.push(value); break; @@ -161,51 +138,51 @@ 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", - StringPtr(name), + &name, "class is undefined"); - stack.push(value); + stack.push(*value); break; } // OP_WITH case OP_WITH_ROOT: { - stack.push(ValuePtr(method_frame)); + stack.push(*method_frame); break; } case OP_WITH_SELF: { - stack.push(ValuePtr(get_self())); + stack.push(get_self()); break; } case OP_WITH_READ: { - stack.push(ValuePtr(rcontext)); + stack.push(*rcontext); break; } case OP_WITH_WRITE: { if(wcontext==method_frame) throw Exception("parser.runtime", - Exception::undefined_source, + 0, "$.name outside of $name[...]"); - stack.push(ValuePtr(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.get(); - ncontext->put_element(name, value, false); + Value& value=stack.pop().value(); + const String& name=stack.pop().string(); + Value& ncontext=stack.pop().value(); + ncontext.put_element(name, &value, false); break; } case OP_CONSTRUCT_EXPR: @@ -213,36 +190,36 @@ 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.get(); - ncontext->put_element(name, value->as_expr_result(), false); + Value& value=stack.pop().value(); + const String& name=stack.pop().string(); + Value& ncontext=stack.pop().value(); + ncontext.put_element(name, &value.as_expr_result(), false); 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_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, *local_ops); #endif - value=ValuePtr(new VJunction(JunctionPtr(new Junction( + Value& value=*new VJunction(new Junction( get_self(), 0, method_frame, rcontext, wcontext, - local_ops)))); + &local_ops)); - name=stack.pop().string; - ncontext=stack.pop().value.get(); - ncontext->put_element(name, value, false); + const String& name=stack.pop().string(); + Value& ncontext=stack.pop().value(); + ncontext.put_element(name, &value, false); 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_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, *local_ops); #endif stack.push(local_ops); @@ -250,14 +227,14 @@ void Request::execute(ArrayOperation& op } case OP_WRITE_VALUE: { - value=stack.pop().value; - write_assign_lang(value, last_get_element_name); + 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 @@ -266,93 +243,93 @@ void Request::execute(ArrayOperation& op } case OP_STRING__WRITE: { - value=i.next().value; + Value* value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\"", value->get_string(0)->cstr().get()); + debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr()); #endif - write_no_lang(*value->get_string(0)); + write_no_lang(*value->get_string()); break; } case OP_GET_ELEMENT_OR_OPERATOR: { - value=get_element(last_get_element_name, true); + Value& value=get_element(true); stack.push(value); break; } case OP_GET_ELEMENT: { - value=get_element(last_get_element_name, false); + Value& value=get_element(false); stack.push(value); break; } case OP_GET_ELEMENT__WRITE: { - value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); - write_assign_lang(value, last_get_element_name); + Value& value=get_element(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; - uchar saved_lang= flang; - flang=String::UL_PASS_APPENDED; - WWrapper local(ValuePtr(0)/*empty*/, wcontext); + String::Language saved_lang=flang; + flang=String::L_PASS_APPENDED; + 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(ValuePtr(0) /*empty*/, 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(StringPtr string=wcontext->get_string(&pool())) - value=ValuePtr(new VString(string)); + if(const String* string=wcontext->get_string()) + value=new VString(*string); else - value=ValuePtr(new VVoid); + value=new VVoid; + stack.push(*value); wcontext=saved_wcontext; - stack.push(value); break; } // CALL case OP_STORE_PARAM: { - value=stack.pop().value; - VMethodFrame *frame=static_cast(stack.top_value().unknown); + 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=static_cast(stack.top_value().unknown); + 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_printf(sapi_info, " (%d)\n", local_ops.count()); debug_dump(sapi_info, 1, *local_ops); #endif // when they evaluate expression parameter, @@ -362,15 +339,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=ValuePtr(new VJunction(JunctionPtr(new Junction( + Value& value=*new VJunction(new Junction( 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; } @@ -389,21 +366,22 @@ void Request::execute(ArrayOperation& op case OP_CALL: case OP_CALL__WRITE: { - 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?local_ops.count():0); + if(local_ops) + debug_dump(sapi_info, 1, *local_ops); debug_printf(sapi_info, "->\n"); #endif - value=stack.pop().value; + Value& value=stack.pop().value(); - JunctionPtr junction=value->get_junction(); + Junction* junction=value.get_junction(); if(!junction) throw Exception("parser.runtime", - last_get_element_name, + 0, "(%s) not a method or junction, can not call it", - value->type()); + value.type()); /* no check needed, code compiled the way that that's impossible // check: // that this is method-junction, not a code-junction @@ -412,49 +390,49 @@ void Request::execute(ArrayOperation& op // ^junction[] if(!junction->method) throw Exception("parser.runtime", - last_get_element_name, + "(%s) is code junction, can not call it", - value->type()); + value.type()); */ - VMethodFrame frame(pool(), last_get_element_name, *junction, method_frame/*caller*/); + VMethodFrame frame(*junction, method_frame/*caller*/); 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; + 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(); - ValuePtr new_self=get_self(); + 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(ValuePtr value=called_class->create_new_value()) { + if(Value* value=called_class.create_new_value()) { // some stateless_class creatable derivates new_self=value; } else throw Exception("parser.runtime", - frame.name(), + 0, //&frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", - (char*)called_class->name()->cstr()); + called_class.name().cstr()); - frame.write(new_self, - String::UL_CLEAN // not used, always an object, not string + frame.write(*new_self, + String::L_CLEAN // not used, always an object, not string ); } else throw Exception("parser.runtime", - frame.name(), + 0, //&frame.name(), "method is static and can not be used as constructor"); } else - new_self=frame.junction.self; + new_self=&frame.junction.self; - frame.set_self(new_self); + frame.set_self(*new_self); // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); @@ -463,29 +441,33 @@ void Request::execute(ArrayOperation& op { const Method& method=*frame.junction.method; Method::Call_type call_type= - called_class==new_self.get() ? Method::CT_STATIC : Method::CT_DYNAMIC; + &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()); + frame.junction.self, + /*frame.name(), */frame.numbered_params()); method.native_code( *this, - frame.name(), frame.numbered_params()); // execute it + /*frame.name(), */frame.numbered_params()); // execute it } else // parser code, execute it - recoursion_checked_execute(frame.name(), *method.parser_code); + 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", - frame.name(), + 0, //&frame.name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); @@ -496,13 +478,8 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; method_frame=saved_method_frame; -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - if(const String *s=value->get_string()) - wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row); -#endif - - if(op.code==OP_CALL__WRITE) { - write_assign_lang(result, last_get_element_name); + if(opcode==OP_CALL__WRITE) { + write_assign_lang(result); } else { // OP_CALL stack.push(result.as_value()); } @@ -516,55 +493,51 @@ void Request::execute(ArrayOperation& op // expression ops: unary case OP_NEG: { - a=stack.pop().value; - value=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(new VBool(a->is_defined())); + Value& a=stack.pop().value(); + Value& value=*new VBool(a.is_defined()); stack.push(value); break; } case OP_IN: { - /// @test String::cmp - a=stack.pop().value; - CharPtr path=a->as_string(&pool())->cstr(); - value=ValuePtr(new VBool( - request_info.uri && strncmp(path, request_info.uri, strlen(path))==0)); + 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=ValuePtr(new VBool( - file_readable(absolute(a->as_string(&pool()))))); + Value& a=stack.pop().value(); + Value& value=*new VBool(file_readable(absolute(a.as_string()))); stack.push(value); break; } case OP_DEXISTS: { - a=stack.pop().value; - value=ValuePtr(new VBool( - dir_readable(absolute(a->as_string(&pool()))))); + Value& a=stack.pop().value(); + Value& value=*new VBool(dir_readable(absolute(a.as_string()))); stack.push(value); break; } @@ -572,262 +545,262 @@ void Request::execute(ArrayOperation& op // expression ops: binary case OP_SUB: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(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=ValuePtr(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=ValuePtr(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) { - StringPtr problem_source=b->as_string(&pool()); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Division by zero"); } - value=ValuePtr(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) { - StringPtr problem_source=b->as_string(&pool()); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Modulus by zero"); } - value=ValuePtr(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) { - StringPtr problem_source=b->as_string(&pool()); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Division by zero"); } - value=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(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=ValuePtr(new VBool(result < 0.0)); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + double result=a.as_double() - b.as_double(); + Value& value=*new VBool(result < 0.0); stack.push(value); break; } case OP_NUM_GT: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result > 0.0)); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + double result=a.as_double() - b.as_double(); + Value& value=*new VBool(result > 0.0); 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=ValuePtr(new VBool(result <= 0.0)); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + double result=a.as_double() - b.as_double(); + Value& value=*new VBool(result <= 0.0); 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=ValuePtr(new VBool(result >= 0.0)); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + double result=a.as_double() - b.as_double(); + Value& value=*new VBool(result >= 0.0); 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=ValuePtr(new VBool(result == 0.0)); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + double result=a.as_double() - b.as_double(); + Value& value=*new VBool(result == 0.0); 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=ValuePtr(new VBool(result != 0.0)); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + double result=a.as_double() - b.as_double(); + Value& value=*new VBool(result != 0.0); stack.push(value); break; } case OP_STR_LT: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) < b->as_string(&pool()))); + 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=ValuePtr(new VBool(a->as_string(&pool()) > b->as_string(&pool()))); + 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=ValuePtr(new VBool(a->as_string(&pool()) <= b->as_string(&pool()))); + 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=ValuePtr(new VBool(a->as_string(&pool()) >= b->as_string(&pool()))); + 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=ValuePtr(new VBool(a->as_string(&pool()) == b->as_string(&pool()))); + 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=ValuePtr(new VBool(a->as_string(&pool()) != b->as_string(&pool()))); + 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=ValuePtr(new VBool(a->is(b->as_string(&pool())->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; } default: - throw Exception(Exception::undefined_type, - Exception::undefined_source, - "invalid opcode %d", op.code); + throw Exception(0, + 0, + "invalid opcode %d", opcode); } } } @@ -836,45 +809,46 @@ void Request::execute(ArrayOperation& op @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any */ -ValuePtr Request::get_element(StringPtr& remember_name, bool can_call_operator) { - StringPtr name=stack.pop().string; remember_name=name; - Value* ncontext=stack.pop().value.get(); - ValuePtr value(0); +Value& Request::get_element(bool can_call_operator) { + const String& name=stack.pop().string(); //remember_name=name; + Value& ncontext=stack.pop().value(); + Value* value=0; if(can_call_operator) { - if(Method* method=main_class->get_method(name)) // looking operator of that name FIRST - value=ValuePtr(new VJunction(JunctionPtr(new Junction( - main_class, method, 0,0,0, ArrayOperationPtr(0))))); + 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)); } 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(ValuePtr base=get_self()->base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, VObjectPtr(0)); // temporarily prevent go-back-down virtual calls + 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 goto value_ready; } } if(!value) - value=ncontext->get_element(name, *ncontext, false); + value=ncontext.get_element(name, ncontext, false); if(value && wcontext->get_constructing()) - if(JunctionPtr junction=value->get_junction()) { - if(junction->self->get_class()!=ncontext) + if(Junction* junction=value->get_junction()) { + if(junction->self.get_class()!=&ncontext) throw Exception("parser.runtime", - name, - "constructor must be declared in class %s", ncontext->get_class()->name_cstr()); + &name, + "constructor must be declared in class '%s'", + ncontext.get_class()->name_cstr()); } value_ready: if(value) - value=process_to_value(value); // process possible code-junction + value=&process_to_value(*value); // process possible code-junction else - value=ValuePtr(new VVoid); + value=new VVoid; - return value; + return *value; } /** @param intercept_string @@ -888,9 +862,9 @@ value_ready: using the fact it's either string_ or value_ result requested to speed up checkes */ -StringOrValue Request::process(ValuePtr input_value, bool intercept_string) { +StringOrValue Request::process(Value& input_value, bool intercept_string) { StringOrValue result; - JunctionPtr junction=input_value->get_junction(); + Junction* junction=input_value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE @@ -899,7 +873,7 @@ StringOrValue Request::process(ValuePtr if(!junction->method_frame) throw Exception("parser.runtime", - Exception::undefined_source, + 0, "junction used outside of context"); VMethodFrame *saved_method_frame=method_frame; @@ -920,19 +894,19 @@ StringOrValue Request::process(ValuePtr wcontext=&local; // execute it - recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); + 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(&pool())); + result.set_string(*wcontext->get_string()); } else { // plain wwrapper - WWrapper local(ValuePtr(0)/*empty*/, wcontext); + WWrapper local(0/*empty*/, wcontext); wcontext=&local; // execute it - recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); + recoursion_checked_execute(/*0/*result_name* /, */ *junction->code); result=wcontext->result(); } @@ -950,7 +924,7 @@ StringOrValue Request::process(ValuePtr return result; } -StringPtr Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { +const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; @@ -962,7 +936,7 @@ StringPtr Request::execute_method(VMetho execute(*method.parser_code); // result - StringPtr result=wcontext->result().as_string(&pool()); + const String& result=wcontext->result().as_string(); wcontext=saved_wcontext; rcontext=saved_rcontext; @@ -972,35 +946,33 @@ StringPtr Request::execute_method(VMetho return result; } -StringPtr Request::execute_method(ValuePtr aself, - const Method& method, VStringPtr optional_param, +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; - Junction local_junction(aself, &method, 0,0,0, ArrayOperationPtr(0)); - VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/); + Junction local_junction(aself, &method, 0,0,0, 0); + VMethodFrame local_frame(/*method.name, */local_junction, method_frame/*caller*/); if(optional_param && local_frame.can_store_param()) { - local_frame.store_param(optional_param); + local_frame.store_param(*optional_param); local_frame.fill_unspecified_params(); } local_frame.set_self(aself); rcontext=wcontext=method_frame=&local_frame; - // preventing local object from deletes - local_frame.ref(); // prevent non-string writes for better error reporting if(do_return_string) - wcontext->write(pool(), ValuePtr(&local_frame)); + wcontext->write(local_frame); // execute! execute(*method.parser_code); // result - StringPtr result(0); + const String* result=0; if(do_return_string) - result=wcontext->result().as_string(&pool()); + result=&wcontext->result().as_string(); wcontext=saved_wcontext; rcontext=saved_rcontext; @@ -1009,28 +981,24 @@ StringPtr Request::execute_method(ValueP return result; } -StringPtr Request::execute_nonvirtual_method(VStateless_class& aclass, - StringPtr method_name, VStringPtr optional_param, - bool do_return_string, - const Method **return_method) { - - const Method *method=aclass.get_method(method_name); - StringPtr result(0); - if(return_method) - *return_method=method; - - if(method) - return execute_method(ValuePtr(&aclass), *method, optional_param, do_return_string); - else - return StringPtr(0); +Request::Execute_nonvirtual_method_result +Request::execute_nonvirtual_method(VStateless_class& aclass, + 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); + return result; } -StringPtr Request::execute_virtual_method(ValuePtr aself, - StringPtr method_name) { - if(ValuePtr value=aself->get_element(method_name, *aself, false)) - if(JunctionPtr junction=value->get_junction()) +const String* Request::execute_virtual_method(Value& aself, + const String& method_name) { + if(Value* value=aself.get_element(method_name, aself, false)) + if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) - return execute_method(aself, *method, VStringPtr(0)/*no params*/, true); + return execute_method(aself, *method, 0/*no params*/, true); - return StringPtr(0); + return 0; }