--- parser3/src/classes/reflection.C 2016/10/01 18:50:46 1.60 +++ parser3/src/classes/reflection.C 2016/11/30 21:30:24 1.71 @@ -10,7 +10,7 @@ #include "pa_vbool.h" #include "pa_vobject.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.60 2016/10/01 18:50:46 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.71 2016/11/30 21:30:24 moko Exp $"; static const String class_type_methoded("methoded"); @@ -18,6 +18,7 @@ static const String method_type_native(" static const String method_type_parser("parser"); static const String method_name("name"); +static const String method_class_name("class"); static const String method_call_type("call_type"); static const String method_inherited("inherited"); static const String method_overridden("overridden"); @@ -62,47 +63,26 @@ 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_names?method->params_names->count():0; + 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); - VConstructorFrame frame(*method, r.get_method_frame(), object); - Value* v[100]; - if(nparams>0){ - for(int i=0; i0){ + for(int i=0; i::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_no_lang(result); + r.write(result); } @@ -134,12 +114,12 @@ static const String& get_class_name(Valu static void _class(Request& r, MethodParams& params) { - r.write_no_lang(get_class(params[0])); + r.write(get_class(params[0])); } static void _class_name(Request& r, MethodParams& params) { - r.write_no_lang(get_class_name(params[0])); + r.write(get_class_name(params[0])); } static void _class_by_name(Request& r, MethodParams& params) { @@ -147,13 +127,13 @@ static void _class_by_name(Request& r, M Value* class_value=r.get_class(class_name); if(!class_value) throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); - r.write_no_lang(*class_value); + r.write(*class_value); } static void _base(Request& r, MethodParams& params) { if(VStateless_class* vclass=params[0].get_class()) if(Value* base=vclass->base()){ - r.write_no_lang(get_class(*base)); + r.write(get_class(*base)); return; } @@ -165,7 +145,7 @@ static void _base(Request& r, MethodPara static void _base_name(Request& r, MethodParams& params) { if(VStateless_class* vclass=params[0].get_class()) if(Value* base=vclass->base()) - r.write_no_lang(get_class_name(*base)); + r.write(get_class_name(*base)); } static void _def(Request& r, MethodParams& params) { @@ -173,7 +153,7 @@ static void _def(Request& r, MethodParam if(type == def_class) { const String& name=params.as_string(1, "name must be string"); // can't use get_class because it will call @autouse[] if the class wasn't loaded - r.write_no_lang(VBool::get(r.classes().get(name)!=0)); + r.write(VBool::get(r.classes().get(name)!=0)); } else { throw Exception(PARSER_RUNTIME, &type, "is invalid type, must be '%s'", def_class.cstr()); } @@ -190,7 +170,7 @@ static void _methods(Request& r, MethodP result.hash().put(i.key(), new VString(i.value()->native_code ? method_type_native : method_type_parser)); } - r.write_no_lang(result); + r.write(result); } static VJunction &method_junction(Value &self, Method &method){ @@ -204,12 +184,12 @@ static VJunction &method_junction(Value } static void _method(Request& r, MethodParams& params) { - Value &source=*params.get(0); + Value &source=params[0]; 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(); - r.write_no_lang(method_junction(self, *method)); + r.write(method_junction(self, *method)); return; } throw Exception(PARSER_RUNTIME, 0, "param must be method junction"); @@ -222,7 +202,7 @@ static void _method(Request& r, MethodPa if(VStateless_class* vclass=source.get_class()) { if(Method* method=vclass->get_method(name)){ - r.write_no_lang( 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, not junction"), *method) : *method->get_vjunction(source) ); return; } } @@ -233,16 +213,16 @@ static void _fields(Request& r, MethodPa Value& o=params.as_no_junction(0, "param must be object or class, not junction"); if(HashStringValue* fields=o.get_fields()) - r.write_no_lang(*new VHash(*fields)); + r.write(*new VHash(*fields)); else - r.write_no_lang(*new VHash()); + r.write(*new VHash()); } static void _fields_reference(Request& r, MethodParams& params) { Value& o=params.as_no_junction(0, "param must be object or hash, not junction"); if(HashStringValue* fields=o.get_fields_reference()) - r.write_no_lang(*new VHashReference(*fields)); + r.write(*new VHashReference(*fields)); else throw Exception(PARSER_RUNTIME, 0, "param must be object or hash"); } @@ -253,19 +233,27 @@ static void _field(Request& r, MethodPar if(HashStringValue* fields=o.get_fields()) if(Value* value=fields->get(name)) - r.write_no_lang(*value); + r.write(*value); } static void _method_info(Request& r, MethodParams& params) { const Method* method; - VStateless_class* vclass=0; - if(Junction *j=params.get(0)->get_junction()){ + VHash& result=*new VHash; + HashStringValue* hash=result.get_hash(); + + if(Junction *j=params[0].get_junction()){ if(!(method=j->method)) throw Exception(PARSER_RUNTIME, 0, "param must be class name or method junction"); + + hash->put(method_name, new VString(*method->name)); + hash->put(method_class_name, new VString(*new String(j->self.type()))); + } else { const String& class_name=params.as_string(0, "param must be class name or method junction"); - if(!(vclass=r.get_class(class_name))) + VStateless_class* vclass=r.get_class(class_name); + + if(!vclass) throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); if(params.count()==1) @@ -274,18 +262,14 @@ static void _method_info(Request& r, Met const String& method_name=params.as_string(1, "method name must be string"); if(!(method=vclass->get_method(method_name))) throw Exception(PARSER_RUNTIME, &method_name, "method not found in class '%s'", vclass->type()); - } - VHash& result=*new VHash; - HashStringValue* hash=result.get_hash(); - hash->put(method_name, new VString(*method->name)); - - Method* base_method; - if(vclass && vclass->base() && (base_method=vclass->base()->get_method(*method->name))){ - VStateless_class* c=vclass->base()->get_class(); - while(c->base() && base_method==c->base()->get_method(*method->name)) - c=c->base()->get_class(); - hash->put((base_method==method) ? method_inherited : method_overridden, new VString(*new String(c->type()))); + Method* base_method; + if(vclass && vclass->base() && (base_method=vclass->base()->get_method(*method->name))){ + VStateless_class* c=vclass->base()->get_class(); + while(c->base() && base_method==c->base()->get_method(*method->name)) + c=c->base()->get_class(); + hash->put((base_method==method) ? method_inherited : method_overridden, new VString(*new String(c->type()))); + } } Value* call_type=0; @@ -308,7 +292,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)); @@ -322,15 +306,31 @@ static void _method_info(Request& r, Met hash->put(method_extra_param, new VString(*method->extra_params)); } - r.write_no_lang(result); + r.write(result); +} + +static void _filename(Request& r, MethodParams& params) { + 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(params[0].get_class())){ + r.write(*new VString(vclass->get_filespec())); + } } static void _dynamical(Request& r, MethodParams& params) { if(params.count()){ - r.write_no_lang(VBool::get(params[0].get_class() != ¶ms[0])); + r.write(VBool::get(params[0].get_class() != ¶ms[0])); } else { VMethodFrame* caller=r.get_method_frame()->caller(); - r.write_no_lang(VBool::get(caller && caller->get_class() != &caller->self())); + r.write(VBool::get(caller && caller->get_class() != &caller->self())); } } @@ -343,12 +343,12 @@ static void _is(Request& r, MethodParams if(value) { if(type == "code" || type == "method") { Junction *junction=value->get_junction(); - r.write_no_lang(VBool::get(junction && ((junction->code==0) ^ (type == "code"))) ); + r.write(VBool::get(junction && ((junction->code==0) ^ (type == "code"))) ); } else { - r.write_no_lang(VBool::get( value->is(type.cstr()) )); + r.write(VBool::get( value->is(type.cstr()) )); } } else - r.write_no_lang(VBool::get(type == "void")); + r.write(VBool::get(type == "void")); } static void _copy(Request& r, MethodParams& params) { @@ -369,7 +369,7 @@ static void _uid(Request& r, MethodParam char local_buf[MAX_NUMBER]; int size=snprintf(local_buf, sizeof(local_buf), "%p", &obj); - r.write_pass_lang(*new String(String::C(pa_strdup(local_buf, (size_t)size), size))); + r.write(*new String(String::C(pa_strdup(local_buf, (size_t)size), size))); } static void _delete(Request&, MethodParams& params) { @@ -406,15 +406,15 @@ static void _mixin(Request& r, MethodPar valid_options++; } if(Value* vmethods=options->get("methods")) { - copy_methods=r.process_to_value(*vmethods).as_bool(); + copy_methods=r.process(*vmethods).as_bool(); valid_options++; } if(Value* vfields=options->get("fields")) { - copy_fields=r.process_to_value(*vfields).as_bool(); + copy_fields=r.process(*vfields).as_bool(); valid_options++; } if(Value* voverwrite=options->get("overwrite")) { - overwrite=r.process_to_value(*voverwrite).as_bool(); + overwrite=r.process(*voverwrite).as_bool(); valid_options++; } if(valid_options!=options->count()) @@ -497,6 +497,9 @@ MReflection::MReflection(): Methoded("re // ^reflection:method_info[junction] add_native_method("method_info", Method::CT_STATIC, _method_info, 1, 2); + // ^reflection:filename[object or class] + add_native_method("filename", Method::CT_STATIC, _filename, 1, 1); + // ^reflection:fields[object or class] add_native_method("fields", Method::CT_STATIC, _fields, 1, 1);