--- parser3/src/main/execute.C 2002/04/16 08:41:05 1.232 +++ parser3/src/main/execute.C 2003/02/03 09:17:47 1.295.2.7 @@ -1,12 +1,12 @@ /** @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) - - $Id: execute.C,v 1.232 2002/04/16 08:41:05 paf Exp $ */ +static const char* IDENT_EXECUTE_C="$Date: 2003/02/03 09:17:47 $"; + #include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" @@ -23,7 +23,7 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -#define DEBUG_EXECUTE +//#define DEBUG_EXECUTE //#define DEBUG_STRING_APPENDS_VS_EXPANDS @@ -46,7 +46,6 @@ char *opcode_name[]={ "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", "OBJECT_POOL", "STRING_POOL", - "GET_METHOD_FRAME", "STORE_PARAM", "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", @@ -55,6 +54,7 @@ char *opcode_name[]={ "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary "SUB", "ADD", "MUL", "DIV", "MOD", "INTDIV", + "BIN_SL", "BIN_SR", "BIN_AND", "BIN_OR", "BIN_XOR", "LOG_AND", "LOG_OR", "LOG_XOR", "NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE", @@ -62,13 +62,13 @@ char *opcode_name[]={ "IS" }; -void va_debug_printf(Pool& pool, const char *fmt,va_list args) { +void va_debug_printf(Pool& pool, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); SAPI::log(pool, "%s", buf); } -void debug_printf(Pool& pool, const char *fmt, ...) { +void debug_printf(Pool& pool, const char* fmt, ...) { va_list args; va_start(args,fmt); va_debug_printf(pool,fmt,args); @@ -76,13 +76,13 @@ void debug_printf(Pool& pool, const char } void debug_dump(Pool& pool, int level, const Array& ops) { - Array_iter i(ops); + Array_iterator i(ops); while(i.has_next()) { Operation op; op.cast=i.next(); if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - Value *value=static_cast(i.next()); + Value* value=i.next().value; debug_printf(pool, "%*s%s" " \"%s\" %s", @@ -99,76 +99,62 @@ void debug_dump(Pool& pool, int level, c case OP_NESTED_CODE: case OP_OBJECT_POOL: case OP_STRING_POOL: - const Array *local_ops=reinterpret_cast(i.next()); + case OP_CALL: + local_ops=i.next().ops; debug_dump(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 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(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("source----------------------------\n"); + debug_dump(0, ops); + debug_printf("execution-------------------------\n"); #endif + 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("%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(" \"%s\" %s", value->get_string()->cstr(), value->type()); #endif - PUSH(value); - break; - } - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: - { - VMethodFrame *frame=static_cast(stack.top_value()); - // code - const Array *local_ops=reinterpret_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); -#endif - // when they evaluate expression parameter, - // the object expression result - // does not need to be written into calling frame - // it must go into any expressions using that parameter - // 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, 0, - root, - rcontext, - op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops); - - value=NEW VJunction(j); - - // store param - frame->store_param(frame->name(), value); + stack.push(value); break; } case OP_GET_CLASS: @@ -176,47 +162,51 @@ 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(root); + 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(); - ncontext->put_element(name, value); - value->set_name(name); + value=stack.pop().value; + name=stack.pop().string; + ncontext=stack.pop().value.get(); + ncontext->put_element(name, value, false); break; } case OP_CONSTRUCT_EXPR: @@ -224,54 +214,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(); - ncontext->put_element(name, value->as_expr_result()); - value->set_name(name); + 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(" (%d)\n", local_ops->count()); + debug_dump(1, *local_ops); #endif - Junction& j=*NEW Junction(pool(), - *self, 0, 0, - root, + value=ValuePtr(new VJunction(JunctionPtr(new Junction( + get_self(), 0, + method_frame, rcontext, wcontext, - local_ops); - - value=NEW VJunction(j); - const String& name=POP_NAME(); - Value *ncontext=POP(); - ncontext->put_element(name, value); - value->set_name(name); + local_ops)))); + + 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(" (%d)\n", local_ops->count()); + debug_dump(1, *local_ops); #endif - PUSH(local_ops); + stack.push(local_ops); break; } case OP_WRITE_VALUE: { - value=POP(); - write_assign_lang(*value); + 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 @@ -280,109 +267,111 @@ 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(" \"%s\"", value->get_string(0).cstr()); #endif - write_no_lang(vstring->string()); + write_no_lang(*value->get_string(0)); break; } case OP_GET_ELEMENT_OR_OPERATOR: { - // maybe they do ^object.method[] call, remember the fact - wcontext->set_somebody_entered_some_object(true); - - //_asm int 3; - value=get_element(true); - PUSH(value); + value=get_element(last_get_element_name, true); + stack.push(value); break; } case OP_GET_ELEMENT: { - // maybe they do ^object.method[] call, remember the fact - wcontext->set_somebody_entered_some_object(true); - - //_asm int 3; - value=get_element(false); - PUSH(value); + value=get_element(last_get_element_name, false); + stack.push(value); break; } case OP_GET_ELEMENT__WRITE: { - value=get_element(false); - write_assign_lang(*value); + value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); + 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; - PUSH(wcontext); - PUSH((void *)flang); + WContext *saved_wcontext=wcontext; + uchar saved_lang= flang; flang=String::UL_PASS_APPENDED; - WWrapper local(pool(), 0 /*empty*/); + WWrapper local(ValuePtr(0)/*empty*/, wcontext); wcontext=&local; execute(*local_ops); - value=&wcontext->result().as_value(); - flang=static_cast(reinterpret_cast(POP())); - wcontext=static_cast(POP()); - PUSH(value); + value=wcontext->result().as_value(); + flang=saved_lang; + wcontext=saved_wcontext; + stack.push(value); break; } case OP_STRING_POOL: { - const Array *local_ops=reinterpret_cast(i.next()); + local_ops=i.next().ops; - PUSH(wcontext); - WWrapper local(pool(), 0 /*empty*/); + WContext *saved_wcontext=wcontext; + WWrapper local(ValuePtr(0) /*empty*/, wcontext); 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()); - wcontext=static_cast(POP()); - PUSH(value); + value=ValuePtr(new VVoid); + + wcontext=saved_wcontext; + stack.push(value); break; } // CALL - case OP_GET_METHOD_FRAME: + case OP_STORE_PARAM: { - value=POP(); - - // info: - // code compiled so that this one's always method-junction, - // not a code-junction - Junction *junction=value->get_junction(); - if(!junction) - throw Exception("parser.runtime", - &value->name(), - "(%s) not a method or junction, can not call it", - value->type()); - - VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction); - PUSH(frame); + value=stack.pop().value; + VMethodFrame *frame=static_cast(stack.top_value().unknown); + // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" + frame->store_param(value); break; } - case OP_STORE_PARAM: + case OP_CURLY_CODE__STORE_PARAM: + case OP_EXPR_CODE__STORE_PARAM: { - value=POP(); - VMethodFrame *frame=static_cast(stack.top_value()); - frame->store_param(frame->name(), value); + // code + local_ops=i.next().ops; + VMethodFrame *frame=static_cast(stack.top_value().unknown); +#ifdef DEBUG_EXECUTE + debug_printf(" (%d)\n", local_ops->count()); + debug_dump(1, *local_ops); +#endif + // when they evaluate expression parameter, + // the object expression result + // does not need to be written into calling frame + // it must go into any expressions using that parameter + // 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( + get_self(), 0, + method_frame, + rcontext, + op.code==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); break; } @@ -401,102 +390,112 @@ void Request::execute(const Array& ops) case OP_CALL: case OP_CALL__WRITE: { + local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), "->\n"); + debug_printf(" (%d)\n", local_ops->count()); + debug_dump(1, *local_ops); + + debug_printf("->\n"); #endif - VMethodFrame *frame=static_cast(POP()); - frame->fill_unspecified_params(); - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + value=stack.pop().value; + + 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, method_frame/*caller*/); + if(local_ops){ // store param code goes here + stack.push(&frame); // argument for *STORE_PARAM ops + execute(*local_ops); + stack.pop().value; + } + frame.fill_unspecified_params(); + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; - VStateless_class *called_class=frame->junction.self.get_class(); + 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) { + 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()); + 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 { - // this is not constructor call - - // not ^name.method call, name:method call; and - // is context object or class & is it my class or my parent's class and? - VStateless_class *read_class=rcontext->get_class(); - if( - !(wcontext->get_somebody_entered_some_object() && - !wcontext->get_somebody_entered_some_class()) && - read_class && read_class->is_or_derived_from(*called_class)) // yes - self=rcontext; // dynamic call - else // no, not me or relative of mine (=total stranger) - self=&frame->junction.self; // static call - } + } else + 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()); + frame.set_in_expression(wcontext->get_in_expression()); - rcontext=wcontext=frame; + rcontext=wcontext=&frame; { - // take object or class from any wrappers - // and substitute class alias to the class they are called AS - Temp_alias temp_alias(*self->get_aliased(), *frame->junction.vclass); - - const Method& method=*frame->junction.method; + 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? - // root unchanged, so that ^for ^foreach & co may write to locals 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 - } else { // parser code - root=frame; - // execute it - recoursion_checked_execute(&frame->name(), *method.parser_code); - } + frame.name(), frame.numbered_params()); // execute it + } 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"); } StringOrValue result=wcontext->result(); - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS if(const String *s=value->get_string()) @@ -504,16 +503,13 @@ void Request::execute(const Array& ops) #endif if(op.code==OP_CALL__WRITE) { - write_assign_lang(result); - // forget the fact they've entered some ^object.method[]. - // see OP_GET_ELEMENT - wcontext->set_somebody_entered_some_object(false); + 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("<-returned"); #endif break; } @@ -521,332 +517,363 @@ 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(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif + 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(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif + 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(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif + 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=stack.pop().value; a=stack.pop().value; + value=ValuePtr(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())); + stack.push(value); break; } case OP_BIN_AND: { - b=POP(); a=POP(); - value=NEW VDouble(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 VDouble(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 VDouble(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(); - value=NEW VBool(pool(), a->as_double() < b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + double result=a->as_double() - b->as_double(); + value=ValuePtr(new VBool(result < 0.0)); + stack.push(value); break; } case OP_NUM_GT: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() > b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + double result=a->as_double() - b->as_double(); + value=ValuePtr(new VBool(result > 0.0)); + stack.push(value); break; } case OP_NUM_LE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() <= b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + double result=a->as_double() - b->as_double(); + value=ValuePtr(new VBool(result <= 0.0)); + stack.push(value); break; } case OP_NUM_GE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() >= b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + double result=a->as_double() - b->as_double(); + value=ValuePtr(new VBool(result >= 0.0)); + stack.push(value); break; } case OP_NUM_EQ: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() == b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + double result=a->as_double() - b->as_double(); + value=ValuePtr(new VBool(result == 0.0)); + stack.push(value); break; } case OP_NUM_NE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() != b->as_double()); - PUSH(value); + b=stack.pop().value; a=stack.pop().value; + double result=a->as_double() - b->as_double(); + 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: { - //_asm int 3; - b=POP(); a=POP(); - value=NEW VBool(pool(), b->as_string() == a->type()); - 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(bool can_call_operator) { - const String& name=POP_NAME(); - Value *ncontext=POP(); - Value *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(), - *root, self->get_class(), method, 0,0,0,0); - value=NEW VJunction(junction); - } - if(!value) - value=ncontext->get_element(name); - if(value) { - value=&process_to_value(*value); // process possible code-junction - value->update_name(name); - } else { - value=NEW VVoid(pool()); - value->set_name(name); +/** + @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=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(!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 *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 + 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); + + 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; } @@ -862,21 +889,25 @@ Value *Request::get_element(bool can_cal 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("ja->\n"); #endif - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + + if(!junction->method_frame) + throw Exception("parser.runtime", + Exception::undefined_source, + "junction used outside of context"); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; - self=&junction->self; - root=junction->root; + method_frame=junction->method_frame; rcontext=junction->rcontext; // for expression method params @@ -886,34 +917,33 @@ StringOrValue Request::process(Value& in if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(pool(), *junction->wcontext); + VCodeFrame local(*junction->wcontext, junction->wcontext); 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*/); + WWrapper local(ValuePtr(0)/*empty*/, wcontext); 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(); } - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; #ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-ja returned"); + debug_printf("<-ja returned"); #endif } else { result.set_value(input_value); @@ -921,73 +951,85 @@ StringOrValue Request::process(Value& in return result; } -const String *Request::execute_method(Value& aself, const Method& method, - bool return_cstr) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); +StringPtr Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; // initialize contexts - root=rcontext=self=&aself; - WWrapper local(pool(), &aself); - wcontext=&local; + rcontext=wcontext=method_frame=&amethod_frame; // execute! execute(*method.parser_code); // result - const String *result=return_cstr ? &wcontext->as_string() : 0; + StringPtr result=wcontext->result().as_string(&pool()); - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; // return return result; } -const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); +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; + WContext *saved_wcontext=wcontext; - // initialize contexts - root=rcontext=self=&amethodFrame; - wcontext=&amethodFrame; + Junction local_junction(aself, &method, 0,0,0, ArrayOperationPtr(0)); + VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/); + if(optional_param && local_frame.can_store_param()) { + local_frame.store_param(optional_param); + local_frame.fill_unspecified_params(); + } + local_frame.set_self(aself); + rcontext=wcontext=method_frame=&local_frame; + + // prevent non-string writes for better error reporting + if(do_return_string) + wcontext->write(pool(), ValuePtr(new VVoid)); // execute! execute(*method.parser_code); // result - const String& result=wcontext->as_string(); + StringPtr result(0); + if(do_return_string) + result=wcontext->result().as_string(&pool()); - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); - - // return + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + return result; } -const String *Request::execute_virtual_method(Value& aself, - const String& method_name) { - if(Value *value=aself.get_element(method_name)) - if(Junction *junction=value->get_junction()) - if(const Method *method=junction->method) - return execute_method(aself, *method, true /*return_cstr*/); - - return 0; +StringPtr Request::execute_nonvirtual_method(VStateless_classPtr 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(aclass, *method, optional_param, do_return_string); + else + return 0; } -const String *Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, - bool return_cstr) { - if(const Method *method=aclass.get_method(method_name)) - return execute_method(aclass, *method, return_cstr); - +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; }