From 25013841d2c28eca33a8a1f94a33babad36d80aa Mon Sep 17 00:00:00 2001
From: Silvan Jegen <s.jegen@gmail.com>
Date: Mon, 26 Dec 2016 14:09:32 +0100
Subject: Fix "go vet" issue

---
 conf/scanner.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf/scanner.go')

diff --git a/conf/scanner.go b/conf/scanner.go
index 9bd7a4b..fd9868a 100644
--- a/conf/scanner.go
+++ b/conf/scanner.go
@@ -61,7 +61,7 @@ func (s *scanner) Scan() (token, error) {
 		r, rlen := utf8.DecodeRune(s.data[s.offset+processed:])
 		if r == utf8.RuneError {
 			if rlen == 1 {
-				return token{}, fmt.Errorf("found invalid UTF8 at offset %d, before: %s", s.offset, s.data[s.offset])
+				return token{}, fmt.Errorf("found invalid UTF8 at offset %d, before: %s", s.offset, string(s.data[s.offset]))
 			} else if rlen == 0 {
 				return token{}, io.EOF
 			}
-- 
cgit v1.2.1-18-gbd029


From d700b7019e8fc380ee5ca454f3aa3edd36f30faf Mon Sep 17 00:00:00 2001
From: Silvan Jegen <s.jegen@gmail.com>
Date: Tue, 27 Dec 2016 14:38:28 +0100
Subject: Parse more of our current config format

---
 conf/scanner.go | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'conf/scanner.go')

diff --git a/conf/scanner.go b/conf/scanner.go
index fd9868a..44301fe 100644
--- a/conf/scanner.go
+++ b/conf/scanner.go
@@ -14,8 +14,10 @@ type tokentype int
 const (
 	Name tokentype = iota
 	Literal
-	DeliOpen
-	DeliClose
+	ListDelimiter
+	ObjectDelimiter
+	EmptyList
+	EmptyObject
 	Nothing
 	IfStatement
 )
@@ -50,7 +52,16 @@ func newScanner(r io.Reader) *scanner {
 }
 
 func getTokenType(s []byte) tokentype {
-	return Nothing
+	switch s[0] {
+	case '"', '\'':
+		return Literal
+	case '[':
+		return ListDelimiter
+	case '{':
+		return ObjectDelimiter
+	}
+
+	return Name
 }
 
 func (s *scanner) Scan() (token, error) {
-- 
cgit v1.2.1-18-gbd029


From e2fdd3b1b714b9fa896218c68fdfe57d906730ba Mon Sep 17 00:00:00 2001
From: Silvan Jegen <s.jegen@gmail.com>
Date: Wed, 28 Dec 2016 19:48:53 +0100
Subject: Implement Peek()

---
 conf/scanner.go | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'conf/scanner.go')

diff --git a/conf/scanner.go b/conf/scanner.go
index 44301fe..74e66e8 100644
--- a/conf/scanner.go
+++ b/conf/scanner.go
@@ -33,6 +33,8 @@ type scanner struct {
 	data    []byte
 	offset  int
 	curline int
+
+	peeked *token
 }
 
 func newScanner(r io.Reader) *scanner {
@@ -55,9 +57,9 @@ func getTokenType(s []byte) tokentype {
 	switch s[0] {
 	case '"', '\'':
 		return Literal
-	case '[':
+	case '[', ']':
 		return ListDelimiter
-	case '{':
+	case '{', '}':
 		return ObjectDelimiter
 	}
 
@@ -68,6 +70,11 @@ func (s *scanner) Scan() (token, error) {
 	processed := 0
 	tokenstarted := false
 	oldline := s.curline
+	if s.peeked != nil {
+		ret := *s.peeked
+		s.peeked = nil
+		return ret, nil
+	}
 	for {
 		r, rlen := utf8.DecodeRune(s.data[s.offset+processed:])
 		if r == utf8.RuneError {
@@ -108,6 +115,15 @@ func (s *scanner) Scan() (token, error) {
 	return ret, nil
 }
 
-func (s *scanner) peek() (tokentype, string, error) {
-	return Nothing, "", nil
+func (s *scanner) Peek() (token, error) {
+	if s.peeked != nil {
+		return *s.peeked, nil
+	}
+
+	tok, err := s.Scan()
+	if err != nil {
+		return token{}, err
+	}
+	s.peeked = &tok
+	return tok, nil
 }
-- 
cgit v1.2.1-18-gbd029