From d7876007d9590c8659961822c8b25ecf955cf87b Mon Sep 17 00:00:00 2001
From: Derek Collison <derek@apcera.com>
Date: Wed, 7 Aug 2013 09:17:32 -0700
Subject: [PATCH] Support quoted map keys too

---
 conf/lex.go      | 17 ++++++++++++++++-
 conf/lex_test.go | 15 +++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/conf/lex.go b/conf/lex.go
index 5334bb39..85eae215 100644
--- a/conf/lex.go
+++ b/conf/lex.go
@@ -434,13 +434,28 @@ func lexMapKeyStart(lx *lexer) stateFn {
 			return lexCommentStart
 		}
 		lx.backup()
+	case r == sqStringStart || r == dqStringStart:
+		lx.next()
+		return lexSkip(lx, lexMapQuotedKey)
 	}
 	lx.ignore()
 	lx.next()
 	return lexMapKey
 }
 
-// lexKey consumes the text of a key. Assumes that the first character (which
+// lexMapQuotedKey consumes the text of a key between quotes.
+func lexMapQuotedKey(lx *lexer) stateFn {
+	r := lx.peek()
+	if r == sqStringEnd || r == dqStringEnd {
+		lx.emit(itemKey)
+		lx.next()
+		return lexSkip(lx, lexMapKeyEnd)
+	}
+	lx.next()
+	return lexMapQuotedKey
+}
+
+// lexMapKey consumes the text of a key. Assumes that the first character (which
 // is not whitespace) has already been consumed.
 func lexMapKey(lx *lexer) stateFn {
 	r := lx.peek()
diff --git a/conf/lex_test.go b/conf/lex_test.go
index 0a891fba..fc94d3c2 100644
--- a/conf/lex_test.go
+++ b/conf/lex_test.go
@@ -424,3 +424,18 @@ func TestNonQuotedStrings(t *testing.T) {
 	lx := lex(noquotes)
 	expect(t, lx, expectedItems)
 }
+
+func TestMapQuotedKeys(t *testing.T) {
+	expectedItems := []item{
+		{itemKey, "foo", 1},
+		{itemMapStart, "", 1},
+		{itemKey, "bar", 1},
+		{itemInteger, "4242", 1},
+		{itemMapEnd, "", 1},
+		{itemEOF, "", 1},
+	}
+	lx := lex("foo = {'bar' = 4242}")
+	expect(t, lx, expectedItems)
+	lx = lex("foo = {\"bar\" = 4242}")
+	expect(t, lx, expectedItems)
+}