--- parser3/src/classes/reflection.C 2016/11/26 22:54:17 1.67 +++ parser3/src/classes/reflection.C 2016/11/29 23:51:41 1.70 @@ -10,7 +10,7 @@ #include "pa_vbool.h" #include "pa_vobject.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.67 2016/11/26 22:54:17 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.70 2016/11/29 23:51:41 moko Exp $"; static const String class_type_methoded("methoded"); @@ -62,33 +62,11 @@ static void _create(Request& r, MethodPa int max_params_count; if(method->native_code){ - if(method->call_type==Method::CT_STATIC) - throw Exception(PARSER_RUNTIME, - &constructor_name, - "native method of class '%s' is not allowed to be called dynamically", - vclass->type()); - - if(nparamsmin_numbered_params_count) - throw Exception(PARSER_RUNTIME, - &constructor_name, - "native method of class '%s' accepts minimum %d parameter(s) (%d passed)", - vclass->type(), - method->min_numbered_params_count, - nparams); - max_params_count=method->max_numbered_params_count; } else { max_params_count=method->params_count; } - if(nparams>max_params_count) - throw Exception(PARSER_RUNTIME, - &constructor_name, - "method of class '%s' accepts maximum %d parameter(s) (%d passed)", - vclass->type(), - max_params_count, - nparams); - Value &object = r.construct(*vclass, *method); CONSTRUCTOR_FRAME_ACTION(*method, r.get_method_frame(), object, { @@ -311,7 +289,7 @@ static void _method_info(Request& r, Met hash->put(method_max_params, new VInt(method->max_numbered_params_count)); } else { // parser code - const String* filespec = r.get_method_filename(method); + const String* filespec = r.get_method_filespec(method); if( filespec ) hash->put("file", new VString(*filespec)); @@ -329,10 +307,18 @@ static void _method_info(Request& r, Met } static void _filename(Request& r, MethodParams& params) { - Value& o=params.as_no_junction(0, "param must be object or class, not junction"); + if(Junction *j=params[0].get_junction()){ + if(const Method* method=j->method){ + if(!method->native_code) + if(const String* filespec = r.get_method_filespec(method)) + r.write(*new VString(*filespec)); + return; + } + throw Exception(PARSER_RUNTIME, 0, "param must be object, class or method junction"); + } - if(VClass* vclass = dynamic_cast(o.get_class())){ - r.write(*new VString(vclass->get_filename())); + if(VClass* vclass = dynamic_cast(params[0].get_class())){ + r.write(*new VString(vclass->get_filespec())); } }