libfoundation: Refactor __MCAssertIsStream() to use type info.

peter-b · peter-b · commit 588da6a6e0f5 · 2015-10-08T02:12:09.000+01:00
In LC8, the `__MCAssertIsStream()` macro can be implemented more
cleanly around type info objects.  The previous implementation doesn't
work any more anyway.
diff --git a/libfoundation/src/foundation-private.h b/libfoundation/src/foundation-private.h
@@ -452,12 +452,6 @@ inline MCValueTypeCode __MCValueGetTypeCode(__MCValue *self)
 	return (self -> flags >> 28);
 }
 
-inline const MCValueCustomCallbacks *
-__MCValueGetCustomCallbacks(__MCValue *self)
-{
-	return reinterpret_cast<__MCCustomValue *>(self)->callbacks;
-}
-
 template<class T> inline bool __MCValueCreate(MCValueTypeCode p_type_code, T*& r_value)
 {
 	__MCValue *t_value;
diff --git a/libfoundation/src/foundation-stream.cpp b/libfoundation/src/foundation-stream.cpp
@@ -312,9 +312,7 @@ static MCValueCustomCallbacks kMCStreamCustomValueCallbacks =
 static inline void __MCAssertIsStream(MCStreamRef ref)
 {
 	__MCValue *val = reinterpret_cast<__MCValue *>(ref);
-	MCAssert(nil != val &&
-	         __MCValueGetTypeCode(val) == kMCValueTypeCodeCustom &&
-	         __MCValueGetCustomCallbacks(val) == &kMCStreamCustomValueCallbacks);
+	MCAssert(MCValueGetTypeInfo(val) == kMCStreamTypeInfo);
 }
 
 MC_DLLEXPORT_DEF

Original file line number	Diff line number	Diff line change
`@@ -452,12 +452,6 @@ inline MCValueTypeCode __MCValueGetTypeCode(__MCValue *self)`
`452`	`452`	`return (self -> flags >> 28);`
`453`	`453`	`}`
`454`	`454`
`455`		`-inline const MCValueCustomCallbacks *`
`456`		`-__MCValueGetCustomCallbacks(__MCValue *self)`
`457`		`-{`
`458`		`- return reinterpret_cast<__MCCustomValue *>(self)->callbacks;`
`459`		`-}`
`460`		`-`
`461`	`455`	`template<class T> inline bool __MCValueCreate(MCValueTypeCode p_type_code, T*& r_value)`
`462`	`456`	`{`
`463`	`457`	`__MCValue *t_value;`
Original file line number	Diff line number	Diff line change
`@@ -312,9 +312,7 @@ static MCValueCustomCallbacks kMCStreamCustomValueCallbacks =`
`312`	`312`	`static inline void __MCAssertIsStream(MCStreamRef ref)`
`313`	`313`	`{`
`314`	`314`	`__MCValue val = reinterpret_cast<__MCValue >(ref);`
`315`		`- MCAssert(nil != val &&`
`316`		`- __MCValueGetTypeCode(val) == kMCValueTypeCodeCustom &&`
`317`		`- __MCValueGetCustomCallbacks(val) == &kMCStreamCustomValueCallbacks);`
	`315`	`+ MCAssert(MCValueGetTypeInfo(val) == kMCStreamTypeInfo);`
`318`	`316`	`}`
`319`	`317`
`320`	`318`	`MC_DLLEXPORT_DEF`