--- parser3/src/classes/reflection.C	2016/07/20 17:27:42	1.49
+++ parser3/src/classes/reflection.C	2016/09/20 09:43:05	1.53
@@ -8,8 +8,9 @@
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
 #include "pa_vbool.h"
+#include "pa_vobject.h"
 
-volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.49 2016/07/20 17:27:42 moko Exp $";
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.53 2016/09/20 09:43:05 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -51,10 +52,7 @@ static void _create(Request& r, MethodPa
 	Value* constructor_value=vclass->get_element(constructor_name);
 
 	if(!constructor_value || !constructor_value->get_junction())
-		throw Exception(PARSER_RUNTIME,
-			&constructor_name,
-			"constructor must be declared in class '%s'",
-			vclass->type());
+		throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", vclass->type());
 
 	Junction* junction=constructor_value->get_junction();
 	const Method* method=junction->method;
@@ -116,30 +114,31 @@ static void _classes(Request& r, MethodP
 }
 
 
-static Value* get_class(Value* value){
-	if(VStateless_class* result=value->get_class())
-		return result;
-	else
-		// junction
+static Value& get_class(Value& value){
+	if(VStateless_class* result=value.get_class())
+		return *result;
+	else {
+		// we can't return code junction to outside as it's stack value
+		if(Junction *j=value.get_junction())
+			if(j->code)
+				throw Exception(PARSER_RUNTIME, 0, "param must not be code junction");
+		// method junction
 		return value;
+	}
 }
 
-static const String* get_class_name(Value* value){
-	if(VStateless_class* vclass=value->get_class())
-		return new String(vclass->type());
-	else
-		// junction
-		return new String(value->type());
+static const String& get_class_name(Value& value){
+	return *new String(get_class(value).type());
 }
 
 
 static void _class(Request& r, MethodParams& params) {
-	r.write_no_lang(*get_class(&params[0]));
+	r.write_no_lang(get_class(params[0]));
 }
 
 
 static void _class_name(Request& r, MethodParams& params) {
-	r.write_no_lang(*get_class_name(&params[0]));
+	r.write_no_lang(get_class_name(params[0]));
 }
 
 static void _class_by_name(Request& r, MethodParams& params) {
@@ -153,19 +152,19 @@ static void _class_by_name(Request& r, M
 static void _base(Request& r, MethodParams& params) {
 	if(VStateless_class* vclass=params[0].get_class())
 		if(Value* base=vclass->base()){
-			r.write_no_lang(*get_class(base));
+			r.write_no_lang(get_class(*base));
 			return;
 		}
 
 	// classes with fields only, like env & console or without base
-	r.write_no_lang(*VVoid::get());
+	r.write_value(*VVoid::get());
 }
 
 
 static void _base_name(Request& r, MethodParams& params) {
 	if(VStateless_class* vclass=params[0].get_class())
 		if(Value* base=vclass->base())
-			r.write_no_lang(*get_class_name(base));
+			r.write_no_lang(get_class_name(*base));
 }
 
 static void _def(Request& r, MethodParams& params) {
@@ -193,16 +192,40 @@ static void _methods(Request& r, MethodP
 	r.write_no_lang(result);
 }
 
+static VJunction &method_junction(Value &self, Method &method, const String *name=0){
+	if(method.native_code)
+		throw Exception(PARSER_RUNTIME, name, "method must not be native");
+
+	if(!(dynamic_cast<VObject*>(&self) || dynamic_cast<VClass*>(&self)))
+		throw Exception(PARSER_RUNTIME, 0, "self must be parser object or class");
+
+	return *method.get_vjunction(self);
+}
+
 static void _method(Request& r, MethodParams& params) {
-	Value& o=params.as_no_junction(0, "first param must be object or class, not junction");
+	Value &source=*params.get(0);
+
+	if(Junction *j=source.get_junction()){
+		if(Method* method=const_cast<Method*>(j->method)){
+			Value& self=params.count()>1 ? params.as_no_junction(1, "self must be object, not junction") : r.get_method_frame()->caller()->self();
+			r.write_no_lang(method_junction(self, *method));
+			return;
+		}
+		throw Exception(PARSER_RUNTIME, 0, "param must be method junction");
+	}
+
+	if(params.count()==1)
+		throw Exception(PARSER_RUNTIME, 0, "method name must be specified");
+
 	const String& name=params.as_string(1, "method name must be string");
 
-	if(VStateless_class* vclass=o.get_class()) {
-		if(Method* method=vclass->get_method(name))
-			r.write_no_lang(*method->get_vjunction(o));
-	} else {
-		// class which does not have methods (env, console, etc)
+	if(VStateless_class* vclass=source.get_class()) {
+		if(Method* method=vclass->get_method(name)){
+			r.write_no_lang( params.count()>2 ? method_junction(params.as_no_junction(2, "self must be object, not junction"), *method, &name) : *method->get_vjunction(source) );
+			return;
+		}
 	}
+	r.write_value(*VVoid::get());
 }
 
 static void _fields(Request& r, MethodParams& params) {
@@ -241,7 +264,7 @@ static void _method_info(Request& r, Met
 	const String& method_name=params.as_string(1, "method_name must be string");
 	Method* method=vclass->get_method(method_name);
 	if(!method)
-		throw Exception(PARSER_RUNTIME, &method_name, "method not found in class %s", class_name.cstr());
+		throw Exception(PARSER_RUNTIME, &method_name, "method not found in class '%s'", vclass->type());
 
 	VHash& result=*new VHash;
 	HashStringValue* hash=result.get_hash();
@@ -377,7 +400,7 @@ MReflection::MReflection(): Methoded("re
 	add_native_method("methods", Method::CT_STATIC, _methods, 1, 1);
 
 	// ^reflection:method[object or class;method_name]
-	add_native_method("method", Method::CT_STATIC, _method, 2, 2);
+	add_native_method("method", Method::CT_STATIC, _method, 1, 3);
 
 	// ^reflection:method_info[class_name;method_name]
 	add_native_method("method_info", Method::CT_STATIC, _method_info, 2, 2);