--- parser3/src/main/execute.C 2002/09/21 12:36:10 1.277 +++ parser3/src/main/execute.C 2003/02/20 16:09:01 1.295.2.16 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/09/21 12:36:10 $"; +static const char* IDENT_EXECUTE_C="$Date: 2003/02/20 16:09:01 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -23,15 +23,7 @@ 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 #ifdef DEBUG_EXECUTE char *opcode_name[]={ @@ -44,8 +36,7 @@ char *opcode_name[]={ "GET_CLASS", "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", - "GET_ELEMENT_OR_OPERATOR", "OP_GET_ELEMENT_OR_JUNCTION_EXPAND", - "GET_ELEMENT", "GET_ELEMENT__WRITE", + "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", "OBJECT_POOL", "STRING_POOL", "STORE_PARAM", "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", @@ -63,35 +54,34 @@ char *opcode_name[]={ "IS" }; -void va_debug_printf(Pool& pool, const char *fmt,va_list args) { +void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); - SAPI::log(pool, "%s", buf); + SAPI::log(sapi_info, "%s", buf); } -void debug_printf(Pool& pool, const char *fmt, ...) { +void debug_printf(SAPI_Info& sapi_info, const char* fmt, ...) { va_list args; - va_start(args,fmt); - va_debug_printf(pool,fmt,args); + va_start(args, fmt); + va_debug_printf(sapi_info, fmt, args); va_end(args); } -void debug_dump(Pool& pool, int level, const Array& ops) { - Array_iter i(ops); +void debug_dump(SAPI_Info& sapi_info, Pool& pool, int level, ArrayOperation& ops) { + Array_iterator i(ops); while(i.has_next()) { - Operation op; - op.cast=i.next(); + Operation& op=i.next(); if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - Value *value=static_cast(i.next()); - debug_printf(pool, + ValuePtr value=i.next().value; + debug_printf(sapi_info, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[op.code], - value->get_string()->cstr(), value->type()); + value->get_string(&pool)->cstr().get(), value->type()); continue; } - debug_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[op.code]); switch(op.code) { case OP_CURLY_CODE__STORE_PARAM: @@ -101,47 +91,55 @@ void debug_dump(Pool& pool, int level, c case OP_OBJECT_POOL: case OP_STRING_POOL: case OP_CALL: - const Array *local_ops=reinterpret_cast(i.next()); - debug_dump(pool, level+1, *local_ops); + case OP_CALL__WRITE: + if(ArrayOperation* local_ops=i.next().ops.get()) + debug_dump(sapi_info, pool, level+1, *local_ops); } } } #endif -#define PUSH(value) stack.push(value) -#define POP() static_cast(stack.pop()) -#define POP_NAME() static_cast(stack.pop())->as_string() -#define POP_CODE() static_cast(stack.pop()) +// Request -void Request::execute(const Array& ops) { +void Request::execute(ArrayOperation& ops) { // _asm int 3; #ifdef DEBUG_EXECUTE - debug_printf(pool(), "source----------------------------\n"); - debug_dump(pool(), 0, ops); - debug_printf(pool(), "execution-------------------------\n"); + debug_printf(sapi_info, "source----------------------------\n"); + debug_dump(sapi_info, pool(), 0, ops); + debug_printf(sapi_info, "execution-------------------------\n"); #endif - const String *last_get_element_name=0; + StringPtr last_get_element_name(0); - Array_iter i(ops); + Array_iterator i(ops); while(i.has_next()) { - Operation op; - op.cast=i.next(); + if(interrupted()) + throw Exception("parser.interrupted", + Exception::undefined_source, + "execution stopped"); + + Operation& op=i.next(); #ifdef DEBUG_EXECUTE - debug_printf(pool(), "%d:%s", stack.top_index()+1, opcode_name[op.code]); + debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[op.code]); #endif - Value *value; - Value *a; Value *b; - Array *b_code; + ValuePtr value; + ValuePtr a; ValuePtr b; + //ArrayOperationPtr b_code; + + StringPtr name; + Value* ncontext; + + ArrayOperationPtr local_ops; + switch(op.code) { // param in next instruction case OP_VALUE: { - value=static_cast(i.next()); + value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); + debug_printf(sapi_info, " \"%s\" %s", value->get_string(&pool())->cstr().get(), value->type()); #endif - PUSH(value); + stack.push(value); break; } case OP_GET_CLASS: @@ -149,45 +147,50 @@ void Request::execute(const Array& ops) // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); - const String& name=POP_NAME(); - value=static_cast(classes().get(name)); + name=stack.pop().string(); + value=classes().get(name); if(!value) throw Exception("parser.runtime", - &name, + StringPtr(name), "class is undefined"); - PUSH(value); + stack.push(value); break; } // OP_WITH case OP_WITH_ROOT: { - PUSH(method_frame); + stack.push(ValuePtr(method_frame)); break; } case OP_WITH_SELF: { - PUSH(self); + stack.push(ValuePtr(get_self())); break; } case OP_WITH_READ: { - PUSH(rcontext); + stack.push(ValuePtr(rcontext)); break; } case OP_WITH_WRITE: { - PUSH(wcontext); + if(wcontext==method_frame) + throw Exception("parser.runtime", + Exception::undefined_source, + "$.name outside of $name[...]"); + + stack.push(ValuePtr(wcontext)); break; } // OTHER ACTIONS BUT WITHs case OP_CONSTRUCT_VALUE: { - value=POP(); - const String& name=POP_NAME(); - Value *ncontext=POP(); + value=stack.pop().value; + name=stack.pop().string(); + ncontext=stack.pop().value.get(); ncontext->put_element(name, value, false); break; } @@ -196,52 +199,51 @@ void Request::execute(const Array& ops) // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - value=POP(); - const String& name=POP_NAME(); - Value *ncontext=POP(); + value=stack.pop().value; + name=stack.pop().string(); + ncontext=stack.pop().value.get(); ncontext->put_element(name, value->as_expr_result(), false); break; } case OP_CURLY_CODE__CONSTRUCT: { - const Array *local_ops=reinterpret_cast(i.next()); + local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, pool(), 1, *local_ops); #endif - Junction& j=*NEW Junction(pool(), - *self, 0, + value=ValuePtr(new VJunction(JunctionPtr(new Junction( + get_self(), 0, method_frame, rcontext, wcontext, - local_ops); + local_ops)))); - value=NEW VJunction(j); - const String& name=POP_NAME(); - Value *ncontext=POP(); + name=stack.pop().string(); + ncontext=stack.pop().value.get(); ncontext->put_element(name, value, false); break; } case OP_NESTED_CODE: { - Array *local_ops=static_cast(i.next()); + local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, pool(), 1, *local_ops); #endif - PUSH(local_ops); + stack.push(local_ops); break; } case OP_WRITE_VALUE: { - value=POP(); - write_assign_lang(*value, last_get_element_name); + value=stack.pop().value; + write_assign_lang(value, last_get_element_name); break; } case OP_WRITE_EXPR_RESULT: { - value=POP(); - write_no_lang(*value->as_expr_result()); + value=stack.pop().value; + write_no_lang(value->as_expr_result()); // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION @@ -250,89 +252,82 @@ void Request::execute(const Array& ops) } case OP_STRING__WRITE: { - VString *vstring=static_cast(i.next()); + value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " \"%s\"", vstring->string().cstr()); + debug_printf(sapi_info, " \"%s\"", value->get_string(0)->cstr().get()); #endif - write_no_lang(vstring->string()); + write_no_lang(*value->get_string(0)); break; } case OP_GET_ELEMENT_OR_OPERATOR: { value=get_element(last_get_element_name, true); - PUSH(value); - break; - } - case OP_GET_ELEMENT_OR_JUNCTION_EXPAND: - { - value=get_element(last_get_element_name, false, true/* the only user */); - PUSH(value); + stack.push(value); break; } case OP_GET_ELEMENT: { value=get_element(last_get_element_name, false); - PUSH(value); + 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); + write_assign_lang(value, last_get_element_name); break; } case OP_OBJECT_POOL: { - const Array *local_ops=reinterpret_cast(i.next()); + local_ops=i.next().ops; WContext *saved_wcontext=wcontext; uchar saved_lang= flang; flang=String::UL_PASS_APPENDED; - WWrapper local(pool(), 0 /*empty*/, wcontext); + WWrapper local(ValuePtr(0)/*empty*/, wcontext); local.ref(); wcontext=&local; execute(*local_ops); - value=&wcontext->result().as_value(); + value=wcontext->result().as_value(); flang=saved_lang; wcontext=saved_wcontext; - PUSH(value); + stack.push(value); break; } case OP_STRING_POOL: { - const Array *local_ops=reinterpret_cast(i.next()); + local_ops=i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(pool(), 0 /*empty*/, wcontext); + WWrapper local(ValuePtr(0) /*empty*/, wcontext); local.ref(); wcontext=&local; execute(*local_ops); // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - const String *string=wcontext->get_string(); - Value *value; - if(string) - value=NEW VString(*string); + if(StringPtr string=wcontext->get_string(&pool())) + value=ValuePtr(new VString(string)); else - NEW VVoid(pool()); + value=ValuePtr(new VVoid); + wcontext=saved_wcontext; - PUSH(value); + stack.push(value); break; } // CALL case OP_STORE_PARAM: { - value=POP(); - VMethodFrame *frame=static_cast(stack.top_value()); - // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 + value=stack.pop().value; + VMethodFrame *frame=static_cast(stack.top_value().ptr); + // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" frame->store_param(value); break; } @@ -340,11 +335,11 @@ void Request::execute(const Array& ops) case OP_EXPR_CODE__STORE_PARAM: { // code - const Array *local_ops=reinterpret_cast(i.next()); - VMethodFrame *frame=static_cast(stack.top_value()); + local_ops=i.next().ops; + VMethodFrame *frame=static_cast(stack.top_value().ptr); #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, pool(), 1, *local_ops); #endif // when they evaluate expression parameter, // the object expression result @@ -353,15 +348,12 @@ void Request::execute(const Array& ops) // hence, we zero junction.wcontext here, and later // in .process we would test that field // in decision "which wwrapper to use" - Junction& j=*NEW Junction(pool(), - *self, 0, + value=ValuePtr(new VJunction(JunctionPtr(new Junction( + get_self(), 0, method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops); - - value=NEW VJunction(j); - + 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); @@ -383,67 +375,73 @@ void Request::execute(const Array& ops) case OP_CALL: case OP_CALL__WRITE: { - Array *local_ops=static_cast(i.next()); + local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0); + if(local_ops) + debug_dump(sapi_info, pool(), 1, *local_ops); - debug_printf(pool(), "->\n"); + debug_printf(sapi_info, "->\n"); #endif - value=POP(); + value=stack.pop().value; - Junction *junction=value->get_junction(); + JunctionPtr junction=value->get_junction(); if(!junction) throw Exception("parser.runtime", last_get_element_name, "(%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 + // [disabling these contstructions:] + // $junction{code} + // ^junction[] if(!junction->method) throw Exception("parser.runtime", last_get_element_name, "(%s) is code junction, can not call it", value->type()); + */ - VMethodFrame frame(pool(), *last_get_element_name, *junction); + VMethodFrame frame(pool(), last_get_element_name, *junction, method_frame/*caller*/); frame.ref(); if(local_ops){ // store param code goes here - PUSH(&frame); // argument for *STORE_PARAM ops + stack.push(&frame); // argument for *STORE_PARAM ops execute(*local_ops); - POP(); + stack.pop().value; } frame.fill_unspecified_params(); - Value *saved_self=self; VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; + Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - VStateless_class *called_class=frame.junction.self.get_class(); + VStateless_class *called_class=frame.junction.self->get_class(); + ValuePtr 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(pool())) { + if(ValuePtr value=called_class->create_new_value()) { // some stateless_class creatable derivates - self=value; + new_self=value; } else throw Exception("parser.runtime", - &frame.name(), + frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", - called_class->name().cstr()); + (char*)called_class->name()->cstr()); - frame.write(*self, + frame.write(new_self, String::UL_CLEAN // not used, always an object, not string ); } else throw Exception("parser.runtime", - &frame.name(), + frame.name(), "method is static and can not be used as constructor"); } else - self=&frame.junction.self; + new_self=frame.junction.self; - frame.set_self(*self); + frame.set_self(new_self); // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); @@ -452,32 +450,29 @@ void Request::execute(const Array& ops) { const Method& method=*frame.junction.method; Method::Call_type call_type= - called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; + called_class==new_self.get() ? Method::CT_STATIC : Method::CT_DYNAMIC; if( method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? try { + method_frame=&frame; if(method.native_code) { // native code? - // method_frame unchanged, so that ^for ^foreach & co may write to locals method.check_actual_numbered_params( - frame.junction.self, + *frame.junction.self, frame.name(), frame.numbered_params()); method.native_code( *this, frame.name(), frame.numbered_params()); // execute it - } else { // parser code - method_frame=&frame; - // execute it - recoursion_checked_execute(&frame.name(), *method.parser_code); - } + } else // parser code, execute it + recoursion_checked_execute(frame.name(), *method.parser_code); } catch(...) { // record it to stack trace - exception_trace.push((void *)&frame.name()); - /*re*/throw; + exception_trace.push(frame.name()); + rethrow; } } else throw Exception("parser.runtime", - &frame.name(), + frame.name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); @@ -487,21 +482,15 @@ void Request::execute(const Array& ops) wcontext=saved_wcontext; rcontext=saved_rcontext; method_frame=saved_method_frame; - self=saved_self; - -#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); } else { // OP_CALL - PUSH(&result.as_value()); + stack.push(result.as_value()); } #ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-returned"); + debug_printf(sapi_info, "<-returned"); #endif break; } @@ -509,335 +498,334 @@ void Request::execute(const Array& ops) // expression ops: unary case OP_NEG: { - Value *operand=POP(); - value=NEW VDouble(pool(), -operand->as_double()); - PUSH(value); + a=stack.pop().value; + value=ValuePtr(new VDouble(-a->as_double())); + stack.push(value); break; } case OP_INV: { - Value *operand=POP(); - value=NEW VDouble(pool(), ~operand->as_int()); - PUSH(value); + a=stack.pop().value; + value=ValuePtr(new VDouble(~a->as_int())); + stack.push(value); break; } case OP_NOT: { - Value *operand=POP(); - value=NEW VBool(pool(), !operand->as_bool()); - PUSH(value); + a=stack.pop().value; + value=ValuePtr(new VBool(!a->as_bool())); + stack.push(value); break; } case OP_DEF: { - Value *operand=POP(); - value=NEW VBool(pool(), operand->is_defined()); - PUSH(value); + a=stack.pop().value; + value=ValuePtr(new VBool(a->is_defined())); + stack.push(value); break; } case OP_IN: { /// @test String::cmp - Value *operand=POP(); - const char *path=operand->as_string().cstr(); - value=NEW VBool(pool(), - info.uri && strncmp(path, info.uri, strlen(path))==0); - PUSH(value); + 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)); + stack.push(value); break; } case OP_FEXISTS: { - Value *operand=POP(); - value=NEW VBool(pool(), - file_readable(absolute(operand->as_string()))); - PUSH(value); + a=stack.pop().value; + value=ValuePtr(new VBool( + file_readable(absolute(a->as_string(&pool()))))); + stack.push(value); break; } case OP_DEXISTS: { - Value *operand=POP(); - value=NEW VBool(pool(), - dir_readable(absolute(operand->as_string()))); - PUSH(value); + a=stack.pop().value; + value=ValuePtr(new VBool( + dir_readable(absolute(a->as_string(&pool()))))); + stack.push(value); break; } // expression ops: binary case OP_SUB: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), a->as_double() - b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VDouble(a->as_double() - b->as_double())); + stack.push(value); break; } case OP_ADD: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), a->as_double() + b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VDouble(a->as_double() + b->as_double())); + stack.push(value); break; } case OP_MUL: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), a->as_double() * b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VDouble(a->as_double() * b->as_double())); + stack.push(value); break; } case OP_DIV: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double a_double=a->as_double(); double b_double=b->as_double(); if(b_double == 0) { - const String *problem_source=&b->as_string(); + StringPtr problem_source=b->as_string(&pool()); throw Exception("number.zerodivision", problem_source, "Division by zero"); } - value=NEW VDouble(pool(), a_double / b_double); - PUSH(value); + value=ValuePtr(new VDouble(a_double / b_double)); + stack.push(value); break; } case OP_MOD: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double a_double=a->as_double(); double b_double=b->as_double(); if(b_double == 0) { - const String *problem_source=&b->as_string(); + StringPtr problem_source=b->as_string(&pool()); throw Exception("number.zerodivision", problem_source, "Modulus by zero"); } - value=NEW VDouble(pool(), fmod(a_double, b_double)); - PUSH(value); + value=ValuePtr(new VDouble(fmod(a_double, b_double))); + stack.push(value); break; } case OP_INTDIV: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; int a_int=a->as_int(); int b_int=b->as_int(); if(b_int == 0) { - const String *problem_source=&b->as_string(); + StringPtr problem_source=b->as_string(&pool()); throw Exception("number.zerodivision", problem_source, "Division by zero"); } - value=NEW VInt(pool(), a_int / b_int); - PUSH(value); + value=ValuePtr(new VInt(a_int / b_int)); + stack.push(value); break; } case OP_BIN_SL: { - b=POP(); a=POP(); - value=NEW VInt(pool(), + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VInt( a->as_int() << - b->as_int()); - PUSH(value); + b->as_int())); + stack.push(value); break; } case OP_BIN_SR: { - b=POP(); a=POP(); - value=NEW VInt(pool(), + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VInt( a->as_int() >> - b->as_int()); - PUSH(value); + b->as_int())); + stack.push(value); break; } case OP_BIN_AND: { - b=POP(); a=POP(); - value=NEW VInt(pool(), + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VInt( a->as_int() & - b->as_int()); - PUSH(value); + b->as_int())); + stack.push(value); break; } case OP_BIN_OR: { - b=POP(); a=POP(); - value=NEW VInt(pool(), + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VInt( a->as_int() | - b->as_int()); - PUSH(value); + b->as_int())); + stack.push(value); break; } case OP_BIN_XOR: { - b=POP(); a=POP(); - value=NEW VInt(pool(), + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VInt( a->as_int() ^ - b->as_int()); - PUSH(value); + b->as_int())); + stack.push(value); break; } case OP_LOG_AND: { - b_code=POP_CODE(); a=POP(); + local_ops=stack.pop().ops; a=stack.pop().value; bool result; if(a->as_bool()) { - execute(*b_code); - b=POP(); + execute(*local_ops); + b=stack.pop().value; result=b->as_bool(); } else result=false; - value=NEW VBool(pool(), result); - PUSH(value); + value=ValuePtr(new VBool(result)); + stack.push(value); break; } case OP_LOG_OR: { - b_code=POP_CODE(); a=POP(); + local_ops=stack.pop().ops; a=stack.pop().value; bool result; if(a->as_bool()) result=true; else { - execute(*b_code); - b=POP(); + execute(*local_ops); + b=stack.pop().value; result=b->as_bool(); } - value=NEW VBool(pool(), result); - PUSH(value); + value=ValuePtr(new VBool(result)); + stack.push(value); break; } case OP_LOG_XOR: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_bool() ^ b->as_bool())); + stack.push(value); break; } case OP_NUM_LT: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result < 0.0); - PUSH(value); + value=ValuePtr(new VBool(result < 0.0)); + stack.push(value); break; } case OP_NUM_GT: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result > 0.0); - PUSH(value); + value=ValuePtr(new VBool(result > 0.0)); + stack.push(value); break; } case OP_NUM_LE: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result <= 0.0); - PUSH(value); + value=ValuePtr(new VBool(result <= 0.0)); + stack.push(value); break; } case OP_NUM_GE: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result >= 0.0); - PUSH(value); + value=ValuePtr(new VBool(result >= 0.0)); + stack.push(value); break; } case OP_NUM_EQ: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result == 0.0); - PUSH(value); + value=ValuePtr(new VBool(result == 0.0)); + stack.push(value); break; } case OP_NUM_NE: { - b=POP(); a=POP(); + b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result != 0.0); - PUSH(value); + value=ValuePtr(new VBool(result != 0.0)); + stack.push(value); break; } case OP_STR_LT: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() < b->as_string()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_string(&pool()) < b->as_string(&pool()))); + stack.push(value); break; } case OP_STR_GT: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() > b->as_string()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_string(&pool()) > b->as_string(&pool()))); + stack.push(value); break; } case OP_STR_LE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() <= b->as_string()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_string(&pool()) <= b->as_string(&pool()))); + stack.push(value); break; } case OP_STR_GE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() >= b->as_string()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_string(&pool()) >= b->as_string(&pool()))); + stack.push(value); break; } case OP_STR_EQ: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() == b->as_string()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_string(&pool()) == b->as_string(&pool()))); + stack.push(value); break; } case OP_STR_NE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() != b->as_string()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->as_string(&pool()) != b->as_string(&pool()))); + stack.push(value); break; } case OP_IS: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->is(b->as_string().cstr())); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + value=ValuePtr(new VBool(a->is(b->as_string(&pool())->cstr()))); + stack.push(value); break; } default: - throw Exception(0, - 0, + throw Exception(Exception::undefined_type, + Exception::undefined_source, "invalid opcode %d", op.code); } } } -/// @test cache|prepare junctions -Value *Request::get_element(const String *& remember_name, - bool can_call_operator, bool should_explode_junction) { - const String& name=POP_NAME(); remember_name=&name; - Value *ncontext=POP(); - Value *value=0; +/** + @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); if(can_call_operator) { - if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST - // as if that method were in self and we have normal dynamic method here - Junction& junction=*NEW Junction(pool(), - *method_frame, method, 0,0,0,0); - value=NEW VJunction(junction); - } + if(MethodPtr method=main_class->get_method(name)) // looking operator of that name FIRST + value=ValuePtr(new VJunction(JunctionPtr(new Junction( + main_class, method.get(), 0,0,0, ArrayOperationPtr(0))))); } if(!value) { if(!wcontext->get_constructing() // not constructing @@ -845,21 +833,28 @@ Value *Request::get_element(const String 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_object=self->base_object()) { // doing DYNAMIC call - Temp_derived temp_derived(*base_object, 0); // temporarily prevent go-back-down virtual calls - value=base_object->get_element(name, base_object, false); // virtual-up lookup starting from parent - goto _void; + if(ValuePtr base=get_self()->base()) { // doing DYNAMIC call + Temp_derived temp_derived(*base, VObjectPtr(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); -_void: - if(value) { - if(should_explode_junction) // process $junction, but leave $junction.xxx as is - value=&process_to_value(*value); // process possible code-junction - } else - value=NEW VVoid(pool()); + if(value && wcontext->get_constructing()) + if(JunctionPtr 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()); + } + +value_ready: + if(value) + value=process_to_value(value); // process possible code-junction + else + value=ValuePtr(new VVoid); return value; } @@ -875,26 +870,24 @@ _void: 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 Request::process(ValuePtr input_value, bool intercept_string) { StringOrValue result; - Junction *junction=input_value.get_junction(); + JunctionPtr junction=input_value->get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE - debug_printf(pool(), "ja->\n"); + debug_printf(sapi_info, "ja->\n"); #endif if(!junction->method_frame) throw Exception("parser.runtime", - 0, + Exception::undefined_source, "junction used outside of context"); - Value *saved_self=self; VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; + Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - self=&junction->self; method_frame=junction->method_frame; rcontext=junction->rcontext; @@ -905,23 +898,23 @@ StringOrValue Request::process(Value& in if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); + VCodeFrame local(*junction->wcontext, junction->wcontext); local.ref(); wcontext=&local; // execute it - recoursion_checked_execute(0/*result_name*/, *junction->code); + recoursion_checked_execute(Exception::undefined_source/*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()); + result.set_string(wcontext->get_string(&pool())); } else { // plain wwrapper - WWrapper local(pool(), 0/*empty*/, wcontext); + WWrapper local(ValuePtr(0)/*empty*/, wcontext); local.ref(); wcontext=&local; // execute it - recoursion_checked_execute(0/*result_name*/, *junction->code); + recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); result=wcontext->result(); } @@ -929,10 +922,9 @@ StringOrValue Request::process(Value& in wcontext=saved_wcontext; rcontext=saved_rcontext; method_frame=saved_method_frame; - self=saved_self; #ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-ja returned"); + debug_printf(sapi_info, "<-ja returned"); #endif } else { result.set_value(input_value); @@ -940,94 +932,81 @@ StringOrValue Request::process(Value& in return result; } -const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { - Value *saved_self=self; +StringPtr Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; + Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; // initialize contexts - self=rcontext=wcontext=method_frame=&amethod_frame; + rcontext=wcontext=method_frame=&amethod_frame; // execute! execute(*method.parser_code); // result - const String& result=wcontext->result().as_string(); + StringPtr result=wcontext->result().as_string(&pool()); wcontext=saved_wcontext; rcontext=saved_rcontext; method_frame=saved_method_frame; - self=saved_self; // return return result; } -void Request::execute_method(Value& aself, - const Method& method, VString *optional_param, - const String **return_string) { - Value *saved_self=self; +StringPtr Request::execute_method(ValuePtr aself, + const Method& method, VStringPtr optional_param, + bool do_return_string) { VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; + Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - // initialize contexts - //method_frame=rcontext=self=&aself; - self=&aself; -// WWrapper local(pool(), &aself, wcontext); -// wcontext=&local; - Junction local_junction(pool(), *self, &method, 0,0,0,0); - VMethodFrame local_frame(pool(), method.name, local_junction); + Junction local_junction(aself, &method, 0,0,0, ArrayOperationPtr(0)); + VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/); local_frame.ref(); if(optional_param && local_frame.can_store_param()) { local_frame.store_param(optional_param); local_frame.fill_unspecified_params(); } - local_frame.set_self(*self); + local_frame.set_self(aself); rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting - if(return_string) - wcontext->write(local_frame); + if(do_return_string) + wcontext->write(pool(), ValuePtr(&local_frame)); // execute! execute(*method.parser_code); // result - const String *result=0; - if(return_string) - *return_string=&wcontext->result().as_string(); + StringPtr result(0); + if(do_return_string) + result=wcontext->result().as_string(&pool()); wcontext=saved_wcontext; rcontext=saved_rcontext; method_frame=saved_method_frame; - self=saved_self; -} -void Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString *optional_param, - const String **return_string, - const Method **return_method) { - - const Method *method=aclass.get_method(method_name); - if(return_string) - *return_string=0; - if(return_method) - *return_method=method; + return result; +} - if(method) - execute_method(aclass, *method, optional_param, return_string); +Request::Execute_nonvirtual_method_result +Request::execute_nonvirtual_method(VStateless_class& aclass, + StringPtr method_name, VStringPtr 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(ValuePtr(&aclass), *result.method, optional_param, + do_return_string); + return result; } -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) { - const String *result; - execute_method(aself, *method, 0/*no params*/, &result); - 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()) + if(const Method *method=junction->method) + return execute_method(aself, *method, VStringPtr(0)/*no params*/, true); - return 0; + return StringPtr(0); }