Skip to content

Commit dd5399e

Browse files
author
AJ Roetker
committed
Fix issues
1 parent a4a39e1 commit dd5399e

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

vm/vm.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ func evalBinary(ctx expr.EvalContext, node *expr.BinaryNode, depth int, visitedI
604604
case value.TimeValue:
605605
lht, ok := value.ValueToTime(at)
606606
if !ok {
607-
return value.BoolValueFalse, false
607+
return nil, false
608608
}
609609
return operateTime(node.Operator.T, lht, bt.Val())
610610
default:
@@ -764,7 +764,7 @@ func evalBinary(ctx expr.EvalContext, node *expr.BinaryNode, depth int, visitedI
764764
lht := at.Val()
765765
rht, ok := value.ValueToTime(br)
766766
if !ok {
767-
return value.BoolValueFalse, false
767+
return nil, false
768768
}
769769

770770
return operateTime(node.Operator.T, lht, rht)
@@ -776,7 +776,7 @@ func evalBinary(ctx expr.EvalContext, node *expr.BinaryNode, depth int, visitedI
776776
rhvals = bv.Val()
777777
case value.Slice:
778778
sliceValue := bv.SliceValue()
779-
rhvals := make([]string, len(sliceValue))
779+
rhvals = make([]string, len(sliceValue))
780780
for i, arg := range sliceValue {
781781
rhvals[i] = arg.ToString()
782782
}
@@ -816,15 +816,17 @@ func evalBinary(ctx expr.EvalContext, node *expr.BinaryNode, depth int, visitedI
816816
case lex.TokenNE:
817817
return value.NewBoolValue(true), true
818818
case lex.TokenContains, lex.TokenLike, lex.TokenIN, lex.TokenIntersects:
819-
return value.NewBoolValue(false), false
819+
return nil, false
820820
default:
821821
return nil, false
822822
}
823823
default:
824-
return value.NewErrorValue(fmt.Errorf("unsupported left side value: %T in %s", at, node)), false
824+
// return value.NewErrorValue(fmt.Errorf("unsupported left side value: %T in %s", at, node)), false
825+
return nil, false
825826
}
826827

827-
return value.NewErrorValue(fmt.Errorf("unsupported binary expression: %s", node)), false
828+
// return value.NewErrorValue(fmt.Errorf("unsupported binary expression: %s", node)), false
829+
return nil, false
828830
}
829831

830832
func walkIdentity(ctx expr.EvalContext, node *expr.IdentityNode) (value.Value, bool) {
@@ -1180,6 +1182,7 @@ func init() {
11801182
globber, err = glob.New(defaultConfig)
11811183
if err != nil {
11821184
u.Errorf("failed to create optimized globber: %v", err)
1185+
return
11831186
}
11841187
}
11851188

0 commit comments

Comments
 (0)