--- parser3/src/classes/reflection.C 2026/02/25 18:22:40 1.101 +++ parser3/src/classes/reflection.C 2026/10/13 20:02:00 1.107 @@ -1,7 +1,7 @@ /** @file Parser: @b reflection parser class. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ @@ -10,8 +10,9 @@ #include "pa_vbool.h" #include "pa_varray.h" #include "pa_vobject.h" +#include "pa_vtable.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.101 2026/02/25 18:22:40 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.107 2026/10/13 20:02:00 moko Exp $"; static const String class_type_methoded("methoded"); @@ -403,6 +404,14 @@ static void _filename(Request& r, Method } } +static void _used(Request& r, MethodParams&) { + VArray& result=*new VArray; + ArrayValue& files=result.array(); + for(uint file_no=pseudo_file_no__process+1; const String* file_spec=r.get_used_filespec(file_no); file_no++) + files+=new VString(*file_spec); + r.write(result); +} + static void _dynamical(Request& r, MethodParams& params) { if(params.count()){ r.write(VBool::get(params[0].get_class() != ¶ms[0])); @@ -536,6 +545,8 @@ static void _override(Request& r, Method 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; @@ -562,8 +573,6 @@ static void _override(Request& r, Method 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) { const String& str=params.as_string(params.count()-1, "param must be string"); String::Language lang = String::L_UNSPECIFIED; @@ -575,7 +584,7 @@ static void _tainting(Request& r, Method optimized=true; else if(slang == "tainted") lang=String::L_TAINTED; - else lang=get_untaint_lang(slang); + else lang=String::name2lang(slang); } if(!str.is_empty()){ @@ -596,7 +605,20 @@ 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) { + if(params.count()) + if(VException* exception=dynamic_cast(¶ms[0])) { + r.write(*new VTable(&exception->stack(r))); + return; + } + bool show_args=false; bool show_locals=false; @@ -667,14 +689,10 @@ static void _stack(Request& r, MethodPar 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); + } HASH_PUT_CSTR(*current, "locals", &vlocals); } @@ -734,6 +752,9 @@ MReflection::MReflection(): Methoded("re // ^reflection:filename[object or class or method] add_native_method("filename", Method::CT_STATIC, _filename, 1, 1); + // ^reflection:used[] + add_native_method("used", Method::CT_STATIC, _used, 0, 0); + // ^reflection:fields[object or class] add_native_method("fields", Method::CT_STATIC, _fields, 1, 1);