--- parser3/src/classes/reflection.C 2025/10/05 19:41:27 1.100 +++ parser3/src/classes/reflection.C 2026/09/25 17:03:52 1.105 @@ -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.100 2025/10/05 19:41:27 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.105 2026/09/25 17:03:52 moko Exp $"; static const String class_type_methoded("methoded"); @@ -126,7 +127,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); @@ -536,6 +537,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; @@ -596,7 +599,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 +683,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); }