--- parser3/src/main/execute.C 2001/03/06 12:22:58 1.49 +++ parser3/src/main/execute.C 2001/03/06 15:55:35 1.55 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.49 2001/03/06 12:22:58 paf Exp $ + $Id: execute.C,v 1.55 2001/03/06 15:55:35 paf Exp $ */ #include "pa_array.h" @@ -12,6 +12,7 @@ #include "pa_vmframe.h" #include "pa_vobject.h" #include "pa_vdouble.h" +#include "pa_vbool.h" #include @@ -22,12 +23,11 @@ char *opcode_name[]={ // literals - "STRING", "CODE", "CLASS", + "VALUE", "CODE", "CLASS", // actions - "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", + "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", "CONSTRUCT", - "EXPRESSION_EVAL", "MODIFY_EVAL", "WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", @@ -35,7 +35,7 @@ char *opcode_name[]={ "CREATE_SWPOOL", "REDUCE_SWPOOL", "GET_METHOD_FRAME", "STORE_PARAM", - "CALL" + "CALL", // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", @@ -44,8 +44,7 @@ char *opcode_name[]={ "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", - "XOR" + "STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE" }; void dump(int level, const Array& ops) { @@ -66,9 +65,9 @@ void dump(int level, const Array& ops) { op.cast=ops.quick_get(i); fprintf(stderr, "%*s%s", level*4, "", opcode_name[op.code]); - if(op.code==OP_STRING) { - VString *vstring=static_cast(ops.quick_get(++i)); - fprintf(stderr, " \"%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)); @@ -85,9 +84,9 @@ void dump(int level, const Array& ops) { void Request::execute(const Array& ops) { if(1) { - fputs("source----------------------------", stderr); + fputs("source----------------------------\n", stderr); dump(0, ops); - fputs("execution-------------------------", stderr); + fputs("execution-------------------------\n", stderr); } int size=ops.size(); @@ -98,12 +97,12 @@ void Request::execute(const Array& ops) fprintf(stderr, "%d:%s", stack.top(), opcode_name[op.code]); switch(op.code) { - // param in next instruction - case OP_STRING: + // param in next instruction + case OP_VALUE: { - VString *vstring=static_cast(ops.quick_get(++i)); - fprintf(stderr, " \"%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: @@ -127,7 +126,7 @@ void Request::execute(const Array& ops) break; } - // OP_WITH + // OP_WITH case OP_WITH_SELF: { PUSH(self); @@ -149,7 +148,7 @@ void Request::execute(const Array& ops) break; } - // ... + // OTHER ACTIONS BUT WITHs case OP_CONSTRUCT: { Value *value=POP(); @@ -159,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(); @@ -208,7 +206,7 @@ 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); @@ -217,7 +215,7 @@ void Request::execute(const Array& ops) case OP_CREATE_SWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */); + wcontext=NEW WWrapper(pool(), 0 /* empty */, false /* not constructing */); break; } case OP_REDUCE_SWPOOL: @@ -225,13 +223,13 @@ void Request::execute(const Array& ops) // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext String *string=wcontext->get_string(); - Value *value=NEW VString(*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(); @@ -269,8 +267,7 @@ void Request::execute(const Array& ops) // 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 // context is object or class & is it my class or my parent's class? VClass *read_class=rcontext->get_class(); @@ -299,6 +296,52 @@ void Request::execute(const Array& ops) 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(); @@ -309,6 +352,141 @@ void Request::execute(const Array& ops) 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: fprintf(stderr, "\tTODO");