Fixed formatting

This commit is contained in:
eanderton
2014-07-08 22:02:42 -04:00
parent 262211488d
commit 5dd3b53635
3 changed files with 26 additions and 26 deletions
+4 -4
View File
@@ -1,12 +1,12 @@
package main package main
import ( import (
"io/ioutil"
"os"
"github.com/pelletier/go-toml"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/pelletier/go-toml"
"io/ioutil"
"log" "log"
"os"
"time" "time"
) )
@@ -40,7 +40,7 @@ func translate(tomlData interface{}) interface{} {
return typed return typed
case *toml.TomlTree: case *toml.TomlTree:
return translate((map[string]interface{})(*orig)) return translate((map[string]interface{})(*orig))
case []*toml.TomlTree: case []*toml.TomlTree:
typed := make([]map[string]interface{}, len(orig)) typed := make([]map[string]interface{}, len(orig))
for i, v := range orig { for i, v := range orig {
typed[i] = translate(v).(map[string]interface{}) typed[i] = translate(v).(map[string]interface{})
+2 -2
View File
@@ -419,7 +419,7 @@ func lexInsideKeyGroupArray(l *lexer) stateFn {
return lexVoid return lexVoid
} else if l.peek() == '[' { } else if l.peek() == '[' {
return l.errorf("group name cannot contain ']'") return l.errorf("group name cannot contain ']'")
} }
if l.next() == eof { if l.next() == eof {
break break
@@ -440,7 +440,7 @@ func lexInsideKeyGroup(l *lexer) stateFn {
return lexVoid return lexVoid
} else if l.peek() == '[' { } else if l.peek() == '[' {
return l.errorf("group name cannot contain ']'") return l.errorf("group name cannot contain ']'")
} }
if l.next() == eof { if l.next() == eof {
break break
+20 -20
View File
@@ -64,16 +64,16 @@ func (t *TomlTree) GetPath(keys []string) interface{} {
if !exists { if !exists {
return nil return nil
} }
switch node := (*subtree)[intermediate_key].(type) { switch node := (*subtree)[intermediate_key].(type) {
case *TomlTree: case *TomlTree:
subtree = node subtree = node
case []*TomlTree: case []*TomlTree:
// go to most recent element // go to most recent element
if len(node) == 0 { if len(node) == 0 {
return nil //(*subtree)[intermediate_key] = append(node, &TomlTree{}) return nil //(*subtree)[intermediate_key] = append(node, &TomlTree{})
} }
subtree = node[len(node)-1] subtree = node[len(node)-1]
} }
} }
return (*subtree)[keys[len(keys)-1]] return (*subtree)[keys[len(keys)-1]]
} }
@@ -102,16 +102,16 @@ func (t *TomlTree) SetPath(keys []string, value interface{}) {
var new_tree TomlTree = make(TomlTree) var new_tree TomlTree = make(TomlTree)
(*subtree)[intermediate_key] = &new_tree (*subtree)[intermediate_key] = &new_tree
} }
switch node := (*subtree)[intermediate_key].(type) { switch node := (*subtree)[intermediate_key].(type) {
case *TomlTree: case *TomlTree:
subtree = node subtree = node
case []*TomlTree: case []*TomlTree:
// go to most recent element // go to most recent element
if len(node) == 0 { if len(node) == 0 {
(*subtree)[intermediate_key] = append(node, &TomlTree{}) (*subtree)[intermediate_key] = append(node, &TomlTree{})
} }
subtree = node[len(node)-1] subtree = node[len(node)-1]
} }
} }
(*subtree)[keys[len(keys)-1]] = value (*subtree)[keys[len(keys)-1]] = value
} }