barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move query interface definitions into query

Browse source
This commit is contained in:
kortschak 2014-07-31 08:52:24 +09:30
parent 38f7b79761
commit a6cf432313
7 changed files with 74 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

11
graph/sexp/session.go
View file

@ -22,6 +22,7 @@ import (
"sort"
"github.com/google/cayley/graph"
"github.com/google/cayley/query"
)
type Session struct {
@ -39,7 +40,7 @@ func (s *Session) ToggleDebug() {
s.debug = !s.debug
}
func (s *Session) InputParses(input string) (graph.ParseResult, error) {
func (s *Session) InputParses(input string) (query.ParseResult, error) {
var parenDepth int
for i, x := range input {
if x == '(' {
@ -52,17 +53,17 @@ func (s *Session) InputParses(input string) (graph.ParseResult, error) {
if (i - 10) > min {
min = i - 10
}
return graph.ParseFail, errors.New(fmt.Sprintf("Too many close parens at char %d: %s", i, input[min:i]))
return query.ParseFail, errors.New(fmt.Sprintf("Too many close parens at char %d: %s", i, input[min:i]))
}
}
}
if parenDepth > 0 {
return graph.ParseMore, nil
return query.ParseMore, nil
}
if len(ParseString(input)) > 0 {
return graph.Parsed, nil
return query.Parsed, nil
}
return graph.ParseFail, errors.New("Invalid Syntax")
return query.ParseFail, errors.New("Invalid Syntax")
}
func (s *Session) ExecInput(input string, out chan interface{}, limit int) {