--- parser3/src/main/execute.C 2009/06/16 08:40:32 1.350 +++ parser3/src/main/execute.C 2010/04/19 19:39:54 1.360 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/06/16 08:40:32 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2010/04/19 19:39:54 $"; #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 @@ -276,11 +272,11 @@ void Request::execute(ArrayOperation& op debug_origin=i.next().origin; Value& value=*i.next().value; - const String& name=*value.get_string(); + const String& name=*value.get_string(); debug_name=&name; DEBUG_PRINT_STRING(name) - Value* class_value=classes().get(name); + Value* class_value=get_class(name); if(!class_value) throw Exception(PARSER_RUNTIME, &name, @@ -295,8 +291,8 @@ void Request::execute(ArrayOperation& op // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); - const String& name=stack.pop().string(); - Value* value=classes().get(name); + const String& name=stack.pop().string(); debug_name=&name; + Value* value=get_class(name); if(!value) throw Exception(PARSER_RUNTIME, &name, @@ -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: @@ -548,7 +543,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(var_name) - const String* field=get_element(*rcontext, var_name).get_string(); + const String* field=&get_element(*rcontext, var_name).as_string(); Value& value=get_element(object, *field); @@ -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,14 +708,6 @@ void Request::execute(ArrayOperation& op break; } -#ifndef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT - case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: - { - SET_CONSTRUCTING(wcontext,true) - break; - } -#endif - case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); @@ -762,7 +749,7 @@ void Request::execute(ArrayOperation& op } VMethodFrame frame(*junction, method_frame); - METHOD_FRAME_ACTION(op_call(frame, GET_CONSTRUCTING(wcontext))); + METHOD_FRAME_ACTION(op_call(frame, false)); stack.push(frame.result().as_value()); DEBUG_PRINT_STR("<-returned") @@ -802,7 +789,7 @@ void Request::execute(ArrayOperation& op #ifdef OPTIMIZE_CALL const Method& method=*junction->method; - if (!GET_CONSTRUCTING(wcontext) && 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); @@ -818,14 +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 (!GET_CONSTRUCTING(wcontext) && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ VMethodFrame frame(*junction, method_frame); METHOD_FRAME_ACTION(op_call_write(frame)); } else #endif // OPTIMIZE_CALL { VMethodFrame frame(*junction, method_frame); - METHOD_FRAME_ACTION(op_call(frame, GET_CONSTRUCTING(wcontext))); + METHOD_FRAME_ACTION(op_call(frame, false)); write_pass_lang(frame.result()); } @@ -842,27 +829,21 @@ 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(); + const String& class_name=*vclass_name.get_string(); debug_name=&class_name; DEBUG_PRINT_STRING(class_name) - Value* class_value=classes().get(class_name); + Value* class_value=get_class(class_name); if(!class_value) throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); - SET_CONSTRUCTING(wcontext,true) - debug_origin=i.next().origin; Value& vconstructor_name=*i.next().value; const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; @@ -872,19 +853,19 @@ void Request::execute(ArrayOperation& op Value& constructor_value=get_element(*class_value, constructor_name); Junction* junction=constructor_value.get_junction(); -#ifdef OPTIMIZE_CONSTRUCT_OBJECT - if(!junction || junction->self.get_class()!=class_value) + if(!junction) throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", class_value->get_class()->name_cstr()); -#endif ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) DEBUG_PRINT_STR("->\n") - VMethodFrame frame(*junction, method_frame); + Junction casted=Junction(*class_value, junction->method); + VConstructorFrame frame(casted, method_frame); + METHOD_FRAME_ACTION(op_call(frame, true /* constructing */)); if(opcode==OP::OP_CONSTRUCT_OBJECT) stack.push(frame.result().as_value()); @@ -894,7 +875,6 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STR("<-returned") break; } -#endif // OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT // expression ops: unary case OP::OP_NEG: @@ -1233,10 +1213,9 @@ void Request::op_call(VMethodFrame& fram Value* new_self; if(constructing) { - SET_CONSTRUCTING(wcontext,false) 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, @@ -1244,9 +1223,7 @@ void Request::op_call(VMethodFrame& fram "is not a constructor, system class '%s' can be constructed only implicitly", called_class.name().cstr()); - frame.write(*new_self, - String::L_CLEAN // not used, always an object, not string - ); + frame.write(*new_self); } else throw Exception(PARSER_RUNTIME, 0, //&frame.name(), @@ -1313,42 +1290,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(!GET_CONSTRUCTING(wcontext) // 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()); - } + 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()); + } - Value* value=ncontext.get_element(name, ncontext, true); - - if(value && GET_CONSTRUCTING(wcontext)) - 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, @@ -1388,12 +1351,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, @@ -1413,11 +1376,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? @@ -1428,8 +1390,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 @@ -1453,7 +1415,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1481,12 +1443,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, @@ -1550,7 +1512,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 @@ -1607,15 +1569,13 @@ const String* Request::execute_method(Va // prevent non-string writes for better error reporting if(do_return_string) - wcontext->write(local_frame); + local_frame.write(local_frame); // execute! execute(*method.parser_code); // result - const String* result=0; - if(do_return_string) - result=&wcontext->result().as_string(); + const String* result=do_return_string ? local_frame.get_string() : 0; RESTORE_CONTEXT @@ -1636,7 +1596,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);