ostiwe/go-toml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix strings lexing and add a few tests

Browse Source
This commit is contained in:
Thomas Pelletier
2013-03-26 10:53:49 +01:00
parent b1c54ee485
commit 8a5d380286
4 changed files with 93 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lexer.go
+1 -1
View File
@@ -305,7 +305,7 @@ func lexString(l *lexer) stateFn {
l.emitWithValue(tokenString, growing_string)
l.pos += 1
l.ignore()
return lexVoid
return lexRvalue
}
if l.follow("\\\"") {
lexer_test.go
+50
View File
@@ -150,6 +150,56 @@ func TestKeyEqualFalse(t *testing.T) {
})
}
func TestArrayNestedString(t *testing.T) {
testFlow(t, "a = [ [\"hello\", \"world\"] ]", []token{
token{tokenKey, "a"},
token{tokenEqual, "="},
token{tokenLeftBracket, "["},
token{tokenLeftBracket, "["},
token{tokenString, "hello"},
token{tokenComma, ","},
token{tokenString, "world"},
token{tokenRightBracket, "]"},
token{tokenRightBracket, "]"},
token{tokenEOF, ""},
})
}
func TestArrayNestedInts(t *testing.T) {
testFlow(t, "a = [ [42, 21], [10] ]", []token{
token{tokenKey, "a"},
token{tokenEqual, "="},
token{tokenLeftBracket, "["},
token{tokenLeftBracket, "["},
token{tokenInteger, "42"},
token{tokenComma, ","},
token{tokenInteger, "21"},
token{tokenRightBracket, "]"},
token{tokenComma, ","},
token{tokenLeftBracket, "["},
token{tokenInteger, "10"},
token{tokenRightBracket, "]"},
token{tokenRightBracket, "]"},
token{tokenEOF, ""},
})
}
func TestArrayInts(t *testing.T) {
testFlow(t, "a = [ 42, 21, 10, ]", []token{
token{tokenKey, "a"},
token{tokenEqual, "="},
token{tokenLeftBracket, "["},
token{tokenInteger, "42"},
token{tokenComma, ","},
token{tokenInteger, "21"},
token{tokenComma, ","},
token{tokenInteger, "10"},
token{tokenComma, ","},
token{tokenRightBracket, "]"},
token{tokenEOF, ""},
})
}
func TestKeyEqualArrayBools(t *testing.T) {
testFlow(t, "foo = [true, false, true]", []token{
token{tokenKey, "foo"},
parser.go
+2
View File
@@ -162,6 +162,8 @@ func parseArray(p *parser) []interface{} {
panic("unterminated array")
}
if follow.typ != tokenRightBracket && follow.typ != tokenComma {
fmt.Println(follow.typ)
fmt.Println(follow.val)
panic("missing comma")
}
if follow.typ == tokenComma {
parser_test.go
+40 -30
View File
@@ -6,7 +6,11 @@ import (
"time"
)
func assertTree(t *testing.T, tree *TomlTree, ref map[string]interface{}) {
func assertTree(t *testing.T, tree *TomlTree, err error, ref map[string]interface{}) {
if (err != nil) {
t.Fatal("Non-nil error:", err.Error())
return
}
for k, v := range ref {
if fmt.Sprintf("%v", tree.Get(k)) != fmt.Sprintf("%v", v) {
t.Log("was expecting", v, "at", k, "but got", tree.Get(k))
@@ -25,21 +29,21 @@ func TestCreateSubTree(t *testing.T) {
}
func TestSimpleKV(t *testing.T) {
tree, _ := Load("a = 42")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = 42")
assertTree(t, tree, err, map[string]interface{}{
"a": int64(42),
})
tree, _ = Load("a = 42\nb = 21")
assertTree(t, tree, map[string]interface{}{
assertTree(t, tree, err, map[string]interface{}{
"a": int64(42),
"b": int64(21),
})
}
func TestSimpleNumbers(t *testing.T) {
tree, _ := Load("a = +42\nb = -21\nc = +4.2\nd = -2.1")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = +42\nb = -21\nc = +4.2\nd = -2.1")
assertTree(t, tree, err, map[string]interface{}{
"a": int64(42),
"b": int64(-21),
"c": float64(4.2),
@@ -48,74 +52,82 @@ func TestSimpleNumbers(t *testing.T) {
}
func TestSimpleDate(t *testing.T) {
tree, _ := Load("a = 1979-05-27T07:32:00Z")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = 1979-05-27T07:32:00Z")
assertTree(t, tree, err, map[string]interface{}{
"a": time.Date(1979, time.May, 27, 7, 32, 0, 0, time.UTC),
})
}
func TestSimpleString(t *testing.T) {
tree, _ := Load("a = \"hello world\"")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = \"hello world\"")
assertTree(t, tree, err, map[string]interface{}{
"a": "hello world",
})
}
func TestBools(t *testing.T) {
tree, _ := Load("a = true\nb = false")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = true\nb = false")
assertTree(t, tree, err, map[string]interface{}{
"a": true,
"b": false,
})
}
func TestNestedKeys(t *testing.T) {
tree, _ := Load("[a.b.c]\nd = 42")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("[a.b.c]\nd = 42")
assertTree(t, tree, err, map[string]interface{}{
"a.b.c.d": int64(42),
})
}
func TestArrayOne(t *testing.T) {
tree, _ := Load("a = [1]")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = [1]")
assertTree(t, tree, err, map[string]interface{}{
"a": []int64{int64(1)},
})
}
func TestArrayZero(t *testing.T) {
tree, _ := Load("a = []")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = []")
assertTree(t, tree, err, map[string]interface{}{
"a": []interface{}{},
})
}
func TestArraySimple(t *testing.T) {
tree, _ := Load("a = [42, 21, 10]")
assertTree(t, tree, map[string]interface{}{
fmt.Println("test")
tree, err := Load("a = [42, 21, 10]")
assertTree(t, tree, err, map[string]interface{}{
"a": []int64{int64(42), int64(21), int64(10)},
})
fmt.Println("blah")
tree, _ = Load("a = [42, 21, 10,]")
assertTree(t, tree, map[string]interface{}{
assertTree(t, tree, err, map[string]interface{}{
"a": []int64{int64(42), int64(21), int64(10)},
})
}
func TestArrayMultiline(t *testing.T) {
tree, _ := Load("a = [42,\n21, 10,]")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = [42,\n21, 10,]")
assertTree(t, tree, err, map[string]interface{}{
"a": []int64{int64(42), int64(21), int64(10)},
})
}
func TestArrayNested(t *testing.T) {
tree, _ := Load("a = [[42, 21], [10]]")
assertTree(t, tree, map[string]interface{}{
tree, err := Load("a = [[42, 21], [10]]")
assertTree(t, tree, err, map[string]interface{}{
"a": [][]int64{[]int64{int64(42), int64(21)}, []int64{int64(10)}},
})
}
func TestArrayNestedStrings(t *testing.T) {
tree, err := Load("data = [ [\"gamma\", \"delta\"] ]")
assertTree(t, tree, err, map[string]interface{}{
"data": [][]string{[]string{"gamma", "delta"}},
})
}
func TestMissingValue(t *testing.T) {
_, err := Load("a = ")
if (err.Error() != "expecting a value") {
@@ -139,10 +151,8 @@ func TestMissingFile(t *testing.T) {
func TestParseFile(t *testing.T) {
tree, err := LoadFile("example.toml")
if (err != nil) {
t.Fatal("Non-nil error:", err.Error())
}
assertTree(t, tree, map[string]interface{}{
assertTree(t, tree, err, map[string]interface{}{
"a": [][]int64{[]int64{int64(42), int64(21)}, []int64{int64(10)}},
})
}