fixed typed nil in if

tw1nk · Jun 3, 2021 · 418b0b6 · 418b0b6
1 parent 02e0f36
commit 418b0b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/gval_parameterized_test.go b/gval_parameterized_test.go
@@ -608,6 +608,22 @@ func TestParameterized(t *testing.T) {
  }{},
  want: 99.,
  },
+ {
+ name: "operator with typed nil 99",
+ expression: `ProjectID + 99`,
+ parameter: struct {
+ ProjectID *uint
+ }{},
+ want: "<nil>99",
+ },
+ {
+ name: "operator with typed nil if",
+ expression: `Flag ? 1 : 2`,
+ parameter: struct {
+ Flag *uint
+ }{},
+ want: 2.,
+ },
  },
  t,
  )

diff --git a/parse.go b/parse.go
@@ -255,7 +255,7 @@ func parseIf(c context.Context, p *Parser, e Evaluable) (Evaluable, error) {
  if err != nil {
  return nil, err
  }
- if x == false || x == nil {
+ if valX := reflect.ValueOf(x); x == nil || valX.IsZero() {
  return b(c, v)
  }
  return a(c, v)