Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:(ast) Visitor support skip object and array #630

Merged
merged 6 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ast/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ func (self *Parser) lspace(sp int) int {
return sp
}

func (self *Parser) backward() {
for ; self.p >= 0 && isSpace(self.s[self.p]); self.p-=1 {}
}

func (self *Parser) decodeArray(ret *linkedNodes) (Node, types.ParsingError) {
sp := self.p
ns := len(self.s)
Expand Down
46 changes: 31 additions & 15 deletions ast/visitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package ast

import (
`encoding/json`
`errors`

`github.com/bytedance/sonic/internal/native/types`
)
Expand Down Expand Up @@ -174,6 +175,19 @@ func (self *traverser) decodeArray() error {
sp := self.parser.p
ns := len(self.parser.s)

/* allocate array space and parse every element */
if err := self.visitor.OnArrayBegin(_DEFAULT_NODE_CAP); err != nil {
if err == VisitOPSkip {
// NOTICE: for user needs to skip entiry object
self.parser.p -= 1
if _, e := self.parser.skipFast(); e != 0 {
return e
}
return self.visitor.OnArrayEnd()
}
return err
}

/* check for EOF */
self.parser.p = self.parser.lspace(sp)
if self.parser.p >= ns {
Expand All @@ -183,16 +197,9 @@ func (self *traverser) decodeArray() error {
/* check for empty array */
if self.parser.s[self.parser.p] == ']' {
self.parser.p++
if err := self.visitor.OnArrayBegin(0); err != nil {
return err
}
return self.visitor.OnArrayEnd()
}

/* allocate array space and parse every element */
if err := self.visitor.OnArrayBegin(_DEFAULT_NODE_CAP); err != nil {
return err
}
for {
/* decode the value */
if err := self.decodeValue(); err != nil {
Expand Down Expand Up @@ -223,6 +230,19 @@ func (self *traverser) decodeObject() error {
sp := self.parser.p
ns := len(self.parser.s)

/* allocate object space and decode each pair */
if err := self.visitor.OnObjectBegin(_DEFAULT_NODE_CAP); err != nil {
if err == VisitOPSkip {
// NOTICE: for user needs to skip entiry object
self.parser.p -= 1
if _, e := self.parser.skipFast(); e != 0 {
return e
}
return self.visitor.OnObjectEnd()
}
return err
}

/* check for EOF */
self.parser.p = self.parser.lspace(sp)
if self.parser.p >= ns {
Expand All @@ -231,17 +251,9 @@ func (self *traverser) decodeObject() error {

/* check for empty object */
if self.parser.s[self.parser.p] == '}' {
self.parser.p++
if err := self.visitor.OnObjectBegin(0); err != nil {
return err
}
return self.visitor.OnObjectEnd()
}

/* allocate object space and decode each pair */
if err := self.visitor.OnObjectBegin(_DEFAULT_NODE_CAP); err != nil {
return err
}
for {
var njs types.JsonState
var err types.ParsingError
Expand Down Expand Up @@ -313,3 +325,7 @@ func (self *traverser) decodeString(iv int64, ep int) error {
}
return self.visitor.OnString(out)
}

// If visitor return this error on `OnObjectBegin()` or `OnArrayBegin()`,
// the transverer will skip entiry object or array
var VisitOPSkip = errors.New("")
AsterDY marked this conversation as resolved.
Show resolved Hide resolved
109 changes: 109 additions & 0 deletions ast/visitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,115 @@ func TestVisitor_UserNodeDiff(t *testing.T) {
})
}

type skipVisitor struct {
sp int
Skip int
inSkip bool
CountSkip int
}

func (self *skipVisitor) OnNull() error {
if self.sp == self.Skip+1 && self.inSkip {
panic("unexpected key")
}
return nil
}

func (self *skipVisitor) OnFloat64(v float64, n json.Number) error {
if self.sp == self.Skip+1 && self.inSkip {
panic("unexpected key")
}
return nil
}

func (self *skipVisitor) OnInt64(v int64, n json.Number) error {
if self.sp == self.Skip+1 && self.inSkip {
panic("unexpected key")
}
return nil
}

func (self *skipVisitor) OnBool(v bool) error {
if self.sp == self.Skip+1 && self.inSkip {
panic("unexpected key")
}
return nil
}

func (self *skipVisitor) OnString(v string) error {
if self.sp == self.Skip+1 && self.inSkip {
panic("unexpected key")
}
return nil
}

func (self *skipVisitor) OnObjectBegin(capacity int) error {
println("self.sp", self.sp)
if self.sp == self.Skip {
self.inSkip = true
self.CountSkip++
println("op skip")
self.sp++
return VisitOPSkip
}
self.sp++
return nil
}

func (self *skipVisitor) OnObjectKey(key string) error {
if self.sp == self.Skip+1 && self.inSkip {
panic("unexpected key")
}
return nil
}

func (self *skipVisitor) OnObjectEnd() error {
if self.sp == self.Skip + 1 {
if !self.inSkip {
panic("not in skip")
}
self.inSkip = false
println("finish op skip")
}
self.sp--
return nil
}

func (self *skipVisitor) OnArrayBegin(capacity int) error {
println("arr self.sp", self.sp)
if self.sp == self.Skip {
self.inSkip = true
self.CountSkip++
println("arr op skip")
self.sp++
return VisitOPSkip
}
self.sp++
return nil
}

func (self *skipVisitor) OnArrayEnd() error {
println("arr self.sp", self.sp)
if self.sp == self.Skip + 1 {
if !self.inSkip {
panic("arr not in skip")
}
self.inSkip = false
println("arr finish op skip")
}
self.sp--
return nil
}

func TestVisitor_OpSkip(t *testing.T) {
var suite skipVisitor
suite.Skip = 1
Preorder(`{ "a": [ null ] , "b": 1, "c": { "1" : 1 } }`, &suite, nil)
if suite.CountSkip != 2 {
t.Fatal(suite.CountSkip)
}
}

func BenchmarkVisitor_UserNode(b *testing.B) {
const str = _TwitterJson
b.Run("AST", func(b *testing.B) {
Expand Down
1 change: 1 addition & 0 deletions fuzz/go-fuzz-corpus
Submodule go-fuzz-corpus added at c42c1b
2 changes: 1 addition & 1 deletion tools/asm2asm
Loading