eval func should return ok not err

yaacov · Feb 21, 2019 · f7f9cc6 · f7f9cc6
1 parent ded2b11
commit f7f9cc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/cmd/tsl_mem/model.go b/cmd/tsl_mem/model.go
@@ -19,8 +19,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/yaacov/tsl/pkg/walkers/semantics"
 
 	"github.com/yaacov/tsl/cmd/model"
@@ -33,13 +31,8 @@ type Book map[string]interface{}
 var Books = []Book{}
 
 func evalFactory(book Book) semantics.EvalFunc {
-	return func(k string) (interface{}, error) {
-		v, ok := book[k]
-		if !ok {
-			return nil, fmt.Errorf("no value for key %s", k)
-		}
-
-		return v, nil
+	return func(k string) (interface{}, bool) {
+		return book[k], true
 	}
 }
 

diff --git a/pkg/walkers/semantics/walk.go b/pkg/walkers/semantics/walk.go
@@ -27,7 +27,7 @@ import (
 )
 
 // EvalFunc is a key evaluation function type.
-type EvalFunc = func(string) (interface{}, error)
+type EvalFunc = func(string) (interface{}, bool)
 
 // Walk travel the TSL tree and implements search semantics.
 //
@@ -44,9 +44,9 @@ type EvalFunc = func(string) (interface{}, error)
 //
 //  	// evalFactory creates an evaluation function for a data record.
 //  	func evalFactory(r map[string]string) semantics.EvalFunc {
-//  		return func(k string) (interface{}, error) {
-//  			v := r[k]
-//  			return v, nil
+//  		return func(k string) (interface{}, bool) {
+//  			v, ok := r[k]
+//  			return v, ok
 //  		}
 //  	}
 //