--- parser3/src/classes/reflection.C	2016/09/20 09:43:05	1.53
+++ 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.53 2016/09/20 09:43:05 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,89 @@ 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);
+	}
+}
+
+static void _mixin(Request& r, MethodParams& params) {
+	Value& vsource=params.as_no_junction(0, "source must not be code");
+
+	Value* vtarget=0;
+	const String *name=0;
+	bool copy_methods=true;
+	bool copy_fields=true;
+	bool overwrite=true;
+
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1, "mixin options")) {
+			int valid_options=0;
+			if(vtarget=options->get("to")) {
+				valid_options++;
+			}
+			if(Value* vname=options->get("name")) {
+				name=&vname->as_string();
+				valid_options++;
+			}
+			if(Value* vmethods=options->get("methods")) {
+				copy_methods=r.process_to_value(*vmethods).as_bool();
+				valid_options++;
+			}
+			if(Value* vfields=options->get("fields")) {
+				copy_fields=r.process_to_value(*vfields).as_bool();
+				valid_options++;
+			}
+			if(Value* voverwrite=options->get("overwrite")) {
+				overwrite=r.process_to_value(*voverwrite).as_bool();
+				valid_options++;
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+
+	if(!vtarget)
+		vtarget=&r.get_method_frame()->caller()->self();
+
+	VClass* source=dynamic_cast<VClass*>(vsource.get_class());
+	VClass* target=dynamic_cast<VClass*>(vtarget->get_class());
+
+	if(!source)
+		throw Exception(PARSER_RUNTIME, 0, "source must be parser object or class");
+	if(!target)
+		throw Exception(PARSER_RUNTIME, 0, "destination must be parser object or class");
+
+	if(name){
+		if(copy_methods)
+			if(Method* method=source->get_method(*name))
+				if(overwrite || !target->get_method(*name)){
+					target->set_method(*name, 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);
+				}
+
+	} else {
+		if(copy_methods)
+			for(HashStringMethod::Iterator i(source->get_methods()); i; i.next()){
+				if(overwrite || !target->get_method(i.key()))
+					target->set_method(*i.value()->name, i.value());
+			}
+		if(copy_fields)
+			for(HashStringProperty::Iterator i(*source->get_properties()); i; i.next()){
+				if(i.value()->value && ( overwrite || !target->get_properties()->get(i.key()) ))
+					target->put_element(*target, *new String(i.key(), String::L_TAINTED), i.value()->value);
+			}
 	}
 }
 
@@ -399,7 +479,8 @@ MReflection::MReflection(): Methoded("re
 	// ^reflection:methods[class_name]
 	add_native_method("methods", Method::CT_STATIC, _methods, 1, 1);
 
-	// ^reflection:method[object or class;method_name]
+	// ^reflection:method[object or class;method_name[;self]]
+	// ^reflection:method[junction[;self]]
 	add_native_method("method", Method::CT_STATIC, _method, 1, 3);
 
 	// ^reflection:method_info[class_name;method_name]
@@ -428,4 +509,8 @@ MReflection::MReflection(): Methoded("re
 
 	// ^reflection:delete[object or class;field_name]
 	add_native_method("delete", Method::CT_STATIC, _delete, 2, 2);
+
+	// ^reflection:mixin[object or class or junction;options]
+	add_native_method("mixin", Method::CT_STATIC, _mixin, 1, 2);
+
 }