--- parser3/src/main/execute.C 2003/01/31 16:45:26 1.295.2.6 +++ parser3/src/main/execute.C 2003/02/17 11:29:53 1.295.2.12 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/01/31 16:45:26 $"; +static const char* IDENT_EXECUTE_C="$Date: 2003/02/17 11:29:53 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -23,7 +23,7 @@ static const char* IDENT_EXECUTE_C="$Dat #include "pa_vimage.h" #include "pa_wwrapper.h" -//#define DEBUG_EXECUTE +#define DEBUG_EXECUTE //#define DEBUG_STRING_APPENDS_VS_EXPANDS @@ -62,35 +62,34 @@ char *opcode_name[]={ "IS" }; -void va_debug_printf(Pool& pool, const char* fmt,va_list args) { +void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); - SAPI::log(pool, "%s", buf); + SAPI::log(sapi_info, "%s", buf); } -void debug_printf(Pool& pool, const char* fmt, ...) { +void debug_printf(SAPI_Info& sapi_info, const char* fmt, ...) { va_list args; - va_start(args,fmt); - va_debug_printf(pool,fmt,args); + va_start(args, fmt); + va_debug_printf(sapi_info, fmt, args); va_end(args); } -void debug_dump(Pool& pool, int level, const Array& ops) { - Array_iterator i(ops); +void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { + Array_iterator i(ops); while(i.has_next()) { - Operation op; - op.cast=i.next(); + Operation& op=i.next(); if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - Value* value=i.next().value; - debug_printf(pool, + ValuePtr value=i.next().value; + debug_printf(sapi_info, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[op.code], - value->get_string()->cstr(), value->type()); + value->get_string(0)->cstr().get(), value->type()); continue; } - debug_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[op.code]); switch(op.code) { case OP_CURLY_CODE__STORE_PARAM: @@ -100,28 +99,22 @@ void debug_dump(Pool& pool, int level, c case OP_OBJECT_POOL: case OP_STRING_POOL: case OP_CALL: - const Array *local_ops=reinterpret_cast(i.next()); - debug_dump(pool, level+1, *local_ops); + case OP_CALL__WRITE: + ArrayOperation& local_ops=*i.next().ops; + debug_dump(sapi_info, level+1, local_ops); } } } #endif -/*#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(ArrayOperation& ops) { // _asm int 3; #ifdef DEBUG_EXECUTE - debug_printf(pool(), "source----------------------------\n"); - debug_dump(pool(), 0, ops); - debug_printf(pool(), "execution-------------------------\n"); + debug_printf(sapi_info, "source----------------------------\n"); + debug_dump(sapi_info, 0, ops); + debug_printf(sapi_info, "execution-------------------------\n"); #endif StringPtr last_get_element_name(0); @@ -134,7 +127,7 @@ void Request::execute(ArrayOperation& op Operation& op=i.next(); #ifdef DEBUG_EXECUTE - debug_printf(pool(), "%d:%s", stack.top_index()+1, opcode_name[op.code]); + debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[op.code]); #endif ValuePtr value; @@ -152,7 +145,7 @@ void Request::execute(ArrayOperation& op { value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); + debug_printf(sapi_info, " \"%s\" %s", value->get_string(0)->cstr().get(), value->type()); #endif stack.push(value); break; @@ -162,7 +155,7 @@ void Request::execute(ArrayOperation& op // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); - name=stack.pop().string; + name=stack.pop().string(); value=classes().get(name); if(!value) throw Exception("parser.runtime", @@ -204,7 +197,7 @@ void Request::execute(ArrayOperation& op case OP_CONSTRUCT_VALUE: { value=stack.pop().value; - name=stack.pop().string; + name=stack.pop().string(); ncontext=stack.pop().value.get(); ncontext->put_element(name, value, false); break; @@ -215,7 +208,7 @@ void Request::execute(ArrayOperation& op wcontext->set_in_expression(false); value=stack.pop().value; - name=stack.pop().string; + name=stack.pop().string(); ncontext=stack.pop().value.get(); ncontext->put_element(name, value->as_expr_result(), false); break; @@ -224,17 +217,17 @@ void Request::execute(ArrayOperation& op { local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->count()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, 1, *local_ops); #endif value=ValuePtr(new VJunction(JunctionPtr(new Junction( - *get_self(), 0, + get_self(), 0, method_frame, rcontext, wcontext, local_ops)))); - name=stack.pop().string; + name=stack.pop().string(); ncontext=stack.pop().value.get(); ncontext->put_element(name, value, false); break; @@ -243,8 +236,8 @@ void Request::execute(ArrayOperation& op { local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->count()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, 1, *local_ops); #endif stack.push(local_ops); break; @@ -258,7 +251,7 @@ void Request::execute(ArrayOperation& op case OP_WRITE_EXPR_RESULT: { value=stack.pop().value; - write_no_lang(*value->as_expr_result()); + write_no_lang(value->as_expr_result()); // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION @@ -267,11 +260,11 @@ void Request::execute(ArrayOperation& op } case OP_STRING__WRITE: { - VString *vstring=static_cast(i.next()); + value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " \"%s\"", vstring->string().cstr()); + debug_printf(sapi_info, " \"%s\"", value->get_string(0)->cstr().get()); #endif - write_no_lang(vstring->string()); + write_no_lang(*value->get_string(0)); break; } @@ -291,24 +284,24 @@ void Request::execute(ArrayOperation& op case OP_GET_ELEMENT__WRITE: { value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); - write_assign_lang(*value, last_get_element_name); + write_assign_lang(value, last_get_element_name); break; } case OP_OBJECT_POOL: { - const Array *local_ops=reinterpret_cast(i.next()); + local_ops=i.next().ops; WContext *saved_wcontext=wcontext; uchar saved_lang= flang; flang=String::UL_PASS_APPENDED; - WWrapper local(pool(), 0 /*empty*/, wcontext); + WWrapper local(ValuePtr(0)/*empty*/, wcontext); wcontext=&local; execute(*local_ops); - value=&wcontext->result().as_value(); + value=wcontext->result().as_value(); flang=saved_lang; wcontext=saved_wcontext; stack.push(value); @@ -317,22 +310,21 @@ void Request::execute(ArrayOperation& op case OP_STRING_POOL: { - const Array *local_ops=reinterpret_cast(i.next()); + local_ops=i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(pool(), 0 /*empty*/, wcontext); + WWrapper local(ValuePtr(0) /*empty*/, wcontext); wcontext=&local; execute(*local_ops); // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - const String *string=wcontext->get_string(); - Value* value; - if(string) - value=NEW VString(*string); + if(StringPtr string=wcontext->get_string(&pool())) + value=ValuePtr(new VString(string)); else - NEW VVoid(pool()); + value=ValuePtr(new VVoid); + wcontext=saved_wcontext; stack.push(value); break; @@ -342,8 +334,8 @@ void Request::execute(ArrayOperation& op case OP_STORE_PARAM: { value=stack.pop().value; - 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 + VMethodFrame *frame=static_cast(stack.top_value().ptr); + // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" frame->store_param(value); break; } @@ -351,11 +343,11 @@ void Request::execute(ArrayOperation& op case OP_EXPR_CODE__STORE_PARAM: { // code - const Array *local_ops=reinterpret_cast(i.next()); - VMethodFrame *frame=static_cast(stack.top_value()); + local_ops=i.next().ops; + VMethodFrame *frame=static_cast(stack.top_value().ptr); #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->count()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, 1, *local_ops); #endif // when they evaluate expression parameter, // the object expression result @@ -364,15 +356,12 @@ void Request::execute(ArrayOperation& op // 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(), - *get_self(), 0, + value=ValuePtr(new VJunction(JunctionPtr(new Junction( + get_self(), 0, method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops); - - value=NEW VJunction(j); - + local_ops)))); // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 frame->store_param(value); @@ -394,16 +383,16 @@ void Request::execute(ArrayOperation& op case OP_CALL: case OP_CALL__WRITE: { - Array *local_ops=static_cast(i.next()); + local_ops=i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->count()); - debug_dump(pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops->count()); + debug_dump(sapi_info, 1, *local_ops); - debug_printf(pool(), "->\n"); + debug_printf(sapi_info, "->\n"); #endif value=stack.pop().value; - Junction *junction=value->get_junction(); + JunctionPtr junction=value->get_junction(); if(!junction) throw Exception("parser.runtime", last_get_element_name, @@ -422,7 +411,7 @@ void Request::execute(ArrayOperation& op value->type()); */ - VMethodFrame frame(pool(), *last_get_element_name, *junction, method_frame/*caller*/); + 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); @@ -433,8 +422,8 @@ void Request::execute(ArrayOperation& op Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - VStateless_class *called_class=frame.junction.self.get_class(); - Value* new_self=get_self(); + 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) { @@ -445,21 +434,21 @@ void Request::execute(ArrayOperation& op new_self=value; } else throw Exception("parser.runtime", - &frame.name(), + frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", - called_class->name().cstr()); + (char*)called_class->name()->cstr()); - frame.write(*new_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 - new_self=&frame.junction.self; + new_self=frame.junction.self; - frame.set_self(*new_self); + frame.set_self(new_self); // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); @@ -468,7 +457,7 @@ void Request::execute(ArrayOperation& op { const Method& method=*frame.junction.method; Method::Call_type call_type= - called_class==new_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? @@ -476,21 +465,21 @@ void Request::execute(ArrayOperation& op method_frame=&frame; if(method.native_code) { // native code? method.check_actual_numbered_params( - frame.junction.self, + *frame.junction.self, frame.name(), frame.numbered_params()); method.native_code( *this, frame.name(), frame.numbered_params()); // execute it } else // parser code, execute it - recoursion_checked_execute(&frame.name(), *method.parser_code); + recoursion_checked_execute(frame.name(), *method.parser_code); } catch(...) { // record it to stack trace - exception_trace.push((void *)&frame.name()); + 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"); @@ -509,11 +498,11 @@ void Request::execute(ArrayOperation& op if(op.code==OP_CALL__WRITE) { write_assign_lang(result, last_get_element_name); } else { // OP_CALL - stack.push(&result.as_value()); + stack.push(result.as_value()); } #ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-returned"); + debug_printf(sapi_info, "<-returned"); #endif break; } @@ -521,55 +510,55 @@ void Request::execute(ArrayOperation& op // expression ops: unary case OP_NEG: { - Value* operand=stack.pop().value; - value=NEW VDouble(pool(), -operand->as_double()); + a=stack.pop().value; + value=ValuePtr(new VDouble(-a->as_double())); stack.push(value); break; } case OP_INV: { - Value* operand=stack.pop().value; - value=NEW VDouble(pool(), ~operand->as_int()); + a=stack.pop().value; + value=ValuePtr(new VDouble(~a->as_int())); stack.push(value); break; } case OP_NOT: { - Value* operand=stack.pop().value; - value=NEW VBool(pool(), !operand->as_bool()); + a=stack.pop().value; + value=ValuePtr(new VBool(!a->as_bool())); stack.push(value); break; } case OP_DEF: { - Value* operand=stack.pop().value; - value=NEW VBool(pool(), operand->is_defined()); + a=stack.pop().value; + value=ValuePtr(new VBool(a->is_defined())); stack.push(value); break; } case OP_IN: { /// @test String::cmp - Value* operand=stack.pop().value; - const char* path=operand->as_string().cstr(); - value=NEW VBool(pool(), - info.uri && strncmp(path, info.uri, strlen(path))==0); + 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=stack.pop().value; - value=NEW VBool(pool(), - file_readable(absolute(operand->as_string()))); + a=stack.pop().value; + value=ValuePtr(new VBool( + file_readable(absolute(a->as_string(&pool()))))); stack.push(value); break; } case OP_DEXISTS: { - Value* operand=stack.pop().value; - value=NEW VBool(pool(), - dir_readable(absolute(operand->as_string()))); + a=stack.pop().value; + value=ValuePtr(new VBool( + dir_readable(absolute(a->as_string(&pool()))))); stack.push(value); break; } @@ -578,21 +567,21 @@ void Request::execute(ArrayOperation& op case OP_SUB: { b=stack.pop().value; a=stack.pop().value; - value=NEW VDouble(pool(), a->as_double() - b->as_double()); + value=ValuePtr(new VDouble(a->as_double() - b->as_double())); stack.push(value); break; } case OP_ADD: { b=stack.pop().value; a=stack.pop().value; - value=NEW VDouble(pool(), a->as_double() + b->as_double()); + value=ValuePtr(new VDouble(a->as_double() + b->as_double())); stack.push(value); break; } case OP_MUL: { b=stack.pop().value; a=stack.pop().value; - value=NEW VDouble(pool(), a->as_double() * b->as_double()); + value=ValuePtr(new VDouble(a->as_double() * b->as_double())); stack.push(value); break; } @@ -604,13 +593,13 @@ void Request::execute(ArrayOperation& op double b_double=b->as_double(); if(b_double == 0) { - const String *problem_source=&b->as_string(); + StringPtr problem_source=b->as_string(&pool()); throw Exception("number.zerodivision", problem_source, "Division by zero"); } - value=NEW VDouble(pool(), a_double / b_double); + value=ValuePtr(new VDouble(a_double / b_double)); stack.push(value); break; } @@ -622,13 +611,13 @@ void Request::execute(ArrayOperation& op double b_double=b->as_double(); if(b_double == 0) { - const String *problem_source=&b->as_string(); + StringPtr problem_source=b->as_string(&pool()); throw Exception("number.zerodivision", problem_source, "Modulus by zero"); } - value=NEW VDouble(pool(), fmod(a_double, b_double)); + value=ValuePtr(new VDouble(fmod(a_double, b_double))); stack.push(value); break; } @@ -640,94 +629,94 @@ void Request::execute(ArrayOperation& op int b_int=b->as_int(); if(b_int == 0) { - const String *problem_source=&b->as_string(); + StringPtr problem_source=b->as_string(&pool()); throw Exception("number.zerodivision", problem_source, "Division by zero"); } - value=NEW VInt(pool(), a_int / b_int); + 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=NEW VInt(pool(), + value=ValuePtr(new VInt( a->as_int() << - b->as_int()); + b->as_int())); stack.push(value); break; } case OP_BIN_SR: { b=stack.pop().value; a=stack.pop().value; - value=NEW VInt(pool(), + value=ValuePtr(new VInt( a->as_int() >> - b->as_int()); + b->as_int())); stack.push(value); break; } case OP_BIN_AND: { b=stack.pop().value; a=stack.pop().value; - value=NEW VInt(pool(), + value=ValuePtr(new VInt( a->as_int() & - b->as_int()); + b->as_int())); stack.push(value); break; } case OP_BIN_OR: { b=stack.pop().value; a=stack.pop().value; - value=NEW VInt(pool(), + value=ValuePtr(new VInt( a->as_int() | - b->as_int()); + b->as_int())); stack.push(value); break; } case OP_BIN_XOR: { b=stack.pop().value; a=stack.pop().value; - value=NEW VInt(pool(), + value=ValuePtr(new VInt( a->as_int() ^ - b->as_int()); + b->as_int())); stack.push(value); break; } case OP_LOG_AND: { - b_code=POP_CODE(); a=stack.pop().value; + local_ops=stack.pop().ops; a=stack.pop().value; bool result; if(a->as_bool()) { - execute(*b_code); + execute(*local_ops); b=stack.pop().value; result=b->as_bool(); } else result=false; - value=NEW VBool(pool(), result); + value=ValuePtr(new VBool(result)); stack.push(value); break; } case OP_LOG_OR: { - b_code=POP_CODE(); a=stack.pop().value; + local_ops=stack.pop().ops; a=stack.pop().value; bool result; if(a->as_bool()) result=true; else { - execute(*b_code); + execute(*local_ops); b=stack.pop().value; result=b->as_bool(); } - value=NEW VBool(pool(), result); + value=ValuePtr(new VBool(result)); stack.push(value); break; } case OP_LOG_XOR: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); + value=ValuePtr(new VBool(a->as_bool() ^ b->as_bool())); stack.push(value); break; } @@ -735,7 +724,7 @@ void Request::execute(ArrayOperation& op { b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result < 0.0); + value=ValuePtr(new VBool(result < 0.0)); stack.push(value); break; } @@ -743,7 +732,7 @@ void Request::execute(ArrayOperation& op { b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result > 0.0); + value=ValuePtr(new VBool(result > 0.0)); stack.push(value); break; } @@ -751,7 +740,7 @@ void Request::execute(ArrayOperation& op { b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result <= 0.0); + value=ValuePtr(new VBool(result <= 0.0)); stack.push(value); break; } @@ -759,7 +748,7 @@ void Request::execute(ArrayOperation& op { b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result >= 0.0); + value=ValuePtr(new VBool(result >= 0.0)); stack.push(value); break; } @@ -767,7 +756,7 @@ void Request::execute(ArrayOperation& op { b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result == 0.0); + value=ValuePtr(new VBool(result == 0.0)); stack.push(value); break; } @@ -775,63 +764,63 @@ void Request::execute(ArrayOperation& op { b=stack.pop().value; a=stack.pop().value; double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result != 0.0); + value=ValuePtr(new VBool(result != 0.0)); stack.push(value); break; } case OP_STR_LT: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_string() < b->as_string()); + value=ValuePtr(new VBool(a->as_string(&pool()) < b->as_string(&pool()))); stack.push(value); break; } case OP_STR_GT: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_string() > b->as_string()); + value=ValuePtr(new VBool(a->as_string(&pool()) > b->as_string(&pool()))); stack.push(value); break; } case OP_STR_LE: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_string() <= b->as_string()); + value=ValuePtr(new VBool(a->as_string(&pool()) <= b->as_string(&pool()))); stack.push(value); break; } case OP_STR_GE: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_string() >= b->as_string()); + value=ValuePtr(new VBool(a->as_string(&pool()) >= b->as_string(&pool()))); stack.push(value); break; } case OP_STR_EQ: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_string() == b->as_string()); + value=ValuePtr(new VBool(a->as_string(&pool()) == b->as_string(&pool()))); stack.push(value); break; } case OP_STR_NE: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->as_string() != b->as_string()); + value=ValuePtr(new VBool(a->as_string(&pool()) != b->as_string(&pool()))); stack.push(value); break; } case OP_IS: { b=stack.pop().value; a=stack.pop().value; - value=NEW VBool(pool(), a->is(b->as_string().cstr())); + 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); } } @@ -841,16 +830,14 @@ void Request::execute(ArrayOperation& op @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any */ -Value* Request::get_element(const String *& remember_name, bool can_call_operator) { - String* name=stack.pop().string; remember_name=&name; - Value* ncontext=stack.pop().value; - Value* value=0; +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 - Junction& junction=*NEW Junction(pool(), - main_class, method, 0,0,0,0); - value=NEW VJunction(junction); - } + 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 @@ -858,8 +845,8 @@ Value* Request::get_element(const String if(VStateless_class *called_class=ncontext->get_class()) if(VStateless_class *read_class=rcontext->get_class()) if(read_class->derived_from(*called_class)) // current derived from called - if(Value* base=get_self()->base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls + 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; } @@ -868,18 +855,18 @@ Value* Request::get_element(const String value=ncontext->get_element(name, *ncontext, false); if(value && wcontext->get_constructing()) - if(Junction *junction=value->get_junction()) { - if(junction->self.get_class()!=ncontext) + if(JunctionPtr junction=value->get_junction()) { + if(junction->self->get_class()!=ncontext) throw Exception("parser.runtime", - &name, + 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 + value=process_to_value(value); // process possible code-junction else - value=NEW VVoid(pool()); + value=ValuePtr(new VVoid); return value; } @@ -895,18 +882,18 @@ value_ready: using the fact it's either string_ or value_ result requested to speed up checkes */ -StringOrValue Request::process(Value& input_value, bool intercept_string) { +StringOrValue Request::process(ValuePtr input_value, bool intercept_string) { StringOrValue result; - Junction *junction=input_value.get_junction(); + JunctionPtr junction=input_value->get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE - debug_printf(pool(), "ja->\n"); + debug_printf(sapi_info, "ja->\n"); #endif if(!junction->method_frame) throw Exception("parser.runtime", - 0, + Exception::undefined_source, "junction used outside of context"); VMethodFrame *saved_method_frame=method_frame; @@ -923,23 +910,23 @@ StringOrValue Request::process(Value& in if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); + VCodeFrame local(*junction->wcontext, junction->wcontext); wcontext=&local; // execute it - recoursion_checked_execute(0/*result_name*/, *junction->code); + recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - result.set_string(*wcontext->get_string()); + result.set_string(wcontext->get_string(&pool())); } else { // plain wwrapper - WWrapper local(pool(), 0/*empty*/, wcontext); + WWrapper local(ValuePtr(0)/*empty*/, wcontext); 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(); } @@ -949,7 +936,7 @@ StringOrValue Request::process(Value& in method_frame=saved_method_frame; #ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-ja returned"); + debug_printf(sapi_info, "<-ja returned"); #endif } else { result.set_value(input_value); @@ -957,7 +944,7 @@ StringOrValue Request::process(Value& in return result; } -const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { +StringPtr Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; @@ -969,7 +956,7 @@ const String& Request::execute_method(VM execute(*method.parser_code); // result - const String& result=wcontext->result().as_string(); + StringPtr result=wcontext->result().as_string(&pool()); wcontext=saved_wcontext; rcontext=saved_rcontext; @@ -979,14 +966,14 @@ const String& Request::execute_method(VM return result; } -void Request::execute_method(Value& aself, - const Method& method, VString *optional_param, - const String **return_string) { +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; - Junction local_junction(pool(), aself, &method, 0,0,0,0); + 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); @@ -994,48 +981,50 @@ void Request::execute_method(Value& asel } local_frame.set_self(aself); rcontext=wcontext=method_frame=&local_frame; + // preventing local object from deletes + local_frame.ref(); // prevent non-string writes for better error reporting - if(return_string) - wcontext->write(local_frame); + if(do_return_string) + wcontext->write(pool(), ValuePtr(&local_frame)); // execute! execute(*method.parser_code); // result - const String *result=0; - if(return_string) - *return_string=&wcontext->result().as_string(); + StringPtr result(0); + if(do_return_string) + result=wcontext->result().as_string(&pool()); wcontext=saved_wcontext; rcontext=saved_rcontext; method_frame=saved_method_frame; + + return result; } -void Request::execute_nonvirtual_method(VStateless_class& aclass, +StringPtr Request::execute_nonvirtual_method(VStateless_class& aclass, StringPtr method_name, VStringPtr optional_param, - const String **return_string, + bool do_return_string, const Method **return_method) { const Method *method=aclass.get_method(method_name); - if(return_string) - *return_string=0; + StringPtr result(0); if(return_method) *return_method=method; if(method) - execute_method(aclass, *method, optional_param, return_string); + return execute_method(ValuePtr(&aclass), *method, optional_param, do_return_string); + else + return StringPtr(0); } -StringPtr Request::execute_virtual_method(Value& aself, +StringPtr Request::execute_virtual_method(ValuePtr aself, StringPtr method_name) { - if(Value* value=aself.get_element(method_name, aself, false)) - if(Junction *junction=value->get_junction()) - if(const Method *method=junction->method) { - const String *result; - execute_method(aself, *method, 0/*no params*/, &result); - return result; - } + if(ValuePtr value=aself->get_element(method_name, *aself, false)) + if(JunctionPtr junction=value->get_junction()) + if(const Method *method=junction->method) + return execute_method(aself, *method, VStringPtr(0)/*no params*/, true); - return 0; + return StringPtr(0); }