--- parser3/src/classes/reflection.C	2010/08/01 14:49:33	1.17
+++ parser3/src/classes/reflection.C	2011/02/20 05:32:39	1.23
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_REFLECTION_C="$Date: 2010/08/01 14:49:33 $";
+static const char * const IDENT_REFLECTION_C="$Date: 2011/02/20 05:32:39 $";
 
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
@@ -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
@@ -107,7 +106,8 @@ static void _create(Request& r, MethodPa
 		frame.empty_params();
 	}
 	r.op_call(frame);
-	r.write_pass_lang(object);
+	object.enable_default_setter();
+	r.write_pass_lang(frame.result());
 }
 
 
@@ -236,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
@@ -279,6 +281,18 @@ static void _dynamical(Request& r, Metho
 	}
 }
 
+static void _copy(Request& r, MethodParams& params) {
+	HashStringValue* src=params.as_no_junction(0, "source must not be code").get_hash();
+
+	if(src==NULL) 
+		throw Exception(PARSER_RUNTIME, 0, "source must have hash representation");
+
+	Value& dst=params.as_no_junction(1, "destination must not be code");
+
+	for(HashStringValue::Iterator i(*src); i; i.next())
+		r.put_element(dst, *new String(i.key(), String::L_TAINTED), i.value());
+}
+
 // constructor
 MReflection::MReflection(): Methoded("reflection") {
 	// ^reflection:create[class_name;constructor_name[;param1[;param2[;...]]]]
@@ -310,4 +324,7 @@ MReflection::MReflection(): Methoded("re
 
 	// ^reflection:dynamical[[object or class, caller if absent]]
 	add_native_method("dynamical", Method::CT_STATIC, _dynamical, 0, 1);
+
+	// ^reflection:copy[src;dst]
+	add_native_method("copy", Method::CT_STATIC, _copy, 2, 2);
 }