--- parser3/src/classes/reflection.C 2009/07/28 08:03:05 1.3 +++ parser3/src/classes/reflection.C 2009/08/08 22:28:37 1.7 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REFLECTION_C="$Date: 2009/07/28 08:03:05 $"; +static const char * const IDENT_REFLECTION_C="$Date: 2009/08/08 22:28:37 $"; #include "pa_vmethod_frame.h" #include "pa_request.h" @@ -16,9 +16,9 @@ static const String class_type_methoded( static const String method_type_native("native"); static const String method_type_parser("parser"); +static const String method_call_type("call_type"); static const String method_call_type_static("static"); static const String method_call_type_dynamic("dynamic"); -static const String method_call_type_any("any"); static const String method_min_params("min_params"); static const String method_max_params("max_params"); @@ -49,7 +49,7 @@ static void _create(Request& r, MethodPa "class is undefined"); const String& constructor_name=params.as_string(1, "constructor_name must be string"); - Value* constructor_value=class_value->get_element(constructor_name, *class_value, true); + Value* constructor_value=class_value->get_element(constructor_name); if(!constructor_value || !constructor_value->get_junction() || constructor_value->get_junction()->self.get_class()!=class_value) throw Exception(PARSER_RUNTIME, @@ -174,13 +174,18 @@ static void _base_name(Request& r, Metho r.write_no_lang(*get_class_name(base)); } +struct Store_method_info { + VStateless_class* base_class; + HashStringValue* result; +}; static void store_method_info( - HashString::key_type key, - HashString::value_type method, - HashStringValue* result + HashStringMethod::key_type key, + HashStringMethod::value_type method, + Store_method_info* info ) { - result->put(key, new VString(method->native_code?method_type_native:method_type_parser)); + if(!info->base_class || info->base_class->get_method(String(key, String::L_CLEAN)) != method) + info->result->put(key, new VString(method->native_code?method_type_native:method_type_parser)); } static void _methods(Request& r, MethodParams& params) { @@ -193,8 +198,9 @@ static void _methods(Request& r, MethodP VHash& result=*new VHash; if(VStateless_class* lclass=class_value->get_class()){ - HashString methods=lclass->get_methods(); - methods.for_each(store_method_info, result.get_hash()); + HashStringMethod methods=lclass->get_methods(); + Store_method_info info={lclass->base()?lclass->base()->get_class():0, result.get_hash()}; + methods.for_each(store_method_info, &info); } else { // class which does not have methods (env, console, etc) } @@ -230,19 +236,17 @@ static void _method_params(Request& r, M // native code hash->put(method_min_params, new VInt(method->min_numbered_params_count)); hash->put(method_max_params, new VInt(method->max_numbered_params_count)); - const String* call_type; + Value* call_type=0; switch(method->call_type){ case Method::CT_DYNAMIC: - call_type=&method_call_type_dynamic; + call_type=new VString(method_call_type_dynamic); break; case Method::CT_STATIC: - call_type=&method_call_type_static; + call_type=new VString(method_call_type_static); break; - default: - call_type=&method_call_type_any; } - hash->put(String("call_type"), new VString(*call_type)); - + if(call_type) + hash->put(method_call_type, call_type); } else { // parser code if(method->params_names)