--- parser3/src/classes/reflection.C 2017/01/26 22:57:46 1.81 +++ parser3/src/classes/reflection.C 2017/02/15 17:05:21 1.84 @@ -1,7 +1,7 @@ /** @file Parser: @b reflection parser class. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -10,7 +10,7 @@ #include "pa_vbool.h" #include "pa_vobject.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.81 2017/01/26 22:57:46 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.84 2017/02/15 17:05:21 moko Exp $"; static const String class_type_methoded("methoded"); @@ -203,9 +203,33 @@ static void _methods(Request& r, MethodP if(!vclass) throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); + bool reverse=true; + + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1, "methods options")) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next() ){ + String::Body key=i.key(); + Value* value=i.value(); + if(key == "reverse") { + reverse=r.process(*value).as_bool(); + valid_options++; + } + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + VHash& result=*new VHash; - 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)); + + if(reverse){ + 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 { + 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)); + } } r.write(result); @@ -549,16 +573,13 @@ static void _stack(Request& r, MethodPar if(key == "args") { show_args=r.process(*value).as_bool(); valid_options++; - } - if(key == "locals") { + } else if(key == "locals") { show_locals=r.process(*value).as_bool(); valid_options++; - } - if(key == "limit") { + } else if(key == "limit") { limit=r.process(*value).as_int(); valid_options++; - } - if(key == "offset") { + } else if(key == "offset") { offset=r.process(*value).as_int(); valid_options++; } @@ -665,7 +686,7 @@ MReflection::MReflection(): Methoded("re add_native_method("def", Method::CT_STATIC, _def, 2, 2); // ^reflection:methods[class_name] - add_native_method("methods", Method::CT_STATIC, _methods, 1, 1); + add_native_method("methods", Method::CT_STATIC, _methods, 1, 2); // ^reflection:method[object or class;method_name[;self]] // ^reflection:method[junction[;self]]