chore: Replace stack collection with list

MetaCubeX · Nov 20, 2023 · b05cf14 · b05cf14
1 parent a6b816b
commit b05cf14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 62 deletions.
diff --git a/common/collections/stack.go b/common/collections/stack.go
diff --git a/rules/logic/logic.go b/rules/logic/logic.go
@@ -2,10 +2,10 @@ package logic
 
 import (
 	"fmt"
+	list "github.com/bahlo/generic-list-go"
 	"regexp"
 	"strings"
 
-	"github.com/metacubex/mihomo/common/collections"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/rules/common"
 )
@@ -133,7 +133,7 @@ func (logic *Logic) payloadToRule(subPayload string, parseRule ParseRuleFunc) (C
 }
 
 func (logic *Logic) format(payload string) ([]Range, error) {
-	stack := collections.NewStack()
+	stack := list.New[Range]()
 	num := 0
 	subRanges := make([]Range, 0)
 	for i, c := range payload {
@@ -144,15 +144,16 @@ func (logic *Logic) format(payload string) ([]Range, error) {
 			}
 
 			num++
-			stack.Push(sr)
+			stack.PushBack(sr)
 		} else if c == ')' {
 			if stack.Len() == 0 {
 				return nil, fmt.Errorf("missing '('")
 			}
 
-			sr := stack.Pop().(Range)
-			sr.end = i
-			subRanges = append(subRanges, sr)
+			sr := stack.Back()
+			stack.Remove(sr)
+			sr.Value.end = i
+			subRanges = append(subRanges, sr.Value)
 		}
 	}