--- parser3/src/classes/reflection.C	2016/09/26 16:29:08	1.55
+++ parser3/src/classes/reflection.C	2016/09/27 21:11:18	1.58
@@ -10,7 +10,7 @@
 #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.58 2016/09/27 21:11:18 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -192,9 +192,9 @@ static void _methods(Request& r, MethodP
 	r.write_no_lang(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<VObject*>(&self) || dynamic_cast<VClass*>(&self)))
 		throw Exception(PARSER_RUNTIME, 0, "self must be parser object or class");
@@ -221,7 +221,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_no_lang( params.count()>2 ? method_junction(params.as_no_junction(2, "self must be object, not junction"), *method) : *method->get_vjunction(source) );
 			return;
 		}
 	}
@@ -363,9 +363,16 @@ static void _uid(Request& r, MethodParam
 }
 
 static void _delete(Request&, MethodParams& params) {
+	Value* v=&params.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<VObject*>(v)){
+		o->get_fields()->remove(key);
+	} else if(VClass* c=dynamic_cast<VClass*>(v)){
+		HashStringProperty &p=*c->get_properties();
+		if(Property* property=p.get(key))
+			if(property->value)
+				p.remove(key);
 	}
 }
 
@@ -420,21 +427,19 @@ static void _mixin(Request& r, MethodPar
 			if(Method* method=source->get_method(*name))
 				if(overwrite || !target->get_method(*name)){
 					target->set_method(*name, method);
-					return;
 				}
 
 		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, i.value());
 			}
 		if(copy_fields)
 			for(HashStringProperty::Iterator i(*source->get_properties()); i; i.next()){