--- parser3/src/main/execute.C 2001/03/09 04:47:29 1.79 +++ parser3/src/main/execute.C 2001/03/16 12:46:35 1.113 @@ -1,5 +1,9 @@ /* - $Id: execute.C,v 1.79 2001/03/09 04:47:29 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: execute.C,v 1.113 2001/03/16 12:46:35 paf Exp $ */ #include "pa_array.h" @@ -13,8 +17,10 @@ #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_vbool.h" +#include "pa_vtable.h" #include +#include #define PUSH(value) stack.push(value) #define POP() static_cast(stack.pop()) @@ -23,13 +29,13 @@ char *opcode_name[]={ // literals - "VALUE", "CODE__STORE_PARAM", + "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", // actions "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", "GET_CLASS", - "CONSTRUCT", - "WRITE", + "CONSTRUCT_VALUE", "CONSTRUCT_DOUBLE", + "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", @@ -45,86 +51,108 @@ 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) { + if(op.code==OP_CURLY_CODE__STORE_PARAM || op.code==OP_EXPR_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; } - case OP_CODE__STORE_PARAM: + case OP_CURLY_CODE__STORE_PARAM: + case OP_EXPR_CODE__STORE_PARAM: { 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); + // when they evaluate expression parameter, + // the object expression result + // does not need to be written into calling frame + // it must go into any expressions using that parameter + // hence, zeroing junction.wcontext being created + // later, in .process would test that field + // in decision "which wwrapper to use" Junction& j=*NEW Junction(pool(), *self, 0, 0, - root, frame, frame, local_ops); + root, frame, op.code==OP_EXPR_CODE__STORE_PARAM?0:frame, local_ops); Value *value=NEW VJunction(j); - value->set_name(frame->name()); // store param - frame->store_param(value); + frame->store_param(frame->name(), value); break; } case OP_GET_CLASS: { - String& name=POP_NAME(); + // maybe the do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + + const String& name=POP_NAME(); VClass *vclass=static_cast(classes().get(name)); if(!vclass) THROW(0,0, @@ -158,19 +186,41 @@ void Request::execute(const Array& ops) } // OTHER ACTIONS BUT WITHs - case OP_CONSTRUCT: + 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_WRITE: + case OP_CONSTRUCT_EXPR: { Value *value=POP(); - wcontext->write(*value); + const String& name=POP_NAME(); + Value *ncontext=POP(); + ncontext->put_element(name, value->get_expr_result()); + value->set_name(name); + break; + } + case OP_WRITE_VALUE: + { + Value *value=POP(); + write_assign_lang(*value); + break; + } + case OP_WRITE_EXPR_RESULT: + { + Value *value=POP(); + write_expr_result(*value->get_expr_result()); + break; + } + case OP_STRING__WRITE: + { + VString *vstring=static_cast(ops.quick_get(++i)); + log_printf(" \"%s\"", vstring->string().cstr()); + write(vstring->string()); break; } @@ -184,7 +234,7 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT__WRITE: { Value *value=get_element(); - wcontext->write(*value); + write_assign_lang(*value); break; } @@ -214,8 +264,12 @@ void Request::execute(const Array& ops) } case OP_REDUCE_RWPOOL: { - String *string=wcontext->get_string(); - Value *value=string?NEW VString(*string):NEW VString(); + 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); @@ -231,8 +285,12 @@ 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=string?NEW VString(*string):NEW VString(); + 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; @@ -242,16 +300,18 @@ void Request::execute(const Array& ops) case OP_GET_METHOD_FRAME: { Value *value=POP(); - // info: this one's always method-junction, not a code-junction + // info: + // code compiled so that this one's always method-junction, + // not a code-junction Junction *junction=value->get_junction(); if(!junction) THROW(0,0, &value->name(), - "type is '%s', can not call it (must be method or junction)", + "(%s) not a method or junction, can not call it", value->type()); VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); - frame->set_name(junction->self.name()); + frame->set_name(value->name()); PUSH(frame); break; } @@ -259,13 +319,13 @@ void Request::execute(const Array& ops) { Value *value=POP(); VMethodFrame *frame=static_cast(stack.top_value()); - frame->store_param(value); + frame->store_param(frame->name(), value); break; } case OP_CALL: { - fprintf(stderr, "->\n"); + log_printf("->\n"); VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); PUSH(self); @@ -273,16 +333,25 @@ 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) - if(wcontext->constructing()) { // constructing? - // yes, constructor call: $some(^class:method(..)) - self=NEW VObject(*called_class); - frame->write(*self); + if( + wcontext->constructing() && // constructing? + wcontext->somebody_entered_some_class()) { // ^class:method[..]? + // 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, + String::Untaint_lang::NO // not used, always an object, not string + ); } else self=&frame->junction.self; // no, static or simple dynamic call @@ -290,14 +359,18 @@ 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); - - Method& method=*frame->junction.method; - if(method.native_code) // native code? - (*method.native_code)(*this, frame->numbered_params()); // execute it - else // parser code + // 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? + method.check_actual_numbered_params( + frame->junction.self, + frame->name(), frame->numbered_params()); + (*method.native_code)( + *this, + frame->name(), frame->numbered_params()); // execute it + } else // parser code execute(*method.parser_code); // execute it } Value *value=wcontext->result(); @@ -308,7 +381,7 @@ void Request::execute(const Array& ops) self=static_cast(POP()); PUSH(value); - fprintf(stderr, "<-returned"); + log_printf("<-returned"); break; } @@ -316,16 +389,14 @@ void Request::execute(const Array& ops) case OP_NEG: { Value *operand=POP(); - Value *value=NEW VDouble(pool(), - -operand->get_double()); + 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())); + Value *value=NEW VDouble(pool(), ~(int)operand->get_double()); PUSH(value); break; } @@ -346,7 +417,8 @@ void Request::execute(const Array& ops) case OP_IN: { Value *operand=POP(); - Value *value=NEW VBool(pool(), true/*TODO*/); + const char *path=operand->as_string().cstr(); + Value *value=NEW VBool(pool(), strcmp(path, info.uri)<=0); PUSH(value); break; } @@ -362,32 +434,28 @@ void Request::execute(const Array& ops) case OP_SUB: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), - a->get_double() - b->get_double()); + 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()); + 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()); + 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()); + Value *value=NEW VDouble(pool(), a->get_double() / b->get_double()); PUSH(value); break; } @@ -395,8 +463,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) % - static_cast(b->get_double())); + (int)a->get_double() % + (int)b->get_double()); PUSH(value); break; } @@ -404,8 +472,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) & - static_cast(b->get_double())); + (int)a->get_double() & + (int)b->get_double()); PUSH(value); break; } @@ -413,8 +481,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) | - static_cast(b->get_double())); + (int)a->get_double() | + (int)b->get_double()); PUSH(value); break; } @@ -422,8 +490,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) ^ - static_cast(b->get_double())); + (int)a->get_double() ^ + (int)b->get_double()); PUSH(value); break; } @@ -532,23 +600,30 @@ 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"); } } Value *Request::get_element() { - String& name=POP_NAME(); + const String& name=POP_NAME(); Value *ncontext=POP(); Value *value=ncontext->get_element(name); if(value) - value=&autocalc(*value); // autocalc possible code-junction + value=&process(*value, &name); // process possible code-junction else { value=NEW VUnknown(pool()); value->set_name(name); @@ -557,24 +632,38 @@ Value *Request::get_element() { return value; } -Value& Request::autocalc(Value& value, bool make_string) { +Value& Request::process(Value& value, const String *name, bool intercept_string) { + // intercept_string: + // true: + // they want result=string value, + // possible object result goes to wcontext + // false: + // they want any result[string|object] + // nothing goes to wcontext. + // used in (expression) params evaluation + + Value *result; Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? - // autocalc it - fprintf(stderr, "ja->\n"); + // process it + log_printf("ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); WContext *frame; - if(make_string) { + // for expression method params + // wcontext is set 0 + // using the fact in decision "which wwrapper to use" + bool using_code_frame=intercept_string && junction->wcontext; + if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes frame=NEW VCodeFrame(pool(), *junction->wcontext); } else { // plain wwrapper - frame=NEW WWrapper(pool(), 0 /* empty */, false /*not constructing*/); + frame=NEW WWrapper(pool(), 0/*empty*/, false/*not constructing*/); } wcontext=frame; @@ -582,8 +671,7 @@ Value& Request::autocalc(Value& value, b root=junction->root; rcontext=junction->rcontext; execute(*junction->code); - Value *result; - if(make_string) { + if(using_code_frame) { // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction @@ -596,8 +684,50 @@ Value& Request::autocalc(Value& value, b root=POP(); self=static_cast(POP()); - fprintf(stderr, "<-ja returned"); - return *result; + log_printf("<-ja returned"); } else - return value; + result=&value; + + if(name) + result->set_name(*name); + return *result; +} + +char *Request::execute_method(Value& aself, const Method& method, bool return_cstr) { + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + // initialize contexts + root=rcontext=self=&aself; + wcontext=NEW WWrapper(pool(), &aself, 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; +} + +char *Request::execute_method(Value& aself, + const String& method_name, bool return_cstr) { + if(Value *value=aself.get_element(method_name)) + if(Junction *junction=value->get_junction()) + if(const Method *method=junction->method) + return execute_method(aself, *method, return_cstr); + + return 0; }