Fixes bug with handling of empty identifier

whoerau · Jan 1, 2018 · cd6ec77 · cd6ec77
1 parent 2655679
commit cd6ec77
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,6 @@ language: go
 
 go:
   - 1.7
+  - 1.8
+  - 1.9
   - tip
diff --git a/identifier.go b/identifier.go
@@ -49,7 +49,7 @@ var reservedWords = map[string]bool{
 //     a key with spaces      -> false
 //     1startsWithANumber	  -> false
 func validIdentifier(s string) bool {
-	if reservedWords[s] {
+	if reservedWords[s] || s == "" {
 		return false
 	}
 

diff --git a/identifier_test.go b/identifier_test.go
@@ -21,6 +21,9 @@ func TestValidIdentifier(t *testing.T) {
 		{"true", false},
 		{"else", false},
 		{"null", false},
+
+		// Empty string
+		{"", false},
 	}
 
 	for _, test := range tests {

diff --git a/script/precommit b/script/precommit
@@ -4,4 +4,3 @@ PROJDIR=$(cd `dirname $0`/.. && pwd)
 cd ${PROJDIR}
 
 ./script/test
-./script/lint
diff --git a/statements_test.go b/statements_test.go
@@ -29,7 +29,8 @@ func TestStatementsSimple(t *testing.T) {
 			"foo": "bar"
 		},
 		"else": 1,
-		"id": 66912849
+		"id": 66912849,
+		"": 2
 	}`)
 
 	ss, err := statementsFromJSON(bytes.NewReader(j), statement{{"json", typBare}})
@@ -52,6 +53,7 @@ func TestStatementsSimple(t *testing.T) {
 		`json.anob.foo = "bar";`,
 		`json["else"] = 1;`,
 		`json.id = 66912849;`,
+		`json[""] = 2;`,
 	})
 
 	t.Logf("Have: %#v", ss)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,6 @@ language: go @@
     go:
       - 1.7
+      - 1.8
+      - 1.9
       - tip
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ PROJDIR=$(cd `dirname $0`/.. && pwd)
		cd ${PROJDIR}

		./script/test
		./script/lint