Merge pull request #355 from MichaelMure/query-parser-ast

replace the all-in-one query parser by a complete one with AST/lexer/parser

2 files changed, 7 insertions, 5 deletions

diff --git a/termui/bug_table.go b/termui/bug_table.go
index 41aa4e83..80d5ebcb 100644
--- a/termui/bug_table.go
+++ b/termui/bug_table.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/entity"
+	"github.com/MichaelMure/git-bug/query"
 	"github.com/MichaelMure/git-bug/util/colors"
 )
 
@@ -26,7 +27,7 @@ const defaultQuery = "status:open"
 type bugTable struct {
 	repo         *cache.RepoCache
 	queryStr     string
-	query        *cache.Query
+	query        *query.Query
 	allIds       []entity.Id
 	excerpts     []*cache.BugExcerpt
 	pageCursor   int
@@ -34,14 +35,14 @@ type bugTable struct {
 }
 
 func newBugTable(c *cache.RepoCache) *bugTable {
-	query, err := cache.ParseQuery(defaultQuery)
+	q, err := query.Parse(defaultQuery)
 	if err != nil {
 		panic(err)
 	}
 
 	return &bugTable{
 		repo:         c,
-		query:        query,
+		query:        q,
 		queryStr:     defaultQuery,
 		pageCursor:   0,
 		selectCursor: 0,
diff --git a/termui/termui.go b/termui/termui.go
index 1ef960de..96b7583c 100644
--- a/termui/termui.go
+++ b/termui/termui.go
@@ -12,6 +12,7 @@ import (
 	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/entity"
 	"github.com/MichaelMure/git-bug/input"
+	"github.com/MichaelMure/git-bug/query"
 )
 
 var errTerminateMainloop = errors.New("terminate gocui mainloop")
@@ -336,12 +337,12 @@ func editQueryWithEditor(bt *bugTable) error {
 
 	bt.queryStr = queryStr
 
-	query, err := cache.ParseQuery(queryStr)
+	q, err := query.Parse(queryStr)
 
 	if err != nil {
 		ui.msgPopup.Activate(msgPopupErrorTitle, err.Error())
 	} else {
-		bt.query = query
+		bt.query = q
 	}
 
 	initGui(nil)