libfoundation: Add type checks to exported MCName functions

peter-b · peter-b · commit cd3a8e048ab9 · 2015-10-07T21:28:19.000+01:00
diff --git a/libfoundation/src/foundation-name.cpp b/libfoundation/src/foundation-name.cpp
@@ -55,7 +55,7 @@ MCNameRef MCNAME(const char *p_string)
 
 bool MCNameCreate(MCStringRef p_string, MCNameRef& r_name)
 {
-	MCAssert(p_string != nil);
+	__MCAssertIsString(p_string);
 
 	if (p_string -> char_count == 0 && kMCEmptyName != nil)
 	{
@@ -233,11 +233,13 @@ MCNameRef MCNameLookup(MCStringRef p_string)
 
 uintptr_t MCNameGetCaselessSearchKey(MCNameRef self)
 {
+	__MCAssertIsName(self);
 	return (uintptr_t)self -> key;
 }
 
 MCStringRef MCNameGetString(MCNameRef self)
 {
+	__MCAssertIsName(self);
 	return self -> string;
 }
 
@@ -248,6 +250,9 @@ bool MCNameIsEmpty(MCNameRef self)
 
 bool MCNameIsEqualTo(MCNameRef self, MCNameRef p_other_name)
 {
+	__MCAssertIsName(self);
+	__MCAssertIsName(p_other_name);
+
 	return self == p_other_name ||
 			self -> key == p_other_name -> key;
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ MCNameRef MCNAME(const char *p_string)`
`55`	`55`
`56`	`56`	`bool MCNameCreate(MCStringRef p_string, MCNameRef& r_name)`
`57`	`57`	`{`
`58`		`- MCAssert(p_string != nil);`
	`58`	`+ __MCAssertIsString(p_string);`
`59`	`59`
`60`	`60`	`if (p_string -> char_count == 0 && kMCEmptyName != nil)`
`61`	`61`	`{`
`@@ -233,11 +233,13 @@ MCNameRef MCNameLookup(MCStringRef p_string)`
`233`	`233`
`234`	`234`	`uintptr_t MCNameGetCaselessSearchKey(MCNameRef self)`
`235`	`235`	`{`
	`236`	`+ __MCAssertIsName(self);`
`236`	`237`	`return (uintptr_t)self -> key;`
`237`	`238`	`}`
`238`	`239`
`239`	`240`	`MCStringRef MCNameGetString(MCNameRef self)`
`240`	`241`	`{`
	`242`	`+ __MCAssertIsName(self);`
`241`	`243`	`return self -> string;`
`242`	`244`	`}`
`243`	`245`
`@@ -248,6 +250,9 @@ bool MCNameIsEmpty(MCNameRef self)`
`248`	`250`
`249`	`251`	`bool MCNameIsEqualTo(MCNameRef self, MCNameRef p_other_name)`
`250`	`252`	`{`
	`253`	`+ __MCAssertIsName(self);`
	`254`	`+ __MCAssertIsName(p_other_name);`
	`255`	`+`
`251`	`256`	`return self == p_other_name \|\|`
`252`	`257`	`self -> key == p_other_name -> key;`
`253`	`258`	`}`