From 20af4e2adccbf1596cff830e59b53606451997e2 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 24 Oct 2021 13:41:33 -0700 Subject: [PATCH] Remove unused ToString --- BeefLibs/corlib/src/Runtime.bf | 10 +--------- BeefRT/rt/BfObjects.h | 2 +- BeefRT/rt/Internal.cpp | 21 +-------------------- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/BeefLibs/corlib/src/Runtime.bf b/BeefLibs/corlib/src/Runtime.bf index ce7933c1..eb25c60a 100644 --- a/BeefLibs/corlib/src/Runtime.bf +++ b/BeefLibs/corlib/src/Runtime.bf @@ -102,7 +102,7 @@ namespace System function void* (int size) mAlloc; function void (void* ptr) mFree; function void (Object obj) mObject_Delete; - function void (Object obj, String str) mObject_ToString; + void* mUnused0; function Type (Object obj) mObject_GetType; function void (Object obj) mObject_GCMarkMembers; function Object (Object obj, int32 typeId) mObject_DynamicCastToTypeId; @@ -141,13 +141,6 @@ namespace System delete obj; } - static void Object_ToString(Object obj, String str) - { -#if BF_DBG_RUNTIME - obj.ToString(str); -#endif - } - static Type Object_GetType(Object obj) { #if BF_DBG_RUNTIME @@ -241,7 +234,6 @@ namespace System mAlloc = => Alloc; mFree = => Free; mObject_Delete = => Object_Delete; - mObject_ToString = => Object_ToString; mObject_GetType = => Object_GetType; mObject_GCMarkMembers = => Object_GCMarkMembers; mObject_DynamicCastToTypeId = => Object_DynamicCastToTypeId; diff --git a/BeefRT/rt/BfObjects.h b/BeefRT/rt/BfObjects.h index c9234ed1..c7e79574 100644 --- a/BeefRT/rt/BfObjects.h +++ b/BeefRT/rt/BfObjects.h @@ -84,7 +84,7 @@ namespace bf void*(*Alloc)(intptr size); void(*Free)(void* ptr); 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); void(*Object_GCMarkMembers)(bf::System::Object* obj); bf::System::Object* (*Object_DynamicCastToTypeId)(bf::System::Object* obj, int typeId); diff --git a/BeefRT/rt/Internal.cpp b/BeefRT/rt/Internal.cpp index d391e642..a453ea43 100644 --- a/BeefRT/rt/Internal.cpp +++ b/BeefRT/rt/Internal.cpp @@ -84,8 +84,7 @@ namespace bf BFRT_EXPORT static Object* UnsafeCastToObject(void* inPtr); BFRT_EXPORT static void* UnsafeCastToPtr(Object* obj); BFRT_EXPORT static void ObjectDynCheck(Object* object, int typeId, bool allowNull); - BFRT_EXPORT static void ObjectDynCheckFailed(Object* object, int typeId); - BFRT_EXPORT static void Throw(Exception* ex); + BFRT_EXPORT static void ObjectDynCheckFailed(Object* object, int typeId); BFRT_EXPORT static void ThrowIndexOutOfRange(intptr stackOffset); BFRT_EXPORT static void FatalError(String* error, intptr stackOffset = 0); BFRT_EXPORT static void MemCpy(void* dest, void* src, intptr length); @@ -395,24 +394,6 @@ void* Internal::UnsafeCastToPtr(Object* 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) { if ((stackOffset != -1) && (::IsDebuggerPresent()))