--- parser3/src/main/execute.C 2001/03/19 15:29:39 1.116 +++ parser3/src/main/execute.C 2001/04/11 15:45:50 1.145 @@ -1,26 +1,30 @@ -/* - 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.116 2001/03/19 15:29:39 paf Exp $ + $Id: execute.C,v 1.145 2001/04/11 15:45:50 paf Exp $ */ -#include "pa_array.h" +#include "pa_config_includes.h" #include "code.h" +#include "pa_array.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 -#include #define PUSH(value) stack.push(value) #define POP() static_cast(stack.pop()) @@ -55,70 +59,75 @@ char *opcode_name[]={ "IS" }; -void va_log_printf(const char *fmt,va_list args) { +void va_log_printf(Pool& pool, const char *fmt,va_list args) { return; - vfprintf(stderr, fmt, args); + char buf[MAX_STRING]; + vsnprintf(buf, MAX_STRING, fmt, args); + SAPI::log(pool, "%s", buf); } -void log_printf(const char *fmt, ...) { - // TODO: куда-нибудь пристроить +void log_printf(Pool& pool, const char *fmt, ...) { va_list args; va_start(args,fmt); - va_log_printf(fmt,args); + va_log_printf(pool,fmt,args); va_end(args); } -void dump(int level, const Array& ops) { +void dump(Pool& pool, int level, const Array& ops) { if(0){ - int size=ops.size(); - //log_printf("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)); - log_printf(" \"%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; } - log_printf("\n"); + log_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); 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); } } } void Request::execute(const Array& ops) { if(1) { - log_printf("source----------------------------\n"); - dump(0, ops); - log_printf("execution-------------------------\n"); + log_printf(pool(), "source----------------------------\n"); + dump(pool(), 0, ops); + log_printf(pool(), "execution-------------------------\n"); } - int size=ops.size(); - //log_printf("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)); - log_printf(" \"%s\" %s", value->get_string()->cstr(), value->type()); + log_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); PUSH(value); break; } @@ -128,19 +137,30 @@ void Request::execute(const Array& ops) VMethodFrame *frame=static_cast(stack.top_value()); // code const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); - log_printf(" (%d)\n", local_ops->size()); - dump(1, *local_ops); + log_printf(pool(), " (%d)\n", local_ops->size()); + dump(pool(), 1, *local_ops); + // when called method of some object, specifying object literally, + // e.g ^t.menu, code of curly params must be executed + // in r/w context of that object. + // otherwise in current r/w context. + // // 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 + // later, in .process we would test that field // in decision "which wwrapper to use" Junction& j=*NEW Junction(pool(), *self, 0, 0, - root, frame, op.code==OP_EXPR_CODE__STORE_PARAM?0:frame, local_ops); + root, + wcontext->somebody_entered_some_object()>1? + &frame->junction.self /*^t.menu{}*/:rcontext/*^if()*/, + op.code==OP_EXPR_CODE__STORE_PARAM? + 0:wcontext->somebody_entered_some_object()>1? + frame/*^t.menu{}*/:wcontext/*^if()*/, + local_ops); Value *value=NEW VJunction(j); @@ -150,17 +170,17 @@ void Request::execute(const Array& ops) } case OP_GET_CLASS: { - // maybe the do ^class:method[] call, remember the fact + // 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; } @@ -201,7 +221,7 @@ 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; } @@ -214,19 +234,22 @@ void Request::execute(const Array& ops) case OP_WRITE_EXPR_RESULT: { Value *value=POP(); - write_expr_result(*value->get_expr_result()); + write_expr_result(*value->as_expr_result()); break; } case OP_STRING__WRITE: { VString *vstring=static_cast(ops.quick_get(++i)); - log_printf(" \"%s\"", vstring->string().cstr()); - write(vstring->string()); + 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; @@ -243,12 +266,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; @@ -260,7 +286,7 @@ void Request::execute(const Array& ops) PUSH(rcontext); rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */); + wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); break; } case OP_REDUCE_RWPOOL: @@ -279,7 +305,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: @@ -301,6 +327,7 @@ void Request::execute(const Array& ops) case OP_GET_METHOD_FRAME: { Value *value=POP(); + // info: // code compiled so that this one's always method-junction, // not a code-junction @@ -311,7 +338,13 @@ void Request::execute(const Array& ops) "(%s) not a method or junction, can not call it", value->type()); - VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); + 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; @@ -326,7 +359,7 @@ void Request::execute(const Array& ops) case OP_CALL: { - log_printf("->\n"); + log_printf(pool(), "->\n"); VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); PUSH(self); @@ -340,19 +373,19 @@ void Request::execute(const Array& ops) 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? - wcontext->somebody_entered_some_class()) { // ^class:method[..]? - // yes, this is a constructor call + if(frame->is_constructor) { + // this is a constructor call // some stateless_object derivates with constructors - if(called_class->name()==TABLE_CLASS_NAME) + if(called_class==table_class) self=NEW VTable(pool()); - else /*if(called_class->name()==ENV_CLASS_NAME) - self=NEW VEnv(pool()); - else */ // stateful object + else if(called_class==file_class) + self=NEW VFile(pool()); + else if(called_class==image_class) + self=NEW VImage(pool()); + 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 @@ -365,15 +398,26 @@ void Request::execute(const Array& ops) 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 + 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(); @@ -383,7 +427,7 @@ void Request::execute(const Array& ops) self=static_cast(POP()); PUSH(value); - log_printf("<-returned"); + log_printf(pool(), "<-returned"); break; } @@ -391,28 +435,28 @@ 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(), ~(int)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; } @@ -420,14 +464,15 @@ void Request::execute(const Array& ops) { Value *operand=POP(); const char *path=operand->as_string().cstr(); - Value *value=NEW VBool(pool(), strcmp(path, info.uri)<=0); + Value *value=NEW VBool(pool(), info.uri && strcmp(path, info.uri)<=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; } @@ -436,28 +481,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; } @@ -465,8 +510,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->get_double() % - (int)b->get_double()); + (int)a->as_double() % + (int)b->as_double()); PUSH(value); break; } @@ -474,8 +519,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->get_double() & - (int)b->get_double()); + (int)a->as_double() & + (int)b->as_double()); PUSH(value); break; } @@ -483,8 +528,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->get_double() | - (int)b->get_double()); + (int)a->as_double() | + (int)b->as_double()); PUSH(value); break; } @@ -492,71 +537,71 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->get_double() ^ - (int)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; } @@ -613,9 +658,8 @@ void Request::execute(const Array& ops) default: THROW(0,0, 0, - "unhandled '%s' opcode", opcode_name[op.code]); + "invalid opcode %d", op.code); } - log_printf("\n"); } } @@ -623,7 +667,13 @@ Value *Request::get_element() { const String& name=POP_NAME(); Value *ncontext=POP(); Value *value=ncontext->get_element(name); - + if(!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); + } if(value) value=&process(*value, &name); // process possible code-junction else { @@ -642,14 +692,14 @@ Value *Request::get_element() { - false: they want any result[string|object] nothing goes to wcontext. - used in (expression) params evaluation + used in @c (expression) params evaluation */ Value& Request::process(Value& value, const String *name, bool intercept_string) { Value *result; Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it - log_printf("ja->\n"); + log_printf(pool(), "ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); @@ -687,7 +737,7 @@ Value& Request::process(Value& value, co root=POP(); self=static_cast(POP()); - log_printf("<-ja returned"); + log_printf(pool(), "<-ja returned"); } else result=&value; @@ -704,7 +754,7 @@ const String *Request::execute_method(Va // initialize contexts root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself, false /* not constructing */); + wcontext=NEW WWrapper(pool(), &aself, false /*not constructing*/); // execute! execute(*method.parser_code);