Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-24 18:48:01 +02:00
Code Activity

Boxed struct ptr changes.

Browse source
This commit is contained in:
Brian Fiete 2019-10-09 16:16:01 -07:00
parent ad2542eba6
commit 5af6428bf4
20 changed files with 573 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

21
BeefLibs/corlib/src/Pointer.bf
View file

@ -1,12 +1,29 @@
namespace System
{
struct Pointer
[AlwaysInclude]
struct Pointer : IHashable
{
void* mVal;
public int GetHashCode()
{
return (int)mVal;
}
[AlwaysInclude]
Object GetBoxed()
{
return new box this;
}
}
struct Pointer<T>
struct Pointer<T> : IHashable
{
T* mVal;
public int GetHashCode()
{
return (int)mVal;
}
}
}

35
BeefLibs/corlib/src/Reflection/MethodInfo.bf
View file

@ -154,26 +154,35 @@ namespace System.Reflection
Type underlyingType = argType.UnderlyingType;
if ((paramType.IsPrimitive) && (underlyingType.IsTypedPrimitive)) // Boxed primitive?
underlyingType = underlyingType.UnderlyingType;
if (!underlyingType.IsSubtypeOf(paramType))
if (argType.IsBoxedStructPtr)
{
if (underlyingType.IsGenericType)
dataPtr = *(void**)dataPtr;
handled = true;
}
else
{
if (!underlyingType.IsSubtypeOf(paramType))
{
var ptrTypedPrimitive = (SpecializedGenericType)underlyingType;
if ((ptrTypedPrimitive.mTypeFlags.HasFlag(.Sys_PointerT)))
if (underlyingType.IsGenericType)
{
let elementType = Type.GetType(ptrTypedPrimitive.mResolvedTypeRefs[0]);
if (elementType == paramType)
var ptrTypedPrimitive = (SpecializedGenericType)underlyingType;
if ((ptrTypedPrimitive.mTypeFlags.HasFlag(.Sys_PointerT)))
{
dataPtr = *(void**)dataPtr;
handled = true;
let elementType = Type.GetType(ptrTypedPrimitive.mResolvedTypeRefs[0]);
if (elementType == paramType)
{
dataPtr = *(void**)dataPtr;
handled = true;
}
}
}
/*if (underlyingType.IsSpecialType(TypeInstance.[Friend]sPointerTType, "System", "Pointer", 2))
{
}*/
}
/*if (underlyingType.IsSpecialType(TypeInstance.[Friend]sPointerTType, "System", "Pointer", 2))
{
}*/
}
if (!handled)

16
BeefLibs/corlib/src/Type.bf
View file

@ -213,6 +213,14 @@ namespace System
}
}
public bool IsPointer
{
get
{
return (mTypeFlags & (TypeFlags.Boxed | TypeFlags.Pointer)) == TypeFlags.Pointer;
}
}
public bool IsBoxed
{
get
@ -221,6 +229,14 @@ namespace System
}
}
public bool IsBoxedStructPtr
{
get
{
return (mTypeFlags & (TypeFlags.Boxed | TypeFlags.Pointer)) == TypeFlags.Boxed | TypeFlags.Pointer;
}
}
public bool IsEnum
{
get