--- parser3/src/main/execute.C 2001/10/19 12:43:30 1.196 +++ parser3/src/main/execute.C 2002/04/16 08:41:05 1.232 @@ -1,10 +1,10 @@ /** @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) - $Id: execute.C,v 1.196 2001/10/19 12:43:30 parser Exp $ + $Id: execute.C,v 1.232 2002/04/16 08:41:05 paf Exp $ */ #include "pa_opcode.h" @@ -23,31 +23,38 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -//#define DEBUG_EXECUTE +#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=400; #ifdef DEBUG_EXECUTE char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", + "NESTED_CODE", // actions "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", - "CREATE_EWPOOL", "REDUCE_EWPOOL", - "CREATE_SWPOOL", "REDUCE_SWPOOL", + "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", + "OBJECT_POOL", "STRING_POOL", "GET_METHOD_FRAME", "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "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", @@ -89,6 +96,9 @@ void debug_dump(Pool& pool, int level, c 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: const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } @@ -99,8 +109,10 @@ 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); @@ -115,11 +127,14 @@ void Request::execute(const Array& ops) debug_printf(pool(), "%d:%s", stack.top_index()+1, opcode_name[op.code]); #endif + Value *value; + Value *a; Value *b; + Array *b_code; switch(op.code) { // param in next instruction case OP_VALUE: { - Value *value=static_cast(i.next()); + value=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); #endif @@ -150,7 +165,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); @@ -162,9 +177,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 Exception(0,0, + throw Exception("parser.runtime", &name, "class is undefined"); @@ -197,7 +212,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); @@ -206,7 +221,10 @@ void Request::execute(const Array& ops) } 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()); @@ -227,27 +245,37 @@ 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(); 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: @@ -260,50 +288,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(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; } - 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*/); - 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_SWPOOL: + case OP_STRING_POOL: { + const Array *local_ops=reinterpret_cast(i.next()); + PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /*empty*/); - 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(); @@ -320,14 +362,14 @@ 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 Exception(0, 0, + throw Exception("parser.runtime", &value->name(), "(%s) not a method or junction, can not call it", value->type()); @@ -338,7 +380,7 @@ void Request::execute(const Array& ops) } case OP_STORE_PARAM: { - Value *value=POP(); + value=POP(); VMethodFrame *frame=static_cast(stack.top_value()); frame->store_param(frame->name(), value); break; @@ -346,10 +388,18 @@ void Request::execute(const Array& ops) case OP_PREPARE_TO_CONSTRUCT_OBJECT: { - wcontext->constructing(true); + wcontext->set_constructing(true); break; } + + case OP_PREPARE_TO_EXPRESSION: + { + wcontext->set_in_expression(true); + break; + } + case OP_CALL: + case OP_CALL__WRITE: { #ifdef DEBUG_EXECUTE debug_printf(pool(), "->\n"); @@ -362,23 +412,25 @@ void Request::execute(const Array& ops) PUSH(wcontext); VStateless_class *called_class=frame->junction.self.get_class(); - if(wcontext->constructing()) { - wcontext->constructing(false); + if(wcontext->get_constructing()) { + wcontext->set_constructing(false); if(frame->junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call if(Value *value=called_class->create_new_value(pool())) { - // some stateless_object creatable derivates + // some stateless_class creatable derivates self=value; - } else { - // stateful object - self=NEW VObject(pool(), *called_class); - } + } 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 - throw Exception(0, 0, + throw Exception("parser.runtime", &frame->name(), "method is static and can not be used as constructor"); } else { @@ -388,8 +440,8 @@ void Request::execute(const Array& ops) // 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()) && + !(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) @@ -397,7 +449,11 @@ void Request::execute(const Array& ops) } frame->set_self(*self); - root=rcontext=wcontext=frame; + + // 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 @@ -408,40 +464,54 @@ 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( - 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 Exception(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 Exception(0, 0, + } 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); + // 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 @@ -452,36 +522,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; @@ -489,7 +560,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; @@ -497,7 +568,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; @@ -506,28 +577,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(); @@ -538,18 +609,18 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - throw Exception(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(); @@ -560,19 +631,41 @@ void Request::execute(const Array& ops) if(!problem_source->origin().file) problem_source=&b->name(); #endif - throw Exception(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(); +#ifndef NO_STRING_ORIGIN + if(!problem_source->origin().file) + problem_source=&b->name(); +#endif + 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); @@ -580,8 +673,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); @@ -589,8 +682,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); @@ -598,140 +691,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: { //_asm int 3; - Value *b=POP(); Value *a=POP(); - Value *value=NEW VBool(pool(), b->as_string() == a->type()); + b=POP(); a=POP(); + value=NEW VBool(pool(), b->as_string() == a->type()); PUSH(value); break; } default: - throw Exception(0,0, + throw Exception(0, 0, "invalid opcode %d", op.code); } } } -Value *Request::get_element() { +/// @test cache|prepare junctions +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(Method* method=OP.get_method(name)) { // maybe operator? + 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*/, self->get_class(), method, 0,0,0,0); + *root, self->get_class(), method, 0,0,0,0); value=NEW VJunction(junction); } - if(value) - value=&process(*value, &name); // process possible code-junction - else { + 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); } @@ -747,10 +859,12 @@ 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 @@ -761,7 +875,10 @@ Value& Request::process(Value& value, co 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" @@ -769,25 +886,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*/); - } - - //frame->set_name(value.name()); - 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,16 +915,14 @@ 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(Value& aself, const Method& method, + bool return_cstr) { PUSH(self); PUSH(root); PUSH(rcontext); @@ -814,17 +930,39 @@ const String *Request::execute_method(Va // initialize contexts root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself); + WWrapper local(pool(), &aself); + wcontext=&local; + + // execute! + execute(*method.parser_code); + + // 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; - if(return_cstr) - result=&wcontext->as_string(); - else - result=0; // ignore result + const String& result=wcontext->as_string(); wcontext=static_cast(POP()); rcontext=POP(); @@ -836,18 +974,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);