--- parser3/src/classes/reflection.C	2016/11/01 23:10:41	1.64
+++ parser3/src/classes/reflection.C	2016/11/26 22:54:17	1.67
@@ -10,7 +10,7 @@
 #include "pa_vbool.h"
 #include "pa_vobject.h"
 
-volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.64 2016/11/01 23:10:41 moko Exp $";
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.67 2016/11/26 22:54:17 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -78,7 +78,7 @@ static void _create(Request& r, MethodPa
 
 		max_params_count=method->max_numbered_params_count;
 	} else {
-		max_params_count=method->params_names?method->params_names->count():0;
+		max_params_count=method->params_count;
 	}
 
 	if(nparams>max_params_count)
@@ -90,19 +90,20 @@ static void _create(Request& r, MethodPa
 			nparams);
 
 	Value &object = r.construct(*vclass, *method);
-	VConstructorFrame frame(*method, r.get_method_frame(), object);
 
-	Value* v[100];
-	if(nparams>0){
-		for(int i=0; i<nparams; i++)
-			v[i]=&r.process(params[i+2]);
-		frame.store_params((Value**)&v, nparams);
-	} else {
-		frame.empty_params();
-	}
-	r.call(frame);
-	object.enable_default_setter();
-	r.write(frame.result());
+	CONSTRUCTOR_FRAME_ACTION(*method, r.get_method_frame(), object, {
+		Value* v[100];
+		if(nparams>0){
+			for(int i=0; i<nparams; i++)
+				v[i]=&r.process(params[i+2]);
+			frame.store_params((Value**)&v, nparams);
+		} else {
+			frame.empty_params();
+		}
+		r.call(frame);
+		object.enable_default_setter();
+		r.write(frame.result());
+	});
 }
 
 
@@ -258,14 +259,20 @@ static void _field(Request& r, MethodPar
 
 static void _method_info(Request& r, MethodParams& params) {
 	const Method* method;
-	VStateless_class* vclass=0;
+
+	VHash& result=*new VHash;
+	HashStringValue* hash=result.get_hash();
 
 	if(Junction *j=params[0].get_junction()){
 		if(!(method=j->method))
 			throw Exception(PARSER_RUNTIME, 0, "param must be class name or method junction");
+
+		hash->put(method_name, new VString(*method->name));
 	} else {
 		const String& class_name=params.as_string(0, "param must be class name or method junction");
-		if(!(vclass=r.get_class(class_name)))
+		VStateless_class* vclass=r.get_class(class_name);
+
+		if(!vclass)
 			throw Exception(PARSER_RUNTIME, &class_name, "class is undefined");
 
 		if(params.count()==1)
@@ -274,18 +281,14 @@ static void _method_info(Request& r, Met
 		const String& method_name=params.as_string(1, "method name must be string");
 		if(!(method=vclass->get_method(method_name)))
 			throw Exception(PARSER_RUNTIME, &method_name, "method not found in class '%s'", vclass->type());
-	}
 
-	VHash& result=*new VHash;
-	HashStringValue* hash=result.get_hash();
-	hash->put(method_name, new VString(*method->name));
-
-	Method* base_method;
-	if(vclass && vclass->base() && (base_method=vclass->base()->get_method(*method->name))){
-		VStateless_class* c=vclass->base()->get_class();
-		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(*new String(c->type())));
+		Method* base_method;
+		if(vclass && vclass->base() && (base_method=vclass->base()->get_method(*method->name))){
+			VStateless_class* c=vclass->base()->get_class();
+			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(*new String(c->type())));
+		}
 	}
 
 	Value* call_type=0;
@@ -325,6 +328,14 @@ static void _method_info(Request& r, Met
 	r.write(result);
 }
 
+static void _filename(Request& r, MethodParams& params) {
+	Value& o=params.as_no_junction(0, "param must be object or class, not junction");
+
+	if(VClass* vclass = dynamic_cast<VClass*>(o.get_class())){
+		r.write(*new VString(vclass->get_filename()));
+	}
+}
+
 static void _dynamical(Request& r, MethodParams& params) {
 	if(params.count()){
 		r.write(VBool::get(params[0].get_class() != &params[0]));
@@ -497,6 +508,9 @@ MReflection::MReflection(): Methoded("re
 	// ^reflection:method_info[junction]
 	add_native_method("method_info", Method::CT_STATIC, _method_info, 1, 2);
 
+	// ^reflection:filename[object or class]
+	add_native_method("filename", Method::CT_STATIC, _filename, 1, 1);
+
 	// ^reflection:fields[object or class]
 	add_native_method("fields", Method::CT_STATIC, _fields, 1, 1);