go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #245 from octo/cartridge-return

Browse Source 
scanner: Improve regular expression in "scanner".scanHeredoc().
This commit is contained in:
Mitchell Hashimoto 2018-04-03 10:00:26 -07:00 committed by GitHub
commit c247bd0851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hcl/printer/printer_test.go
View File

@ -153,6 +153,8 @@ func TestFormatValidOutput(t *testing.T) {
cases := []string{ cases := []string{
"#\x00", "#\x00",
"#\ue123t", "#\ue123t",
"Y=<<4\n4/\n\n\n/4/@=4/\n\n\n/4000000004\r\r\n00004\n",
"x=<<_\n_\r\r\n_\n",
} }
for _, c := range cases { for _, c := range cases {

1
hcl/printer/testdata/object_with_heredoc.golden vendored
View File

@ -1,6 +1,7 @@
obj { obj {
foo = [<<EOF foo = [<<EOF
TEXT! TEXT!
!!EOF
EOF EOF
] ]
} }

1
hcl/printer/testdata/object_with_heredoc.input vendored
View File

@ -1,6 +1,7 @@
obj { obj {
foo = [<<EOF foo = [<<EOF
TEXT! TEXT!
!!EOF
EOF EOF
] ]
} }

4
hcl/scanner/scanner.go
View File

@ -440,9 +440,9 @@ func (s *Scanner) scanHeredoc() {
var identRegexp *regexp.Regexp var identRegexp *regexp.Regexp
if identBytes[0] == '-' { if identBytes[0] == '-' {
identRegexp = regexp.MustCompile(fmt.Sprintf(`[[:space:]]*%s\z`, identBytes[1:])) identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\r*\z`, identBytes[1:]))
} else { } else {
identRegexp = regexp.MustCompile(fmt.Sprintf(`[[:space:]]*%s\z`, identBytes)) identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\r*\z`, identBytes))
} }
// Read the actual string value // Read the actual string value