history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: adjust sub_rule to logic package, and fix not rule failed

Browse Source
This commit is contained in:
Skyxim
2022-09-11 16:19:42 +08:00
parent ef2f8317c7
commit 4597ed49cf
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rules/parser.go
View File

@ -6,7 +6,6 @@ import (
RC "github.com/Dreamacro/clash/rules/common"
"github.com/Dreamacro/clash/rules/logic"
RP "github.com/Dreamacro/clash/rules/provider"
"github.com/Dreamacro/clash/rules/sub_rule"
)
func ParseRule(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error) {
@ -47,7 +46,7 @@ func ParseRule(tp, payload, target string, params []string, subRules *map[string
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
case "SUB-RULE":
parsed, parseErr = sub_rule.NewSubRule(payload, target, subRules, ParseRule)
parsed, parseErr = logic.NewSubRule(payload, target, subRules, ParseRule)
case "AND":
parsed, parseErr = logic.NewAND(payload, target, ParseRule)
case "OR":