--- parser3/src/main/execute.C 2009/06/14 00:34:04 1.349 +++ parser3/src/main/execute.C 2009/08/11 10:19:02 1.356 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/06/14 00:34:04 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/08/11 10:19:02 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -66,10 +66,8 @@ char *opcode_name[]={ #endif "OBJECT_POOL", "STRING_POOL", "PREPARE_TO_CONSTRUCT_OBJECT", -#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT "CONSTRUCT_OBJECT", "CONSTRUCT_OBJECT__WRITE", -#endif "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", @@ -148,7 +146,6 @@ void debug_dump(SAPI_Info& sapi_info, in continue; } #endif -#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT if( opcode==OP::OP_CONSTRUCT_OBJECT || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE @@ -167,7 +164,6 @@ void debug_dump(SAPI_Info& sapi_info, in debug_dump(sapi_info, level+1, *local_ops); continue; } -#endif if( opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE @@ -426,7 +422,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(const VJunction* vjunction=ncontext.put_element(name, &value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) throw Exception(PARSER_RUNTIME, 0, @@ -451,12 +447,11 @@ void Request::execute(ArrayOperation& op } case OP::OP_WRITE_EXPR_RESULT: { - Value& value=stack.pop().value(); - write_no_lang(value.as_expr_result()); - - // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); + + Value& value=stack.pop().value(); + wcontext->write(value.as_expr_result()); break; } case OP::OP_STRING__WRITE: @@ -645,9 +640,9 @@ void Request::execute(ArrayOperation& op String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; #ifdef OPTIMIZE_SINGLE_STRING_WRITE - WObjectPoolWrapper local(0/*empty*/, wcontext); + WObjectPoolWrapper local(wcontext); #else - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); #endif wcontext=&local; @@ -664,7 +659,7 @@ void Request::execute(ArrayOperation& op ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(0 /*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; execute(local_ops); @@ -713,20 +708,24 @@ void Request::execute(ArrayOperation& op break; } -#ifndef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT - case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: - { - wcontext->set_constructing(true); - break; - } -#endif - case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); break; } +#define METHOD_FRAME_ACTION(action) \ + if(local_ops){ \ + size_t first = stack.top_index(); \ + execute(*local_ops); \ + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ + action; \ + stack.set_top_index(first); \ + } else { \ + frame.empty_params(); \ + action; \ + } + case OP::OP_CALL: { ArrayOperation* local_ops=i.next().ops; @@ -750,18 +749,7 @@ void Request::execute(ArrayOperation& op } VMethodFrame frame(*junction, method_frame); - - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - + METHOD_FRAME_ACTION(op_call(frame, false)); stack.push(frame.result().as_value()); DEBUG_PRINT_STR("<-returned") @@ -801,7 +789,7 @@ void Request::execute(ArrayOperation& op #ifdef OPTIMIZE_CALL const Method& method=*junction->method; - if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_FRAME){ + if(method.call_optimization==Method::CO_WITHOUT_FRAME){ if(local_ops){ // store param code goes here size_t first = stack.top_index(); execute(*local_ops); @@ -817,36 +805,14 @@ void Request::execute(ArrayOperation& op method.check_actual_numbered_params(junction->self, &method_params); method.native_code(*this, method_params); // execute it } - } else if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call_write(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call_write(frame); - } + METHOD_FRAME_ACTION(op_call_write(frame)); } else #endif // OPTIMIZE_CALL { VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } + METHOD_FRAME_ACTION(op_call(frame, false)); write_pass_lang(frame.result()); } @@ -863,13 +829,9 @@ void Request::execute(ArrayOperation& op break; } -#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT case OP::OP_CONSTRUCT_OBJECT: case OP::OP_CONSTRUCT_OBJECT__WRITE: { - // maybe they do ^class:method[] call, remember the fact - wcontext->set_somebody_entered_some_class(); - debug_origin=i.next().origin; Value& vclass_name=*i.next().value; const String& class_name=*vclass_name.get_string(); @@ -882,8 +844,6 @@ void Request::execute(ArrayOperation& op &class_name, "class is undefined"); - wcontext->set_constructing(true); - debug_origin=i.next().origin; Value& vconstructor_name=*i.next().value; const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; @@ -892,58 +852,29 @@ void Request::execute(ArrayOperation& op Value& constructor_value=get_element(*class_value, constructor_name); + Junction* junction=constructor_value.get_junction(); + if(!junction) + throw Exception(PARSER_RUNTIME, + &constructor_name, + "constructor must be declared in class '%s'", + class_value->get_class()->name_cstr()); + ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) DEBUG_PRINT_STR("->\n") - Junction* junction=constructor_value.get_junction(); - if(!junction) { - if(constructor_value.is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); - else - throw Exception(PARSER_RUNTIME, - 0, - "is '%s', not a method or junction, can not call it", - constructor_value.type()); - } else { - VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); + Junction casted=Junction(*class_value, junction->method); + VMethodFrame frame(casted, method_frame); - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - - if(opcode==OP::OP_CONSTRUCT_OBJECT) - stack.push(frame.result().as_value()); - else - write_pass_lang(frame.result()); - } + METHOD_FRAME_ACTION(op_call(frame, true /* constructing */)); + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); DEBUG_PRINT_STR("<-returned") - - -/* - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); - } -*/ break; } -#endif // OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT // expression ops: unary case OP::OP_NEG: @@ -1276,16 +1207,15 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; \ method_frame=saved_method_frame; -void Request::op_call(VMethodFrame& frame){ +void Request::op_call(VMethodFrame& frame, bool constructing){ const Junction &junction=frame.junction; VStateless_class& called_class=*junction.self.get_class(); Value* new_self; - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); + if(constructing) { if(junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - if(new_self=called_class.create_new_value(fpool, 0 /*creating fields only in VClass*/)) { + if(new_self=called_class.create_new_value(fpool)) { // some stateless_class creatable derivates } else throw Exception(PARSER_RUNTIME, @@ -1362,42 +1292,28 @@ void Request::op_call_write(VMethodFrame method_frame=saved_method_frame; } -/** - @bug ^superbase:method would dynamically call ^base:method if there is any -*/ Value& Request::get_element(Value& ncontext, const String& name) { - if(!wcontext->get_constructing() // not constructing - && wcontext->get_somebody_entered_some_class() ) // ^class:method - if(VStateless_class *called_class=ncontext.get_class()) - if(VStateless_class *read_class=rcontext->get_class()) - if(read_class->derived_from(*called_class)) // current derived from called - if(Value* base=get_self().base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls - Value *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent - return *(value ? &process_to_value(*value) : VVoid::get()); - } - - Value* value=ncontext.get_element(name, ncontext, true); + if(wcontext->get_somebody_entered_some_class()) // ^class:method + if(VStateless_class *called_class=ncontext.get_class()) + if(VStateless_class *read_class=rcontext->get_class()) + if(read_class->derived_from(*called_class)){ // current derived from called + Value *value=called_class->get_element(get_self(), name); + return *(value ? &process_to_value(*value) : VVoid::get()); + } - if(value && wcontext->get_constructing()) - if(Junction* junction=value->get_junction()) - if(junction->self.get_class()!=&ncontext) - throw Exception(PARSER_RUNTIME, - &name, - "constructor must be declared in class '%s'", - ncontext.get_class()->name_cstr()); + Value* value=ncontext.get_element(name); return *(value ? &process_to_value(*value) : VVoid::get()); } void Request::put_element(Value& ncontext, const String& name, Value* value) { // put_element can return property-setting-junction - if(const VJunction* vjunction=ncontext.put_element(ncontext, name, value, false)) + if(const VJunction* vjunction=ncontext.put_element(name, value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { // process it VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); - int param_count=frame.method_params_count(); + size_t param_count=frame.method_params_count(); if(param_count!=1) throw Exception(PARSER_RUNTIME, 0, @@ -1437,12 +1353,12 @@ StringOrValue Request::process(Value& in if(junction) { if(junction->is_getter) { // is it a getter-junction? VMethodFrame frame(*junction, method_frame/*caller*/); - int param_count=frame.method_params_count(); + Value *param; - if(param_count){ + if(size_t param_count=frame.method_params_count()){ if(junction->auto_name){ // default getter if(param_count==1){ - Value *param=new VString(*junction->auto_name); + param=new VString(*junction->auto_name); frame.store_params(¶m, 1); } else throw Exception(PARSER_RUNTIME, @@ -1462,11 +1378,10 @@ StringOrValue Request::process(Value& in method_frame=&frame; recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it - StringOrValue result=wcontext->result(); RESTORE_CONTEXT - return result; + return frame.result(); } if(junction->code) { // is it a code-junction? @@ -1477,8 +1392,8 @@ StringOrValue Request::process(Value& in if(!junction->method_frame) throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + 0, + "junction used outside of context"); SAVE_CONTEXT @@ -1502,7 +1417,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1530,12 +1445,12 @@ void Request::process_write(Value& input if(junction) { if(junction->is_getter) { // is it a getter-junction? VMethodFrame frame(*junction, method_frame/*caller*/); - int param_count=frame.method_params_count(); + Value *param; - if(param_count){ + if(size_t param_count=frame.method_params_count()){ if(junction->auto_name){ // default getter if(param_count==1){ - Value *param=new VString(*junction->auto_name); + param=new VString(*junction->auto_name); frame.store_params(¶m, 1); } else throw Exception(PARSER_RUNTIME, @@ -1599,7 +1514,7 @@ void Request::process_write(Value& input write_pass_lang(local.result()); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1685,7 +1600,7 @@ Request::execute_nonvirtual_method(VStat const String* Request::execute_virtual_method(Value& aself, const String& method_name) { - if(Value* value=aself.get_element(method_name, aself, false)) + 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, 0/*no params*/, true);