Skip to content

Commit

Permalink
resolve: add missing character in float regex
Browse files Browse the repository at this point in the history
The [+-] is optional after the exponent delineator.
  • Loading branch information
squeed committed Jan 8, 2019
1 parent 51d6538 commit 70076f2
Show file tree
Hide file tree
Showing 3 changed files with 7 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
// YAML Float regex
{
"a: 123456e1\n",
M{"a": "123456e1"},
M{"a": float64(1234560)},
}, {
"a: 123456E1\n",
M{"a": "123456E1"},
M{"a": float64(1234560)},
},
// yaml-test-suite 3GZX: Spec Example 7.1. Alias Nodes
{
Expand Down
3 changes: 3 additions & 0 deletions encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ var marshalTests = []struct {
}, {
map[string]interface{}{"v": "10"},
"v: \"10\"\n",
}, {
map[string]interface{}{"v": "123e1"},
"v: \"123e1\"\n",
}, {
map[string]interface{}{"v": 0.1},
"v: 0.1\n",
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]+([eE][-+]?[0-9]+)?$`)

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

0 comments on commit 70076f2

Please sign in to comment.