From da1984f22448e918d2776fa57a74528f7931db3d Mon Sep 17 00:00:00 2001 From: M09Ic Date: Wed, 14 Dec 2022 20:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drecu=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=BC=96=E8=AF=91=E7=9A=84bug.=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0words=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 2 ++ internal/option.go | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f1ba675..88eeebc 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/chainreactors/ipcs v0.0.13 github.com/chainreactors/logs v0.6.2 github.com/chainreactors/parsers v0.2.9-0.20221210155102-cc0814762410 - github.com/chainreactors/words v0.3.2-0.20221214061028-a7cf9f9f8ddb + github.com/chainreactors/words v0.3.2-0.20221214062855-48dff09b01ad ) require ( diff --git a/go.sum b/go.sum index c328c92..647479a 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/chainreactors/words v0.3.2-0.20221212161820-bae5f18558db h1:Rv6mcLAKX github.com/chainreactors/words v0.3.2-0.20221212161820-bae5f18558db/go.mod h1:QIWX1vMT5j/Mp9zx3/wgZh3FqskhjCbo/3Ffy/Hxj9w= github.com/chainreactors/words v0.3.2-0.20221214061028-a7cf9f9f8ddb h1:9AV8SH+SvEqmcylzZMeWei5NYIhl/0hMR7Y269M0Eqw= github.com/chainreactors/words v0.3.2-0.20221214061028-a7cf9f9f8ddb/go.mod h1:QIWX1vMT5j/Mp9zx3/wgZh3FqskhjCbo/3Ffy/Hxj9w= +github.com/chainreactors/words v0.3.2-0.20221214062855-48dff09b01ad h1:uL3TIQgvFY7dLoX0tAzIIXilCPIcNeLz/124gs+SA/Q= +github.com/chainreactors/words v0.3.2-0.20221214062855-48dff09b01ad/go.mod h1:QIWX1vMT5j/Mp9zx3/wgZh3FqskhjCbo/3Ffy/Hxj9w= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internal/option.go b/internal/option.go index 08d8653..90a4a9a 100644 --- a/internal/option.go +++ b/internal/option.go @@ -380,11 +380,13 @@ func (opt *Option) PrepareRunner() (*Runner, error) { r.FilterExpr = exp } - exp, err := expr.Compile(opt.Recursive) - if err != nil { - return nil, err + if opt.Depth > 0 { + exp, err := expr.Compile(opt.Recursive) + if err != nil { + return nil, err + } + r.RecursiveExpr = exp } - r.RecursiveExpr = exp // prepare header for _, h := range opt.Headers {