--- parser3/src/classes/reflection.C	2009/08/11 12:37:17	1.8
+++ parser3/src/classes/reflection.C	2012/06/05 10:30:32	1.28
@@ -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: 2009/08/11 12:37:17 $";
-
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
 #include "pa_vbool.h"
 
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.28 2012/06/05 10:30:32 misha 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
@@ -42,7 +41,7 @@ DECLARE_CLASS_VAR(reflection, new MRefle
 
 static void _create(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);
+	Value* class_value=r.get_class(class_name);
 
 	if(!class_value)
 		throw Exception(PARSER_RUNTIME,
@@ -52,7 +51,7 @@ static void _create(Request& r, MethodPa
 	const String& constructor_name=params.as_string(1, "constructor_name must be string");
 	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)
+	if(!constructor_value || !constructor_value->get_junction())
 		throw Exception(PARSER_RUNTIME,
 			&constructor_name,
 			"constructor must be declared in class '%s'",
@@ -83,7 +82,7 @@ static void _create(Request& r, MethodPa
 
 		max_params_count=method->max_numbered_params_count;
 	} else {
-		max_params_count=method->params_names->count();
+		max_params_count=method->params_names?method->params_names->count():0;
 	}
 
 	if(nparams>max_params_count)
@@ -95,7 +94,8 @@ static void _create(Request& r, MethodPa
 			max_params_count,
 			nparams);
 
-	VMethodFrame frame(*junction, r.get_method_frame());
+	Value &object = r.construct(*class_value, *method);
+	VConstructorFrame frame(*method, r.get_method_frame(), object);
 
 	Value* v[100];
 	if(nparams>0){
@@ -105,7 +105,8 @@ static void _create(Request& r, MethodPa
 	} else {
 		frame.empty_params();
 	}
-	r.op_call(frame, true/*constructing*/);
+	r.op_call(frame);
+	object.enable_default_setter();
 	r.write_pass_lang(frame.result());
 }
 
@@ -185,14 +186,14 @@ static void store_method_info(
 
 static void _methods(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);
+	Value* class_value=r.get_class(class_name);
 	if(!class_value)
 		throw Exception(PARSER_RUNTIME,
 			&class_name,
 			"class is undefined");
 
 	VHash& result=*new VHash;
-	if(VStateless_class* lclass=class_value->get_class()){
+	if(VStateless_class* lclass=class_value->get_class()) {
 		HashStringMethod methods=lclass->get_methods();
 		methods.for_each(store_method_info, result.get_hash());
 	} else {
@@ -201,10 +202,40 @@ static void _methods(Request& r, MethodP
 	r.write_no_lang(result);
 }
 
+static void _method(Request& r, MethodParams& params) {
+	Value& o=params.as_no_junction(0, "first param must be object or class, not junction");
+	const String& name=params.as_string(1, "method name must be string");
+
+	if(VStateless_class* lclass=o.get_class()) {
+		if(Method* method=lclass->get_method(name))
+			r.write_no_lang(*method->get_vjunction(o));
+	} else {
+		// class which does not have methods (env, console, etc)
+	}
+}
+
+static void _fields(Request& r, MethodParams& params) {
+	Value& o=params.as_no_junction(0, "param must be object or class, not junction");
+
+	if(HashStringValue* fields=o.get_fields()) {
+		VHash& result=*new VHash(*fields);
+		r.write_no_lang(result);
+	} else
+		r.write_no_lang(*new VHash());
+}
+
+static void _field(Request& r, MethodParams& params) {
+	Value& o=params.as_no_junction(0, "first param must be object or class, not junction");
+	const String& name=params.as_string(1, "field name must be string");
+
+	if(HashStringValue* fields=o.get_fields())
+		if(Value* value=fields->get(name))
+			r.write_no_lang(*value);
+}
 
 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);
+	Value* class_value=r.get_class(class_name);
 	if(!class_value)
 		throw Exception(PARSER_RUNTIME,
 			&class_name,
@@ -228,11 +259,13 @@ static void _method_info(Request& r, Met
 	HashStringValue* hash=result.get_hash();
 
 	VStateless_class* c=lclass;
-	while(c->base() && c->base()->get_class() && c->base()->get_class()->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
@@ -251,6 +284,9 @@ static void _method_info(Request& r, Met
 			hash->put(method_call_type, call_type);
 	} else {
 		// parser code
+		const String* filespec = r.get_method_filename(method);
+		if( filespec )
+			hash->put("file", new VString(*filespec));
 		if(method->params_names)
 			for(size_t i=0; i<method->params_names->count(); i++)
 				hash->put(String::Body::Format(i), new VString(*method->params_names->get(i)));
@@ -259,6 +295,44 @@ static void _method_info(Request& r, Met
 	r.write_no_lang(result);
 }
 
+static void _dynamical(Request& r, MethodParams& params) {
+	if(params.count()){
+		r.write_no_lang(VBool::get(params[0].get_class() != &params[0]));
+	} else {
+		VMethodFrame* caller=r.get_method_frame()->caller();
+		r.write_no_lang(VBool::get(caller && caller->get_class() != &caller->self()));
+	}
+}
+
+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());
+}
+
+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));
+}
+
+static void _delete(Request&, MethodParams& params) {
+	const String& key=params.as_string(1, "field name must be string");
+	if(HashStringValue* fields=params[0].get_fields()){
+		fields->remove(key);
+	}
+}
+
+
 // constructor
 MReflection::MReflection(): Methoded("reflection") {
 	// ^reflection:create[class_name;constructor_name[;param1[;param2[;...]]]]
@@ -282,6 +356,27 @@ MReflection::MReflection(): Methoded("re
 	// ^reflection:methods[class_name]
 	add_native_method("methods", Method::CT_STATIC, _methods, 1, 1);
 
-	// ^reflection:method_params[class_name;method_name]
+	// ^reflection:method[object or class;method_name]
+	add_native_method("method", Method::CT_STATIC, _method, 2, 2);
+
+	// ^reflection:method_info[class_name;method_name]
 	add_native_method("method_info", Method::CT_STATIC, _method_info, 2, 2);
+
+	// ^reflection:fields[object or class]
+	add_native_method("fields", Method::CT_STATIC, _fields, 1, 1);
+
+	// ^reflection:field[object or class;field_name]
+	add_native_method("field", Method::CT_STATIC, _field, 2, 2);
+
+	// ^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);
+
+	// ^reflection:uid[object or class]
+	add_native_method("uid", Method::CT_STATIC, _uid, 1, 1);
+
+	// ^reflection:delete[object or class;field_name]
+	add_native_method("delete", Method::CT_STATIC, _delete, 2, 2);
 }