revoe

imiskolee · Sep 10, 2017 · f7e50a3 · f7e50a3
1 parent c67c510
commit f7e50a3
Show file tree

Hide file tree

Showing 19 changed files with 98 additions and 63 deletions.
diff --git a/gotemplate_Bool.go → optional_Bool.go b/gotemplate_Bool.go → optional_Bool.go
diff --git a/gotemplate_Byte.go → optional_Byte.go b/gotemplate_Byte.go → optional_Byte.go
diff --git a/gotemplate_Float32.go → optional_Float32.go b/gotemplate_Float32.go → optional_Float32.go
diff --git a/gotemplate_Float64.go → optional_Float64.go b/gotemplate_Float64.go → optional_Float64.go
diff --git a/gotemplate_Int.go → optional_Int.go b/gotemplate_Int.go → optional_Int.go
diff --git a/gotemplate_Int16.go → optional_Int16.go b/gotemplate_Int16.go → optional_Int16.go
diff --git a/gotemplate_Int32.go → optional_Int32.go b/gotemplate_Int32.go → optional_Int32.go
diff --git a/gotemplate_Int64.go → optional_Int64.go b/gotemplate_Int64.go → optional_Int64.go
diff --git a/gotemplate_Int8.go → optional_Int8.go b/gotemplate_Int8.go → optional_Int8.go
diff --git a/gotemplate_String.go → optional_String.go b/gotemplate_String.go → optional_String.go
diff --git a/gotemplate_Uint.go → optional_Uint.go b/gotemplate_Uint.go → optional_Uint.go
diff --git a/gotemplate_Uint16.go → optional_Uint16.go b/gotemplate_Uint16.go → optional_Uint16.go
diff --git a/gotemplate_Uint32.go → optional_Uint32.go b/gotemplate_Uint32.go → optional_Uint32.go
diff --git a/gotemplate_Uint64.go → optional_Uint64.go b/gotemplate_Uint64.go → optional_Uint64.go
diff --git a/gotemplate_Uint8.go → optional_Uint8.go b/gotemplate_Uint8.go → optional_Uint8.go
diff --git a/gotemplate_Uintptr.go → optional_Uintptr.go b/gotemplate_Uintptr.go → optional_Uintptr.go
diff --git a/optional_scanner/utils.go b/optional_scanner/utils.go
@@ -0,0 +1,32 @@
+package optional_scanner
+
+import (
+	"errors"
+	"strconv"
+)
+
+func ScanBool(input string) (bool, error) {
+	return strconv.ParseBool(input)
+}
+func ScanInt(input string) (int64, error) {
+	return strconv.ParseInt(input, 10, 64)
+}
+
+func ScanUint(input string) (uint64, error) {
+	return strconv.ParseUint(input, 10, 64)
+}
+
+func ScanFloat(input string) (float64, error) {
+	return strconv.ParseFloat(input, 64)
+}
+
+func ScanString(input string) (string, error) {
+	return input, nil
+}
+
+func ScanByte(input string) (byte, error) {
+	if len(input) > 0 {
+		return byte(input[0]), nil
+	}
+	return 0, errors.New("nil string")
+}
diff --git a/templates/optional.go b/templates/optional.go
@@ -5,10 +5,12 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
+	"github.com/imiskolee/optional/optional_scanner"
 	"time"
 )
 
 var _ = time.Time{}
+var __ = optional_scanner.ScanBool
 
 // template type Optional(T,scan)
 type T string