diff --git a/lang/funcs/listlookup_func.go b/lang/funcs/listlookup_func.go index 5a3b43d3..f4066554 100644 --- a/lang/funcs/listlookup_func.go +++ b/lang/funcs/listlookup_func.go @@ -153,6 +153,9 @@ func (obj *ListLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant, return nil, fmt.Errorf("unable to build function with %d args", l) } + var invariants []interfaces.Invariant + var invar interfaces.Invariant + // add the relationship to the returned value invar = &interfaces.EqualityInvariant{ Expr1: cfavInvar.Expr, @@ -179,9 +182,6 @@ func (obj *ListLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant, } invariants = append(invariants, invar) - var invariants []interfaces.Invariant - var invar interfaces.Invariant - // If we figure out either of these types, we'll know // the full type... var t1 *types.Type // list type @@ -316,7 +316,7 @@ func (obj *ListLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant, // XXX: if t{1..2} are missing, we could also return a // new generator for later if we learn new information, - // but we'd have to be careful to not do the infinitely + // but we'd have to be careful to not do it infinitely. // TODO: do we return this relationship with ExprCall? invar = &interfaces.EqualityWrapCallInvariant{ diff --git a/lang/funcs/maplookup_func.go b/lang/funcs/maplookup_func.go index 7785d47b..106223bb 100644 --- a/lang/funcs/maplookup_func.go +++ b/lang/funcs/maplookup_func.go @@ -145,6 +145,9 @@ func (obj *MapLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant, e return nil, fmt.Errorf("unable to build function with %d args", l) } + var invariants []interfaces.Invariant + var invar interfaces.Invariant + // add the relationship to the returned value invar = &interfaces.EqualityInvariant{ Expr1: cfavInvar.Expr, @@ -171,9 +174,6 @@ func (obj *MapLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant, e } invariants = append(invariants, invar) - var invariants []interfaces.Invariant - var invar interfaces.Invariant - // If we figure out all of these three types, we'll // know the full type... var t1 *types.Type // map type @@ -342,7 +342,7 @@ func (obj *MapLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant, e // XXX: if t{1..3} are missing, we could also return a // new generator for later if we learn new information, - // but we'd have to be careful to not do the infinitely + // but we'd have to be careful to not do it infinitely. // TODO: do we return this relationship with ExprCall? invar = &interfaces.EqualityWrapCallInvariant{ diff --git a/lang/funcs/structlookup_func.go b/lang/funcs/structlookup_func.go index 283ed4cb..ebed6cc4 100644 --- a/lang/funcs/structlookup_func.go +++ b/lang/funcs/structlookup_func.go @@ -143,6 +143,9 @@ func (obj *StructLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant return nil, fmt.Errorf("unable to build function with %d args", l) } + var invariants []interfaces.Invariant + var invar interfaces.Invariant + // add the relationship to the returned value invar = &interfaces.EqualityInvariant{ Expr1: cfavInvar.Expr, @@ -163,9 +166,6 @@ func (obj *StructLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant } invariants = append(invariants, invar) - var invariants []interfaces.Invariant - var invar interfaces.Invariant - // second arg must be a string invar = &interfaces.EqualsInvariant{ Expr: cfavInvar.Args[1], @@ -282,7 +282,7 @@ func (obj *StructLookupFunc) Unify(expr interfaces.Expr) ([]interfaces.Invariant // XXX: if t1 or t2 are missing, we could also return a // new generator for later if we learn new information, - // but we'd have to be careful to not do the infinitely + // but we'd have to be careful to not do it infinitely. // TODO: do we return this relationship with ExprCall? invar = &interfaces.EqualityWrapCallInvariant{