--- parser3/src/main/execute.C 2003/01/31 16:45:26 1.295.2.6 +++ 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/01/31 16:45:26 $"; +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", @@ -107,54 +107,45 @@ void debug_dump(Pool& pool, int level, c } #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(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(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(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,50 +205,51 @@ 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(pool(), " (%d)\n", local_ops->count()); + debug_printf(pool(), " (%d)\n", local_ops->size()); debug_dump(pool(), 1, *local_ops); #endif - value=ValuePtr(new VJunction(JunctionPtr(new Junction( + 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(pool(), " (%d)\n", local_ops->count()); + 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; + value=POP(); write_no_lang(*value->as_expr_result()); // must be after write(result) and @@ -278,13 +270,13 @@ void Request::execute(ArrayOperation& op 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; } @@ -311,7 +303,7 @@ void Request::execute(ArrayOperation& op value=&wcontext->result().as_value(); flang=saved_lang; wcontext=saved_wcontext; - stack.push(value); + PUSH(value); break; } @@ -328,20 +320,20 @@ void Request::execute(ArrayOperation& op // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext const String *string=wcontext->get_string(); - Value* value; + Value *value; if(string) value=NEW VString(*string); else NEW VVoid(pool()); wcontext=saved_wcontext; - stack.push(value); + PUSH(value); break; } // CALL case OP_STORE_PARAM: { - value=stack.pop().value; + 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); @@ -354,7 +346,7 @@ void Request::execute(ArrayOperation& op const Array *local_ops=reinterpret_cast(i.next()); VMethodFrame *frame=static_cast(stack.top_value()); #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->count()); + debug_printf(pool(), " (%d)\n", local_ops->size()); debug_dump(pool(), 1, *local_ops); #endif // when they evaluate expression parameter, @@ -396,12 +388,12 @@ void Request::execute(ArrayOperation& op { Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->count()); + debug_printf(pool(), " (%d)\n", local_ops->size()); debug_dump(pool(), 1, *local_ops); debug_printf(pool(), "->\n"); #endif - value=stack.pop().value; + value=POP(); Junction *junction=value->get_junction(); if(!junction) @@ -424,23 +416,23 @@ void Request::execute(ArrayOperation& op 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(); - Value* new_self=get_self(); + 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 @@ -486,7 +478,7 @@ void Request::execute(ArrayOperation& op } catch(...) { // record it to stack trace exception_trace.push((void *)&frame.name()); - rethrow; + /*re*/throw; } } else throw Exception("parser.runtime", @@ -509,7 +501,7 @@ 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 @@ -521,84 +513,84 @@ void Request::execute(ArrayOperation& op // expression ops: unary case OP_NEG: { - Value* operand=stack.pop().value; + Value *operand=POP(); value=NEW VDouble(pool(), -operand->as_double()); - stack.push(value); + PUSH(value); break; } case OP_INV: { - Value* operand=stack.pop().value; + Value *operand=POP(); value=NEW VDouble(pool(), ~operand->as_int()); - stack.push(value); + PUSH(value); break; } case OP_NOT: { - Value* operand=stack.pop().value; + Value *operand=POP(); value=NEW VBool(pool(), !operand->as_bool()); - stack.push(value); + PUSH(value); break; } case OP_DEF: { - Value* operand=stack.pop().value; + Value *operand=POP(); value=NEW VBool(pool(), operand->is_defined()); - stack.push(value); + PUSH(value); break; } case OP_IN: { /// @test String::cmp - Value* operand=stack.pop().value; - const char* path=operand->as_string().cstr(); + Value *operand=POP(); + const char *path=operand->as_string().cstr(); value=NEW VBool(pool(), info.uri && strncmp(path, info.uri, strlen(path))==0); - stack.push(value); + PUSH(value); break; } case OP_FEXISTS: { - Value* operand=stack.pop().value; + Value *operand=POP(); value=NEW VBool(pool(), file_readable(absolute(operand->as_string()))); - stack.push(value); + PUSH(value); break; } case OP_DEXISTS: { - Value* operand=stack.pop().value; + Value *operand=POP(); value=NEW VBool(pool(), dir_readable(absolute(operand->as_string()))); - stack.push(value); + PUSH(value); break; } // expression ops: binary case OP_SUB: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VDouble(pool(), a->as_double() - b->as_double()); - stack.push(value); + PUSH(value); break; } case OP_ADD: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VDouble(pool(), a->as_double() + b->as_double()); - stack.push(value); + PUSH(value); break; } case OP_MUL: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VDouble(pool(), a->as_double() * b->as_double()); - stack.push(value); + 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(); @@ -611,12 +603,12 @@ void Request::execute(ArrayOperation& op } value=NEW VDouble(pool(), a_double / b_double); - stack.push(value); + 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(); @@ -629,12 +621,12 @@ void Request::execute(ArrayOperation& op } value=NEW VDouble(pool(), fmod(a_double, b_double)); - stack.push(value); + 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(); @@ -647,185 +639,191 @@ void Request::execute(ArrayOperation& op } value=NEW VInt(pool(), a_int / b_int); - stack.push(value); + PUSH(value); break; } case OP_BIN_SL: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VInt(pool(), a->as_int() << b->as_int()); - stack.push(value); + PUSH(value); break; } case OP_BIN_SR: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VInt(pool(), a->as_int() >> b->as_int()); - stack.push(value); + PUSH(value); break; } case OP_BIN_AND: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VInt(pool(), a->as_int() & b->as_int()); - stack.push(value); + PUSH(value); break; } case OP_BIN_OR: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VInt(pool(), a->as_int() | b->as_int()); - stack.push(value); + PUSH(value); break; } case OP_BIN_XOR: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VInt(pool(), a->as_int() ^ b->as_int()); - stack.push(value); + PUSH(value); break; } case OP_LOG_AND: { - b_code=POP_CODE(); a=stack.pop().value; + b_code=POP_CODE(); a=POP(); bool result; if(a->as_bool()) { execute(*b_code); - b=stack.pop().value; + b=POP(); result=b->as_bool(); } else result=false; value=NEW VBool(pool(), result); - stack.push(value); + PUSH(value); break; } case OP_LOG_OR: { - b_code=POP_CODE(); a=stack.pop().value; + b_code=POP_CODE(); a=POP(); bool result; if(a->as_bool()) result=true; else { execute(*b_code); - b=stack.pop().value; + b=POP(); result=b->as_bool(); } value=NEW VBool(pool(), result); - stack.push(value); + PUSH(value); break; } case OP_LOG_XOR: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); - stack.push(value); + PUSH(value); break; } case OP_NUM_LT: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), 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=NEW VBool(pool(), 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=NEW VBool(pool(), 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=NEW VBool(pool(), 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=NEW VBool(pool(), 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=NEW VBool(pool(), 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; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_string() < b->as_string()); - stack.push(value); + PUSH(value); break; } case OP_STR_GT: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_string() > b->as_string()); - stack.push(value); + PUSH(value); break; } case OP_STR_LE: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_string() <= b->as_string()); - stack.push(value); + PUSH(value); break; } case OP_STR_GE: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_string() >= b->as_string()); - stack.push(value); + PUSH(value); break; } case OP_STR_EQ: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_string() == b->as_string()); - stack.push(value); + PUSH(value); break; } case OP_STR_NE: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->as_string() != b->as_string()); - stack.push(value); + PUSH(value); break; } case OP_IS: { - b=stack.pop().value; a=stack.pop().value; + b=POP(); a=POP(); value=NEW VBool(pool(), a->is(b->as_string().cstr())); - stack.push(value); + PUSH(value); break; } @@ -841,10 +839,10 @@ 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; +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 Junction& junction=*NEW Junction(pool(), @@ -858,7 +856,7 @@ 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 + 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; @@ -910,7 +908,7 @@ StringOrValue Request::process(Value& in "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; @@ -959,7 +957,7 @@ StringOrValue Request::process(Value& in 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 @@ -983,7 +981,7 @@ void Request::execute_method(Value& asel 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(pool(), aself, &method, 0,0,0,0); @@ -1013,7 +1011,7 @@ void Request::execute_method(Value& asel } void Request::execute_nonvirtual_method(VStateless_class& aclass, - StringPtr method_name, VStringPtr optional_param, + const String& method_name, VString *optional_param, const String **return_string, const Method **return_method) { @@ -1027,9 +1025,9 @@ void Request::execute_nonvirtual_method( execute_method(aclass, *method, optional_param, return_string); } -StringPtr Request::execute_virtual_method(Value& aself, - StringPtr method_name) { - if(Value* value=aself.get_element(method_name, aself, false)) +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;