--- parser3/src/classes/reflection.C 2020/12/15 17:10:29 1.87 +++ 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-2020 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #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.87 2020/12/15 17:10:29 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"); @@ -88,15 +90,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 +162,16 @@ 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 _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) { @@ -193,15 +199,13 @@ 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()); } } 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; @@ -224,14 +228,14 @@ static void _methods(Request& r, MethodP #ifdef HASH_ORDER if(reverse){ - for(HashStringMethod::ReverseIterator i(vclass->get_methods()); i; i.prev()){ + 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()){ + 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)); } } @@ -317,21 +321,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()))); @@ -362,14 +363,25 @@ 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; iparams_names->count(); i++) - hash->put(String::Body::Format(i), new VString(*method->params_names->get(i))); + hash->put(pa_uitoa(i), new VString(*method->params_names->get(i))); 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; inamed_params)[i]; + array+=new VString(fname); + } + hash->put(method_named_params, &named_params); + } } r.write(result); @@ -653,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++; @@ -680,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);