--- parser3/src/main/execute.C 2001/02/25 08:50:14 1.39 +++ parser3/src/main/execute.C 2001/03/10 15:17:47 1.86 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.39 2001/02/25 08:50:14 paf Exp $ + $Id: execute.C,v 1.86 2001/03/10 15:17:47 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,100 +22,120 @@ char *opcode_name[]={ - "STRING", "CODE", "CLASS", - "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", - "CONSTRUCT", - "EXPRESSION_EVAL", "MODIFY_EVAL", - "WRITE", + // literals + "VALUE", "CODE__STORE_PARAM", + + // actions + "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", + "GET_CLASS", + "CONSTRUCT_VALUE", "CONSTRUCT_DOUBLE", + "WRITE", "STRING__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", "BIN_XOR", + "LOG_AND", "LOG_OR", "LOG_XOR", + "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_CLASS) { - VClass *vclass=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vclass->name()->cstr()); + if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { + Value *value=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type()); } - printf("\n"); + fprintf(stderr, "\n"); - if(op.code==OP_CODE) { + if(op.code==OP_CODE__STORE_PARAM) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); dump(level+1, *local_ops); } } + fflush(stderr); } 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: + case OP_CODE__STORE_PARAM: { + VMethodFrame *frame=static_cast(stack.top_value()); + // 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, - root,rcontext,wcontext,local_ops); + *self, 0, 0, + root, frame, frame, local_ops); Value *value=NEW VJunction(j); - PUSH(value); + ///value->set_name(frame->name()); + + // store param + frame->store_param(value); break; } - case OP_CLASS: + case OP_GET_CLASS: { - VClass *vclass=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vclass->name()->cstr()); - PUSH(vclass); + const String& name=POP_NAME(); + VClass *vclass=static_cast(classes().get(name)); + if(!vclass) + THROW(0,0, + &name, + ": undefined class"); + + PUSH(vclass); break; } - // OP_WITH + // OP_WITH case OP_WITH_SELF: { PUSH(self); @@ -135,21 +157,36 @@ void Request::execute(const Array& ops) break; } - // ... - case OP_CONSTRUCT: + // OTHER ACTIONS BUT WITHs + case OP_CONSTRUCT_VALUE: { Value *value=POP(); - String& name=POP_NAME(); + const String& name=POP_NAME(); Value *ncontext=POP(); - value->set_name(name); ncontext->put_element(name, value); + value->set_name(name); + break; + } + case OP_CONSTRUCT_EXPR: + { + Value *value=POP(); + const String& name=POP_NAME(); + Value *ncontext=POP(); + ncontext->put_element(name, value->get_expr_result()); + value->set_name(name); break; } - // TODO: OP_EXPRESSION_EVAL, OP_MODIFY_EVAL, case OP_WRITE: { Value *value=POP(); - wcontext->write(value); + write(*value); + break; + } + case OP_STRING__WRITE: + { + VString *vstring=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\"", vstring->value().cstr()); + write(vstring->value()); break; } @@ -163,7 +200,7 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT__WRITE: { Value *value=get_element(); - wcontext->write(value); + write(*value); break; } @@ -171,7 +208,7 @@ void Request::execute(const Array& ops) case OP_CREATE_EWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */); + wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */); break; } case OP_REDUCE_EWPOOL: @@ -188,110 +225,441 @@ void Request::execute(const Array& ops) PUSH(rcontext); rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WWrapper(pool(), ncontext); + wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */); break; } case OP_REDUCE_RWPOOL: { - String *string=wcontext->get_string(); - Value *value=NEW VString(string); + const String *string=wcontext->get_string(); + Value *value; + if(string) + value=NEW VString(*string); + else + value=NEW VUnknown(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 + const String *string=wcontext->get_string(); + Value *value; + if(string) + value=NEW VString(*string); + else + NEW VUnknown(pool()); + wcontext=static_cast(POP()); + PUSH(value); + break; + } - // CALL + // CALL case OP_GET_METHOD_FRAME: { Value *value=POP(); - // [self/class?;params;local;code/native_code](name) + // info: this one's always method-junction, not a code-junction Junction *junction=value->get_junction(); if(!junction) THROW(0,0, - value->name(), + &value->name(), "type is '%s', can not call it (must be method or junction)", value->type()); - //unless(method) method=operators.get_method[...;code/native_code](name) + VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); + frame->set_name(junction->self.name()); PUSH(frame); break; } case OP_STORE_PARAM: { Value *value=POP(); - VMethodFrame *frame=static_cast(stack[0]); + VMethodFrame *frame=static_cast(stack.top_value()); frame->store_param(value); break; } 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); - - VClass *context_class=wcontext->get_class(); + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + VClass *called_class=frame->junction.self.get_class(); - // context is some class? [variable already constructed?] - if(context_class) { // yes - // is it me or one of my parents? - if(context_class->is_or_derived_from(*called_class)) // yes - self=&frame->junction.self; // dynamic call - else // no - self=called_class; // static call - } else { // no, we have constructor call here: $some(^class:method(..)) - self=NEW VObject(pool(), *called_class); - frame->write(self); - } - frame->set_self(self); + // is context 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, not me or relative of mine (total stranger) + if(wcontext->constructing()) { // constructing? + // yes, constructor call: $some(^class:method(..)) + self=NEW VObject(pool(), *called_class); + frame->write(*self, + String::Untaint_lang::NO // not used, always an object, not string + ); + } else + self=&frame->junction.self; // no, 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); + + Method& method=*frame->junction.method; + if(method.native_code) { // native code? + method.check_actual_numbered_params(frame->numbered_params()); + (*method.native_code)(*this, frame->numbered_params()); // execute it + } else // parser code + execute(*method.parser_code); // execute it + } Value *value=wcontext->result(); - wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); - wcontext->write(value); - printf("<-returned"); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + PUSH(value); + 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; + } + case OP_DEF: + { + Value *operand=POP(); + Value *value=NEW VBool(pool(), operand->get_defined()); + PUSH(value); + break; + } + case OP_IN: + { + Value *operand=POP(); + Value *value=NEW VBool(pool(), true/*TODO*/); + PUSH(value); + break; + } + case OP_FEXISTS: + { + Value *operand=POP(); + Value *value=NEW VBool(pool(), true/*TODO*/); + PUSH(value); + break; + } + + // 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_BIN_XOR: + { + 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_LOG_XOR: + { + 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: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), a->as_string() < b->as_string()); + PUSH(value); + break; + } + case OP_STR_GT: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), a->as_string() > b->as_string()); + PUSH(value); + break; + } + case OP_STR_LE: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), a->as_string() <= b->as_string()); + PUSH(value); + break; + } + case OP_STR_GE: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), a->as_string() >= b->as_string()); + PUSH(value); + break; + } + case OP_STR_EQ: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), a->as_string() == b->as_string()); + PUSH(value); + break; + } + case OP_STR_NE: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), a->as_string() != b->as_string()); + PUSH(value); break; } default: - printf("\tTODO"); - break; + THROW(0,0, + 0, + "unhandled '%s' opcode", opcode_name[op.code]); } - printf("\n"); + fprintf(stderr, "\n"); } } Value *Request::get_element() { - String& name=POP_NAME(); + const String& name=POP_NAME(); Value *ncontext=POP(); Value *value=ncontext->get_element(name); - if(value) { - 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); + if(value) + value=&autocalc(*value, &name); // autocalc possible code-junction + else { + value=NEW VUnknown(pool()); + value->set_name(name); + } + + return value; +} + +Value& Request::autocalc(Value& value, const String *name, bool make_string) { + Junction *junction=value.get_junction(); + if(junction && junction->code) { // is it a code-junction? + // autocalc it + fprintf(stderr, "ja->\n"); + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + WContext *frame; + if(make_string) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame frame(pool(), *junction->wcontext); wcontext=&frame; - self=&junction->self; - root=junction->root; - rcontext=junction->rcontext; - execute(*junction->code); + frame=NEW VCodeFrame(pool(), *junction->wcontext); + } else { + // plain wwrapper + frame=NEW WWrapper(pool(), 0 /* empty */, false /*not constructing*/); + } + + wcontext=frame; + self=&junction->self; + root=junction->root; + rcontext=junction->rcontext; + execute(*junction->code); + Value *result; + if(make_string) { // CodeFrame soul: // 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"); + result=NEW VString(*frame->get_string()); + } else + result=frame->result(); + if(name) + result->set_name(*name); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + fprintf(stderr, "<-ja returned"); + return *result; + } else + return value; +} + +char *Request::execute_static(VClass& vclass, String& method_name, bool return_cstr) { + Value *value=vclass.get_element(method_name); + if(value) { // found some 'METHOD_NAME' element + Junction *junction=value->get_junction(); + if(junction) {// it even has junction! + const Method *method=junction->method; + if(method) { // and junction is method-junction! call it + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + // initialize contexts + root=rcontext=self=&vclass; + wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */); + + // execute! + execute(*method->parser_code); + + // result + char *result; + if(return_cstr) + result=wcontext->get_string()->cstr(); // chars + else + result=0; // ignore result + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + // return + return result; + } } - } else { - value=NEW VUnknown(pool()); - value->set_name(name); } - return value; + return 0; }