--- parser3/src/classes/reflection.C 2009/07/26 05:41:54 1.2 +++ parser3/src/classes/reflection.C 2009/08/26 13:46:12 1.12 @@ -5,31 +5,24 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REFLECTION_C="$Date: 2009/07/26 05:41:54 $"; +static const char * const IDENT_REFLECTION_C="$Date: 2009/08/26 13:46:12 $"; #include "pa_vmethod_frame.h" #include "pa_request.h" #include "pa_vbool.h" -const char* const METHOD_TYPE_NATIVE="native"; -const char* const METHOD_TYPE_PARSER="parser"; +static const String class_type_methoded("methoded"); -const char* const METHOD_CALL_TYPE_STATIC="static"; -const char* const METHOD_CALL_TYPE_DYNAMIC="dynamic"; -const char* const METHOD_CALL_TYPE_ANY="any"; +static const String method_type_native("native"); +static const String method_type_parser("parser"); -const char* const METHOD_MIN_PARAMS="min_params"; -const char* const METHOD_MAX_PARAMS="max_params"; +static const String method_call_type("call_type"); +static const String method_inherited("inherited"); +static const String method_call_type_static("static"); +static const String method_call_type_dynamic("dynamic"); -static const String method_type_native(METHOD_TYPE_NATIVE); -static const String method_type_parser(METHOD_TYPE_PARSER); - -static const String method_call_type_static(METHOD_CALL_TYPE_STATIC); -static const String method_call_type_dynamic(METHOD_CALL_TYPE_DYNAMIC); -static const String method_call_type_any(METHOD_CALL_TYPE_ANY); - -static const String method_min_params(METHOD_MIN_PARAMS); -static const String method_max_params(METHOD_MAX_PARAMS); +static const String method_min_params("min_params"); +static const String method_max_params("max_params"); // class @@ -49,7 +42,7 @@ DECLARE_CLASS_VAR(reflection, new MRefle static void _create(Request& r, MethodParams& params) { const String& class_name=params.as_string(0, "class_name must be string"); - Value* class_value=r.classes().get(class_name); + Value* class_value=r.get_class(class_name); if(!class_value) throw Exception(PARSER_RUNTIME, @@ -57,9 +50,9 @@ static void _create(Request& r, MethodPa "class is undefined"); const String& constructor_name=params.as_string(1, "constructor_name must be string"); - Value* constructor_value=class_value->get_element(constructor_name, *class_value, true); + Value* constructor_value=class_value->get_element(constructor_name); - if(!constructor_value || !constructor_value->get_junction() || constructor_value->get_junction()->self.get_class()!=class_value) + if(!constructor_value || !constructor_value->get_junction()) throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", @@ -90,7 +83,7 @@ static void _create(Request& r, MethodPa max_params_count=method->max_numbered_params_count; } else { - max_params_count=method->params_names->count(); + max_params_count=method->params_names?method->params_names->count():0; } if(nparams>max_params_count) @@ -104,7 +97,7 @@ static void _create(Request& r, MethodPa VMethodFrame frame(*junction, r.get_method_frame()); - Value* v[100]; + Value* v[100]; if(nparams>0){ for(int i=0; iget_class()) + v=new VString(class_type_methoded); else - throw Exception(PARSER_RUNTIME, - 0, - "class is undefined"); + v=VVoid::get(); + result->put(key, v); +} + +static void _classes(Request& r, MethodParams&) { + VHash& result=*new VHash; + r.classes().for_each(store_vlass_info, result.get_hash()); + r.write_no_lang(result); +} + + +static Value* get_class(Value* value){ + if(VStateless_class* result=value->get_class()) + return result; + else + // classes with fields only, like env & console + return value; +} + +static const String* get_class_name(Value* value){ + if(VStateless_class* lclass=value->get_class()) + return &lclass->name(); + else + // classes with fields only, like env & console + return new String(value->type()); +} + + +static void _class(Request& r, MethodParams& params) { + r.write_no_lang(*get_class(¶ms[0])); } static void _class_name(Request& r, MethodParams& params) { - r.write_no_lang(String(params[0].type())); + r.write_no_lang(*get_class_name(¶ms[0])); } static void _base(Request& r, MethodParams& params) { - if(Value* lclass=params[0].get_class()) - if(Value* base=lclass->base()) - r.write_no_lang(*lclass->base()); - else - r.write_no_lang(*VVoid::get()); - else - throw Exception(PARSER_RUNTIME, - 0, - "class is undefined"); + if(VStateless_class* lclass=params[0].get_class()) + if(Value* base=lclass->base()){ + r.write_no_lang(*get_class(base)); + return; + } + + // classes with fields only, like env & console or without base + r.write_no_lang(*VVoid::get()); } static void _base_name(Request& r, MethodParams& params) { - if(Value* lclass=params[0].get_class()) + if(VStateless_class* lclass=params[0].get_class()) if(Value* base=lclass->base()) - r.write_no_lang(String(base->type())); + r.write_no_lang(*get_class_name(base)); } - static void store_method_info( - HashString::key_type key, - HashString::value_type method, + HashStringMethod::key_type key, + HashStringMethod::value_type method, HashStringValue* result ) { result->put(key, new VString(method->native_code?method_type_native:method_type_parser)); @@ -163,7 +185,7 @@ static void store_method_info( static void _methods(Request& r, MethodParams& params) { const String& class_name=params.as_string(0, "class_name must be string"); - Value* class_value=r.classes().get(class_name); + Value* class_value=r.get_class(class_name); if(!class_value) throw Exception(PARSER_RUNTIME, &class_name, @@ -171,23 +193,18 @@ static void _methods(Request& r, MethodP VHash& result=*new VHash; if(VStateless_class* lclass=class_value->get_class()){ - HashString methods=lclass->get_methods(); + HashStringMethod methods=lclass->get_methods(); methods.for_each(store_method_info, result.get_hash()); -/* } else { - // exception? - throw Exception(PARSER_RUNTIME, - &class_name, - "class does not have methods"); -*/ + // class which does not have methods (env, console, etc) } r.write_no_lang(result); } -static void _method_params(Request& r, MethodParams& params) { +static void _method_info(Request& r, MethodParams& params) { const String& class_name=params.as_string(0, "class_name must be string"); - Value* class_value=r.classes().get(class_name); + Value* class_value=r.get_class(class_name); if(!class_value) throw Exception(PARSER_RUNTIME, &class_name, @@ -199,7 +216,6 @@ static void _method_params(Request& r, M &class_name, "class does not have methods"); - const String& method_name=params.as_string(1, "method_name must be string"); Method* method=lclass->get_method(method_name); if(!method) @@ -210,23 +226,29 @@ static void _method_params(Request& r, M VHash& result=*new VHash; HashStringValue* hash=result.get_hash(); + + VStateless_class* c=lclass; + while(c->base() && c->base()->get_method(method_name)) + c=c->base()->get_class(); + + if(c!=lclass) + hash->put(method_inherited, new VString(c->name())); + if(method->native_code){ // native code hash->put(method_min_params, new VInt(method->min_numbered_params_count)); hash->put(method_max_params, new VInt(method->max_numbered_params_count)); - const String* call_type; + Value* call_type=0; switch(method->call_type){ case Method::CT_DYNAMIC: - call_type=&method_call_type_dynamic; + call_type=new VString(method_call_type_dynamic); break; case Method::CT_STATIC: - call_type=&method_call_type_static; + call_type=new VString(method_call_type_static); break; - default: - call_type=&method_call_type_any; } - hash->put(String("call_type"), new VString(*call_type)); - + if(call_type) + hash->put(method_call_type, call_type); } else { // parser code if(method->params_names) @@ -237,11 +259,23 @@ static void _method_params(Request& r, M r.write_no_lang(result); } +static void _dynamical(Request& r, MethodParams& params) { + if(params.count()){ + r.write_no_lang(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())); + } +} + // constructor MReflection::MReflection(): Methoded("reflection") { // ^reflection:create[class_name;constructor_name[;param1[;param2[;...]]]] add_native_method("create", Method::CT_STATIC, _create, 2, 102); + // ^reflection:classes[] + add_native_method("classes", Method::CT_STATIC, _classes, 0, 0); + // ^reflection:class[object] add_native_method("class", Method::CT_STATIC, _class, 1, 1); @@ -258,7 +292,8 @@ MReflection::MReflection(): Methoded("re add_native_method("methods", Method::CT_STATIC, _methods, 1, 1); // ^reflection:method_params[class_name;method_name] - add_native_method("method_params", Method::CT_STATIC, _method_params, 2, 2); + add_native_method("method_info", Method::CT_STATIC, _method_info, 2, 2); - // @todo: check how 'create' and 'methods' work with ancestors-classes + // ^reflection:dynamical[[object or class, caller if absent]] + add_native_method("dynamical", Method::CT_STATIC, _dynamical, 0, 1); }