--- parser3/src/classes/reflection.C	2017/02/07 22:00:29	1.83
+++ parser3/src/classes/reflection.C	2023/09/26 20:49:06	1.89
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b reflection parser class.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "pa_vmethod_frame.h"
@@ -10,7 +10,7 @@
 #include "pa_vbool.h"
 #include "pa_vobject.h"
 
-volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.83 2017/02/07 22:00:29 moko Exp $";
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.89 2023/09/26 20:49:06 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -66,7 +66,7 @@ static void _create(Request& r, MethodPa
 			valid_options++;
 			params_hash=vparams_hash->as_hash("arguments");
 			if(params.count()>1)
-				throw Exception(PARSER_RUNTIME, 0, "agruments should not be specified as hash and as create params");
+				throw Exception(PARSER_RUNTIME, 0, "arguments should not be specified as hash and as create params");
 		}
 		if(valid_options!=options->count())
 			throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -88,15 +88,13 @@ static void _create(Request& r, MethodPa
 		params_offset=2;
 	}
 
-	VStateless_class* vclass=r.get_class(*class_name);
-	if(!vclass)
-		throw Exception(PARSER_RUNTIME, class_name, "class is undefined");
+	VStateless_class& vclass=r.get_class_ref(*class_name);
 
-	const Method* method=vclass->get_method(*constructor_name);
+	const Method* method=vclass.get_method(*constructor_name);
 	if(!method)
-		throw Exception(PARSER_RUNTIME, constructor_name, "constructor not found in class '%s'", vclass->type());
+		throw Exception(PARSER_RUNTIME, constructor_name, "constructor not found in class '%s'", vclass.type());
 
-	Value &object = r.construct(*vclass, *method);
+	Value &object = r.construct(vclass, *method);
 
 	int nparams=params_hash ? params_hash->count() : (params.count()-params_offset);
 	if(nparams>MAX_CREATE_PARAMS)
@@ -162,10 +160,7 @@ static void _class_name(Request& r, Meth
 
 static void _class_by_name(Request& r, MethodParams& params) {
 	const String& class_name=params.as_string(0, "class_name must be string");
-	Value* class_value=r.get_class(class_name);
-	if(!class_value)
-		throw Exception(PARSER_RUNTIME, &class_name, "class is undefined");
-	r.write(*class_value);
+	r.write(r.get_class_ref(class_name));
 }
 
 static void _base(Request& r, MethodParams& params) {
@@ -199,13 +194,39 @@ static void _def(Request& r, MethodParam
 
 static void _methods(Request& r, MethodParams& params) {
 	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");
+	VStateless_class& vclass=r.get_class_ref(class_name);
+
+	bool reverse=true;
+
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1, "methods options")) {
+			int valid_options=0;
+			for(HashStringValue::Iterator i(*options); i; i.next() ){
+				String::Body key=i.key();
+				Value* value=i.value();
+				if(key == "reverse") {
+					reverse=r.process(*value).as_bool();
+					valid_options++;
+				}
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	VHash& result=*new VHash;
-	for(HashStringMethod::Iterator i(vclass->get_methods()); i; i.next()){
-		result.hash().put(i.key(), new VString(i.value()->native_code ? method_type_native : method_type_parser));
+
+#ifdef HASH_ORDER
+	if(reverse){
+		for(HashStringMethod::ReverseIterator i(vclass.get_methods()); i; i.prev()){
+			result.hash().put(i.key(), new VString(i.value()->native_code ? method_type_native : method_type_parser));
+		}
+	} else {
+#else
+	{
+#endif
+		for(HashStringMethod::Iterator i(vclass.get_methods()); i; i.next()){
+			result.hash().put(i.key(), new VString(i.value()->native_code ? method_type_native : method_type_parser));
+		}
 	}
 
 	r.write(result);
@@ -289,21 +310,18 @@ static void _method_info(Request& r, Met
 
 	} 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);
-
-		if(!vclass)
-			throw Exception(PARSER_RUNTIME, &class_name, "class is undefined");
+		VStateless_class& vclass=r.get_class_ref(class_name);
 
 		if(params.count()==1)
 			throw Exception(PARSER_RUNTIME, 0, "method name must be specified");
 
 		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());
+		if(!(method=vclass.get_method(method_name)))
+			throw Exception(PARSER_RUNTIME, &method_name, "method not found in class '%s'", vclass.type());
 
 		Method* base_method;
-		if(vclass && vclass->base() && (base_method=vclass->base()->get_method(*method->name))){
-			VStateless_class* c=vclass->base()->get_class();
+		if(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())));
@@ -662,7 +680,7 @@ MReflection::MReflection(): Methoded("re
 	add_native_method("def", Method::CT_STATIC, _def, 2, 2);
 
 	// ^reflection:methods[class_name]
-	add_native_method("methods", Method::CT_STATIC, _methods, 1, 1);
+	add_native_method("methods", Method::CT_STATIC, _methods, 1, 2);
 
 	// ^reflection:method[object or class;method_name[;self]]
 	// ^reflection:method[junction[;self]]