--- parser3/src/main/execute.C 2009/08/11 10:19:02 1.356 +++ parser3/src/main/execute.C 2010/05/25 03:58:25 1.362 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/08/11 10:19:02 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2010/05/25 03:58:25 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -33,11 +33,7 @@ char *opcode_name[]={ // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", -#ifdef OPTIMIZE_BYTECODE_GET_CLASS "VALUE__GET_CLASS", -#else - "GET_CLASS", -#endif "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -167,9 +163,7 @@ void debug_dump(SAPI_Info& sapi_info, in if( opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE -#ifdef OPTIMIZE_BYTECODE_GET_CLASS || opcode==OP::OP_VALUE__GET_CLASS -#endif #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT__WRITE @@ -263,8 +257,6 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - -#ifdef OPTIMIZE_BYTECODE_GET_CLASS case OP::OP_VALUE__GET_CLASS: { // maybe they do ^class:method[] call, remember the fact @@ -272,11 +264,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, @@ -285,23 +277,6 @@ void Request::execute(ArrayOperation& op stack.push(*class_value); break; } -#else - case OP::OP_GET_CLASS: - { - // 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); - if(!value) - throw Exception(PARSER_RUNTIME, - &name, - "class is undefined"); - - stack.push(*value); - break; - } -#endif // OP_WITH case OP::OP_WITH_ROOT: { @@ -543,7 +518,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); @@ -834,11 +809,11 @@ void Request::execute(ArrayOperation& op { 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, @@ -864,7 +839,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STR("->\n") Junction casted=Junction(*class_value, junction->method); - VMethodFrame frame(casted, method_frame); + VConstructorFrame frame(casted, method_frame); METHOD_FRAME_ACTION(op_call(frame, true /* constructing */)); if(opcode==OP::OP_CONSTRUCT_OBJECT) @@ -1223,9 +1198,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(), @@ -1571,15 +1544,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 @@ -1607,3 +1578,67 @@ const String* Request::execute_virtual_m return 0; } + +const String* Request::get_method_filename(const Method* method){ + if(ArrayOperation* code=method->parser_code) + if(code){ + Operation::Origin origin={0, 0, 0}; + Array_iterator i(*code); + while( i.has_next() ){ + switch( i.next().code ){ + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__CONSTRUCT: + case OP::OP_NESTED_CODE: + case OP::OP_OBJECT_POOL: + case OP::OP_STRING_POOL: + case OP::OP_CALL: + case OP::OP_CALL__WRITE: + { + i.next(); // skip local ops + i.next(); // skip next opcode + // continue execution + } + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + case OP::OP_VALUE: + case OP::OP_STRING__WRITE: + case OP::OP_VALUE__GET_CLASS: +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT: + case OP::OP_GET_OBJECT_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: + case OP::OP_VALUE__GET_ELEMENT__WRITE: + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: +#endif + { + origin=i.next().origin; + break; + } + } + if(origin.file_no) + return get_used_filename(origin.file_no); + } + } + return 0; +} +