Add better errors for nil dereference

expr-lang · Aug 20, 2018 · f1ff6e1 · f1ff6e1
1 parent c67292b
commit f1ff6e1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/eval.go b/eval.go
@@ -238,6 +238,9 @@ func (n propertyNode) Eval(env interface{}) (interface{}, error) {
 	}
 	p, ok := extract(v, n.property)
 	if !ok {
+		if isNil(v) {
+			return nil, fmt.Errorf("%v is nil", n.node)
+		}
 		return nil, fmt.Errorf("%v undefined (type %T has no field %v)", n, v, n.property)
 	}
 	return p, nil

diff --git a/eval_test.go b/eval_test.go
@@ -447,6 +447,21 @@ var evalErrorTests = []evalErrorTest{
 		nil,
 		"too many arguments: len(a, b)",
 	},
+	{
+		"Foo.Map",
+		struct{ Foo map[string]int }{Foo: nil},
+		"Foo is nil",
+	},
+	{
+		"Foo.Bar",
+		struct{ Foo *struct{ Bar bool } }{Foo: nil},
+		"Foo is nil",
+	},
+	{
+		"Foo.Panic",
+		struct{ Foo interface{} }{Foo: nil},
+		"Foo is nil",
+	},
 }
 
 func TestEval(t *testing.T) {

diff --git a/runtime.go b/runtime.go
@@ -120,3 +120,8 @@ func contains(needle interface{}, array interface{}) (bool, error) {
 	}
 	return false, nil
 }
+
+func isNil(val interface{}) bool {
+	v := reflect.ValueOf(val)
+	return !v.IsValid() || v.IsNil()
+}