--- parser3/src/main/execute.C 2001/03/13 12:37:05 1.99 +++ parser3/src/main/execute.C 2001/03/16 08:31:21 1.107 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.99 2001/03/13 12:37:05 paf Exp $ + $Id: execute.C,v 1.107 2001/03/16 08:31:21 paf Exp $ */ #include "pa_array.h" @@ -50,61 +50,73 @@ char *opcode_name[]={ "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" + "STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE", + "IS" }; +void va_log_printf(const char *fmt,va_list args) { + vfprintf(stderr, fmt, args); +} + +void log_printf(const char *fmt, ...) { + // TODO: куда-нибудь пристроить + va_list args; + va_start(args,fmt); + va_log_printf(fmt,args); + va_end(args); +} + void dump(int level, const Array& ops) { if(0){ int size=ops.size(); - //fprintf(stderr, "size=%d\n", size); + //log_printf("size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type()); + log_printf(" \"%s\" %s", value->get_string()->cstr(), value->type()); } - fprintf(stderr, "\n"); + log_printf("\n"); 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) { - fputs("source----------------------------\n", stderr); + log_printf("source----------------------------\n"); dump(0, ops); - fputs("execution-------------------------\n", stderr); + log_printf("execution-------------------------\n"); } int size=ops.size(); - //fprintf(stderr, "size=%d\n", size); + //log_printf("size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type()); + log_printf(" \"%s\" %s", value->get_string()->cstr(), value->type()); PUSH(value); break; } @@ -113,7 +125,7 @@ void Request::execute(const Array& ops) VMethodFrame *frame=static_cast(stack.top_value()); // code const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); - fprintf(stderr, " (%d)\n", local_ops->size()); + log_printf(" (%d)\n", local_ops->size()); dump(1, *local_ops); Junction& j=*NEW Junction(pool(), @@ -192,7 +204,7 @@ void Request::execute(const Array& ops) case OP_STRING__WRITE: { VString *vstring=static_cast(ops.quick_get(++i)); - fprintf(stderr, " \"%s\"", vstring->value().cstr()); + log_printf(" \"%s\"", vstring->value().cstr()); write(vstring->value()); break; } @@ -282,7 +294,6 @@ void Request::execute(const Array& ops) value->type()); VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); - //frame->set_name(junction->self.name()); frame->set_name(value->name()); PUSH(frame); break; @@ -297,7 +308,7 @@ void Request::execute(const Array& ops) case OP_CALL: { - fprintf(stderr, "->\n"); + log_printf("->\n"); VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); PUSH(self); @@ -305,9 +316,9 @@ void Request::execute(const Array& ops) PUSH(rcontext); PUSH(wcontext); - VClass *called_class=frame->junction.self.get_class(); + VStateless_class *called_class=frame->junction.self.get_class(); // is context object or class & is it my class or my parent's class? - VClass *read_class=rcontext->get_class(); + VStateless_class *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) @@ -317,6 +328,8 @@ void Request::execute(const Array& ops) // yes, this is a constructor call if(called_class->name()==TABLE_CLASS_NAME) self=NEW VTable(pool()); + else if(called_class->name()==ENV_CLASS_NAME) + self=NEW VEnv(pool()); else self=NEW VObject(pool(), *called_class); frame->write(*self, @@ -329,9 +342,8 @@ void Request::execute(const Array& ops) root=rcontext=wcontext=frame; { // 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); + // and substitute class alias to the class they are called AS + Temp_alias temp_alias(*self->get_aliased(), *frame->junction.vclass); const Method& method=*frame->junction.method; if(method.native_code) { // native code? @@ -350,7 +362,7 @@ void Request::execute(const Array& ops) self=static_cast(POP()); PUSH(value); - fprintf(stderr, "<-returned"); + log_printf("<-returned"); break; } @@ -568,13 +580,20 @@ void Request::execute(const Array& ops) PUSH(value); break; } + case OP_IS: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), b->as_string() == a->type()); + PUSH(value); + break; + } default: THROW(0,0, 0, "unhandled '%s' opcode", opcode_name[op.code]); } - fprintf(stderr, "\n"); + log_printf("\n"); } } @@ -607,7 +626,7 @@ Value& Request::process(Value& value, co Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it - fprintf(stderr, "ja->\n"); + log_printf("ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); @@ -641,7 +660,7 @@ Value& Request::process(Value& value, co root=POP(); self=static_cast(POP()); - fprintf(stderr, "<-ja returned"); + log_printf("<-ja returned"); } else result=&value;