Parser #yay

lex.go

@@ -1,24 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"github.com/localhots/punk/lexer"
-)
-
-func main() {
-	f, _ := os.Open("test.json")
-	b, _ := ioutil.ReadAll(f)
-
-	lex := lexer.New(string(b))
-	go lex.Run()
-	for {
-		if item, ok := lex.NextItem(); ok {
-			fmt.Println(item)
-		} else {
-			break
-		}
-	}
-}

parser/parser.go

@@ -9,58 +9,181 @@ import (
 )
 
 type (
-	ExpectationType int
+	ContextType int
-	Expectation     struct {
+	Context     struct {
-		Type  ExpectationType
+		Type ContextType
-		Key   string
+		Key  string
-		Index int64
 	}
 	Parser struct {
-		exps []Expectation
+		exps    []Context
+		context []Context
+		lex     *lexer.Lexer
 	}
 )
 
 const (
-	Object ExpectationType = iota
+	Unknown ContextType = iota
+	Object
 	Array
 )
 
-func New(selector string) *Parser {
+func New(b []byte, sel string) *Parser {
-	return &Parser{
+	p := &Parser{
-		exps: parseSelector(selector),
+		exps:    parseSelector(sel),
+		context: []Context{},
+		lex:     lexer.New(string(b)),
 	}
+
+	return p
 }
 
-func (p *Parser) Parse(b []byte) {
+func (p *Parser) Parse() {
-	lex := lexer.New(string(b))
+	go p.lex.Run()
-	go lex.Run()
+	p.parseValue(p.next())
+}
 
-	for {
+func (p *Parser) parseValue(item lexer.Item) {
-		if item, ok := lex.NextItem(); ok {
+	if item.Token == lexer.BraceOpen {
-			fmt.Println(item)
+		p.enterContext(Object)
+		p.parseObject()
+		p.leaveContext()
+		return
+	}
+	if item.Token == lexer.BracketOpen {
+		p.enterContext(Array)
+		p.parseArray(0)
+		p.leaveContext()
+		return
+	}
+
+	isMatch := p.checkContext()
+	switch item.Token {
+	case lexer.Null, lexer.Bool, lexer.Number, lexer.String:
+		if isMatch {
+			fmt.Printf("\n\nFOUND MATCH!\nVALUE: %s\n\n", item.String())
+			panic("Match found")
+		}
+	default:
+		if isMatch {
+			panic("Cannot print your match, sorry :(")
 		} else {
-			break
+			unexpected(item)
 		}
 	}
 }
 
-func parseSelector(sel string) []Expectation {
+func (p *Parser) parseArray(i int) {
-	exps := []Expectation{}
+	p.context[len(p.context)-1].Key = strconv.Itoa(i)
+	item := p.next()
+	if item.Token == lexer.BracketClose {
+		return
+	}
+
+	p.parseValue(item)
+
+	switch item := p.next(); item.Token {
+	case lexer.BracketClose:
+		return
+	case lexer.Comma:
+		p.parseArray(i + 1)
+	}
+}
+
+func (p *Parser) parseObject() {
+	item := p.next()
+	switch item.Token {
+	case lexer.BraceClose:
+		return
+	case lexer.String:
+		p.context[len(p.context)-1].Key = item.Val
+	default:
+		unexpected(item)
+	}
+
+	if item := p.next(); item.Token != lexer.Colon {
+		unexpected(item)
+	}
+
+	p.parseValue(p.next())
+
+	switch item := p.next(); item.Token {
+	case lexer.BraceClose:
+		return
+	case lexer.Comma:
+		p.parseObject()
+	default:
+		unexpected(item)
+	}
+}
+
+func (p *Parser) checkContext() bool {
+	depth := len(p.context)
+	if depth != len(p.exps) {
+		return false
+	}
+
+	fmt.Println("Checking...")
+	fmt.Println(p.exps)
+	fmt.Println(p.context)
+
+	for i, exp := range p.exps {
+		ctx := p.context[i]
+		if exp.Type != ctx.Type || exp.Key != ctx.Key {
+			return false
+		}
+	}
+
+	return true
+}
+
+func (p *Parser) next() lexer.Item {
+	if item, ok := p.lex.NextItem(); ok {
+		fmt.Println(item)
+		return item
+	} else {
+		panic("EOF reached")
+	}
+}
+
+func (p *Parser) enterContext(typ ContextType) {
+	p.context = append(p.context, Context{
+		Type: typ,
+	})
+}
+
+func (p *Parser) leaveContext() {
+	p.context = p.context[:len(p.context)-1]
+}
+
+func unexpected(item lexer.Item) {
+	panic(fmt.Errorf("Unexpected token: %s", item.String()))
+}
+
+func parseSelector(sel string) []Context {
+	exps := []Context{}
 	parts := strings.Split(sel[1:], "/")
 	for _, part := range parts {
+		typ := Object
 		if len(part) > 2 && part[:1] == "[" && part[len(part)-1:] == "]" {
-			index, _ := strconv.ParseInt(part[1:len(part)-1], 10, 64)
+			part = part[1 : len(part)-1]
-			exps = append(exps, Expectation{
+			typ = Array
-				Type:  Array,
-				Index: index,
-			})
-		} else {
-			exps = append(exps, Expectation{
-				Type: Object,
-				Key:  part,
-			})
 		}
+		exps = append(exps, Context{
+			Type: typ,
+			Key:  part,
+		})
 	}
 
 	return exps
 }
+
+func (e ContextType) String() string {
+	switch e {
+	case Array:
+		return "Index"
+	case Object:
+		return "Key"
+	default:
+		return "Unknown"
+	}
+}

run.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"io/ioutil"
+	"os"
+
+	"github.com/kr/pretty"
+	"github.com/localhots/punk/parser"
+)
+
+func main() {
+	f, _ := os.Open("test.json")
+	b, _ := ioutil.ReadAll(f)
+
+	p := parser.New(b, "/bananas/[1]/weight")
+	pretty.Println(p)
+	p.Parse()
+}