--- parser3/src/classes/reflection.C	2024/09/11 21:07:36	1.90
+++ parser3/src/classes/reflection.C	2024/12/07 15:14:56	1.95
@@ -1,16 +1,17 @@
 /** @file
 	Parser: @b reflection parser class.
 
-	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
 #include "pa_vbool.h"
+#include "pa_varray.h"
 #include "pa_vobject.h"
 
-volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.90 2024/09/11 21:07:36 moko Exp $";
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.95 2024/12/07 15:14:56 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -26,6 +27,7 @@ static const String method_overridden("o
 static const String method_min_params("min_params");
 static const String method_max_params("max_params");
 static const String method_extra_param("extra_param");
+static const String method_named_params("named_params");
 
 static const String def_class("class");
 
@@ -163,6 +165,15 @@ static void _class_by_name(Request& r, M
 	r.write(r.get_class_ref(class_name));
 }
 
+static void _class_alias(Request& r, MethodParams& params) {
+	const String& src_class_name=params.as_string(0, "source class_name must be string");
+	const String& new_class_name=params.as_string(1, "alias class_name must be string");
+
+	VStateless_class &src_class=r.get_class_ref(src_class_name);
+	if(!r.add_class(new_class_name.cstr(), &src_class))
+		throw Exception(PARSER_RUNTIME, &new_class_name, "class is already defined");
+}
+
 static void _base(Request& r, MethodParams& params) {
 	if(VStateless_class* vclass=params[0].get_class())
 		if(Value* base=vclass->base()){
@@ -188,7 +199,7 @@ static void _def(Request& r, MethodParam
 		// can't use get_class because it will call @autouse[] if the class wasn't loaded
 		r.write(VBool::get(r.classes().get(name)!=0));
 	} else {
-		throw Exception(PARSER_RUNTIME, &type, "is invalid type, must be '%s'", def_class.cstr());
+		throw Exception(PARSER_RUNTIME, &type, "is an invalid type, must be '%s'", def_class.cstr());
 	}
 }
 
@@ -352,7 +363,7 @@ static void _method_info(Request& r, Met
 		if( filespec )
 			hash->put("file", new VString(*filespec));
 
-		hash->put(method_max_params, new VInt(method->params_names ? method->params_names->count() : 0));
+		hash->put(method_max_params, new VInt(method->params_count + (method->named_params ? 1 : 0)));
 
 		if(method->params_names)
 			for(size_t i=0; i<method->params_names->count(); i++)
@@ -360,6 +371,17 @@ static void _method_info(Request& r, Met
 
 		if(method->extra_params)
 			hash->put(method_extra_param, new VString(*method->extra_params));
+		if(method->named_params){
+			size_t named_count=method->named_params->count();
+			VArray& named_params=*new VArray(named_count);
+			ArrayValue &array=named_params.array();
+
+			for(int i=0; i<named_count; i++) {
+				const String& fname=*(*method->named_params)[i];
+				array+=new VString(fname);
+			}
+			hash->put(method_named_params, &named_params);
+		}
 	}
 
 	r.write(result);
@@ -643,7 +665,7 @@ static void _stack(Request& r, MethodPar
 				}
 			}
 
-			result->put(format(index, 0), &vcurrent);
+			result->put(pa_uitoa(index), &vcurrent);
 		}
 		caller=caller->caller();
 		index++;
@@ -670,6 +692,9 @@ MReflection::MReflection(): Methoded("re
 	// ^reflection:class_by_name[class_name]
 	add_native_method("class_by_name", Method::CT_STATIC, _class_by_name, 1, 1);
 
+	// ^reflection:class_alias[class_name;new_class_name]
+	add_native_method("class_alias", Method::CT_STATIC, _class_alias, 2, 2);
+
 	// ^reflection:base_class[object]
 	add_native_method("base", Method::CT_STATIC, _base, 1, 1);