From eba1a7374fdfbd5bac8a4c29a62c9b651d04f571 Mon Sep 17 00:00:00 2001
From: Admin <2762713521@qq.com>
Date: Sun, 1 Dec 2024 17:52:29 +0800
Subject: [PATCH] fix https://github.com/goradd/maps/issues/15

---
 sdk/bindgen/bind_test.go                    | 8 +++-----
 sdk/bindgen/command_test.go                 | 6 ++----
 sdk/bindgen/constants/constants_gen_test.go | 2 +-
 sdk/bindgen/macros_decode.go                | 6 ++----
 ux/ark/ark.go                               | 3 +--
 ux/ark/ark_test.go                          | 4 +---
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/sdk/bindgen/bind_test.go b/sdk/bindgen/bind_test.go
index 0b9aad1a..a94d6f29 100644
--- a/sdk/bindgen/bind_test.go
+++ b/sdk/bindgen/bind_test.go
@@ -7,8 +7,6 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/goradd/maps"
-
 	"github.com/ddkwork/app/bindgen/clang"
 	"github.com/ddkwork/app/bindgen/gengo"
 	"github.com/ddkwork/golibrary/mylog"
@@ -118,8 +116,8 @@ func TestBindMacros(t *testing.T) {
 	mylog.Trace("number of macros", macros.Len())
 
 	var (
-		enumDebuggers = new(maps.SafeSliceMap[string, string])
-		enumIoctls    = new(maps.SafeSliceMap[string, string])
+		enumDebuggers = new(safemap.SafeMap[string, string])
+		enumIoctls    = new(safemap.SafeMap[string, string])
 	)
 	macros.Range(func(key string, value string) bool {
 		if !m.Has(key) {
@@ -331,7 +329,7 @@ typedef struct _LIST_ENTRY {
 #endif
 `
 
-var m = new(maps.SafeSliceMap[string, string])
+var m = new(safemap.SafeMap[string, string])
 
 func init() {
 	m.Set("PAGE_SIZE", "4096")
diff --git a/sdk/bindgen/command_test.go b/sdk/bindgen/command_test.go
index b3f9c367..c4a45724 100644
--- a/sdk/bindgen/command_test.go
+++ b/sdk/bindgen/command_test.go
@@ -8,8 +8,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/goradd/maps"
-
 	"github.com/ddkwork/HyperDbg/sdk"
 
 	"github.com/ddkwork/golibrary/mylog"
@@ -73,7 +71,7 @@ func TestUnmarshalCommandJson(t *testing.T) {
 
 func TestCommandGenerate(t *testing.T) {
 	t.Skip("not well")
-	m := new(maps.SafeSliceMap[string, string])
+	m := safemap.NewOrdered[string, string]()
 	m.Set("debugging", "debugging")
 	m.Set("extension", "extension")
 	m.Set("hwdbg", "hwdbg")
@@ -110,7 +108,7 @@ func commandGenerate(kindName, path string) {
 		return err
 	})
 
-	m := new(maps.SafeSliceMap[string, string])
+	m := safemap.NewOrdered[string, string]()
 	for _, command := range commands {
 		m.Set(command.FullName, command.FullName) // todo this must be use Cmd,then it will return the right command
 	}
diff --git a/sdk/bindgen/constants/constants_gen_test.go b/sdk/bindgen/constants/constants_gen_test.go
index 6b6cb4c0..b7cda6a5 100644
--- a/sdk/bindgen/constants/constants_gen_test.go
+++ b/sdk/bindgen/constants/constants_gen_test.go
@@ -20,7 +20,7 @@ func TestGenConstants(t *testing.T) {
 }
 
 func genConstants(fileName string) {
-	m := new(maps.SafeSliceMap[string, string])
+	m := safemap.NewOrdered[string, string]()
 	for i, s := range stream.NewBuffer(fileName).ToLines() {
 		if i == 4 {
 			// break // test
diff --git a/sdk/bindgen/macros_decode.go b/sdk/bindgen/macros_decode.go
index 750d8a23..bc1b9869 100644
--- a/sdk/bindgen/macros_decode.go
+++ b/sdk/bindgen/macros_decode.go
@@ -2,12 +2,10 @@ package bindgen
 
 import (
 	"strings"
-
-	"github.com/goradd/maps"
 )
 
-func extractMacros(lines []string) *maps.SafeSliceMap[string, string] {
-	macros := new(maps.SafeSliceMap[string, string])
+func extractMacros(lines []string) *safemap.SafeMap[string, string] {
+	macros := new(safemap.SafeMap[string, string])
 	macros.Set("PAGE_SIZE", "4096")
 	var macroName string
 	var macroValue strings.Builder
diff --git a/ux/ark/ark.go b/ux/ark/ark.go
index 52d9ffe0..4d825dad 100644
--- a/ux/ark/ark.go
+++ b/ux/ark/ark.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ddkwork/golibrary/mylog"
 	"github.com/ddkwork/golibrary/stream"
 	"github.com/ddkwork/unison"
-	"github.com/goradd/maps"
 )
 
 func main() {
@@ -66,7 +65,7 @@ func Layout() *unison.Panel {
 	widget.SetScrollLayout(splitPanel, 2)
 
 	left := widget.NewTableScrollPanel(table, header)
-	layouts := new(maps.SafeSliceMap[ArksType, func() unison.Paneler])
+	layouts := new(safemap.SafeMap[ArksType, func() unison.Paneler])
 	layouts.Set(KernelTablesType, func() unison.Paneler {
 		table, header := widget.NewTable(ms.NtApi{}, widget.TableContext[ms.NtApi]{
 			ContextMenuItems: nil,
diff --git a/ux/ark/ark_test.go b/ux/ark/ark_test.go
index 5269d236..9b16cf64 100644
--- a/ux/ark/ark_test.go
+++ b/ux/ark/ark_test.go
@@ -3,14 +3,12 @@ package ark
 import (
 	"testing"
 
-	"github.com/goradd/maps"
-
 	"github.com/ddkwork/golibrary/stream"
 )
 
 func TestName(t *testing.T) {
 	g := stream.NewGeneratedFile()
-	m := new(maps.SafeSliceMap[string, string])
+	m := safemap.NewOrdered[string, string]()
 	m.Set("kernelTables", "kernelTables")
 	m.Set("explorer", "explorer")
 	m.Set("taskManager", "taskManager")