From 798e1c6c0523139416539ce5e87a67cb9fee88c9 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 6 Nov 2015 17:56:57 -0800 Subject: [PATCH] hcl/scanner: allow hyphens in idents --- hcl/scanner/scanner.go | 2 +- hcl/scanner/scanner_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hcl/scanner/scanner.go b/hcl/scanner/scanner.go index 87003f6..6724858 100644 --- a/hcl/scanner/scanner.go +++ b/hcl/scanner/scanner.go @@ -454,7 +454,7 @@ func (s *Scanner) scanDigits(ch rune, base, n int) rune { func (s *Scanner) scanIdentifier() string { offs := s.srcPos.Offset - s.lastCharLen ch := s.next() - for isLetter(ch) || isDigit(ch) { + for isLetter(ch) || isDigit(ch) || ch == '-' { ch = s.next() } diff --git a/hcl/scanner/scanner_test.go b/hcl/scanner/scanner_test.go index 37696e3..18e30e4 100644 --- a/hcl/scanner/scanner_test.go +++ b/hcl/scanner/scanner_test.go @@ -56,6 +56,7 @@ var tokenLists = map[string][]tokenPair{ {token.IDENT, "a"}, {token.IDENT, "a0"}, {token.IDENT, "foobar"}, + {token.IDENT, "foo-bar"}, {token.IDENT, "abc123"}, {token.IDENT, "LGTM"}, {token.IDENT, "_"},