--- parser3/src/main/execute.C 2001/07/13 12:15:51 1.178 +++ parser3/src/main/execute.C 2002/08/01 11:26:49 1.243 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char *RCSId="$Id: execute.C,v 1.178 2001/07/13 12:15:51 parser Exp $"; + +static const char* IDENT_EXECUTE_C="$Id: execute.C,v 1.243 2002/08/01 11:26:49 paf Exp $"; #include "pa_opcode.h" #include "pa_array.h" @@ -21,33 +21,39 @@ static const char *RCSId="$Id: execute.C #include "pa_vtable.h" #include "pa_vfile.h" #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 + -const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; #ifdef DEBUG_EXECUTE char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", + "NESTED_CODE", // actions - "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", + "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "GET_CLASS", - "CONSTRUCT_VALUE", "CONSTRUCT_DOUBLE", + "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", - "GET_ELEMENT", "GET_ELEMENT__WRITE", - "CREATE_EWPOOL", "REDUCE_EWPOOL", - "CREATE_RWPOOL", "REDUCE_RWPOOL", - "CREATE_SWPOOL", "REDUCE_SWPOOL", - "GET_METHOD_FRAME", + "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", + "OBJECT_POOL", "STRING_POOL", "STORE_PARAM", - "CALL", + "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "CALL", "CALL__WRITE", // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary - "SUB", "ADD", "MUL", "DIV", "MOD", + "SUB", "ADD", "MUL", "DIV", "MOD", "INTDIV", "BIN_AND", "BIN_OR", "BIN_XOR", "LOG_AND", "LOG_OR", "LOG_XOR", "NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE", @@ -69,24 +75,13 @@ void debug_printf(Pool& pool, const char } void debug_dump(Pool& pool, int level, const Array& ops) { - { - int size=ops.quick_size(); - //debug_printf(pool, "size=%d\n", size); - for(int i=0; i(ops.quick_get(++i)); + Value *value=static_cast(i.next()); debug_printf(pool, "%*s%s" " \"%s\" %s", @@ -96,8 +91,15 @@ void debug_dump(Pool& pool, int level, c } debug_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); - if(op.code==OP_CURLY_CODE__STORE_PARAM || op.code==OP_EXPR_CODE__STORE_PARAM) { - const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); + switch(op.code) { + case OP_CURLY_CODE__STORE_PARAM: + case OP_EXPR_CODE__STORE_PARAM: + case OP_CURLY_CODE__CONSTRUCT: + case OP_NESTED_CODE: + case OP_OBJECT_POOL: + case OP_STRING_POOL: + case OP_CALL: + const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } } @@ -107,73 +109,93 @@ void debug_dump(Pool& pool, int level, c #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()) + +/** + Helps preventing evaluation of junctions in outdated context + + To stop situations like this: +@code + @main[] + ^method1[] + ^method2[] + + @method1[] + $junction{ + some code + } + + @method2[] + ^junction[] +@endcode + + All Junctions, generated by OP_CURLY_CODE__CONSTRUCT are registered here, + and on scope exit got cleaned - there Junction::root becomes 0, + which later in Request::process triggers exception +*/ +class Auto_junction_cleaner { +public: + Auto_junction_cleaner () : junctions(0) {} + ~Auto_junction_cleaner () { + if(junctions) { + Array_iter i(*junctions); + while(i.has_next()) + static_cast(i.next())->change_context(0); + // someday free junctions + } + } + void register_junction(Pool& apool, Junction& ajunction) { + if(!junctions) + junctions=new(apool) Array(apool); + if(junctions) + *junctions+=&ajunction; + } +private: + Array *junctions; +}; void Request::execute(const Array& ops) { +// _asm int 3; #ifdef DEBUG_EXECUTE debug_printf(pool(), "source----------------------------\n"); debug_dump(pool(), 0, ops); debug_printf(pool(), "execution-------------------------\n"); #endif - int size=ops.quick_size(); - //debug_printf(pool(), "size=%d\n", size); - for(int i=0; i(ops.quick_get(++i)); + value=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " \"%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(ops.quick_get(++i)); -#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 *value=NEW VJunction(j); - - // store param - frame->store_param(frame->name(), value); - break; - } case OP_GET_CLASS: { // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); const String& name=POP_NAME(); - Value *value=static_cast(classes().get(name)); + value=static_cast(classes().get(name)); if(!value) - THROW(0,0, + throw Exception("parser.runtime", &name, "class is undefined"); @@ -182,14 +204,14 @@ void Request::execute(const Array& ops) } // OP_WITH - case OP_WITH_SELF: + case OP_WITH_ROOT: { - PUSH(self); + PUSH(root); break; } - case OP_WITH_ROOT: + case OP_WITH_SELF: { - PUSH(root); + PUSH(self); break; } case OP_WITH_READ: @@ -206,41 +228,73 @@ void Request::execute(const Array& ops) // OTHER ACTIONS BUT WITHs case OP_CONSTRUCT_VALUE: { - Value *value=POP(); + value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); ncontext->put_element(name, value); - value->set_name(name); break; } case OP_CONSTRUCT_EXPR: { - Value *value=POP(); + // 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); break; } - case OP_WRITE_VALUE: + case OP_CURLY_CODE__CONSTRUCT: { - Value *value=POP(); - write_assign_lang(*value); + 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 + Junction& j=*NEW Junction(pool(), + *self, 0, 0, + root, + rcontext, + wcontext, + local_ops); + junction_cleaner.register_junction(pool(), j); - // forget the fact they've entered some ^object.method[]. - // see OP_GET_ELEMENT - wcontext->clear_somebody_entered_some_object(); + value=NEW VJunction(j); + const String& name=POP_NAME(); + Value *ncontext=POP(); + ncontext->put_element(name, value); + break; + } + case OP_NESTED_CODE: + { + Array *local_ops=static_cast(i.next()); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); +#endif + PUSH(local_ops); + break; + } + case OP_WRITE_VALUE: + { + value=POP(); + write_assign_lang(*value, last_get_element_name); break; } case OP_WRITE_EXPR_RESULT: { - Value *value=POP(); - write_expr_result(*value->as_expr_result()); + value=POP(); + write_no_lang(*value->as_expr_result()); + + // must be after write(result) and + // see OP_PREPARE_TO_EXPRESSION + wcontext->set_in_expression(false); break; } case OP_STRING__WRITE: { - VString *vstring=static_cast(ops.quick_get(++i)); + VString *vstring=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " \"%s\"", vstring->string().cstr()); #endif @@ -248,72 +302,64 @@ void Request::execute(const Array& ops) 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(last_get_element_name, true); + PUSH(value); + break; + } case OP_GET_ELEMENT: { // maybe they do ^object.method[] call, remember the fact - wcontext->inc_somebody_entered_some_object(); + wcontext->set_somebody_entered_some_object(true); //_asm int 3; - Value *value=get_element(); + value=get_element(last_get_element_name, false); PUSH(value); break; } case OP_GET_ELEMENT__WRITE: { - Value *value=get_element(); - 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_CREATE_EWPOOL: + case OP_OBJECT_POOL: { + const Array *local_ops=reinterpret_cast(i.next()); + PUSH(wcontext); PUSH((void *)flang); flang=String::UL_PASS_APPENDED; - wcontext=NEW WWrapper(pool(), 0 /*empty*/, true /*constructing*/); - break; - } - case OP_REDUCE_EWPOOL: - { - Value *value=wcontext->result(); + WWrapper local(pool(), 0 /*empty*/); + wcontext=&local; + + execute(*local_ops); + + value=&wcontext->result().as_value(); flang=static_cast(reinterpret_cast(POP())); wcontext=static_cast(POP()); PUSH(value); break; } - case OP_CREATE_RWPOOL: - { - Value *ncontext=POP(); - PUSH(rcontext); - PUSH(wcontext); - rcontext=ncontext; - wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); - break; - } - case OP_REDUCE_RWPOOL: - { - const String *string=wcontext->get_string(); - Value *value; - if(string) - value=NEW VString(*string); - else - value=NEW VVoid(pool()); - wcontext=static_cast(POP()); - rcontext=POP(); - PUSH(value); - break; - } - case OP_CREATE_SWPOOL: + case OP_STRING_POOL: { + const Array *local_ops=reinterpret_cast(i.next()); + PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /*empty*/, false /*not constructing*/); - break; - } - case OP_REDUCE_SWPOOL: - { + WWrapper local(pool(), 0 /*empty*/); + 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(); @@ -328,122 +374,193 @@ void Request::execute(const Array& ops) } // CALL - case OP_GET_METHOD_FRAME: + case OP_STORE_PARAM: { - Value *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(0,0, - &value->name(), - "(%s) not a method or junction, can not call it", - value->type()); + 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 + frame->store_param(value); + break; + } + case OP_CURLY_CODE__STORE_PARAM: + case OP_EXPR_CODE__STORE_PARAM: + { + // code + const Array *local_ops=reinterpret_cast(i.next()); + VMethodFrame *frame=static_cast(stack.top_value()); +#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); - bool is_constructor= - wcontext->constructing() && // constructing? - wcontext->somebody_entered_some_class(); // ^class:method[..]? - if(is_constructor) - wcontext->constructing(false); + // 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; + } - VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction, is_constructor); - PUSH(frame); + case OP_PREPARE_TO_CONSTRUCT_OBJECT: + { + wcontext->set_constructing(true); break; } - case OP_STORE_PARAM: + + case OP_PREPARE_TO_EXPRESSION: { - Value *value=POP(); - VMethodFrame *frame=static_cast(stack.top_value()); - frame->store_param(frame->name(), value); + wcontext->set_in_expression(true); break; } case OP_CALL: + case OP_CALL__WRITE: { + Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); + debug_printf(pool(), "->\n"); #endif - VMethodFrame *frame=static_cast(POP()); - frame->fill_unspecified_params(); + 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", + last_get_element_name, + "(%s) not a method or junction, can not call it", + value->type()); + + VMethodFrame frame(pool(), *last_get_element_name, *junction); + if(local_ops){ // store param code goes here + PUSH(&frame); // argument for *STORE_PARAM ops + execute(*local_ops); + POP(); + } + frame.fill_unspecified_params(); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - VStateless_class *called_class=frame->junction.self.get_class(); - // not ^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->somebody_entered_some_object() && - read_class && read_class->is_or_derived_from(*called_class)) // yes - self=rcontext; // class dynamic call - else // no, not me or relative of mine (total stranger) - // were are constructing something and - // our constructor is just method call and - // not static-only-method call - if(frame->is_constructor && - wcontext->somebody_entered_some_object()==1 && - frame->junction.method->call_type!=Method::CT_STATIC) { + VStateless_class *called_class=frame.junction.self.get_class(); + if(wcontext->get_constructing()) { + wcontext->set_constructing(false); + if(frame.junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - // some stateless_object creatable derivates - if(Value *value=called_class->create_new_value(pool())) + + if(Value *value=called_class->create_new_value(pool())) { + // some stateless_class creatable derivates self=value; - else // stateful object - self=NEW VObject(pool(), *called_class); - frame->write(*self, + } else + throw Exception("parser.runtime", + &frame.name(), + "is not a constructor, system class '%s' can be constructed only implicitly", + called_class->name().cstr()); + + frame.write(*self, String::UL_CLEAN // not used, always an object, not string ); - } else - self=&frame->junction.self; // no, static or simple dynamic call + } else + throw Exception("parser.runtime", + &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 + } - frame->set_self(*self); - root=rcontext=wcontext=frame; + frame.set_self(*self); + + // see OP_PREPARE_TO_EXPRESSION + frame.set_in_expression(wcontext->get_in_expression()); + + 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); + 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; if( method.call_type==Method::CT_ANY || - method.call_type==call_type) // allowed call type? - if(method.native_code) { // native code? - method.check_actual_numbered_params(pool(), - frame->junction.self, - frame->name(), frame->numbered_params()); - method.native_code( - *this, - frame->name(), frame->numbered_params()); // execute it - } else { // parser code - if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { - anti_endless_execute_recoursion=0; // give @exception a chance - THROW(0, 0, - &frame->name(), - "endless recursion detected"); + method.call_type==call_type) { // allowed call type? + try { + 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()); + 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); } - - execute(*method.parser_code); // execute it - anti_endless_execute_recoursion--; + } catch(...) { + // record it to stack trace + exception_trace.push((void *)&frame.name()); + /*re*/throw; } - else - THROW(0, 0, - &frame->name(), + } else + throw Exception("parser.runtime", + &frame.name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); } - Value *value=wcontext->result(); + StringOrValue result=wcontext->result(); wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=static_cast(POP()); - PUSH(value); +#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); + // forget the fact they've entered some ^object.method[]. + // see OP_GET_ELEMENT + wcontext->set_somebody_entered_some_object(false); + } else { // OP_CALL + PUSH(&result.as_value()); + } + #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-returned"); #endif @@ -454,36 +571,37 @@ void Request::execute(const Array& ops) case OP_NEG: { Value *operand=POP(); - Value *value=NEW VDouble(pool(), -operand->as_double()); + value=NEW VDouble(pool(), -operand->as_double()); PUSH(value); break; } case OP_INV: { Value *operand=POP(); - Value *value=NEW VDouble(pool(), ~operand->as_int()); + value=NEW VDouble(pool(), ~operand->as_int()); PUSH(value); break; } case OP_NOT: { Value *operand=POP(); - Value *value=NEW VBool(pool(), !operand->as_bool()); + value=NEW VBool(pool(), !operand->as_bool()); PUSH(value); break; } case OP_DEF: { Value *operand=POP(); - Value *value=NEW VBool(pool(), operand->is_defined()); + value=NEW VBool(pool(), operand->is_defined()); PUSH(value); break; } case OP_IN: { + /// @test String::cmp Value *operand=POP(); const char *path=operand->as_string().cstr(); - Value *value=NEW VBool(pool(), + value=NEW VBool(pool(), info.uri && strncmp(path, info.uri, strlen(path))==0); PUSH(value); break; @@ -491,7 +609,7 @@ void Request::execute(const Array& ops) case OP_FEXISTS: { Value *operand=POP(); - Value *value=NEW VBool(pool(), + value=NEW VBool(pool(), file_readable(absolute(operand->as_string()))); PUSH(value); break; @@ -499,7 +617,7 @@ void Request::execute(const Array& ops) case OP_DEXISTS: { Value *operand=POP(); - Value *value=NEW VBool(pool(), + value=NEW VBool(pool(), dir_readable(absolute(operand->as_string()))); PUSH(value); break; @@ -508,73 +626,83 @@ void Request::execute(const Array& ops) // expression ops: binary case OP_SUB: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), a->as_double() - b->as_double()); + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_double() - b->as_double()); PUSH(value); break; } case OP_ADD: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), a->as_double() + b->as_double()); + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_double() + b->as_double()); PUSH(value); break; } case OP_MUL: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), a->as_double() * b->as_double()); + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_double() * b->as_double()); PUSH(value); break; } case OP_DIV: { - Value *b=POP(); Value *a=POP(); + b=POP(); a=POP(); 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 - THROW(0, 0, + throw Exception("number.zerodivision", problem_source, "Division by zero"); } - Value *value=NEW VDouble(pool(), a_double / b_double); + value=NEW VDouble(pool(), a_double / b_double); PUSH(value); break; } case OP_MOD: { - Value *b=POP(); Value *a=POP(); + b=POP(); a=POP(); 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 - THROW(0, 0, + throw Exception("number.zerodivision", problem_source, "Modulus by zero"); } - Value *value=NEW VDouble(pool(), fmod(a_double, b_double)); + value=NEW VDouble(pool(), fmod(a_double, b_double)); + PUSH(value); + break; + } + case OP_INTDIV: + { + b=POP(); a=POP(); + + int a_int=a->as_int(); + int b_int=b->as_int(); + + if(b_int == 0) { + const String *problem_source=&b->as_string(); + throw Exception("number.zerodivision", + problem_source, + "Division by zero"); + } + + value=NEW VInt(pool(), a_int / b_int); PUSH(value); break; } case OP_BIN_AND: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_int() & b->as_int()); PUSH(value); @@ -582,8 +710,8 @@ void Request::execute(const Array& ops) } case OP_BIN_OR: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_int() | b->as_int()); PUSH(value); @@ -591,8 +719,8 @@ void Request::execute(const Array& ops) } case OP_BIN_XOR: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_int() ^ b->as_int()); PUSH(value); @@ -600,142 +728,159 @@ void Request::execute(const Array& ops) } case OP_LOG_AND: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_bool() && b->as_bool()); + b_code=POP_CODE(); a=POP(); + bool result; + if(a->as_bool()) { + execute(*b_code); + b=POP(); + result=b->as_bool(); + } else + result=false; + value=NEW VBool(pool(), result); PUSH(value); break; } case OP_LOG_OR: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_bool() || b->as_bool()); + b_code=POP_CODE(); a=POP(); + bool result; + if(a->as_bool()) + result=true; + else { + execute(*b_code); + b=POP(); + result=b->as_bool(); + } + value=NEW VBool(pool(), result); PUSH(value); break; } case OP_LOG_XOR: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); PUSH(value); break; } case OP_NUM_LT: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_double() < b->as_double()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_double() < b->as_double()); PUSH(value); break; } case OP_NUM_GT: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_double() > b->as_double()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_double() > b->as_double()); PUSH(value); break; } case OP_NUM_LE: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_double() <= b->as_double()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_double() <= b->as_double()); PUSH(value); break; } case OP_NUM_GE: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_double() >= b->as_double()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_double() >= b->as_double()); PUSH(value); break; } case OP_NUM_EQ: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_double() == b->as_double()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_double() == b->as_double()); PUSH(value); break; } case OP_NUM_NE: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_double() != b->as_double()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_double() != b->as_double()); PUSH(value); break; } case OP_STR_LT: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_string() < b->as_string()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() < b->as_string()); PUSH(value); break; } case OP_STR_GT: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_string() > b->as_string()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() > b->as_string()); PUSH(value); break; } case OP_STR_LE: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_string() <= b->as_string()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() <= b->as_string()); PUSH(value); break; } case OP_STR_GE: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_string() >= b->as_string()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() >= b->as_string()); PUSH(value); break; } case OP_STR_EQ: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_string() == b->as_string()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() == b->as_string()); PUSH(value); break; } case OP_STR_NE: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), a->as_string() != b->as_string()); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() != b->as_string()); PUSH(value); break; } case OP_IS: { - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), b->as_string() == a->type()); + //_asm int 3; + b=POP(); a=POP(); + value=NEW VBool(pool(), b->as_string() == a->type()); PUSH(value); break; } default: - THROW(0,0, + throw Exception(0, 0, "invalid opcode %d", op.code); } } } -Value *Request::get_element() { - const String& name=POP_NAME(); +/// @test cache|prepare junctions +Value *Request::get_element(const String *& remember_name, bool can_call_operator) { + const String& name=POP_NAME(); remember_name=&name; Value *ncontext=POP(); - Value *value; - if(Method* method=OP.get_method(name)) { // operator? - // as if that method were in self and we have normal dynamic method here - Junction& junction=*NEW Junction(pool(), - *self, self->get_class(), method, 0,0,0,0); - value=NEW VJunction(junction); - } else + 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(*value, &name); // process possible code-junction - else { + value=&process_to_value(*value); // process possible code-junction + else value=NEW VVoid(pool()); - value->set_name(name); - } return value; } @@ -748,21 +893,32 @@ Value *Request::get_element() { they want any result[string|object] nothing goes to wcontext. used in @c (expression) params evaluation + + using the fact it's either string_ or value_ result requested to speed up checkes */ -Value& Request::process(Value& value, const String *name, bool intercept_string) { - Value *result; - Junction *junction=value.get_junction(); +StringOrValue Request::process(Value& input_value, bool intercept_string) { + StringOrValue result; + Junction *junction=input_value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE debug_printf(pool(), "ja->\n"); #endif + + if(!junction->root) + throw Exception("parser.runtime", + 0, + "junction used outside of context"); + PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - WContext *frame; + self=&junction->self; + root=junction->root; + rcontext=junction->rcontext; + // for expression method params // wcontext is set 0 // using the fact in decision "which wwrapper to use" @@ -770,24 +926,26 @@ Value& Request::process(Value& value, co if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - frame=NEW VCodeFrame(pool(), *junction->wcontext); - } else { - // plain wwrapper - frame=NEW WWrapper(pool(), 0/*empty*/, false/*not constructing*/); - } - - wcontext=frame; - self=&junction->self; - root=junction->root; - rcontext=junction->rcontext; - execute(*junction->code); - if(using_code_frame) { + VCodeFrame local(pool(), *junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(0/*result_name*/, *junction->code); + // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - result=NEW VString(*frame->get_string()); - } else - result=frame->result(); + result.set_string(*wcontext->get_string()); + } else { + // plain wwrapper + WWrapper local(pool(), 0/*empty*/); + wcontext=&local; + + // execute it + recoursion_checked_execute(0/*result_name*/, *junction->code); + + result=wcontext->result(); + } wcontext=static_cast(POP()); rcontext=POP(); @@ -797,34 +955,27 @@ Value& Request::process(Value& value, co #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); #endif - } else - result=&value; - - if(name) - result->set_name(*name); - return *result; + } else { + result.set_value(input_value); + } + return result; } -const String *Request::execute_method(Value& aself, const Method& method, - bool return_cstr) { +const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); // initialize contexts - root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself, false /*not constructing*/); + root=rcontext=self=&amethodFrame; + wcontext=&amethodFrame; // execute! execute(*method.parser_code); // result - const String *result; - if(return_cstr) - result=&wcontext->as_string(); - else - result=0; // ignore result + const String& result=wcontext->result().as_string(); wcontext=static_cast(POP()); rcontext=POP(); @@ -835,22 +986,72 @@ const String *Request::execute_method(Va return result; } +void Request::execute_method(Value& aself, + const Method& method, VString *optional_param, + const String **return_string) { + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + // initialize contexts + //root=rcontext=self=&aself; + self=&aself; +// WWrapper local(pool(), &aself); +// wcontext=&local; + Junction local_junction(pool(), *self, self->get_class(), &method, 0,0,0,0); + VMethodFrame local_frame(pool(), method.name, local_junction); + if(optional_param && local_frame.can_store_param()) { + local_frame.store_param(optional_param); + local_frame.fill_unspecified_params(); + } + local_frame.set_self(*self); + root=rcontext=wcontext=&local_frame; + + // execute! + execute(*method.parser_code); + + // result + const String *result=0; + if(return_string) { + /*if(Value *result_var_value=wcontext->get_element(*result_var_name)) + *return_string=&result_var_value->as_string(); + else + *return_string=&wcontext->as_string();*/ + *return_string=&wcontext->result().as_string(); + } + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); +} + +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; + + if(method) + execute_method(aclass, *method, optional_param, return_string); +} + const String *Request::execute_virtual_method(Value& aself, - const String& method_name, - bool return_cstr) { + 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, return_cstr); - + if(const Method *method=junction->method) { + const String *result; + execute_method(aself, *method, 0/*no params*/, &result); + return result; + } + 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(aself, *method, return_cstr); - - return 0; -}