Generate flag type lookup funcs

bpfarmer · Jul 10, 2016 · 77f1130 · 77f1130
1 parent 3a8ad86
commit 77f1130
Show file tree

Hide file tree

Showing 4 changed files with 209 additions and 167 deletions.
diff --git a/context.go b/context.go
@@ -3,9 +3,7 @@ package cli
 import (
 	"errors"
 	"flag"
-	"strconv"
 	"strings"
-	"time"
 )
 
 // Context is a type that is passed through to
@@ -173,156 +171,6 @@ func lookupGlobalFlagSet(name string, ctx *Context) *flag.FlagSet {
 	return nil
 }
 
-func lookupInt(name string, set *flag.FlagSet) int {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseInt(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return int(val)
-	}
-
-	return 0
-}
-
-func lookupInt64(name string, set *flag.FlagSet) int64 {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseInt(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return val
-	}
-
-	return 0
-}
-
-func lookupUint(name string, set *flag.FlagSet) uint {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseUint(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return uint(val)
-	}
-
-	return 0
-}
-
-func lookupUint64(name string, set *flag.FlagSet) uint64 {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseUint(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return val
-	}
-
-	return 0
-}
-
-func lookupDuration(name string, set *flag.FlagSet) time.Duration {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := time.ParseDuration(f.Value.String())
-		if err == nil {
-			return val
-		}
-	}
-
-	return 0
-}
-
-func lookupFloat64(name string, set *flag.FlagSet) float64 {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseFloat(f.Value.String(), 64)
-		if err != nil {
-			return 0
-		}
-		return val
-	}
-
-	return 0
-}
-
-func lookupString(name string, set *flag.FlagSet) string {
-	f := set.Lookup(name)
-	if f != nil {
-		return f.Value.String()
-	}
-
-	return ""
-}
-
-func lookupStringSlice(name string, set *flag.FlagSet) []string {
-	f := set.Lookup(name)
-	if f != nil {
-		return (f.Value.(*StringSlice)).Value()
-
-	}
-
-	return nil
-}
-
-func lookupIntSlice(name string, set *flag.FlagSet) []int {
-	f := set.Lookup(name)
-	if f != nil {
-		return (f.Value.(*IntSlice)).Value()
-
-	}
-
-	return nil
-}
-
-func lookupInt64Slice(name string, set *flag.FlagSet) []int64 {
-	f := set.Lookup(name)
-	if f != nil {
-		return (f.Value.(*Int64Slice)).Value()
-
-	}
-
-	return nil
-}
-
-func lookupGeneric(name string, set *flag.FlagSet) interface{} {
-	f := set.Lookup(name)
-	if f != nil {
-		return f.Value
-	}
-	return nil
-}
-
-func lookupBool(name string, set *flag.FlagSet) bool {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseBool(f.Value.String())
-		if err != nil {
-			return false
-		}
-		return val
-	}
-
-	return false
-}
-
-func lookupBoolT(name string, set *flag.FlagSet) bool {
-	f := set.Lookup(name)
-	if f != nil {
-		val, err := strconv.ParseBool(f.Value.String())
-		if err != nil {
-			return true
-		}
-		return val
-	}
-
-	return false
-}
-
 func copyFlag(name string, ff *flag.Flag, set *flag.FlagSet) {
 	switch ff.Value.(type) {
 	case *StringSlice:

diff --git a/flag-types.json b/flag-types.json
@@ -3,25 +3,29 @@
     "name": "Bool",
     "type": "bool",
     "value": false,
-    "context_default": "false"
+    "context_default": "false",
+    "parser": "strconv.ParseBool(f.Value.String())"
   },
   {
     "name": "BoolT",
     "type": "bool",
     "value": false,
     "doctail": " that is true by default",
-    "context_default": "false"
+    "context_default": "false",
+    "parser": "strconv.ParseBool(f.Value.String())"
   },
   {
     "name": "Duration",
     "type": "time.Duration",
     "doctail": " (see https://golang.org/pkg/time/#ParseDuration)",
-    "context_default": "0"
+    "context_default": "0",
+    "parser": "time.ParseDuration(f.Value.String())"
   },
   {
     "name": "Float64",
     "type": "float64",
-    "context_default": "0"
+    "context_default": "0",
+    "parser": "strconv.ParseFloat(f.Value.String(), 64)"
   },
   {
     "name": "Generic",
@@ -33,47 +37,57 @@
   {
     "name": "Int64",
     "type": "int64",
-    "context_default": "0"
+    "context_default": "0",
+    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)"
   },
   {
     "name": "Int",
     "type": "int",
-    "context_default": "0"
+    "context_default": "0",
+    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)",
+    "parser_cast": "int(parsed)"
   },
   {
     "name": "IntSlice",
     "type": "*IntSlice",
     "dest": false,
     "context_default": "nil",
-    "context_type": "[]int"
+    "context_type": "[]int",
+    "parser": "(f.Value.(*IntSlice)).Value(), error(nil)"
   },
   {
     "name": "Int64Slice",
     "type": "*Int64Slice",
     "dest": false,
     "context_default": "nil",
-    "context_type": "[]int64"
+    "context_type": "[]int64",
+    "parser": "(f.Value.(*Int64Slice)).Value(), error(nil)"
   },
   {
     "name": "String",
     "type": "string",
-    "context_default": "\"\""
+    "context_default": "\"\"",
+    "parser": "f.Value.String(), error(nil)"
   },
   {
     "name": "StringSlice",
     "type": "*StringSlice",
     "dest": false,
     "context_default": "nil",
-    "context_type": "[]string"
+    "context_type": "[]string",
+    "parser": "(f.Value.(*StringSlice)).Value(), error(nil)"
   },
   {
     "name": "Uint64",
     "type": "uint64",
-    "context_default": "0"
+    "context_default": "0",
+    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)"
   },
   {
     "name": "Uint",
     "type": "uint",
-    "context_default": "0"
+    "context_default": "0",
+    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)",
+    "parser_cast": "uint(parsed)"
   }
 ]