--- parser3/src/classes/reflection.C	2009/08/11 12:37:17	1.8
+++ parser3/src/classes/reflection.C	2010/08/01 14:49:33	1.17
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_REFLECTION_C="$Date: 2009/08/11 12:37:17 $";
+static const char * const IDENT_REFLECTION_C="$Date: 2010/08/01 14:49:33 $";
 
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
@@ -42,7 +42,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 +52,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 +83,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 +95,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,8 +106,8 @@ static void _create(Request& r, MethodPa
 	} else {
 		frame.empty_params();
 	}
-	r.op_call(frame, true/*constructing*/);
-	r.write_pass_lang(frame.result());
+	r.op_call(frame);
+	r.write_pass_lang(object);
 }
 
 
@@ -185,7 +186,7 @@ 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,
@@ -201,10 +202,17 @@ static void _methods(Request& r, MethodP
 	r.write_no_lang(result);
 }
 
+static void _fields(Request& r, MethodParams& params) {
+	if(HashStringValue* fields=params[0].get_fields()){
+		VHash& result=*new VHash(*fields);
+		r.write_no_lang(result);
+	} else
+		r.write_no_lang(*new VHash());
+}
 
 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,7 +236,7 @@ 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))
+	while(c->base() && c->base()->get_method(method_name))
 		c=c->base()->get_class();
 
 	if(c!=lclass)
@@ -251,6 +259,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 +270,15 @@ 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()));
+	}
+}
+
 // constructor
 MReflection::MReflection(): Methoded("reflection") {
 	// ^reflection:create[class_name;constructor_name[;param1[;param2[;...]]]]
@@ -282,6 +302,12 @@ 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:fields[object or class]
+	add_native_method("fields", Method::CT_STATIC, _fields, 1, 1);
+
+	// ^reflection:method_info[class_name;method_name]
 	add_native_method("method_info", Method::CT_STATIC, _method_info, 2, 2);
+
+	// ^reflection:dynamical[[object or class, caller if absent]]
+	add_native_method("dynamical", Method::CT_STATIC, _dynamical, 0, 1);
 }