From 7d00bc92245f665aad6a6f8e06b40ea487776dd1 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Wed, 5 Mar 2025 11:44:10 +0000 Subject: [PATCH 1/2] Fix module path for haxe 5 --- hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx b/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx index 2aa8647..ba89b3f 100644 --- a/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx +++ b/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx @@ -62,7 +62,7 @@ class Server { var socket:sys.net.Socket; var stateMutex:Mutex; var socketMutex:Mutex; - var currentThreadInfo:cpp.vm.ThreadInfo; + var currentThreadInfo:cpp.vm.Debugger.ThreadInfo; var scopes:Map>; var threads:Map; var breakpoints:Map>; From 74c952badc9327fa260aba74ecab2f9fa77b4461 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Wed, 5 Mar 2025 11:48:47 +0000 Subject: [PATCH 2/2] Fix remaining ThreadInfo references cpp.vm.Debugger is already imported in this file so we can just use the type directly --- hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx b/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx index ba89b3f..193e77b 100644 --- a/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx +++ b/hxcpp-debug-server/hxcpp/debug/jsonrpc/Server.hx @@ -62,7 +62,7 @@ class Server { var socket:sys.net.Socket; var stateMutex:Mutex; var socketMutex:Mutex; - var currentThreadInfo:cpp.vm.Debugger.ThreadInfo; + var currentThreadInfo:ThreadInfo; var scopes:Map>; var threads:Map; var breakpoints:Map>; @@ -537,9 +537,9 @@ class Server { references.clear(); stateMutex.release(); - if (currentThreadInfo.status == cpp.vm.ThreadInfo.STATUS_STOPPED_BREAK_IMMEDIATE) { + if (currentThreadInfo.status == ThreadInfo.STATUS_STOPPED_BREAK_IMMEDIATE) { sendEvent(Protocol.PauseStop, {threadId: threadNumber}); - } else if (currentThreadInfo.status == cpp.vm.ThreadInfo.STATUS_STOPPED_BREAKPOINT) { + } else if (currentThreadInfo.status == ThreadInfo.STATUS_STOPPED_BREAKPOINT) { var bId = currentThreadInfo.breakpoint; var path = file2path[path2Key(fileName)]; var thisFileBreakpoints = breakpoints[path2Key(path)];