gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Address issues found by golint.

Browse Source 
* No functional changes
* Did not address the ALL_CAPS issues
* Did not modify public APIs and field names.
This commit is contained in:
Colin Sullivan
2016-03-15 15:21:13 -06:00
parent ebe6bcdbd3
commit 2baac47820
33 changed files with 224 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
conf/lex.go
View File

@@ -709,9 +709,8 @@ func lexNumberOrDateStart(lx *lexer) stateFn {
if !isDigit(r) {
if r == '.' {
return lx.errorf("Floats must start with a digit, not '.'.")
} else {
return lx.errorf("Expected a digit but got '%v'.", r)
}
return lx.errorf("Expected a digit but got '%v'.", r)
}
return lexNumberOrDate
}
@@ -772,9 +771,8 @@ func lexNumberStart(lx *lexer) stateFn {
if !isDigit(r) {
if r == '.' {
return lx.errorf("Floats must start with a digit, not '.'.")
} else {
return lx.errorf("Expected a digit but got '%v'.", r)
}
return lx.errorf("Expected a digit but got '%v'.", r)
}
return lexNumber
}

16
conf/parse.go
View File

@@ -1,6 +1,6 @@
// Copyright 2013 Apcera Inc. All rights reserved.
// Conf is a configuration file format used by gnatsd. It is
// Package conf supports a configuration file format used by gnatsd. It is
// a flexible format that combines the best of traditional
// configuration formats and newer styles such as JSON and YAML.
package conf
@@ -20,9 +20,6 @@ import (
"time"
)
// Parser will return a map of keys to interface{}, although concrete types
// underly them. The values supported are string, bool, int64, float64, DateTime.
// Arrays and nested Maps are also supported.
type parser struct {
mapping map[string]interface{}
lx *lexer
@@ -37,6 +34,9 @@ type parser struct {
keys []string
}
// Parse will return a map of keys to interface{}, although concrete types
// underly them. The values supported are string, bool, int64, float64, DateTime.
// Arrays and nested Maps are also supported.
func Parse(data string) (map[string]interface{}, error) {
p, err := parse(data)
if err != nil {
@@ -121,9 +121,8 @@ func (p *parser) processItem(it item) error {
if e, ok := err.(*strconv.NumError); ok &&
e.Err == strconv.ErrRange {
return fmt.Errorf("Integer '%s' is out of the range.", it.val)
} else {
return fmt.Errorf("Expected integer, but got '%s'.", it.val)
}
return fmt.Errorf("Expected integer, but got '%s'.", it.val)
}
p.setValue(num)
case itemFloat:
@@ -132,9 +131,8 @@ func (p *parser) processItem(it item) error {
if e, ok := err.(*strconv.NumError); ok &&
e.Err == strconv.ErrRange {
return fmt.Errorf("Float '%s' is out of the range.", it.val)
} else {
return fmt.Errorf("Expected float, but got '%s'.", it.val)
}
return fmt.Errorf("Expected float, but got '%s'.", it.val)
}
p.setValue(num)
case itemBool:
@@ -154,7 +152,7 @@ func (p *parser) processItem(it item) error {
}
p.setValue(dt)
case itemArrayStart:
array := make([]interface{}, 0)
var array = make([]interface{}, 0)
p.pushContext(array)
case itemArrayEnd:
array := p.ctx