From 52033be6ad2e7d9424f69b6655edd3f4837cf626 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Tue, 16 Jun 2020 07:51:16 -0700 Subject: [PATCH] Listens to Static/Instance flags for method enumeration --- BeefLibs/corlib/src/Reflection/MethodInfo.bf | 6 ++---- IDE/src/Debugger/DebugManager.bf | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BeefLibs/corlib/src/Reflection/MethodInfo.bf b/BeefLibs/corlib/src/Reflection/MethodInfo.bf index f26d907e..b9558b72 100644 --- a/BeefLibs/corlib/src/Reflection/MethodInfo.bf +++ b/BeefLibs/corlib/src/Reflection/MethodInfo.bf @@ -381,11 +381,9 @@ namespace System.Reflection mIdx++; if (mIdx == mTypeInstance.[Friend]mMethodDataCount) return false; -#unwarn var methodData = &mTypeInstance.[Friend]mMethodDataPtr[mIdx]; - /*bool matches = (mBindingFlags.HasFlag(BindingFlags.Static) && (methodData.mFlags.HasFlag(FieldFlags.Static))); - matches |= (mBindingFlags.HasFlag(BindingFlags.Instance) && (!methodData.mFlags.HasFlag(FieldFlags.Static)));*/ - bool matches = true; + bool matches = (mBindingFlags.HasFlag(BindingFlags.Static) && (methodData.mFlags.HasFlag(.Static))); + matches |= (mBindingFlags.HasFlag(BindingFlags.Instance) && (!methodData.mFlags.HasFlag(.Static))); if (matches) break; } diff --git a/IDE/src/Debugger/DebugManager.bf b/IDE/src/Debugger/DebugManager.bf index e21d84e8..8227cfea 100644 --- a/IDE/src/Debugger/DebugManager.bf +++ b/IDE/src/Debugger/DebugManager.bf @@ -86,7 +86,8 @@ namespace IDE.Debugger AllowProperties = 0x20, MemoryAddress = 0x40, MemoryWatch = 0x80, - Symbol = 0x100 + Symbol = 0x100, + StepIntoCall = 0x200 } [Reflect]