golint: don't use underscores in Go names Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/utils.go b/utils.go index 88d223f..5b77aba 100644 --- a/utils.go +++ b/utils.go
@@ -128,13 +128,13 @@ // same as ECMA Number.MAX_SAFE_INTEGER and Number.MIN_SAFE_INTEGER const ( - max_json_float = float64(1<<53 - 1) // 9007199254740991.0 2^53 - 1 - min_json_float = -float64(1<<53 - 1) //-9007199254740991.0 -2^53 - 1 + maxJSONFloat = float64(1<<53 - 1) // 9007199254740991.0 2^53 - 1 + minJSONFloat = -float64(1<<53 - 1) //-9007199254740991.0 -2^53 - 1 ) func isFloat64AnInteger(f float64) bool { - if math.IsNaN(f) || math.IsInf(f, 0) || f < min_json_float || f > max_json_float { + if math.IsNaN(f) || math.IsInf(f, 0) || f < minJSONFloat || f > maxJSONFloat { return false }
diff --git a/validation.go b/validation.go index 53fd0b8..90f9043 100644 --- a/validation.go +++ b/validation.go
@@ -615,11 +615,11 @@ } } - pp_has, pp_match := v.validatePatternProperty(currentSubSchema, pk, value[pk], result, context) + ppHas, ppMatch := v.validatePatternProperty(currentSubSchema, pk, value[pk], result, context) if found { - if pp_has && !pp_match { + if ppHas && !ppMatch { result.addInternalError( new(AdditionalPropertyNotAllowedError), context, @@ -630,7 +630,7 @@ } else { - if !pp_has || !pp_match { + if !ppHas || !ppMatch { result.addInternalError( new(AdditionalPropertyNotAllowedError), context, @@ -655,18 +655,18 @@ } } - pp_has, pp_match := v.validatePatternProperty(currentSubSchema, pk, value[pk], result, context) + ppHas, ppMatch := v.validatePatternProperty(currentSubSchema, pk, value[pk], result, context) if found { - if pp_has && !pp_match { + if ppHas && !ppMatch { validationResult := additionalPropertiesSchema.subValidateWithContext(value[pk], context) result.mergeErrors(validationResult) } } else { - if !pp_has || !pp_match { + if !ppHas || !ppMatch { validationResult := additionalPropertiesSchema.subValidateWithContext(value[pk], context) result.mergeErrors(validationResult) } @@ -679,9 +679,9 @@ for pk := range value { - pp_has, pp_match := v.validatePatternProperty(currentSubSchema, pk, value[pk], result, context) + ppHas, ppMatch := v.validatePatternProperty(currentSubSchema, pk, value[pk], result, context) - if pp_has && !pp_match { + if ppHas && !ppMatch { result.addInternalError( new(InvalidPropertyPatternError),