fix: goexports to convert value type only for untyped constants

traefik · Sep 27, 2019 · 2c2b471 · 2c2b471
1 parent 0f46cd5
commit 2c2b471
Show file tree

Hide file tree

Showing 24 changed files with 4,260 additions and 45 deletions.
diff --git a/_test/time9.go b/_test/time9.go
@@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+func main() {
+	fmt.Println((5 * time.Minute).Seconds())
+}
+
+// Output:
+// 300
diff --git a/cmd/goexports/goexports.go b/cmd/goexports/goexports.go
@@ -147,7 +147,12 @@ func genContent(dest, pkgName, license string) ([]byte, error) {
 		pname := path.Base(pkgName) + "." + name
 		switch o := o.(type) {
 		case *types.Const:
-			val[name] = Val{fixConst(pname, o.Val()), false}
+			if b, ok := o.Type().(*types.Basic); ok && (b.Info()&types.IsUntyped) != 0 {
+				// convert untyped constant to right type to avoid overflow
+				val[name] = Val{fixConst(pname, o.Val()), false}
+			} else {
+				val[name] = Val{pname, false}
+			}
 		case *types.Func:
 			val[name] = Val{pname, false}
 		case *types.Var:

diff --git a/stdlib/go1_11_debug_elf.go b/stdlib/go1_11_debug_elf.go
diff --git a/stdlib/go1_11_debug_macho.go b/stdlib/go1_11_debug_macho.go
diff --git a/stdlib/go1_11_os.go b/stdlib/go1_11_os.go
diff --git a/stdlib/go1_11_time.go b/stdlib/go1_11_time.go
diff --git a/stdlib/go1_12_debug_elf.go b/stdlib/go1_12_debug_elf.go
diff --git a/stdlib/go1_12_debug_macho.go b/stdlib/go1_12_debug_macho.go
diff --git a/stdlib/go1_12_os.go b/stdlib/go1_12_os.go
diff --git a/stdlib/go1_12_time.go b/stdlib/go1_12_time.go
diff --git a/stdlib/go1_13_debug_elf.go b/stdlib/go1_13_debug_elf.go
diff --git a/stdlib/go1_13_debug_macho.go b/stdlib/go1_13_debug_macho.go
diff --git a/stdlib/go1_13_os.go b/stdlib/go1_13_os.go
diff --git a/stdlib/go1_13_time.go b/stdlib/go1_13_time.go
diff --git a/stdlib/syscall/go1_11_syscall_windows_386.go b/stdlib/syscall/go1_11_syscall_windows_386.go
diff --git a/stdlib/syscall/go1_11_syscall_windows_amd64.go b/stdlib/syscall/go1_11_syscall_windows_amd64.go