From 48f9f044761e559d228c2c57831a56ecd5b720c9 Mon Sep 17 00:00:00 2001 From: n0m1s Date: Wed, 18 Sep 2019 09:33:15 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20validateCast=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jdr/type.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/jdr/type.go b/jdr/type.go index f328a1a..fd75a72 100644 --- a/jdr/type.go +++ b/jdr/type.go @@ -22,6 +22,14 @@ type VariableType interface { DefaultValue() JsonValue } +func validateCast(err error) bool { + if err != nil { + log.Println(err) + return false + } + return true +} + type VariableType_badType struct {} func (*VariableType_badType) Name() string { @@ -57,7 +65,7 @@ func (*VariableType_bool) ToBool(value JsonValue) (bool, error) { func (self *VariableType_bool) Validate(value JsonValue) bool { _, err := self.ToBool(value) - return err == nil + return validateCast(err) } func (self *VariableType_bool) ToHTML(value JsonValue) (template.HTML, error) { @@ -101,7 +109,7 @@ func (self *VariableType_int) ToInt(value JsonValue) (int64, error) { func (self *VariableType_int) Validate(value JsonValue) bool { _, err := self.ToInt(value) - return err == nil + return validateCast(err) } func (self *VariableType_int) ToHTML(value JsonValue) (template.HTML, error) { @@ -135,7 +143,7 @@ func (*VariableType_float) ToFloat(value JsonValue) (float64, error) { func (self *VariableType_float) Validate(value JsonValue) bool { _, err := self.ToFloat(value) - return err == nil + return validateCast(err) } func (self *VariableType_float) ToHTML(value JsonValue) (template.HTML, error) { @@ -170,7 +178,7 @@ func (self *VariableType_string) ToString(value JsonValue) (string, error) { func (self *VariableType_string) Validate(value JsonValue) bool { _, err := self.ToString(value) - return err != nil + return validateCast(err) } func (self *VariableType_string) ToHTML(value JsonValue) (template.HTML, error) { @@ -254,7 +262,7 @@ func (self *CustomEnum) ToId(value JsonValue) (int, error) { func (self *CustomEnum) Validate(value JsonValue) bool { _, err := self.ToId(value) - return err == nil + return validateCast(err) } func (self *CustomEnum) ToHTML(value JsonValue) (template.HTML, error) {