--- parser3/src/classes/reflection.C	2009/07/28 08:03:05	1.3
+++ parser3/src/classes/reflection.C	2009/08/11 12:37:17	1.8
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (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/11 12:37:17 $";
 
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
@@ -16,9 +16,10 @@ 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_inherited("inherited");
 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 +50,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,10 +175,9 @@ static void _base_name(Request& r, Metho
 			r.write_no_lang(*get_class_name(base));
 }
 
-
 static void store_method_info(
-		HashString<Method*>::key_type key, 
-		HashString<Method*>::value_type method,
+		HashStringMethod::key_type key, 
+		HashStringMethod::value_type method,
 		HashStringValue* result
 ) {
 	result->put(key, new VString(method->native_code?method_type_native:method_type_parser));
@@ -193,7 +193,7 @@ static void _methods(Request& r, MethodP
 
 	VHash& result=*new VHash;
 	if(VStateless_class* lclass=class_value->get_class()){
-		HashString<Method*> methods=lclass->get_methods();
+		HashStringMethod methods=lclass->get_methods();
 		methods.for_each(store_method_info, result.get_hash());
 	} else {
 		// class which does not have methods (env, console, etc)
@@ -202,7 +202,7 @@ static void _methods(Request& r, MethodP
 }
 
 
-static void _method_params(Request& r, MethodParams& params) {
+static void _method_info(Request& r, MethodParams& params) {
 	const String& class_name=params.as_string(0, "class_name must be string");
 	Value* class_value=r.classes().get(class_name);
 	if(!class_value)
@@ -226,23 +226,29 @@ static void _method_params(Request& r, M
 
 	VHash& result=*new VHash;
 	HashStringValue* hash=result.get_hash();
+
+	VStateless_class* c=lclass;
+	while(c->base() && c->base()->get_class() && c->base()->get_class()->get_method(method_name))
+		c=c->base()->get_class();
+
+	if(c!=lclass)
+		hash->put(method_inherited, new VString(c->name()));
+
 	if(method->native_code){
 		// 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)
@@ -277,5 +283,5 @@ MReflection::MReflection(): Methoded("re
 	add_native_method("methods", Method::CT_STATIC, _methods, 1, 1);
 
 	// ^reflection:method_params[class_name;method_name]
-	add_native_method("method_params", Method::CT_STATIC, _method_params, 2, 2);
+	add_native_method("method_info", Method::CT_STATIC, _method_info, 2, 2);
 }