--- parser3/src/classes/reflection.C	2010/09/05 21:01:24	1.20
+++ parser3/src/classes/reflection.C	2012/05/19 20:44:57	1.25
@@ -1,16 +1,16 @@
 /** @file
 	Parser: @b reflection parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_REFLECTION_C="$Date: 2010/09/05 21:01:24 $";
-
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
 #include "pa_vbool.h"
 
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.25 2012/05/19 20:44:57 moko Exp $";
+
 static const String class_type_methoded("methoded");
 
 static const String method_type_native("native");
@@ -18,6 +18,7 @@ static const String method_type_parser("
 
 static const String method_call_type("call_type");
 static const String method_inherited("inherited");
+static const String method_overridden("overridden");
 static const String method_call_type_static("static");
 static const String method_call_type_dynamic("dynamic");
 
@@ -29,8 +30,6 @@ static const String method_max_params("m
 class MReflection: public Methoded {
 public:
 	MReflection();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
@@ -108,7 +107,7 @@ static void _create(Request& r, MethodPa
 	}
 	r.op_call(frame);
 	object.enable_default_setter();
-	r.write_pass_lang(object);
+	r.write_pass_lang(frame.result());
 }
 
 
@@ -237,11 +236,13 @@ static void _method_info(Request& r, Met
 	HashStringValue* hash=result.get_hash();
 
 	VStateless_class* c=lclass;
-	while(c->base() && c->base()->get_method(method_name))
+	Method* base_method;
+	if(c->base() && (base_method=c->base()->get_method(method_name))){
 		c=c->base()->get_class();
-
-	if(c!=lclass)
-		hash->put(method_inherited, new VString(c->name()));
+		while(c->base() && base_method==c->base()->get_method(method_name))
+			c=c->base()->get_class();
+		hash->put((base_method==method) ? method_inherited : method_overridden, new VString(c->name()));
+	}
 
 	if(method->native_code){
 		// native code
@@ -292,6 +293,15 @@ static void _copy(Request& r, MethodPara
 		r.put_element(dst, *new String(i.key(), String::L_TAINTED), i.value());
 }
 
+static void _uid(Request& r, MethodParams& params) {
+	Value& obj=params.as_no_junction(0, "object must not be code");
+
+	char local_buf[MAX_NUMBER];
+	int size=snprintf(local_buf, sizeof(local_buf), "%p", &obj);
+
+	r.write_pass_lang(*new String(pa_strdup(local_buf, (size_t)size), String::L_CLEAN, size));
+}
+
 // constructor
 MReflection::MReflection(): Methoded("reflection") {
 	// ^reflection:create[class_name;constructor_name[;param1[;param2[;...]]]]
@@ -326,4 +336,7 @@ MReflection::MReflection(): Methoded("re
 
 	// ^reflection:copy[src;dst]
 	add_native_method("copy", Method::CT_STATIC, _copy, 2, 2);
+
+	// ^reflection:uid[object or class]
+	add_native_method("uid", Method::CT_STATIC, _uid, 1, 1);
 }