--- parser3/src/classes/reflection.C 2016/07/13 15:03:51 1.43 +++ parser3/src/classes/reflection.C 2016/07/20 17:01:48 1.48 @@ -9,7 +9,7 @@ #include "pa_request.h" #include "pa_vbool.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.43 2016/07/13 15:03:51 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.48 2016/07/20 17:01:48 moko Exp $"; static const String class_type_methoded("methoded"); @@ -42,21 +42,19 @@ 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.get_class(class_name); + VStateless_class* vclass=r.get_class(class_name); - if(!class_value) - throw Exception(PARSER_RUNTIME, - &class_name, - "class is undefined"); + if(!vclass) + throw Exception(PARSER_RUNTIME, &class_name, "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); + Value* constructor_value=vclass->get_element(constructor_name); if(!constructor_value || !constructor_value->get_junction()) throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", - class_value->type()); + vclass->type()); Junction* junction=constructor_value->get_junction(); const Method* method=junction->method; @@ -69,13 +67,13 @@ static void _create(Request& r, MethodPa throw Exception(PARSER_RUNTIME, &constructor_name, "native method of class '%s' is not allowed to be called dynamically", - class_value->type()); + 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)", - class_value->type(), + vclass->type(), method->min_numbered_params_count, nparams); @@ -88,11 +86,11 @@ static void _create(Request& r, MethodPa throw Exception(PARSER_RUNTIME, &constructor_name, "method of class '%s' accepts maximum %d parameter(s) (%d passed)", - class_value->type(), + vclass->type(), max_params_count, nparams); - Value &object = r.construct(*class_value, *method); + Value &object = r.construct(*vclass, *method); VConstructorFrame frame(*method, r.get_method_frame(), object); Value* v[100]; @@ -109,22 +107,11 @@ static void _create(Request& r, MethodPa } -static void store_vlass_info( - HashStringValue::key_type key, - HashStringValue::value_type value, - HashStringValue* result -){ - Value* v; - if(value->get_class()) - v=new VString(class_type_methoded); - else - 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()); + for(HashString::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); } @@ -193,6 +180,7 @@ static void _def(Request& r, MethodParam const String& type=params.as_string(0, "type must be string"); 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)); } else { throw Exception(PARSER_RUNTIME, &type, "is invalid type, must be '%s'", def_class.cstr()); @@ -232,13 +220,21 @@ static void _method(Request& r, MethodPa static void _fields(Request& r, MethodParams& params) { Value& o=params.as_no_junction(0, "param must be object or class, not junction"); - if(HashStringValue* fields=o.get_fields()) { - VHash& result=*new VHash(*fields); - r.write_no_lang(result); - } else + if(HashStringValue* fields=o.get_fields()) + r.write_no_lang(*new VHash(*fields)); + else r.write_no_lang(*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)); + else + throw Exception(PARSER_RUNTIME, 0, "param must be object or hash"); +} + static void _field(Request& r, MethodParams& params) { Value& o=params.as_no_junction(0, "first param must be object or class, not junction"); const String& name=params.as_string(1, "field name must be string"); @@ -252,23 +248,16 @@ static void _method_info(Request& r, Met const String& class_name=params.as_string(0, "class_name must be string"); Value* class_value=r.get_class(class_name); if(!class_value) - throw Exception(PARSER_RUNTIME, - &class_name, - "class is undefined"); + throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); VStateless_class* lclass=class_value->get_class(); if(!lclass) - throw Exception(PARSER_RUNTIME, - &class_name, - "class does not have methods"); + throw Exception(PARSER_RUNTIME, &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) - throw Exception(PARSER_RUNTIME, - &method_name, - "method not found in class %s", - class_name.cstr()); + throw Exception(PARSER_RUNTIME, &method_name, "method not found in class %s", class_name.cstr()); VHash& result=*new VHash; HashStringValue* hash=result.get_hash(); @@ -348,7 +337,7 @@ static void _is(Request& r, MethodParams static void _copy(Request& r, MethodParams& params) { HashStringValue* src=params.as_no_junction(0, "source must not be code").get_hash(); - if(src==NULL) + if(src==NULL) throw Exception(PARSER_RUNTIME, 0, "source must have hash representation"); Value& dst=params.as_no_junction(1, "destination must not be code"); @@ -412,6 +401,9 @@ MReflection::MReflection(): Methoded("re // ^reflection:fields[object or class] add_native_method("fields", Method::CT_STATIC, _fields, 1, 1); + // ^reflection:fields_reference[object] + add_native_method("fields_reference", Method::CT_STATIC, _fields_reference, 1, 1); + // ^reflection:field[object or class;field_name] add_native_method("field", Method::CT_STATIC, _field, 2, 2);