From 2293443ea0ceec8fca018556f41646fdb8da45d0 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Thu, 7 Mar 2013 13:02:33 -0600
Subject: [PATCH] Fix function type-equivalence requiring same param names,
 addresses #957

---
 src/Type.cc                                   |  6 +--
 src/Type.h                                    |  6 +--
 .../Baseline/language.func-assignment/out     |  4 ++
 testing/btest/language/func-assignment.bro    | 39 +++++++++++++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 testing/btest/Baseline/language.func-assignment/out
 create mode 100644 testing/btest/language/func-assignment.bro

diff --git a/src/Type.cc b/src/Type.cc
index 6ac6070660..db6e940e87 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -712,7 +712,7 @@ int FuncType::MatchesIndex(ListExpr*& index) const
 			MATCHES_INDEX_SCALAR : DOES_NOT_MATCH_INDEX;
 	}
 
-int FuncType::CheckArgs(const type_list* args) const
+int FuncType::CheckArgs(const type_list* args, bool is_init) const
 	{
 	const type_list* my_args = arg_types->Types();
 
@@ -720,7 +720,7 @@ int FuncType::CheckArgs(const type_list* args) const
 		return 0;
 
 	for ( int i = 0; i < my_args->length(); ++i )
-		if ( ! same_type((*args)[i], (*my_args)[i]) )
+		if ( ! same_type((*args)[i], (*my_args)[i], is_init) )
 			return 0;
 
 	return 1;
@@ -1722,7 +1722,7 @@ int same_type(const BroType* t1, const BroType* t2, int is_init)
 				return 0;
 			}
 
-		return same_type(ft1->Args(), ft2->Args(), is_init);
+		return ft1->CheckArgs(ft2->ArgTypes()->Types(), is_init);
 		}
 
 	case TYPE_RECORD:
diff --git a/src/Type.h b/src/Type.h
index 249d8709c5..0b7620cd68 100644
--- a/src/Type.h
+++ b/src/Type.h
@@ -370,11 +370,9 @@ public:
 		{ Unref(yield); yield = 0; flavor = arg_flav; }
 
 	int MatchesIndex(ListExpr*& index) const;
-	int CheckArgs(const type_list* args) const;
+	int CheckArgs(const type_list* args, bool is_init = false) const;
 
-	TypeList* ArgTypes()	{ return arg_types; }
-
-	ID* GetReturnValueID() const;
+	TypeList* ArgTypes() const	{ return arg_types; }
 
 	void Describe(ODesc* d) const;
 	void DescribeReST(ODesc* d) const;
diff --git a/testing/btest/Baseline/language.func-assignment/out b/testing/btest/Baseline/language.func-assignment/out
new file mode 100644
index 0000000000..b569f7ee55
--- /dev/null
+++ b/testing/btest/Baseline/language.func-assignment/out
@@ -0,0 +1,4 @@
+Brogrammers, like bowties, are cool. Brogrammers, like bowties, are cool. Brogrammers, like bowties, are cool.
+Brogrammers, like bowties, are cool. Brogrammers, like bowties, are cool.
+BROGRAMMERS, LIKE BOWTIES, ARE COOL.
+BROGRAMMERS, LIKE BOWTIES, ARE COOL.
diff --git a/testing/btest/language/func-assignment.bro b/testing/btest/language/func-assignment.bro
new file mode 100644
index 0000000000..576d7f3270
--- /dev/null
+++ b/testing/btest/language/func-assignment.bro
@@ -0,0 +1,39 @@
+# @TEST-EXEC: bro -b %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+function double_string(s: string): string
+	{
+	return string_cat(s, " ", s);
+	}
+
+function triple_string(str: string): string
+	{
+	return string_cat(str, " ", str, " ", str);
+	}
+
+type sample_function: record {
+	s: string;
+	f: function(str: string): string;
+};
+
+event bro_init()
+	{
+	local test_sf: sample_function;
+	test_sf$s = "Brogrammers, like bowties, are cool.";
+
+	test_sf$f = triple_string;
+	print test_sf$f(test_sf$s);
+
+	test_sf$f = double_string;
+	print test_sf$f(test_sf$s);
+
+	# Works as expected
+	test_sf$f = function(str: string): string
+		{ return to_upper(str); };
+	print test_sf$f(test_sf$s);
+
+	# Func arg names shouldn't factor in to the type check.
+	test_sf$f = function(s: string): string
+		{ return to_upper(s); };
+	print test_sf$f(test_sf$s);
+	}