go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parser: simplify objectItem method

Browse Source
This commit is contained in:
Fatih Arslan 2015-10-27 01:26:51 +03:00
parent acef702a2f
commit bbc2d19923
1 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
parser/parser.go
View File

@ -112,12 +112,8 @@ func (p *Parser) objectItem() (*ast.ObjectItem, error) {
return nil, err return nil, err
} }
switch p.tok.Type {
case token.ASSIGN:
// assignments
o := &ast.ObjectItem{ o := &ast.ObjectItem{
Keys: keys, Keys: keys,
Assign: p.tok.Pos,
} }
if p.leadComment != nil { if p.leadComment != nil {
@ -125,36 +121,19 @@ func (p *Parser) objectItem() (*ast.ObjectItem, error) {
p.leadComment = nil p.leadComment = nil
} }
switch p.tok.Type {
case token.ASSIGN:
o.Assign = p.tok.Pos
o.Val, err = p.object() o.Val, err = p.object()
if err != nil { if err != nil {
return nil, err return nil, err
} }
// do a look-ahead for line comment
p.scan()
if o.Val.Pos().Line == keys[0].Pos().Line && p.lineComment != nil {
o.LineComment = p.lineComment
p.lineComment = nil
}
p.unscan()
return o, nil
case token.LBRACE: case token.LBRACE:
// object or nested objects
o := &ast.ObjectItem{
Keys: keys,
}
if p.leadComment != nil {
o.LeadComment = p.leadComment
// free it up so we don't add it for following items
p.leadComment = nil
}
o.Val, err = p.objectType() o.Val, err = p.objectType()
if err != nil { if err != nil {
return nil, err return nil, err
} }
}
// do a look-ahead for line comment // do a look-ahead for line comment
p.scan() p.scan()
@ -162,13 +141,11 @@ func (p *Parser) objectItem() (*ast.ObjectItem, error) {
o.LineComment = p.lineComment o.LineComment = p.lineComment
p.lineComment = nil p.lineComment = nil
} }
p.unscan() p.unscan()
return o, nil return o, nil
} }
return nil, fmt.Errorf("not yet implemented: %s", p.tok.Type)
}
// objectKey parses an object key and returns a ObjectKey AST // objectKey parses an object key and returns a ObjectKey AST
func (p *Parser) objectKey() ([]*ast.ObjectKey, error) { func (p *Parser) objectKey() ([]*ast.ObjectKey, error) {
keyCount := 0 keyCount := 0