--- parser3/src/main/execute.C 2001/07/25 08:16:21 1.182 +++ parser3/src/main/execute.C 2002/01/31 16:39:01 1.215 @@ -2,10 +2,10 @@ Parser: executor part of request class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) + $Id: execute.C,v 1.215 2002/01/31 16:39:01 paf Exp $ */ -static const char *RCSId="$Id: execute.C,v 1.182 2001/07/25 08:16:21 parser Exp $"; #include "pa_opcode.h" #include "pa_array.h" @@ -21,6 +21,7 @@ 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 @@ -30,23 +31,24 @@ const uint ANTI_ENDLESS_EXECUTE_RECOURSI 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_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", - "GET_ELEMENT", "GET_ELEMENT__WRITE", + "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_SWPOOL", "REDUCE_SWPOOL", "GET_METHOD_FRAME", "STORE_PARAM", - "CALL", + "PREPARE_TO_CONSTRUCT_OBJECT", "CALL", // 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", @@ -68,24 +70,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", @@ -95,8 +86,12 @@ 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: + const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } } @@ -106,28 +101,32 @@ 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()) 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 @@ -139,7 +138,7 @@ void Request::execute(const Array& ops) { VMethodFrame *frame=static_cast(stack.top_value()); // code - const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); + 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); @@ -158,7 +157,7 @@ void Request::execute(const Array& ops) op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, local_ops); - Value *value=NEW VJunction(j); + value=NEW VJunction(j); // store param frame->store_param(frame->name(), value); @@ -170,9 +169,9 @@ void Request::execute(const Array& ops) 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(0,0, &name, "class is undefined"); @@ -181,14 +180,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: @@ -205,7 +204,7 @@ 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); @@ -214,7 +213,7 @@ void Request::execute(const Array& ops) } case OP_CONSTRUCT_EXPR: { - Value *value=POP(); + value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); ncontext->put_element(name, value->as_expr_result()); @@ -223,7 +222,7 @@ void Request::execute(const Array& ops) } case OP_CURLY_CODE__CONSTRUCT: { - const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); + 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); @@ -235,32 +234,42 @@ void Request::execute(const Array& ops) wcontext, local_ops); - Value *value=NEW VJunction(j); + value=NEW VJunction(j); const String& name=POP_NAME(); Value *ncontext=POP(); ncontext->put_element(name, value); value->set_name(name); 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 *value=POP(); + value=POP(); write_assign_lang(*value); // forget the fact they've entered some ^object.method[]. // see OP_GET_ELEMENT - wcontext->clear_somebody_entered_some_object(); + wcontext->set_somebody_entered_some_object(false); break; } case OP_WRITE_EXPR_RESULT: { - Value *value=POP(); + value=POP(); write_expr_result(*value->as_expr_result()); 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 @@ -268,20 +277,30 @@ 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(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(false); PUSH(value); break; } case OP_GET_ELEMENT__WRITE: { - Value *value=get_element(); + value=get_element(false); write_assign_lang(*value); break; } @@ -292,12 +311,12 @@ void Request::execute(const Array& ops) PUSH(wcontext); PUSH((void *)flang); flang=String::UL_PASS_APPENDED; - wcontext=NEW WWrapper(pool(), 0 /*empty*/, true /*constructing*/); + wcontext=NEW WWrapper(pool(), 0 /*empty*/); break; } case OP_REDUCE_EWPOOL: { - Value *value=wcontext->result(); + value=&wcontext->result(); flang=static_cast(reinterpret_cast(POP())); wcontext=static_cast(POP()); PUSH(value); @@ -307,7 +326,7 @@ void Request::execute(const Array& ops) case OP_CREATE_SWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /*empty*/, false /*not constructing*/); + wcontext=NEW WWrapper(pool(), 0 /*empty*/); break; } case OP_REDUCE_SWPOOL: @@ -328,36 +347,35 @@ void Request::execute(const Array& ops) // CALL case OP_GET_METHOD_FRAME: { - Value *value=POP(); + 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, + throw Exception(0, 0, &value->name(), "(%s) not a method or junction, can not call it", value->type()); - bool is_constructor= - wcontext->constructing() && // constructing? - wcontext->somebody_entered_some_class(); // ^class:method[..]? - if(is_constructor) - wcontext->constructing(false); - - VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction, is_constructor); + VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction); PUSH(frame); break; } case OP_STORE_PARAM: { - Value *value=POP(); + value=POP(); VMethodFrame *frame=static_cast(stack.top_value()); frame->store_param(frame->name(), value); break; } + case OP_PREPARE_TO_CONSTRUCT_OBJECT: + { + wcontext->set_constructing(true); + break; + } case OP_CALL: { #ifdef DEBUG_EXECUTE @@ -371,35 +389,44 @@ void Request::execute(const Array& ops) PUSH(wcontext); VStateless_class *called_class=frame->junction.self.get_class(); - // 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->somebody_entered_some_object() && - !wcontext->somebody_entered_some_class()) && - 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) { + 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); + } else + throw Exception(0, 0, + &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(0, 0, + &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; + rcontext=wcontext=frame; { // take object or class from any wrappers // and substitute class alias to the class they are called AS @@ -410,33 +437,42 @@ void Request::execute(const Array& ops) 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; + { // anti_endless_execute_recoursion + if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { + anti_endless_execute_recoursion=0; // give @exception a chance + throw Exception(0, 0, + &frame->name(), + "call canceled - endless recursion detected"); + } + execute(*method.parser_code); // execute it + anti_endless_execute_recoursion--; + } } - - execute(*method.parser_code); // execute it - anti_endless_execute_recoursion--; + } catch(...) { + // record it to stack trace + trace.push((void *)&frame->name()); + /*re*/throw; } - else - THROW(0, 0, + } else + throw Exception(0, 0, &frame->name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); } - Value *value=wcontext->result(); + value=&wcontext->result(); wcontext=static_cast(POP()); rcontext=POP(); @@ -454,36 +490,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 +528,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 +536,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,28 +545,28 @@ 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(); @@ -540,18 +577,18 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - THROW(0, 0, + throw Exception(0, 0, 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(); @@ -562,19 +599,41 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - THROW(0, 0, + throw Exception(0, 0, 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(); +#ifndef NO_STRING_ORIGIN + if(!problem_source->origin().file) + problem_source=&b->name(); +#endif + throw Exception(0, 0, + 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 +641,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 +650,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,134 +659,150 @@ 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, 0, "invalid opcode %d", op.code); } } } -Value *Request::get_element() { +Value *Request::get_element(bool can_call_operator) { const String& name=POP_NAME(); Value *ncontext=POP(); Value *value=ncontext->get_element(name); - if(!value) + if(!value && can_call_operator) if(Method* method=OP.get_method(name)) { // maybe 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); + *root, self->get_class(), method, 0,0,0,0); value=NEW VJunction(junction); } if(value) @@ -773,21 +848,33 @@ Value& Request::process(Value& value, co frame=NEW VCodeFrame(pool(), *junction->wcontext); } else { // plain wwrapper - frame=NEW WWrapper(pool(), 0/*empty*/, false/*not constructing*/); + frame=NEW WWrapper(pool(), 0/*empty*/); } + //frame->set_name(value.name()); wcontext=frame; self=&junction->self; root=junction->root; rcontext=junction->rcontext; - execute(*junction->code); + + { // anti_endless_execute_recoursion + if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { + anti_endless_execute_recoursion=0; // give @exception a chance + throw Exception(0, 0, + name, + "junction evaluation canceled - endless recursion detected"); + } + execute(*junction->code); + anti_endless_execute_recoursion--; + } + if(using_code_frame) { // 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=&frame->result(); wcontext=static_cast(POP()); rcontext=POP(); @@ -805,8 +892,8 @@ Value& Request::process(Value& value, co return *result; } -const String *Request::execute_method(Value& aself, const Method& method, - bool return_cstr) { +const String *Request::execute_method(Value& aself, const Method& method, + bool return_cstr) { PUSH(self); PUSH(root); PUSH(rcontext); @@ -814,17 +901,38 @@ const String *Request::execute_method(Va // initialize contexts root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself, false /*not constructing*/); + wcontext=NEW WWrapper(pool(), &aself); // execute! execute(*method.parser_code); // result - const String *result; - if(return_cstr) - result=&wcontext->as_string(); - else - result=0; // ignore result + const String *result=return_cstr ? &wcontext->as_string() : 0; + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + // return + return result; +} + +const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + // initialize contexts + root=rcontext=self=&amethodFrame; + wcontext=&amethodFrame; + + // execute! + execute(*method.parser_code); + + // result + const String& result=wcontext->as_string(); wcontext=static_cast(POP()); rcontext=POP(); @@ -836,18 +944,17 @@ const String *Request::execute_method(Va } 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); - + return execute_method(aself, *method, true /*return_cstr*/); + return 0; } const String *Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, + const String& method_name, bool return_cstr) { if(const Method *method=aclass.get_method(method_name)) return execute_method(aclass, *method, return_cstr);