--- parser3/src/main/execute.C 2001/02/25 14:23:32 1.43 +++ parser3/src/main/execute.C 2001/03/06 15:55:35 1.55 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.43 2001/02/25 14:23:32 paf Exp $ + $Id: execute.C,v 1.55 2001/03/06 15:55:35 paf Exp $ */ #include "pa_array.h" @@ -11,6 +11,8 @@ #include "pa_vcframe.h" #include "pa_vmframe.h" #include "pa_vobject.h" +#include "pa_vdouble.h" +#include "pa_vbool.h" #include @@ -20,46 +22,58 @@ char *opcode_name[]={ - "STRING", "CODE", "CLASS", - "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", + // literals + "VALUE", "CODE", "CLASS", + + // actions + "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", "CONSTRUCT", - "EXPRESSION_EVAL", "MODIFY_EVAL", "WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", + "CREATE_SWPOOL", "REDUCE_SWPOOL", "GET_METHOD_FRAME", "STORE_PARAM", - "CALL" + "CALL", + + // expression ops: unary + "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", + // expression ops: binary + "SUB", "ADD", "MUL", "DIV", "MOD", + "BIN_AND", "BIN_OR", + "LOG_AND", "LOG_OR", + "NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE", + "STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE" }; void dump(int level, const Array& ops) { if(0){ int size=ops.size(); - //printf("size=%d\n", size); + //fprintf(stderr, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - printf(" \"%s\"", vstring->get_string()->cstr()); + if(op.code==OP_VALUE) { + Value *value=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type()); } if(op.code==OP_CLASS) { VClass *vclass=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vclass->name().cstr()); + fprintf(stderr, " \"%s\"", vclass->name().cstr()); } - printf("\n"); + fprintf(stderr, "\n"); if(op.code==OP_CODE) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); @@ -70,35 +84,34 @@ void dump(int level, const Array& ops) { void Request::execute(const Array& ops) { if(1) { - puts("source----------------------------"); + fputs("source----------------------------\n", stderr); dump(0, ops); - puts("execution-------------------------"); + fputs("execution-------------------------\n", stderr); } int size=ops.size(); - //printf("size=%d\n", size); + //fprintf(stderr, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - printf(" \"%s\"", vstring->get_string()->cstr()); - PUSH(vstring); + Value *value=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type()); + PUSH(value); break; } case OP_CODE: { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); - printf(" (%d)\n", local_ops->size()); + fprintf(stderr, " (%d)\n", local_ops->size()); dump(1, *local_ops); Junction& j=*NEW Junction(pool(), - *self, - 0, + *self, 0, 0, root,rcontext,wcontext,local_ops); Value *value=NEW VJunction(j); @@ -108,12 +121,12 @@ void Request::execute(const Array& ops) case OP_CLASS: { VClass *vclass=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vclass->name().cstr()); + fprintf(stderr, " \"%s\"", vclass->name().cstr()); PUSH(vclass); break; } - // OP_WITH + // OP_WITH case OP_WITH_SELF: { PUSH(self); @@ -135,7 +148,7 @@ void Request::execute(const Array& ops) break; } - // ... + // OTHER ACTIONS BUT WITHs case OP_CONSTRUCT: { Value *value=POP(); @@ -145,7 +158,6 @@ void Request::execute(const Array& ops) ncontext->put_element(name, value); break; } - // TODO: OP_EXPRESSION_EVAL, OP_MODIFY_EVAL, case OP_WRITE: { Value *value=POP(); @@ -194,14 +206,30 @@ void Request::execute(const Array& ops) case OP_REDUCE_RWPOOL: { String *string=wcontext->get_string(); - Value *value=NEW VString(*string); + Value *value=string?NEW VString(*string):NEW VString(pool()); wcontext=static_cast(POP()); rcontext=POP(); PUSH(value); break; } + case OP_CREATE_SWPOOL: + { + PUSH(wcontext); + wcontext=NEW WWrapper(pool(), 0 /* empty */, false /* not constructing */); + break; + } + case OP_REDUCE_SWPOOL: + { + // from "$a $b" part of expression taking only string value, + // ignoring any other content of wcontext + String *string=wcontext->get_string(); + Value *value=string?NEW VString(*string):NEW VString(pool()); + wcontext=static_cast(POP()); + PUSH(value); + break; + } - // CALL + // CALL case OP_GET_METHOD_FRAME: { Value *value=POP(); @@ -227,37 +255,244 @@ void Request::execute(const Array& ops) case OP_CALL: { - printf("->\n"); + fprintf(stderr, "->\n"); VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); - PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + VClass *called_class=frame->junction.self.get_class(); // constructing? if(wcontext->constructing()) { // yes // constructor call: $some(^class:method(..)) - self=NEW VObject(pool(), *called_class); - frame->write(self); + frame->write(self=NEW VObject(pool(), *called_class)); } else { // no - // static or dynamic call - self=&frame->junction.self; + // context is object or class & is it my class or my parent's class? + VClass *read_class=rcontext->get_class(); + if(read_class && read_class->is_or_derived_from(*called_class)) // yes + self=rcontext; // class dynamic call + else // no + self=&frame->junction.self; // static or simple dynamic call } - frame->set_self(self); - + frame->set_self(*self); root=rcontext=wcontext=frame; - execute(frame->junction.method->code); + { + // take object or class from any wrappers + VAliased *aliased=self->get_aliased(); + // substitute class alias to the class they are called AS + Temp_alias temp_alias(*aliased, *frame->junction.vclass); + execute(frame->junction.method->code); + } Value *value=wcontext->result(); - wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); wcontext->write(value); - printf("<-returned"); + fprintf(stderr, "<-returned"); + break; + } + + // expression ops: unary + case OP_NEG: + { + Value *operand=POP(); + Value *value=NEW VDouble(pool(), -operand->get_double()); + PUSH(value); + break; + } + case OP_INV: + { + Value *operand=POP(); + Value *value=NEW VDouble(pool(), + ~static_cast(operand->get_double())); + PUSH(value); + break; + } + case OP_NOT: + { + Value *operand=POP(); + Value *value=NEW VBool(pool(), !operand->get_bool()); + PUSH(value); + break; + } + //todo: def in fexists + + // expression ops: binary + case OP_SUB: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + a->get_double() - + b->get_double()); + PUSH(value); + break; + } + case OP_ADD: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + a->get_double() + + b->get_double()); + PUSH(value); + break; + } + case OP_MUL: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + a->get_double() * + b->get_double()); + PUSH(value); + break; + } + case OP_DIV: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + a->get_double() / + b->get_double()); + PUSH(value); + break; + } + case OP_MOD: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + static_cast(a->get_double()) % + static_cast(b->get_double())); + PUSH(value); + break; + } + case OP_BIN_AND: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + static_cast(a->get_double()) & + static_cast(b->get_double())); + PUSH(value); + break; + } + case OP_BIN_OR: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + static_cast(a->get_double()) | + static_cast(b->get_double())); + PUSH(value); + break; + } + case OP_LOG_AND: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_bool() && + b->get_bool()); + PUSH(value); + break; + } + case OP_LOG_OR: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_bool() || + b->get_bool()); + PUSH(value); + break; + } + case OP_NUM_LT: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_double() < + b->get_double()); + PUSH(value); + break; + } + case OP_NUM_GT: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_double() > + b->get_double()); + PUSH(value); + break; + } + case OP_NUM_LE: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_double() <= + b->get_double()); + PUSH(value); + break; + } + case OP_NUM_GE: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_double() >= + b->get_double()); + PUSH(value); + break; + } + case OP_NUM_EQ: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_double() == + b->get_double()); + PUSH(value); + break; + } + case OP_NUM_NE: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + a->get_double() != + b->get_double()); + PUSH(value); + break; + } + case OP_STR_LT: + case OP_STR_GT: + case OP_STR_LE: + case OP_STR_GE: + case OP_STR_EQ: + case OP_STR_NE: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VBool(pool(), + /*a->get_string() @ + b->get_string()*/false); + PUSH(value); break; } default: - printf("\tTODO"); + fprintf(stderr, "\tTODO"); break; } - printf("\n"); + fprintf(stderr, "\n"); } } @@ -270,8 +505,12 @@ Value *Request::get_element() { Junction *junction=value->get_junction(); if(junction && junction->code) { // is it a code-junction? // autocalc it - printf("ja->\n"); - PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); + fprintf(stderr, "ja->\n"); + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + // almost plain wwrapper about junction wcontext, // BUT intercepts string writes VCodeFrame frame(pool(), *junction->wcontext); wcontext=&frame; @@ -283,8 +522,12 @@ Value *Request::get_element() { // string writes were intercepted // returning them as the result of getting code-junction value=NEW VString(*frame.get_string()); - wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); - printf("<-ja returned"); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + fprintf(stderr, "<-ja returned"); } } else { value=NEW VUnknown(pool());