1
0
Fork 0

Go greedy

This commit is contained in:
Gregory Eremin 2015-02-17 23:05:42 +07:00
parent e33501d6a5
commit 0d2df2c6e5
2 changed files with 15 additions and 8 deletions

View File

@ -13,6 +13,7 @@ type (
// Context building block // Context building block
expectation struct { expectation struct {
typ expectationType typ expectationType
greedy bool
key string // Object key key string // Object key
index int64 // Array index index int64 // Array index
} }
@ -37,9 +38,12 @@ func (c *context) compare(c2 *context) bool {
if exp.typ != exp2.typ { if exp.typ != exp2.typ {
return false return false
} }
if exp.greedy || exp2.greedy {
continue
}
switch exp.typ { switch exp.typ {
case array: case array:
if exp.index != -1 && exp2.index != -1 && exp.index != exp2.index { if exp.index != exp2.index {
return false return false
} }
case object: case object:
@ -92,7 +96,7 @@ func parseSelector(sel string) []expectation {
c.typ = array c.typ = array
part = part[1 : len(part)-1] part = part[1 : len(part)-1]
if part == "*" { if part == "*" {
c.index = -1 c.greedy = true
} else if i, err := strconv.ParseInt(part, 10, 64); err == nil { } else if i, err := strconv.ParseInt(part, 10, 64); err == nil {
c.index = i c.index = i
} else { } else {
@ -100,8 +104,12 @@ func parseSelector(sel string) []expectation {
} }
} else { } else {
c.typ = object c.typ = object
if part == "*" {
c.greedy = true
} else {
c.key = part c.key = part
} }
}
exps = append(exps, c) exps = append(exps, c)
} }

3
run.go
View File

@ -13,8 +13,7 @@ func main() {
b, _ := ioutil.ReadAll(f) b, _ := ioutil.ReadAll(f)
p := parser.New(b, []string{ p := parser.New(b, []string{
"/prices/pomelo", "/prices/*",
"/prices/peach",
"/bananas/[*]/weight", "/bananas/[*]/weight",
}) })
res := p.Parse() res := p.Parse()