--- parser3/src/main/execute.C 2001/03/12 09:08:51 1.92 +++ parser3/src/main/execute.C 2001/05/07 14:09:04 1.153 @@ -1,22 +1,28 @@ -/* - Parser +/** @file + Parser: executor part of request class. + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.92 2001/03/12 09:08:51 paf Exp $ + $Id: execute.C,v 1.153 2001/05/07 14:09:04 paf Exp $ */ +#include "pa_config_includes.h" +#include "pa_opcode.h" #include "pa_array.h" -#include "code.h" #include "pa_request.h" #include "pa_vstring.h" #include "pa_vhash.h" #include "pa_vunknown.h" -#include "pa_vcframe.h" -#include "pa_vmframe.h" +#include "pa_vcode_frame.h" +#include "pa_vmethod_frame.h" #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_vbool.h" +#include "pa_vtable.h" +#include "pa_vfile.h" +#include "pa_vimage.h" #include @@ -27,13 +33,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_VALUE", "CONSTRUCT_DOUBLE", - "WRITE", "STRING__WRITE", + "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", @@ -43,81 +49,110 @@ char *opcode_name[]={ "CALL", // expression ops: unary - "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", + "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // 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" + "STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE", + "IS" }; -void dump(int level, const Array& ops) { +void va_log_printf(Pool& pool, const char *fmt,va_list args) { + return; + char buf[MAX_STRING]; + vsnprintf(buf, MAX_STRING, fmt, args); + SAPI::log(pool, "%s", buf); +} + +void log_printf(Pool& pool, const char *fmt, ...) { + va_list args; + va_start(args,fmt); + va_log_printf(pool,fmt,args); + va_end(args); +} + +void dump(Pool& pool, int level, const Array& ops) { if(0){ - int size=ops.size(); - //fprintf(stderr, "size=%d\n", size); + int size=ops.quick_size(); + //log_printf(pool, "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(pool, + "%*s%s" + " \"%s\" %s", + level*4, "", opcode_name[op.code], + value->get_string()->cstr(), value->type()); + continue; } - fprintf(stderr, "\n"); + log_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); - 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); + dump(pool, level+1, *local_ops); } } - fflush(stderr); } void Request::execute(const Array& ops) { if(1) { - fputs("source----------------------------\n", stderr); - dump(0, ops); - fputs("execution-------------------------\n", stderr); + log_printf(pool(), "source----------------------------\n"); + dump(pool(), 0, ops); + log_printf(pool(), "execution-------------------------\n"); } - int size=ops.size(); - //fprintf(stderr, "size=%d\n", size); + int size=ops.quick_size(); + //log_printf(pool(), "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(pool(), " \"%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()); - dump(1, *local_ops); + log_printf(pool(), " (%d)\n", local_ops->size()); + dump(pool(), 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, we zero junction.wcontext here, and later + // in .process we would test that field + // in decision "which wwrapper to use" Junction& j=*NEW Junction(pool(), *self, 0, 0, - root, frame, frame, local_ops); + root, + rcontext, + op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, + local_ops); Value *value=NEW VJunction(j); @@ -127,14 +162,17 @@ void Request::execute(const Array& ops) } case OP_GET_CLASS: { + // maybe they 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) + Value *value=static_cast(classes().get(name)); + if(!value) THROW(0,0, &name, - ": undefined class"); + "class is undefined"); - PUSH(vclass); + PUSH(value); break; } @@ -175,26 +213,39 @@ void Request::execute(const Array& ops) Value *value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); - ncontext->put_element(name, value->get_expr_result()); + ncontext->put_element(name, value->as_expr_result()); value->set_name(name); break; } - case OP_WRITE: + case OP_WRITE_VALUE: { Value *value=POP(); write_assign_lang(*value); + + // forget the fact they've entered some ^object.method[]. + // see OP_GET_ELEMENT + wcontext->clear_somebody_entered_some_object(); + break; + } + case OP_WRITE_EXPR_RESULT: + { + Value *value=POP(); + write_expr_result(*value->as_expr_result()); break; } case OP_STRING__WRITE: { VString *vstring=static_cast(ops.quick_get(++i)); - fprintf(stderr, " \"%s\"", vstring->value().cstr()); - write(vstring->value()); + log_printf(pool(), " \"%s\"", vstring->string().cstr()); + write_no_lang(vstring->string()); break; } case OP_GET_ELEMENT: { + // maybe they do ^object.method[] call, remember the fact + wcontext->inc_somebody_entered_some_object(); + Value *value=get_element(); PUSH(value); break; @@ -211,12 +262,15 @@ void Request::execute(const Array& ops) case OP_CREATE_EWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */); + PUSH((void *)flang); + flang=String::UL_PASS_APPENDED; + wcontext=NEW WWrapper(pool(), 0 /*empty*/, true /*constructing*/); break; } case OP_REDUCE_EWPOOL: { Value *value=wcontext->result(); + flang=static_cast(reinterpret_cast(POP())); wcontext=static_cast(POP()); PUSH(value); break; @@ -226,9 +280,9 @@ void Request::execute(const Array& ops) { Value *ncontext=POP(); PUSH(rcontext); - rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */); + rcontext=ncontext; + wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); break; } case OP_REDUCE_RWPOOL: @@ -247,7 +301,7 @@ void Request::execute(const Array& ops) case OP_CREATE_SWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */, false /* not constructing */); + wcontext=NEW WWrapper(pool(), 0 /*empty*/, false /*not constructing*/); break; } case OP_REDUCE_SWPOOL: @@ -269,16 +323,24 @@ 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()); + bool is_constructor= + wcontext->constructing() && // constructing? + wcontext->somebody_entered_some_class(); // ^class:method[..]? + if(is_constructor) + wcontext->constructing(false); + + VMethodFrame *frame=NEW VMethodFrame(pool(), *junction, is_constructor); frame->set_name(value->name()); PUSH(frame); break; @@ -293,7 +355,7 @@ void Request::execute(const Array& ops) case OP_CALL: { - fprintf(stderr, "->\n"); + log_printf(pool(), "->\n"); VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); PUSH(self); @@ -301,17 +363,27 @@ 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(); + // not ^name.method call and // 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 + VStateless_class *read_class=rcontext->get_class(); + if( + !wcontext->somebody_entered_some_object() && + 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); + // were are constructing something and + // our constructor is just method call + if(frame->is_constructor && + wcontext->somebody_entered_some_object()==1) { + // this is a constructor call + // some stateless_object creatable derivates + if(Value *value=called_class->create_new_value(pool())) + self=value; + else // stateful object + self=NEW VObject(pool(), *called_class); frame->write(*self, - String::Untaint_lang::NO // not used, always an object, not string + String::UL_CLEAN // not used, always an object, not string ); } else self=&frame->junction.self; // no, static or simple dynamic call @@ -320,18 +392,30 @@ 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.check_actual_numbered_params( - 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 + // 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; + Method::Call_type call_type= + called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; + if( + method.call_type==Method::CT_ANY || + method.call_type==call_type) // allowed call type? + 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 + else + THROW(0, 0, + &frame->name(), + "is not allowed to be called %s", + call_type==Method::CT_STATIC?"statically":"dynamically"); + } Value *value=wcontext->result(); @@ -341,7 +425,7 @@ void Request::execute(const Array& ops) self=static_cast(POP()); PUSH(value); - fprintf(stderr, "<-returned"); + log_printf(pool(), "<-returned"); break; } @@ -349,42 +433,53 @@ 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->as_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->as_double()); PUSH(value); break; } case OP_NOT: { Value *operand=POP(); - Value *value=NEW VBool(pool(), !operand->get_bool()); + Value *value=NEW VBool(pool(), !operand->as_bool()); PUSH(value); break; } case OP_DEF: { Value *operand=POP(); - Value *value=NEW VBool(pool(), operand->get_defined()); + Value *value=NEW VBool(pool(), operand->is_defined()); PUSH(value); break; } 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(), + info.uri && strncmp(path, info.uri, strlen(path))==0); PUSH(value); break; } case OP_FEXISTS: { Value *operand=POP(); - Value *value=NEW VBool(pool(), true/*TODO*/); + Value *value=NEW VBool(pool(), + file_readable(absolute(operand->as_string()))); + PUSH(value); + break; + } + case OP_DEXISTS: + { + Value *operand=POP(); + Value *value=NEW VBool(pool(), + dir_readable(absolute(operand->as_string()))); PUSH(value); break; } @@ -393,28 +488,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->as_double() - b->as_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->as_double() + b->as_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->as_double() * b->as_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->as_double() / b->as_double()); PUSH(value); break; } @@ -422,8 +517,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->as_double() % + (int)b->as_double()); PUSH(value); break; } @@ -431,8 +526,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->as_double() & + (int)b->as_double()); PUSH(value); break; } @@ -440,8 +535,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->as_double() | + (int)b->as_double()); PUSH(value); break; } @@ -449,71 +544,71 @@ 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->as_double() ^ + (int)b->as_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()); + Value *value=NEW VBool(pool(), a->as_bool() && b->as_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()); + Value *value=NEW VBool(pool(), a->as_bool() || b->as_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()); + Value *value=NEW VBool(pool(), a->as_bool() ^ b->as_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()); + Value *value=NEW VBool(pool(), a->as_double() < b->as_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()); + Value *value=NEW VBool(pool(), a->as_double() > b->as_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()); + Value *value=NEW VBool(pool(), a->as_double() <= b->as_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()); + Value *value=NEW VBool(pool(), a->as_double() >= b->as_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()); + Value *value=NEW VBool(pool(), a->as_double() == b->as_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()); + Value *value=NEW VBool(pool(), a->as_double() != b->as_double()); PUSH(value); break; } @@ -559,21 +654,33 @@ 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]); + "invalid opcode %d", op.code); } - fprintf(stderr, "\n"); } } Value *Request::get_element() { const String& name=POP_NAME(); Value *ncontext=POP(); - Value *value=ncontext->get_element(name); - + Value *value; + if(Method* method=OP.get_method(name)) { // operator? + // as if that method were in self and we have normal dynamic method here + Junction& junction=*NEW Junction(pool(), + *self, self->get_class(), method, 0,0,0,0); + value=NEW VJunction(junction); + } else + value=ncontext->get_element(name); if(value) value=&process(*value, &name); // process possible code-junction else { @@ -584,34 +691,39 @@ Value *Request::get_element() { return value; } +/** + 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 @c (expression) params evaluation +*/ 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? // process it - fprintf(stderr, "ja->\n"); + log_printf(pool(), "ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); WContext *frame; - if(intercept_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; @@ -619,7 +731,7 @@ Value& Request::process(Value& value, co root=junction->root; rcontext=junction->rcontext; execute(*junction->code); - if(intercept_string) { + if(using_code_frame) { // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction @@ -632,7 +744,7 @@ Value& Request::process(Value& value, co root=POP(); self=static_cast(POP()); - fprintf(stderr, "<-ja returned"); + log_printf(pool(), "<-ja returned"); } else result=&value; @@ -641,38 +753,41 @@ Value& Request::process(Value& value, co return *result; } -char *Request::execute_static_method(VClass& vclass, String& method_name, bool return_cstr) { - if(Value *value=vclass.get_element(method_name)) { // found some 'METHOD_NAME' element - if(Junction *junction=value->get_junction()) {// it even has junction! - if(const Method *method=junction->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 +const String *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 + const String *result; + if(return_cstr) + result=&wcontext->as_string(); + else + result=0; // ignore result + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + // return + return result; +} - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); +const String *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 - return result; - } - } - } return 0; }