--- parser3/src/classes/reflection.C 2016/09/26 16:29:08 1.55 +++ parser3/src/classes/reflection.C 2016/11/01 23:10:41 1.64 @@ -10,13 +10,14 @@ #include "pa_vbool.h" #include "pa_vobject.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.55 2016/09/26 16:29:08 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.64 2016/11/01 23:10:41 moko Exp $"; static const String class_type_methoded("methoded"); static const String method_type_native("native"); static const String method_type_parser("parser"); +static const String method_name("name"); static const String method_call_type("call_type"); static const String method_inherited("inherited"); static const String method_overridden("overridden"); @@ -94,14 +95,14 @@ static void _create(Request& r, MethodPa Value* v[100]; if(nparams>0){ 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); } @@ -133,12 +134,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) { @@ -146,13 +147,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; } @@ -164,7 +165,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) { @@ -172,7 +173,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()); } @@ -189,12 +190,12 @@ 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, const String *name=0){ +static VJunction &method_junction(Value &self, Method &method){ if(method.native_code) - throw Exception(PARSER_RUNTIME, name, "method must not be native"); + throw Exception(PARSER_RUNTIME, method.name, "method must not be native"); if(!(dynamic_cast(&self) || dynamic_cast(&self))) throw Exception(PARSER_RUNTIME, 0, "self must be parser object or class"); @@ -203,12 +204,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"); @@ -221,7 +222,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, &name) : *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; } } @@ -232,16 +233,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"); } @@ -252,28 +253,37 @@ 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 String& class_name=params.as_string(0, "class_name must be string"); - VStateless_class* vclass=r.get_class(class_name); - if(!vclass) - throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); + const Method* method; + VStateless_class* vclass=0; - const String& method_name=params.as_string(1, "method_name must be string"); - Method* method=vclass->get_method(method_name); - if(!method) - throw Exception(PARSER_RUNTIME, &method_name, "method not found in class '%s'", vclass->type()); + if(Junction *j=params[0].get_junction()){ + if(!(method=j->method)) + throw Exception(PARSER_RUNTIME, 0, "param must be class name or method junction"); + } else { + const String& class_name=params.as_string(0, "param must be class name or method junction"); + if(!(vclass=r.get_class(class_name))) + throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); + + if(params.count()==1) + throw Exception(PARSER_RUNTIME, 0, "method name must be specified"); + + 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)); - VStateless_class* c=vclass; Method* base_method; - if(c->base() && (base_method=c->base()->get_method(method_name))){ - c=c->base()->get_class(); - while(c->base() && base_method==c->base()->get_method(method_name)) + 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()))); } @@ -312,15 +322,15 @@ 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 _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())); } } @@ -333,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) { @@ -359,13 +369,20 @@ 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) { + Value* v=¶ms.as_no_junction(0, "param must be object or class, not junction"); const String& key=params.as_string(1, "field name must be string"); - if(HashStringValue* fields=params[0].get_fields()){ - fields->remove(key); + + if(VObject* o=dynamic_cast(v)){ + o->get_fields()->remove(key); + } else if(VClass* c=dynamic_cast(v)){ + HashStringProperty &p=*c->get_properties(); + if(Property* property=p.get(key)) + if(property->value) + p.remove(key); } } @@ -376,7 +393,7 @@ static void _mixin(Request& r, MethodPar const String *name=0; bool copy_methods=true; bool copy_fields=true; - bool overwrite=true; + bool overwrite=false; if(params.count()>1) if(HashStringValue* options=params.as_hash(1, "mixin options")) { @@ -389,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()) @@ -419,22 +436,20 @@ static void _mixin(Request& r, MethodPar if(copy_methods) if(Method* method=source->get_method(*name)) if(overwrite || !target->get_method(*name)){ - target->set_method(*name, method); - return; + target->set_method(*name, new Method(*method)); } if(copy_fields) if(Property* property=source->get_properties()->get(*name)) if(property->value && (overwrite || !target->get_properties()->get(*name))){ target->put_element(*target, *name, property->value); - return; } } else { if(copy_methods) for(HashStringMethod::Iterator i(source->get_methods()); i; i.next()){ if(overwrite || !target->get_method(i.key())) - target->set_method(*new String(i.key(), String::L_TAINTED), i.value()); + target->set_method(*i.value()->name, new Method(*i.value())); } if(copy_fields) for(HashStringProperty::Iterator i(*source->get_properties()); i; i.next()){ @@ -479,7 +494,8 @@ MReflection::MReflection(): Methoded("re add_native_method("method", Method::CT_STATIC, _method, 1, 3); // ^reflection:method_info[class_name;method_name] - add_native_method("method_info", Method::CT_STATIC, _method_info, 2, 2); + // ^reflection:method_info[junction] + add_native_method("method_info", Method::CT_STATIC, _method_info, 1, 2); // ^reflection:fields[object or class] add_native_method("fields", Method::CT_STATIC, _fields, 1, 1);