--- parser3/src/main/execute.C 2001/03/27 13:47:31 1.127 +++ parser3/src/main/execute.C 2001/04/03 05:23:41 1.136 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.127 2001/03/27 13:47:31 paf Exp $ + $Id: execute.C,v 1.136 2001/04/03 05:23:41 paf Exp $ */ #include "pa_config_includes.h" @@ -21,6 +21,7 @@ #include "pa_vdouble.h" #include "pa_vbool.h" #include "pa_vtable.h" +#include "pa_vfile.h" #include @@ -73,7 +74,7 @@ void log_printf(Pool& pool, const char * void dump(Pool& pool, int level, const Array& ops) { if(0){ - int size=ops.size(); + int size=ops.quick_size(); //log_printf(pool, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - log_printf(pool, " \"%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(pool, "\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)); @@ -109,7 +114,7 @@ void Request::execute(const Array& ops) log_printf(pool(), "execution-------------------------\n"); } - int size=ops.size(); + int size=ops.quick_size(); //log_printf(pool(), "size=%d\n", size); for(int i=0; isize()); 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); @@ -153,7 +169,7 @@ 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(); @@ -204,7 +220,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; } @@ -217,7 +233,7 @@ 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: @@ -230,6 +246,9 @@ void Request::execute(const Array& ops) 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; @@ -350,10 +369,12 @@ void Request::execute(const Array& ops) // some stateless_object derivates with constructors if(called_class==table_class) self=NEW VTable(pool()); + else if(called_class==file_class) + self=NEW VFile(pool()); else // stateful object self=NEW VObject(pool(), *called_class); frame->write(*self, - String::UL_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 @@ -366,15 +387,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(); @@ -392,28 +424,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; } @@ -438,28 +470,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; } @@ -467,8 +499,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; } @@ -476,8 +508,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; } @@ -485,8 +517,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; } @@ -494,71 +526,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; } @@ -617,7 +649,6 @@ void Request::execute(const Array& ops) 0, "unhandled '%s' opcode", opcode_name[op.code]); } - log_printf(pool(), "\n"); } } @@ -655,7 +686,7 @@ Value& Request::process(Value& value, co PUSH(self); PUSH(root); PUSH(rcontext); - PUSH(wcontext); + PUSH(wcontext); WContext *frame; // for expression method params