Skip to content

Commit

Permalink
Parse floats correctly and fix mistake from #171
Browse files Browse the repository at this point in the history
The regular expression is copy & pasted form the one in the spec.
The change suggested in #171 and integrated was improper.

Closes #290
  • Loading branch information
niemeyer committed Mar 19, 2019
1 parent 51d6538 commit 7b8349a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -691,13 +691,13 @@ var unmarshalTests = []struct {
M{"ñoño": "very yes 🟔"},
},

// YAML Float regex shouldn't match this
// This *is* in fact a float number, per the spec. #171 was a mistake.
{
"a: 123456e1\n",
M{"a": "123456e1"},
M{"a": 123456e1},
}, {
"a: 123456E1\n",
M{"a": "123456E1"},
M{"a": 123456E1},
},
// yaml-test-suite 3GZX: Spec Example 7.1. Alias Nodes
{
Expand Down
2 changes: 1 addition & 1 deletion resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func resolvableTag(tag string) bool {
return false
}

var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`)
var yamlStyleFloat = regexp.MustCompile(`^[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?$`)

func resolve(tag string, in string) (rtag string, out interface{}) {
if !resolvableTag(tag) {
Expand Down

0 comments on commit 7b8349a

Please sign in to comment.