--- parser3/src/main/execute.C 2001/02/25 16:36:12 1.45 +++ parser3/src/main/execute.C 2001/03/06 12:57:30 1.50 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.45 2001/02/25 16:36:12 paf Exp $ + $Id: execute.C,v 1.50 2001/03/06 12:57:30 paf Exp $ */ #include "pa_array.h" @@ -11,6 +11,7 @@ #include "pa_vcframe.h" #include "pa_vmframe.h" #include "pa_vobject.h" +#include "pa_vdouble.h" #include @@ -20,7 +21,10 @@ char *opcode_name[]={ + // literals "STRING", "CODE", "CLASS", + + // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", @@ -28,38 +32,49 @@ char *opcode_name[]={ "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", + "CREATE_SWPOOL", "REDUCE_SWPOOL", "GET_METHOD_FRAME", "STORE_PARAM", "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", + "XOR" }; 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()); + fprintf(stderr, " \"%s\"", vstring->get_string()->cstr()); } 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,31 +85,31 @@ void dump(int level, const Array& ops) { void Request::execute(const Array& ops) { if(1) { - puts("source----------------------------"); + fputs("source----------------------------", stderr); dump(0, ops); - puts("execution-------------------------"); + fputs("execution-------------------------", 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()); + fprintf(stderr, " \"%s\"", vstring->get_string()->cstr()); PUSH(vstring); 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, 0, @@ -107,7 +122,7 @@ 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; } @@ -193,12 +208,29 @@ 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 case OP_GET_METHOD_FRAME: @@ -226,7 +258,7 @@ 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); @@ -238,20 +270,24 @@ 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 - // is it my class or my parent's class? + // 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=reinterpret_cast(rcontext); // class dynamic call + self=rcontext; // class dynamic call else // no self=&frame->junction.self; // static or simple dynamic call } 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()); @@ -259,15 +295,26 @@ void Request::execute(const Array& ops) root=POP(); self=static_cast(POP()); wcontext->write(value); - printf("<-returned"); + fprintf(stderr, "<-returned"); + break; + } + + case OP_MUL: + { + Value *b=POP(); + Value *a=POP(); + Value *value=NEW VDouble(pool(), + a->get_double() * + b->get_double()); + PUSH(value); break; } default: - printf("\tTODO"); + fprintf(stderr, "\tTODO"); break; } - printf("\n"); + fprintf(stderr, "\n"); } } @@ -280,7 +327,7 @@ Value *Request::get_element() { Junction *junction=value->get_junction(); if(junction && junction->code) { // is it a code-junction? // autocalc it - printf("ja->\n"); + fprintf(stderr, "ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); @@ -302,7 +349,7 @@ Value *Request::get_element() { rcontext=POP(); root=POP(); self=static_cast(POP()); - printf("<-ja returned"); + fprintf(stderr, "<-ja returned"); } } else { value=NEW VUnknown(pool());