--- parser3/src/classes/reflection.C 2020/12/31 12:08:34 1.88 +++ parser3/src/classes/reflection.C 2026/04/25 13:38:46 1.104 @@ -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-2026 Art. Lebedev Studio (https://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.88 2020/12/31 12:08:34 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.104 2026/04/25 13:38:46 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"); @@ -124,7 +126,7 @@ static void _create(Request& r, MethodPa static void _classes(Request& r, MethodParams&) { VHash& result=*new VHash; - for(HashString::Iterator i(r.classes()); i; i.next()){ + for(OrderedHashString::Iterator i(r.classes()); i; i.next()){ result.hash().put(i.key(), i.value()->get_methods().count()>0 ? new VString(class_type_methoded) : VVoid::get() ); } r.write(result); @@ -159,10 +161,19 @@ 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"); + const String& class_name=params.as_string(0, "class name must be string"); 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()); } } @@ -247,7 +258,7 @@ static void _method(Request& r, MethodPa if(Junction *j=source.get_junction()){ if(Method* method=const_cast(j->method)){ - Value& self=params.count()>1 ? params.as_no_junction(1, "self must be object, not junction") : r.get_method_frame()->caller()->self(); + Value& self=params.count()>1 ? params.as_no_junction(1, "self must be object") : r.get_method_frame()->caller()->self(); r.write(method_junction(self, *method)); return; } @@ -261,7 +272,7 @@ static void _method(Request& r, MethodPa if(VStateless_class* vclass=source.get_class()) { if(Method* method=vclass->get_method(name)){ - r.write( params.count()>2 ? method_junction(params.as_no_junction(2, "self must be object, not junction"), *method) : *method->get_vjunction(source) ); + r.write( params.count()>2 ? method_junction(params.as_no_junction(2, "self must be object"), *method) : *method->get_vjunction(source) ); return; } } @@ -269,7 +280,7 @@ static void _method(Request& r, MethodPa } static void _fields(Request& r, MethodParams& params) { - Value& o=params.as_no_junction(0, "param must be object or class, not junction"); + Value& o=params.as_no_junction(0, "param must be object or class"); if(HashStringValue* fields=o.get_fields()) r.write(*new VHash(*fields)); @@ -278,7 +289,7 @@ static void _fields(Request& r, MethodPa } static void _fields_reference(Request& r, MethodParams& params) { - Value& o=params.as_no_junction(0, "param must be object or hash, not junction"); + Value& o=params.as_no_junction(0, "param must be object or hash"); if(HashStringValue* fields=o.get_fields_reference()) r.write(*new VHashReference(*fields)); @@ -287,7 +298,7 @@ static void _fields_reference(Request& r } static void _field(Request& r, MethodParams& params) { - Value& o=params.as_no_junction(0, "first param must be object or class, not junction"); + Value& o=params.as_no_junction(0, "first param must be object or class"); const String& name=params.as_string(1, "field name must be string"); if(HashStringValue* fields=o.get_fields()) @@ -350,16 +361,27 @@ static void _method_info(Request& r, Met // parser code const String* filespec = r.get_method_filespec(method); if( filespec ) - hash->put("file", new VString(*filespec)); + HASH_PUT_CSTR(*hash, "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(String::Body::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(size_t i=0; inamed_params)[i]; + array+=new VString(fname); + } + hash->put(method_named_params, &named_params); + } } r.write(result); @@ -429,7 +451,7 @@ static void _uid(Request& r, MethodParam } static void _delete(Request&, MethodParams& params) { - Value* v=¶ms.as_no_junction(0, "param must be object or class, not junction"); + Value* v=¶ms.as_no_junction(0, "param must be object or class"); const String& key=params.as_string(1, "field name must be string"); if(VObject* o=dynamic_cast(v)){ @@ -453,29 +475,22 @@ static void _mixin(Request& r, MethodPar if(params.count()>1) if(HashStringValue* options=params.as_hash(1, "mixin options")) { - int valid_options=0; for(HashStringValue::Iterator i(*options); i; i.next() ){ String::Body key=i.key(); Value* value=i.value(); if(key == "to") { vtarget=value; - valid_options++; } else if(key == "name") { name=&value->as_string(); - valid_options++; } else if(key == "methods") { copy_methods=r.process(*value).as_bool(); - valid_options++; } else if(key == "fields") { copy_fields=r.process(*value).as_bool(); - valid_options++; } else if(key == "overwrite") { overwrite=r.process(*value).as_bool(); - valid_options++; - } + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } if(!vtarget) @@ -516,6 +531,39 @@ static void _mixin(Request& r, MethodPar } } +static void _override(Request& r, MethodParams& params) { + Junction *j=params[0].get_junction(); + const Method* method=j ? j->method : 0; + if(!method) + throw Exception(PARSER_RUNTIME, 0, "param must be method junction"); + if(method->native_code) + throw Exception(PARSER_RUNTIME, 0, "param must not be native method"); + + const String *name=method->name; + Value* vtarget=0; + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1, "override options")) { + for(HashStringValue::Iterator i(*options); i; i.next() ){ + if(i.key() == "to") { + vtarget=i.value(); + } else if(i.key() == "name") { + name=&i.value()->as_string(); + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + } + + if(!vtarget) + vtarget=&r.get_method_frame()->caller()->self(); + + VClass* target=dynamic_cast(vtarget->get_class()); + + if(!target) + throw Exception(PARSER_RUNTIME, 0, "destination must be parser object or class"); + + target->set_method(*name, new Method(*method)); +} + String::Language get_untaint_lang(const String& lang_name); // op.C static void _tainting(Request& r, MethodParams& params) { @@ -550,6 +598,13 @@ static void _tainting(Request& r, Method } } +struct LocalsInfo { HashStringValue* args; HashStringValue* locals; }; + +static void collect_local(const String::Body& key, Value* value, LocalsInfo* info) { + if(!info->args->contains(key) && (key != "result")) + info->locals->put(key, value->get_junction() ? VVoid::get() : value); +} + static void _stack(Request& r, MethodParams& params) { bool show_args=false; bool show_locals=false; @@ -559,28 +614,20 @@ static void _stack(Request& r, MethodPar if(params.count()>0) if(HashStringValue* options=params.as_hash(0, "stack options")) { - int valid_options=0; for(HashStringValue::Iterator i(*options); i; i.next() ){ String::Body key=i.key(); Value* value=i.value(); - if(key == "args") { show_args=r.process(*value).as_bool(); - valid_options++; } else if(key == "locals") { show_locals=r.process(*value).as_bool(); - valid_options++; } else if(key == "limit") { limit=r.process(*value).as_int(); - valid_options++; } else if(key == "offset") { offset=r.process(*value).as_int(); - valid_options++; - } + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } limit+=offset; @@ -603,8 +650,8 @@ static void _stack(Request& r, MethodPar if(!method.native_code){ Operation::Origin origin=r.get_method_origin(&method); if(origin.file_no){ - current->put("file", new VString(*r.get_used_filespec(origin.file_no))); - current->put("line", new VInt(origin.line)); // no +1 as declaration before first command + HASH_PUT_CSTR(*current, "file", new VString(*r.get_used_filespec(origin.file_no))); + HASH_PUT_CSTR(*current, "line", new VInt(origin.line)); // no +1 as declaration before first command } if(show_args || show_locals){ @@ -623,27 +670,23 @@ static void _stack(Request& r, MethodPar args->put(*method.extra_params, caller->get_element(*method.extra_params)); if(show_args) - current->put("args", &vargs); + HASH_PUT_CSTR(*current, "args", &vargs); if(show_locals){ VHash& vlocals=*new VHash; HashStringValue* locals=vlocals.get_hash(); - if(VParserMethodFrame* frame=dynamic_cast(caller)) - for(HashString::Iterator h(frame->my); h; h.next()){ - String::Body key=h.key(); - Value* value=h.value(); - if(!args->contains(key) && (key != "result")){ - locals->put(key, value->get_junction() ? VVoid::get() : value); - } - } + if(VParserMethodFrame* frame=dynamic_cast(caller)){ + LocalsInfo linfo = { args, locals }; + frame->my.for_each(collect_local, &linfo); + } - current->put("locals", &vlocals); + HASH_PUT_CSTR(*current, "locals", &vlocals); } } } - result->put(format(index, 0), &vcurrent); + result->put(String::Body::uitoa(index), &vcurrent); } caller=caller->caller(); index++; @@ -670,6 +713,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); @@ -720,6 +766,9 @@ MReflection::MReflection(): Methoded("re // ^reflection:mixin[object or class or junction;options] add_native_method("mixin", Method::CT_STATIC, _mixin, 1, 2); + // ^reflection:override[method junction[;$.to[class] $.name[another_name]]] + add_native_method("override", Method::CT_STATIC, _override, 1, 2); + // ^reflection:tainting[[language or 'tainted' or 'optimized';]string] add_native_method("tainting", Method::CT_STATIC, _tainting, 1, 2);