--- parser3/src/main/execute.C 2001/05/11 17:45:10 1.155 +++ parser3/src/main/execute.C 2001/05/17 09:21:55 1.158 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.155 2001/05/11 17:45:10 parser Exp $ + $Id: execute.C,v 1.158 2001/05/17 09:21:55 parser Exp $ */ #include "pa_config_includes.h" @@ -24,13 +24,14 @@ #include "pa_vfile.h" #include "pa_vimage.h" -#include +//#define DEBUG_EXECUTE + #define PUSH(value) stack.push(value) #define POP() static_cast(stack.pop()) #define POP_NAME() static_cast(stack.pop())->as_string() - +#ifdef DEBUG_EXECUTE char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", @@ -59,75 +60,79 @@ char *opcode_name[]={ "IS" }; -void va_log_printf(Pool& pool, const char *fmt,va_list args) { - return; +void va_debug_printf(Pool& pool, const char *fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); SAPI::log(pool, "%s", buf); } -void log_printf(Pool& pool, const char *fmt, ...) { +void debug_printf(Pool& pool, const char *fmt, ...) { va_list args; va_start(args,fmt); - va_log_printf(pool,fmt,args); + va_debug_printf(pool,fmt,args); va_end(args); } -void dump(Pool& pool, int level, const Array& ops) { - if(0){ +void debug_dump(Pool& pool, int level, const Array& ops) { + { int size=ops.quick_size(); - //log_printf(pool, "size=%d\n", size); + //debug_printf(pool, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - log_printf(pool, + debug_printf(pool, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[op.code], value->get_string()->cstr(), value->type()); continue; } - log_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); + debug_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(pool, level+1, *local_ops); + debug_dump(pool, level+1, *local_ops); } } } +#endif void Request::execute(const Array& ops) { - if(1) { - log_printf(pool(), "source----------------------------\n"); - dump(pool(), 0, ops); - log_printf(pool(), "execution-------------------------\n"); - } +#ifdef DEBUG_EXECUTE + debug_printf(pool(), "source----------------------------\n"); + debug_dump(pool(), 0, ops); + debug_printf(pool(), "execution-------------------------\n"); +#endif int size=ops.quick_size(); - //log_printf(pool(), "size=%d\n", size); + //debug_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()); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); +#endif PUSH(value); break; } @@ -137,9 +142,10 @@ 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(pool(), " (%d)\n", local_ops->size()); - dump(pool(), 1, *local_ops); - +#ifdef DEBUG_EXECUTE + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); +#endif // when they evaluate expression parameter, // the object expression result // does not need to be written into calling frame @@ -236,7 +242,9 @@ void Request::execute(const Array& ops) case OP_STRING__WRITE: { VString *vstring=static_cast(ops.quick_get(++i)); - log_printf(pool(), " \"%s\"", vstring->string().cstr()); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), " \"%s\"", vstring->string().cstr()); +#endif write_no_lang(vstring->string()); break; } @@ -340,8 +348,7 @@ void Request::execute(const Array& ops) if(is_constructor) wcontext->constructing(false); - VMethodFrame *frame=NEW VMethodFrame(pool(), *junction, is_constructor); - frame->set_name(value->name()); + VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction, is_constructor); PUSH(frame); break; } @@ -355,7 +362,9 @@ void Request::execute(const Array& ops) case OP_CALL: { - log_printf(pool(), "->\n"); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), "->\n"); +#endif VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); PUSH(self); @@ -365,17 +374,18 @@ void Request::execute(const Array& ops) 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? + // is context object or class & is it my class or my parent's class and? VStateless_class *read_class=rcontext->get_class(); - if( - !wcontext->somebody_entered_some_object() && + 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) // were are constructing something and - // our constructor is just method call + // our constructor is just method call and + // not static-only-method call if(frame->is_constructor && - wcontext->somebody_entered_some_object()==1) { + wcontext->somebody_entered_some_object()==1 && + frame->junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call // some stateless_object creatable derivates if(Value *value=called_class->create_new_value(pool())) @@ -425,7 +435,9 @@ void Request::execute(const Array& ops) self=static_cast(POP()); PUSH(value); - log_printf(pool(), "<-returned"); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), "<-returned"); +#endif break; } @@ -706,7 +718,9 @@ Value& Request::process(Value& value, co Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it - log_printf(pool(), "ja->\n"); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), "ja->\n"); +#endif PUSH(self); PUSH(root); PUSH(rcontext); @@ -744,7 +758,9 @@ Value& Request::process(Value& value, co root=POP(); self=static_cast(POP()); - log_printf(pool(), "<-ja returned"); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), "<-ja returned"); +#endif } else result=&value;