Fix date manipulation operations

expr-lang · Aug 30, 2023 · f32da1e · f32da1e
1 parent 92c9068
commit f32da1e
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 10 deletions.
diff --git a/expr_test.go b/expr_test.go
@@ -944,6 +944,38 @@ func TestExpr(t *testing.T) {
 			`TimePlusDay - Duration`,
 			date,
 		},
+		{
+			`duration("1h") == duration("1h")`,
+			true,
+		},
+		{
+			`TimePlusDay - Time >= duration("24h")`,
+			true,
+		},
+		{
+			`duration("1h") > duration("1m")`,
+			true,
+		},
+		{
+			`duration("1h") < duration("1m")`,
+			false,
+		},
+		{
+			`duration("1h") >= duration("1m")`,
+			true,
+		},
+		{
+			`duration("1h") <= duration("1m")`,
+			false,
+		},
+		{
+			`duration("1h") > duration("1m")`,
+			true,
+		},
+		{
+			`duration("1h") + duration("1m")`,
+			time.Hour + time.Minute,
+		},
 		{
 			`1 /* one */ + 2 // two`,
 			3,

diff --git a/vm/runtime/generated.go b/vm/runtime/generated.go
diff --git a/vm/runtime/helpers/main.go b/vm/runtime/helpers/main.go
@@ -100,6 +100,11 @@ func Equal(a, b interface{}) bool {
 		case time.Time:
 			return x.Equal(y)
 		}
+	case time.Duration:
+		switch y := b.(type) {
+		case time.Duration:
+			return x == y
+		}
 	}
 	if IsNil(a) && IsNil(b) {
 		return true
@@ -120,6 +125,11 @@ func Less(a, b interface{}) bool {
 		case time.Time:
 			return x.Before(y)
 		}
+	case time.Duration:
+		switch y := b.(type) {
+		case time.Duration:
+			return x < y
+		}
 	}
 	panic(fmt.Sprintf("invalid operation: %T < %T", a, b))
 }
@@ -137,6 +147,11 @@ func More(a, b interface{}) bool {
 		case time.Time:
 			return x.After(y)
 		}
+	case time.Duration:
+		switch y := b.(type) {
+		case time.Duration:
+			return x > y
+		}
 	}
 	panic(fmt.Sprintf("invalid operation: %T > %T", a, b))
 }
@@ -154,6 +169,11 @@ func LessOrEqual(a, b interface{}) bool {
 		case time.Time:
 			return x.Before(y) || x.Equal(y)
 		}
+	case time.Duration:
+		switch y := b.(type) {
+		case time.Duration:
+			return x <= y
+		}
 	}
 	panic(fmt.Sprintf("invalid operation: %T <= %T", a, b))
 }
@@ -171,6 +191,11 @@ func MoreOrEqual(a, b interface{}) bool {
 		case time.Time:
 			return x.After(y) || x.Equal(y)
 		}
+	case time.Duration:
+		switch y := b.(type) {
+		case time.Duration:
+			return x >= y
+		}
 	}
 	panic(fmt.Sprintf("invalid operation: %T >= %T", a, b))
 }
@@ -192,6 +217,8 @@ func Add(a, b interface{}) interface{} {
 		switch y := b.(type) {
 		case time.Time:
 			return y.Add(x)
+		case time.Duration:
+			return x + y
 		}
 	}
 	panic(fmt.Sprintf("invalid operation: %T + %T", a, b))
@@ -204,6 +231,13 @@ func Subtract(a, b interface{}) interface{} {
 		switch y := b.(type) {
 		case time.Time:
 			return x.Sub(y)
+		case time.Duration:
+			return x.Add(-y)
+		}
+	case time.Duration:
+		switch y := b.(type) {
+		case time.Duration:
+			return x - y
 		}
 	}
 	panic(fmt.Sprintf("invalid operation: %T - %T", a, b))