1 files changed, 64 insertions, 4 deletions

diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 8c11007a5..8473fdcd1 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -54,10 +54,10 @@ struct _VariantCall {
 		int arg_count;
 		Vector<Variant> default_args;
 		Vector<Variant::Type> arg_types;
-
-#ifdef DEBUG_ENABLED
 		Vector<StringName> arg_names;
 		Variant::Type return_type;
+
+#ifdef DEBUG_ENABLED
 		bool returns;
 #endif
 		VariantFunc func;
@@ -474,6 +474,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	VCALL_LOCALMEM2R(Array,rfind);
 	VCALL_LOCALMEM1R(Array,find_last);
 	VCALL_LOCALMEM1R(Array,count);
+	VCALL_LOCALMEM1R(Array,has);
 	VCALL_LOCALMEM1(Array,erase);
 	VCALL_LOCALMEM0(Array,sort);
 	VCALL_LOCALMEM2(Array,sort_custom);
@@ -1173,6 +1174,56 @@ bool Variant::has_method(const StringName& p_method) const {
 
 }
 
+Vector<Variant::Type> Variant::get_method_argument_types(Variant::Type p_type,const StringName& p_method) {
+
+	const _VariantCall::TypeFunc &fd = _VariantCall::type_funcs[p_type];
+
+	const Map<StringName,_VariantCall::FuncData>::Element *E = fd.functions.find(p_method);
+	if (!E)
+		return Vector<Variant::Type>();
+
+	return E->get().arg_types;
+}
+
+Vector<StringName> Variant::get_method_argument_names(Variant::Type p_type,const StringName& p_method) {
+
+
+	const _VariantCall::TypeFunc &fd = _VariantCall::type_funcs[p_type];
+
+	const Map<StringName,_VariantCall::FuncData>::Element *E = fd.functions.find(p_method);
+	if (!E)
+		return Vector<StringName>();
+
+	return E->get().arg_names;
+
+}
+
+Variant::Type Variant::get_method_return_type(Variant::Type p_type,const StringName& p_method,bool* r_has_return) {
+
+	const _VariantCall::TypeFunc &fd = _VariantCall::type_funcs[p_type];
+
+	const Map<StringName,_VariantCall::FuncData>::Element *E = fd.functions.find(p_method);
+	if (!E)
+		return Variant::NIL;
+
+	if (r_has_return)
+		*r_has_return=E->get().return_type;
+
+	return E->get().return_type;
+}
+
+Vector<Variant> Variant::get_method_default_arguments(Variant::Type p_type,const StringName& p_method) {
+
+	const _VariantCall::TypeFunc &fd = _VariantCall::type_funcs[p_type];
+
+	const Map<StringName,_VariantCall::FuncData>::Element *E = fd.functions.find(p_method);
+	if (!E)
+		return Vector<Variant>();
+
+	return E->get().default_args;
+
+}
+
 void Variant::get_method_list(List<MethodInfo> *p_list) const {
 
 
@@ -1274,14 +1325,22 @@ bool Variant::has_numeric_constant(Variant::Type p_type, const StringName& p_val
 	return cd.value.has(p_value);
 }
 
-int Variant::get_numeric_constant_value(Variant::Type p_type, const StringName& p_value) {
+int Variant::get_numeric_constant_value(Variant::Type p_type, const StringName& p_value, bool *r_valid) {
+
+	if (r_valid)
+		*r_valid=false;
 
 	ERR_FAIL_INDEX_V(p_type,Variant::VARIANT_MAX,0);
 	_VariantCall::ConstantData& cd = _VariantCall::constant_data[p_type];
 
 
 	Map<StringName,int>::Element *E = cd.value.find(p_value);
-	ERR_FAIL_COND_V(!E,0);
+	if (!E) {
+		return -1;
+	}
+	if (r_valid)
+		*r_valid=true;
+
 	return E->get();
 }
 
@@ -1517,6 +1576,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 	ADDFUNC2(ARRAY,INT,Array,rfind,NIL,"what",INT,"from",varray(-1));
 	ADDFUNC1(ARRAY,INT,Array,find_last,NIL,"value",varray());
 	ADDFUNC1(ARRAY,INT,Array,count,NIL,"value",varray());
+	ADDFUNC1(ARRAY,BOOL,Array,has,NIL,"value",varray());
 	ADDFUNC0(ARRAY,NIL,Array,pop_back,varray());
 	ADDFUNC0(ARRAY,NIL,Array,pop_front,varray());
 	ADDFUNC0(ARRAY,NIL,Array,sort,varray());