Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Remove unused ToString

Browse source
This commit is contained in:
Brian Fiete 2021-10-24 13:41:33 -07:00
parent 14794e5574
commit 20af4e2adc
3 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BeefLibs/corlib/src/Runtime.bf
View file

@ -102,7 +102,7 @@ namespace System
function void* (int size) mAlloc; function void* (int size) mAlloc;
function void (void* ptr) mFree; function void (void* ptr) mFree;
function void (Object obj) mObject_Delete; function void (Object obj) mObject_Delete;
function void (Object obj, String str) mObject_ToString; void* mUnused0;
function Type (Object obj) mObject_GetType; function Type (Object obj) mObject_GetType;
function void (Object obj) mObject_GCMarkMembers; function void (Object obj) mObject_GCMarkMembers;
function Object (Object obj, int32 typeId) mObject_DynamicCastToTypeId; function Object (Object obj, int32 typeId) mObject_DynamicCastToTypeId;
@ -141,13 +141,6 @@ namespace System
delete obj; delete obj;
} }
static void Object_ToString(Object obj, String str)
{
#if BF_DBG_RUNTIME
obj.ToString(str);
#endif
}
static Type Object_GetType(Object obj) static Type Object_GetType(Object obj)
{ {
#if BF_DBG_RUNTIME #if BF_DBG_RUNTIME
@ -241,7 +234,6 @@ namespace System
mAlloc = => Alloc; mAlloc = => Alloc;
mFree = => Free; mFree = => Free;
mObject_Delete = => Object_Delete; mObject_Delete = => Object_Delete;
mObject_ToString = => Object_ToString;
mObject_GetType = => Object_GetType; mObject_GetType = => Object_GetType;
mObject_GCMarkMembers = => Object_GCMarkMembers; mObject_GCMarkMembers = => Object_GCMarkMembers;
mObject_DynamicCastToTypeId = => Object_DynamicCastToTypeId; mObject_DynamicCastToTypeId = => Object_DynamicCastToTypeId;

2
BeefRT/rt/BfObjects.h
View file

@ -84,7 +84,7 @@ namespace bf
void*(*Alloc)(intptr size); void*(*Alloc)(intptr size);
void(*Free)(void* ptr); void(*Free)(void* ptr);
void(*Object_Delete)(bf::System::Object* obj); void(*Object_Delete)(bf::System::Object* obj);
void(*Object_ToString)(bf::System::Object* obj, bf::System::String* str); void* mUnused0;
bf::System::Type* (*Object_GetType)(bf::System::Object* obj); bf::System::Type* (*Object_GetType)(bf::System::Object* obj);
void(*Object_GCMarkMembers)(bf::System::Object* obj); void(*Object_GCMarkMembers)(bf::System::Object* obj);
bf::System::Object* (*Object_DynamicCastToTypeId)(bf::System::Object* obj, int typeId); bf::System::Object* (*Object_DynamicCastToTypeId)(bf::System::Object* obj, int typeId);

19
BeefRT/rt/Internal.cpp
View file

@ -85,7 +85,6 @@ namespace bf
BFRT_EXPORT static void* UnsafeCastToPtr(Object* obj); BFRT_EXPORT static void* UnsafeCastToPtr(Object* obj);
BFRT_EXPORT static void ObjectDynCheck(Object* object, int typeId, bool allowNull); BFRT_EXPORT static void ObjectDynCheck(Object* object, int typeId, bool allowNull);
BFRT_EXPORT static void ObjectDynCheckFailed(Object* object, int typeId); BFRT_EXPORT static void ObjectDynCheckFailed(Object* object, int typeId);
BFRT_EXPORT static void Throw(Exception* ex);
BFRT_EXPORT static void ThrowIndexOutOfRange(intptr stackOffset); BFRT_EXPORT static void ThrowIndexOutOfRange(intptr stackOffset);
BFRT_EXPORT static void FatalError(String* error, intptr stackOffset = 0); BFRT_EXPORT static void FatalError(String* error, intptr stackOffset = 0);
BFRT_EXPORT static void MemCpy(void* dest, void* src, intptr length); BFRT_EXPORT static void MemCpy(void* dest, void* src, intptr length);
@ -395,24 +394,6 @@ void* Internal::UnsafeCastToPtr(Object* obj)
return (void*)obj; return (void*)obj;
} }
void Internal::Throw(Exception* ex)
{
bf::System::String* exStr = gBfRtCallbacks.String_Alloc();
gBfRtCallbacks.Object_ToString(ex, exStr);
Beefy::String errorStr = StrFormat("FATAL: %s", exStr->CStr());
SETUP_ERROR(errorStr.c_str(), 1);
BF_DEBUG_BREAK();
gBfRtCallbacks.DebugMessageData_Fatal();
printf("Thrown: %s", errorStr.c_str());
//TODO: What about capturing callstack?
exit(3);
//throw ex;
}
void Internal::ThrowIndexOutOfRange(intptr stackOffset) void Internal::ThrowIndexOutOfRange(intptr stackOffset)
{ {
if ((stackOffset != -1) && (::IsDebuggerPresent())) if ((stackOffset != -1) && (::IsDebuggerPresent()))