--- parser3/src/classes/reflection.C	2016/11/24 14:59:32	1.66
+++ parser3/src/classes/reflection.C	2016/12/01 21:49:02	1.72
@@ -10,7 +10,7 @@
 #include "pa_vbool.h"
 #include "pa_vobject.h"
 
-volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.66 2016/11/24 14:59:32 moko Exp $";
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.72 2016/12/01 21:49:02 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -18,6 +18,7 @@ static const String method_type_native("
 static const String method_type_parser("parser");
 
 static const String method_name("name");
+static const String method_class_name("class");
 static const String method_call_type("call_type");
 static const String method_inherited("inherited");
 static const String method_overridden("overridden");
@@ -43,53 +44,21 @@ 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");
+	const Method* method;
+	const String& class_name=params.as_string(0, "class name must be string");
 	VStateless_class* vclass=r.get_class(class_name);
 
 	if(!vclass)
 		throw Exception(PARSER_RUNTIME, &class_name, "class is undefined");
 
-	const String& constructor_name=params.as_string(1, "constructor_name must be string");
-	Value* constructor_value=vclass->get_element(constructor_name);
+	const String& constructor_name=params.as_string(1, "constructor name must be string");
 
-	if(!constructor_value || !constructor_value->get_junction())
-		throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", vclass->type());
+	if(!(method=vclass->get_method(constructor_name)))
+		throw Exception(PARSER_RUNTIME, &constructor_name, "constructor not found in class '%s'", vclass->type());
 
-	Junction* junction=constructor_value->get_junction();
-	const Method* method=junction->method;
+	Value &object = r.construct(*vclass, *method);
 
 	int nparams=params.count()-2;
-	int max_params_count;
-
-	if(method->native_code){
-		if(method->call_type==Method::CT_STATIC)
-			throw Exception(PARSER_RUNTIME,
-				&constructor_name,
-				"native method of class '%s' is not allowed to be called dynamically",
-				vclass->type());
-
-		if(nparams<method->min_numbered_params_count)
-			throw Exception(PARSER_RUNTIME,
-				&constructor_name,
-				"native method of class '%s' accepts minimum %d parameter(s) (%d passed)",
-				vclass->type(),
-				method->min_numbered_params_count,
-				nparams);
-
-		max_params_count=method->max_numbered_params_count;
-	} else {
-		max_params_count=method->params_count;
-	}
-
-	if(nparams>max_params_count)
-		throw Exception(PARSER_RUNTIME,
-			&constructor_name,
-			"method of class '%s' accepts maximum %d parameter(s) (%d passed)",
-			vclass->type(),
-			max_params_count,
-			nparams);
-
-	Value &object = r.construct(*vclass, *method);
 
 	CONSTRUCTOR_FRAME_ACTION(*method, r.get_method_frame(), object, {
 		Value* v[100];
@@ -268,6 +237,8 @@ static void _method_info(Request& r, Met
 			throw Exception(PARSER_RUNTIME, 0, "param must be class name or method junction");
 
 		hash->put(method_name, new VString(*method->name));
+		hash->put(method_class_name, new VString(*new String(j->self.type())));
+
 	} else {
 		const String& class_name=params.as_string(0, "param must be class name or method junction");
 		VStateless_class* vclass=r.get_class(class_name);
@@ -311,7 +282,7 @@ static void _method_info(Request& r, Met
 		hash->put(method_max_params, new VInt(method->max_numbered_params_count));
 	} else {
 		// parser code
-		const String* filespec = r.get_method_filename(method);
+		const String* filespec = r.get_method_filespec(method);
 		if( filespec )
 			hash->put("file", new VString(*filespec));
 
@@ -328,6 +299,22 @@ static void _method_info(Request& r, Met
 	r.write(result);
 }
 
+static void _filename(Request& r, MethodParams& params) {
+	if(Junction *j=params[0].get_junction()){
+		if(const Method* method=j->method){
+			if(!method->native_code)
+				if(const String* filespec = r.get_method_filespec(method))
+					r.write(*new VString(*filespec));
+			return;
+		}
+		throw Exception(PARSER_RUNTIME, 0, "param must be object, class or method junction");
+	}
+
+	if(VClass* vclass = dynamic_cast<VClass*>(params[0].get_class())){
+		r.write(*new VString(vclass->get_filespec()));
+	}
+}
+
 static void _dynamical(Request& r, MethodParams& params) {
 	if(params.count()){
 		r.write(VBool::get(params[0].get_class() != &params[0]));
@@ -466,7 +453,7 @@ static void _mixin(Request& r, MethodPar
 // constructor
 MReflection::MReflection(): Methoded("reflection") {
 	// ^reflection:create[class_name;constructor_name[;param1[;param2[;...]]]]
-	add_native_method("create", Method::CT_STATIC, _create, 2, 102);
+	add_native_method("create", Method::CT_STATIC, _create, 1, 101);
 
 	// ^reflection:classes[]
 	add_native_method("classes", Method::CT_STATIC, _classes, 0, 0);
@@ -500,6 +487,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);