noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify code

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-09-21 00:37:03 +01:00
parent 36f65cbc3c
commit 504c1b81e2
1 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sql/select.go
View file

@ -73,12 +73,10 @@ func (p *parser) parseSelectStatement() (stmt *SelectStatement, err error) {
func (p *parser) parseGroup() (mul []*Group, err error) { func (p *parser) parseGroup() (mul []*Group, err error) {
// Remove the GROUP keyword
if _, _, exi := p.mightBe(GROUP); !exi { if _, _, exi := p.mightBe(GROUP); !exi {
return nil, nil return nil, nil
} }
// Next token might be BY
_, _, _ = p.mightBe(BY) _, _, _ = p.mightBe(BY)
return return
@ -91,12 +89,10 @@ func (p *parser) parseOrder() (mul []*Order, err error) {
var lit string var lit string
var exi bool var exi bool
// Remove the ORDER keyword
if _, _, exi := p.mightBe(ORDER); !exi { if _, _, exi := p.mightBe(ORDER); !exi {
return nil, nil return nil, nil
} }
// Next token might be BY
_, _, _ = p.mightBe(BY) _, _, _ = p.mightBe(BY)
for { for {
@ -115,7 +111,8 @@ func (p *parser) parseOrder() (mul []*Order, err error) {
tok, lit, exi = p.mightBe(ASC, DESC) tok, lit, exi = p.mightBe(ASC, DESC)
if !exi { if !exi {
tok, lit = ASC, "ASC" tok = ASC
lit = tok.String()
} }
one.Dir, err = p.declare(tok, lit) one.Dir, err = p.declare(tok, lit)
@ -138,12 +135,10 @@ func (p *parser) parseOrder() (mul []*Order, err error) {
func (p *parser) parseLimit() (Expr, error) { func (p *parser) parseLimit() (Expr, error) {
// Remove the LIMIT keyword
if _, _, exi := p.mightBe(LIMIT); !exi { if _, _, exi := p.mightBe(LIMIT); !exi {
return nil, nil return nil, nil
} }
// Next token might be BY
_, _, _ = p.mightBe(BY) _, _, _ = p.mightBe(BY)
tok, lit, err := p.shouldBe(NUMBER) tok, lit, err := p.shouldBe(NUMBER)
@ -165,34 +160,19 @@ func (p *parser) parseStart() (Expr, error) {
// Next token might be AT // Next token might be AT
_, _, _ = p.mightBe(AT) _, _, _ = p.mightBe(AT)
// Next token might be @ tok, lit, err := p.shouldBe(NUMBER, THING)
_, _, exi := p.mightBe(EAT) if err != nil {
return nil, &ParseError{Found: lit, Expected: []string{"number or record id"}}
if exi == false {
val, err := p.parseNumber()
if err != nil {
return nil, err
}
return val, nil
} }
if exi == true { return p.declare(tok, lit)
p.unscan()
val, err := p.parseThing()
if err != nil {
return nil, err
}
return val, nil
}
return nil, nil
} }
func (p *parser) parseVersion() (Expr, error) { func (p *parser) parseVersion() (Expr, error) {
// Remove the VERSION keyword // Remove the VERSION keyword
if _, _, exi := p.mightBe(VERSION); !exi { if _, _, exi := p.mightBe(VERSION, ON); !exi {
return nil, nil return nil, nil
} }