fix: correct isValueUntyped() to handle typed constants

This commit is contained in:
Marc Vertes
2019-12-19 15:38:05 +01:00
committed by Traefiker Bot
parent e1ac83f7d8
commit 3cd37645eb
2 changed files with 18 additions and 9 deletions

15
_test/time11.go Normal file
View File

@@ -0,0 +1,15 @@
package main
import (
"fmt"
"time"
)
const df = time.Minute * 30
func main() {
fmt.Printf("df: %v %T\n", df, df)
}
// Output:
// df: 30m0s time.Duration

View File

@@ -602,8 +602,6 @@ func (interp *Interpreter) cfg(root *node) ([]*node, error) {
constOp[n.action](n)
}
switch {
//case n.typ != nil && n.typ.cat == BoolT && isAncBranch(n):
// n.findex = -1
case n.rval.IsValid():
n.gen = nop
n.findex = -1
@@ -1851,14 +1849,10 @@ func arrayTypeLen(n *node) int {
// isValueUntyped returns true if value is untyped
func isValueUntyped(v reflect.Value) bool {
// Consider only untyped constant values.
// Consider only constant values.
if v.CanSet() {
return false
}
// Consider only values of default numerical types.
switch v.Type().Kind() {
case reflect.Int, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float64, reflect.Complex128:
return true
}
return false
t := v.Type()
return t.String() == t.Kind().String()
}