--- parser3/src/main/execute.C 2003/02/03 09:17:47 1.295.2.7 +++ parser3/src/main/execute.C 2003/04/07 12:39:32 1.296 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/02/03 09:17:47 $"; +static const char* IDENT_EXECUTE_C="$Date: 2003/04/07 12:39:32 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -62,13 +62,13 @@ char *opcode_name[]={ "IS" }; -void va_debug_printf(Pool& pool, const char* fmt,va_list args) { +void va_debug_printf(Pool& pool, const char *fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); SAPI::log(pool, "%s", buf); } -void debug_printf(Pool& pool, const char* fmt, ...) { +void debug_printf(Pool& pool, const char *fmt, ...) { va_list args; va_start(args,fmt); va_debug_printf(pool,fmt,args); @@ -76,13 +76,13 @@ void debug_printf(Pool& pool, const char } void debug_dump(Pool& pool, int level, const Array& ops) { - Array_iterator i(ops); + Array_iter i(ops); while(i.has_next()) { Operation op; op.cast=i.next(); if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - Value* value=i.next().value; + Value *value=static_cast(i.next()); debug_printf(pool, "%*s%s" " \"%s\" %s", @@ -100,61 +100,52 @@ void debug_dump(Pool& pool, int level, c case OP_OBJECT_POOL: case OP_STRING_POOL: case OP_CALL: - local_ops=i.next().ops; + const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, 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 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()) -*/ -// Request -void Request::execute(ArrayOperation& ops) { +void Request::execute(const Array& ops) { // _asm int 3; #ifdef DEBUG_EXECUTE - debug_printf("source----------------------------\n"); - debug_dump(0, ops); - debug_printf("execution-------------------------\n"); + debug_printf(pool(), "source----------------------------\n"); + debug_dump(pool(), 0, ops); + debug_printf(pool(), "execution-------------------------\n"); #endif - StringPtr last_get_element_name(0); + const String *last_get_element_name=0; - Array_iterator i(ops); + Array_iter i(ops); while(i.has_next()) { if(interrupted()) throw Exception("parser.interrupted", - Exception::undefined_source, + 0, "execution stopped"); - Operation& op=i.next(); + Operation op; + op.cast=i.next(); #ifdef DEBUG_EXECUTE - debug_printf("%d:%s", stack.top_index()+1, opcode_name[op.code]); + debug_printf(pool(), "%d:%s", stack.top_index()+1, opcode_name[op.code]); #endif - ValuePtr value; - ValuePtr a; ValuePtr b; - //ArrayOperationPtr b_code; - - StringPtr name; - Value* ncontext; - - ArrayOperationPtr local_ops; - + Value *value; + Value *a; Value *b; + Array *b_code; switch(op.code) { // param in next instruction case OP_VALUE: { - value=i.next().value; + value=static_cast(i.next()); #ifdef DEBUG_EXECUTE - debug_printf(" \"%s\" %s", value->get_string()->cstr(), value->type()); + debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); #endif - stack.push(value); + PUSH(value); break; } case OP_GET_CLASS: @@ -162,50 +153,50 @@ void Request::execute(ArrayOperation& op // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); - name=stack.pop().string; - value=classes().get(name); + const String& name=POP_NAME(); + value=static_cast(classes().get(name)); if(!value) throw Exception("parser.runtime", - StringPtr(name), + &name, "class is undefined"); - stack.push(value); + PUSH(value); break; } // OP_WITH case OP_WITH_ROOT: { - stack.push(ValuePtr(method_frame)); + PUSH(method_frame); break; } case OP_WITH_SELF: { - stack.push(ValuePtr(get_self())); + PUSH(get_self()); break; } case OP_WITH_READ: { - stack.push(ValuePtr(rcontext)); + PUSH(rcontext); break; } case OP_WITH_WRITE: { if(wcontext==method_frame) throw Exception("parser.runtime", - Exception::undefined_source, + 0, "$.name outside of $name[...]"); - stack.push(ValuePtr(wcontext)); + PUSH(wcontext); break; } // OTHER ACTIONS BUT WITHs case OP_CONSTRUCT_VALUE: { - value=stack.pop().value; - name=stack.pop().string; - ncontext=stack.pop().value.get(); + value=POP(); + const String& name=POP_NAME(); + Value *ncontext=POP(); ncontext->put_element(name, value, false); break; } @@ -214,51 +205,52 @@ void Request::execute(ArrayOperation& op // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - value=stack.pop().value; - name=stack.pop().string; - ncontext=stack.pop().value.get(); + value=POP(); + const String& name=POP_NAME(); + Value *ncontext=POP(); ncontext->put_element(name, value->as_expr_result(), false); break; } case OP_CURLY_CODE__CONSTRUCT: { - local_ops=i.next().ops; + const Array *local_ops=reinterpret_cast(i.next()); #ifdef DEBUG_EXECUTE - debug_printf(" (%d)\n", local_ops->count()); - debug_dump(1, *local_ops); + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); #endif - value=ValuePtr(new VJunction(JunctionPtr(new Junction( - get_self(), 0, + Junction& j=*NEW Junction(pool(), + *get_self(), 0, method_frame, rcontext, wcontext, - local_ops)))); + local_ops); - name=stack.pop().string; - ncontext=stack.pop().value.get(); + value=NEW VJunction(j); + const String& name=POP_NAME(); + Value *ncontext=POP(); ncontext->put_element(name, value, false); break; } case OP_NESTED_CODE: { - local_ops=i.next().ops; + Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE - debug_printf(" (%d)\n", local_ops->count()); - debug_dump(1, *local_ops); + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); #endif - stack.push(local_ops); + PUSH(local_ops); break; } case OP_WRITE_VALUE: { - value=stack.pop().value; - write_assign_lang(value, last_get_element_name); + value=POP(); + write_assign_lang(*value, last_get_element_name); break; } case OP_WRITE_EXPR_RESULT: { - value=stack.pop().value; - write_no_lang(value->as_expr_result()); + value=POP(); + write_no_lang(*value->as_expr_result()); // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION @@ -267,82 +259,83 @@ void Request::execute(ArrayOperation& op } case OP_STRING__WRITE: { - value=i.next().value; + VString *vstring=static_cast(i.next()); #ifdef DEBUG_EXECUTE - debug_printf(" \"%s\"", value->get_string(0).cstr()); + debug_printf(pool(), " \"%s\"", vstring->string().cstr()); #endif - write_no_lang(*value->get_string(0)); + write_no_lang(vstring->string()); break; } case OP_GET_ELEMENT_OR_OPERATOR: { value=get_element(last_get_element_name, true); - stack.push(value); + PUSH(value); break; } case OP_GET_ELEMENT: { value=get_element(last_get_element_name, false); - stack.push(value); + PUSH(value); break; } 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: { - local_ops=i.next().ops; + const Array *local_ops=reinterpret_cast(i.next()); WContext *saved_wcontext=wcontext; uchar saved_lang= flang; flang=String::UL_PASS_APPENDED; - WWrapper local(ValuePtr(0)/*empty*/, wcontext); + WWrapper local(pool(), 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); + PUSH(value); break; } case OP_STRING_POOL: { - local_ops=i.next().ops; + const Array *local_ops=reinterpret_cast(i.next()); WContext *saved_wcontext=wcontext; - WWrapper local(ValuePtr(0) /*empty*/, wcontext); + WWrapper local(pool(), 0 /*empty*/, wcontext); wcontext=&local; execute(*local_ops); // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - if(StringPtr string=wcontext->get_string(&pool())) - value=ValuePtr(new VString(string)); + const String *string=wcontext->get_string(); + Value *value; + if(string) + value=NEW VString(*string); else - value=ValuePtr(new VVoid); - + NEW VVoid(pool()); wcontext=saved_wcontext; - stack.push(value); + PUSH(value); break; } // CALL case OP_STORE_PARAM: { - value=stack.pop().value; - VMethodFrame *frame=static_cast(stack.top_value().unknown); - // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" + 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; } @@ -350,11 +343,11 @@ void Request::execute(ArrayOperation& op case OP_EXPR_CODE__STORE_PARAM: { // code - local_ops=i.next().ops; - VMethodFrame *frame=static_cast(stack.top_value().unknown); + const Array *local_ops=reinterpret_cast(i.next()); + VMethodFrame *frame=static_cast(stack.top_value()); #ifdef DEBUG_EXECUTE - debug_printf(" (%d)\n", local_ops->count()); - debug_dump(1, *local_ops); + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); #endif // when they evaluate expression parameter, // the object expression result @@ -363,12 +356,15 @@ 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" - value=ValuePtr(new VJunction(JunctionPtr(new Junction( - get_self(), 0, + Junction& j=*NEW Junction(pool(), + *get_self(), 0, method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops)))); + local_ops); + + value=NEW VJunction(j); + // store param // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 frame->store_param(value); @@ -390,16 +386,16 @@ void Request::execute(ArrayOperation& op case OP_CALL: case OP_CALL__WRITE: { - local_ops=i.next().ops; + Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE - debug_printf(" (%d)\n", local_ops->count()); - debug_dump(1, *local_ops); + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); - debug_printf("->\n"); + debug_printf(pool(), "->\n"); #endif - value=stack.pop().value; + value=POP(); - JunctionPtr junction=value->get_junction(); + Junction *junction=value->get_junction(); if(!junction) throw Exception("parser.runtime", last_get_element_name, @@ -418,44 +414,44 @@ 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 + PUSH(&frame); // argument for *STORE_PARAM ops execute(*local_ops); - stack.pop().value; + POP(); } frame.fill_unspecified_params(); VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; + Value *saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - VStateless_class *called_class=frame.junction.self->get_class(); - ValuePtr new_self=get_self(); + VStateless_class *called_class=frame.junction.self.get_class(); + Value *new_self=get_self(); if(wcontext->get_constructing()) { wcontext->set_constructing(false); if(frame.junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - if(ValuePtr value=called_class->create_new_value()) { + if(Value *value=called_class->create_new_value(pool())) { // some stateless_class creatable derivates new_self=value; } else throw Exception("parser.runtime", - frame.name(), + &frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", - called_class->name()->cstr()); + called_class->name().cstr()); - frame.write(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()); @@ -464,7 +460,7 @@ void Request::execute(ArrayOperation& op { const Method& method=*frame.junction.method; Method::Call_type call_type= - called_class==new_self.get() ? Method::CT_STATIC : Method::CT_DYNAMIC; + called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; if( method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? @@ -472,21 +468,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(frame.name()); - rethrow; + exception_trace.push((void *)&frame.name()); + /*re*/throw; } } else throw Exception("parser.runtime", - frame.name(), + &frame.name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); @@ -505,11 +501,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()); + PUSH(&result.as_value()); } #ifdef DEBUG_EXECUTE - debug_printf("<-returned"); + debug_printf(pool(), "<-returned"); #endif break; } @@ -517,317 +513,323 @@ void Request::execute(ArrayOperation& op // expression ops: unary case OP_NEG: { - a=stack.pop().value; - value=ValuePtr(new VDouble(-a->as_double())); - stack.push(value); + Value *operand=POP(); + value=NEW VDouble(pool(), -operand->as_double()); + PUSH(value); break; } case OP_INV: { - a=stack.pop().value; - value=ValuePtr(new VDouble(~a->as_int())); - stack.push(value); + Value *operand=POP(); + value=NEW VDouble(pool(), ~operand->as_int()); + PUSH(value); break; } case OP_NOT: { - a=stack.pop().value; - value=ValuePtr(new VBool(!a->as_bool())); - stack.push(value); + Value *operand=POP(); + value=NEW VBool(pool(), !operand->as_bool()); + PUSH(value); break; } case OP_DEF: { - a=stack.pop().value; - value=ValuePtr(new VBool(a->is_defined())); - stack.push(value); + Value *operand=POP(); + value=NEW VBool(pool(), operand->is_defined()); + PUSH(value); break; } case OP_IN: { /// @test String::cmp - 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); + Value *operand=POP(); + const char *path=operand->as_string().cstr(); + value=NEW VBool(pool(), + info.uri && strncmp(path, info.uri, strlen(path))==0); + PUSH(value); break; } case OP_FEXISTS: { - a=stack.pop().value; - value=ValuePtr(new VBool( - file_readable(absolute(a->as_string(&pool()))))); - stack.push(value); + Value *operand=POP(); + value=NEW VBool(pool(), + file_readable(absolute(operand->as_string()))); + PUSH(value); break; } case OP_DEXISTS: { - a=stack.pop().value; - value=ValuePtr(new VBool( - dir_readable(absolute(a->as_string(&pool()))))); - stack.push(value); + Value *operand=POP(); + value=NEW VBool(pool(), + dir_readable(absolute(operand->as_string()))); + PUSH(value); break; } // expression ops: binary case OP_SUB: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VDouble(a->as_double() - b->as_double())); - stack.push(value); + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_double() - b->as_double()); + PUSH(value); break; } case OP_ADD: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VDouble(a->as_double() + b->as_double())); - stack.push(value); + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_double() + b->as_double()); + PUSH(value); break; } case OP_MUL: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VDouble(a->as_double() * b->as_double())); - stack.push(value); + b=POP(); a=POP(); + value=NEW VDouble(pool(), a->as_double() * b->as_double()); + PUSH(value); break; } case OP_DIV: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); double a_double=a->as_double(); double b_double=b->as_double(); if(b_double == 0) { - StringPtr problem_source=b->as_string(&pool()); + const String *problem_source=&b->as_string(); throw Exception("number.zerodivision", problem_source, "Division by zero"); } - value=ValuePtr(new VDouble(a_double / b_double)); - stack.push(value); + value=NEW VDouble(pool(), a_double / b_double); + PUSH(value); break; } case OP_MOD: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); double a_double=a->as_double(); double b_double=b->as_double(); if(b_double == 0) { - StringPtr problem_source=b->as_string(&pool()); + const String *problem_source=&b->as_string(); throw Exception("number.zerodivision", problem_source, "Modulus by zero"); } - value=ValuePtr(new VDouble(fmod(a_double, b_double))); - stack.push(value); + value=NEW VDouble(pool(), fmod(a_double, b_double)); + PUSH(value); break; } case OP_INTDIV: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); int a_int=a->as_int(); int b_int=b->as_int(); if(b_int == 0) { - StringPtr problem_source=b->as_string(&pool()); + const String *problem_source=&b->as_string(); throw Exception("number.zerodivision", problem_source, "Division by zero"); } - value=ValuePtr(new VInt(a_int / b_int)); - stack.push(value); + value=NEW VInt(pool(), a_int / b_int); + PUSH(value); break; } case OP_BIN_SL: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( + b=POP(); a=POP(); + value=NEW VInt(pool(), a->as_int() << - b->as_int())); - stack.push(value); + b->as_int()); + PUSH(value); break; } case OP_BIN_SR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( + b=POP(); a=POP(); + value=NEW VInt(pool(), a->as_int() >> - b->as_int())); - stack.push(value); + b->as_int()); + PUSH(value); break; } case OP_BIN_AND: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( + b=POP(); a=POP(); + value=NEW VInt(pool(), a->as_int() & - b->as_int())); - stack.push(value); + b->as_int()); + PUSH(value); break; } case OP_BIN_OR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( + b=POP(); a=POP(); + value=NEW VInt(pool(), a->as_int() | - b->as_int())); - stack.push(value); + b->as_int()); + PUSH(value); break; } case OP_BIN_XOR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( + b=POP(); a=POP(); + value=NEW VInt(pool(), a->as_int() ^ - b->as_int())); - stack.push(value); + b->as_int()); + PUSH(value); break; } case OP_LOG_AND: { - local_ops=stack.pop().ops; a=stack.pop().value; + b_code=POP_CODE(); a=POP(); bool result; if(a->as_bool()) { - execute(*local_ops); - b=stack.pop().value; + execute(*b_code); + b=POP(); result=b->as_bool(); } else result=false; - value=ValuePtr(new VBool(result)); - stack.push(value); + value=NEW VBool(pool(), result); + PUSH(value); break; } case OP_LOG_OR: { - local_ops=stack.pop().ops; a=stack.pop().value; + b_code=POP_CODE(); a=POP(); bool result; if(a->as_bool()) result=true; else { - execute(*local_ops); - b=stack.pop().value; + execute(*b_code); + b=POP(); result=b->as_bool(); } - value=ValuePtr(new VBool(result)); - stack.push(value); + value=NEW VBool(pool(), result); + PUSH(value); break; } case OP_LOG_XOR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_bool() ^ b->as_bool())); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); + PUSH(value); break; } case OP_NUM_LT: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result < 0.0)); - stack.push(value); + b=POP(); a=POP(); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_doubleas_double() - b->as_double(); - value=ValuePtr(new VBool(result > 0.0)); - stack.push(value); + b=POP(); a=POP(); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double>b_double); + PUSH(value); break; } case OP_NUM_LE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result <= 0.0)); - stack.push(value); + b=POP(); a=POP(); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double<=b_double); + PUSH(value); break; } case OP_NUM_GE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result >= 0.0)); - stack.push(value); + b=POP(); a=POP(); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double>=b_double); + PUSH(value); break; } case OP_NUM_EQ: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result == 0.0)); - stack.push(value); + b=POP(); a=POP(); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double==b_double); + PUSH(value); break; } case OP_NUM_NE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result != 0.0)); - stack.push(value); + b=POP(); a=POP(); + volatile double a_double=a->as_double(); + volatile double b_double=b->as_double(); + value=NEW VBool(pool(), a_double!=b_double); + PUSH(value); break; } case OP_STR_LT: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) < b->as_string(&pool()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() < b->as_string()); + PUSH(value); break; } case OP_STR_GT: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) > b->as_string(&pool()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() > b->as_string()); + PUSH(value); break; } case OP_STR_LE: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) <= b->as_string(&pool()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() <= b->as_string()); + PUSH(value); break; } case OP_STR_GE: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) >= b->as_string(&pool()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() >= b->as_string()); + PUSH(value); break; } case OP_STR_EQ: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) == b->as_string(&pool()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() == b->as_string()); + PUSH(value); break; } case OP_STR_NE: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_string(&pool()) != b->as_string(&pool()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->as_string() != b->as_string()); + PUSH(value); break; } case OP_IS: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->is(b->as_string(&pool())->cstr()))); - stack.push(value); + b=POP(); a=POP(); + value=NEW VBool(pool(), a->is(b->as_string().cstr())); + PUSH(value); break; } default: - throw Exception(Exception::undefined_type, - Exception::undefined_source, + throw Exception(0, + 0, "invalid opcode %d", op.code); } } @@ -837,14 +839,16 @@ void Request::execute(ArrayOperation& op @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any */ -ValuePtr Request::get_element(StringPtr& remember_name, bool can_call_operator) { - StringPtr name=stack.pop().string; remember_name=name; - Value* ncontext=stack.pop().value.get(); - ValuePtr value(0); +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=0; if(can_call_operator) { - if(Method* method=main_class->get_method(name)) // looking operator of that name FIRST - value=ValuePtr(new VJunction(JunctionPtr(new Junction( - main_class, method, 0,0,0, ArrayOperationPtr(0))))); + if(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(!value) { if(!wcontext->get_constructing() // not constructing @@ -852,8 +856,8 @@ ValuePtr Request::get_element(StringPtr& if(VStateless_class *called_class=ncontext->get_class()) if(VStateless_class *read_class=rcontext->get_class()) if(read_class->derived_from(*called_class)) // current derived from called - if(ValuePtr base=get_self()->base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, VObjectPtr(0)); // temporarily prevent go-back-down virtual calls + if(Value *base=get_self()->base()) { // doing DYNAMIC call + Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls value=base->get_element(name, *base, false); // virtual-up lookup starting from parent goto value_ready; } @@ -862,18 +866,18 @@ ValuePtr Request::get_element(StringPtr& value=ncontext->get_element(name, *ncontext, false); if(value && wcontext->get_constructing()) - if(JunctionPtr junction=value->get_junction()) { - if(junction->self->get_class()!=ncontext) + if(Junction *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=ValuePtr(new VVoid); + value=NEW VVoid(pool()); return value; } @@ -889,22 +893,22 @@ value_ready: using the fact it's either string_ or value_ result requested to speed up checkes */ -StringOrValue Request::process(ValuePtr input_value, bool intercept_string) { +StringOrValue Request::process(Value& input_value, bool intercept_string) { StringOrValue result; - JunctionPtr junction=input_value->get_junction(); + Junction *junction=input_value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE - debug_printf("ja->\n"); + debug_printf(pool(), "ja->\n"); #endif if(!junction->method_frame) throw Exception("parser.runtime", - Exception::undefined_source, + 0, "junction used outside of context"); VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; + Value *saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; method_frame=junction->method_frame; @@ -917,23 +921,23 @@ StringOrValue Request::process(ValuePtr if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(*junction->wcontext, junction->wcontext); + VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); wcontext=&local; // execute it - recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); + recoursion_checked_execute(0/*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(&pool())); + result.set_string(*wcontext->get_string()); } else { // plain wwrapper - WWrapper local(ValuePtr(0)/*empty*/, wcontext); + WWrapper local(pool(), 0/*empty*/, wcontext); wcontext=&local; // execute it - recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); + recoursion_checked_execute(0/*result_name*/, *junction->code); result=wcontext->result(); } @@ -943,7 +947,7 @@ StringOrValue Request::process(ValuePtr method_frame=saved_method_frame; #ifdef DEBUG_EXECUTE - debug_printf("<-ja returned"); + debug_printf(pool(), "<-ja returned"); #endif } else { result.set_value(input_value); @@ -951,9 +955,9 @@ StringOrValue Request::process(ValuePtr return result; } -StringPtr Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { +const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; + Value *saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; // initialize contexts @@ -963,7 +967,7 @@ StringPtr Request::execute_method(VMetho execute(*method.parser_code); // result - StringPtr result=wcontext->result().as_string(&pool()); + const String& result=wcontext->result().as_string(); wcontext=saved_wcontext; rcontext=saved_rcontext; @@ -973,14 +977,14 @@ StringPtr Request::execute_method(VMetho return result; } -StringPtr Request::execute_method(ValuePtr aself, - const Method& method, VStringPtr optional_param, - bool do_return_string) { +void Request::execute_method(Value& aself, + const Method& method, VString *optional_param, + const String **return_string) { VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; + Value *saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - Junction local_junction(aself, &method, 0,0,0, ArrayOperationPtr(0)); + Junction local_junction(pool(), aself, &method, 0,0,0,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); @@ -990,46 +994,46 @@ StringPtr Request::execute_method(ValueP rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting - if(do_return_string) - wcontext->write(pool(), ValuePtr(new VVoid)); + if(return_string) + wcontext->write(local_frame); // execute! execute(*method.parser_code); // result - StringPtr result(0); - if(do_return_string) - result=wcontext->result().as_string(&pool()); + const String *result=0; + if(return_string) + *return_string=&wcontext->result().as_string(); wcontext=saved_wcontext; rcontext=saved_rcontext; method_frame=saved_method_frame; - - return result; } -StringPtr Request::execute_nonvirtual_method(VStateless_classPtr aclass, - StringPtr method_name, VStringPtr optional_param, - bool do_return_string, +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); - StringPtr result(0); + const Method *method=aclass.get_method(method_name); + if(return_string) + *return_string=0; if(return_method) *return_method=method; if(method) - return execute_method(aclass, *method, optional_param, do_return_string); - else - return 0; + execute_method(aclass, *method, optional_param, return_string); } -StringPtr Request::execute_virtual_method(ValuePtr aself, - StringPtr method_name) { - if(ValuePtr value=aself->get_element(method_name, *aself, false)) - if(JunctionPtr junction=value->get_junction()) - if(const Method *method=junction->method) - return execute_method(aself, *method, VStringPtr(0)/*no params*/, true); +const String *Request::execute_virtual_method(Value& aself, + const String& 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; + } return 0; }