cleaned up parsing & set math

Author: pjdufour

dfl/Equal.go

@@ -61,6 +61,8 @@ func (e Equal) Evaluate(ctx interface{}, funcs FunctionMap) (interface{}, error)
 	case string:
 		lvs := lv.(string)
 		switch rv.(type) {
+		case Null:
+			return false, nil
 		case string:
 			return lvs == rv.(string), nil
 		case int:

dfl/FunctionMap.go

@@ -23,6 +23,7 @@ type FunctionMap map[string]func(FunctionMap, interface{}, []interface{}) (inter
 func NewFuntionMapWithDefaults() FunctionMap {
 	funcs := FunctionMap{}
 
+	funcs["intersects"] = intersects
 	funcs["flatten"] = flattenArray
 	funcs["filter"] = filterArray
 	funcs["map"] = mapArray

dfl/In.go

@@ -152,6 +152,10 @@ func (i In) Evaluate(ctx interface{}, funcs FunctionMap) (interface{}, error) {
 	lvs := fmt.Sprint(lv)
 
 	switch rv.(type) {
+	case Null:
+		return false, nil
+	case StringSet:
+		return rv.(StringSet).Contains(lvs), nil
 	case string:
 		return strings.Contains(rv.(string), lvs), nil
 	case int:

dfl/In_test.go

@@ -41,7 +41,7 @@ func TestIn(t *testing.T) {
 		if err != nil {
 			t.Errorf(errors.Wrap(err, "Error evaluating expression \""+testCase.Expression+"\"").Error())
 		} else if got != testCase.Result {
-			t.Errorf("TestILike(%q) == %v (%q), want %v (%q)", testCase.Expression, got, reflect.TypeOf(got), testCase.Result, reflect.TypeOf(testCase.Result))
+			t.Errorf("TestIn(%q) == %v (%q), want %v (%q)", testCase.Expression, got, reflect.TypeOf(got), testCase.Result, reflect.TypeOf(testCase.Result))
 		}
 	}
 

dfl/IsArray.go

@@ -0,0 +1,9 @@
+package dfl
+
+import (
+	"strings"
+)
+
+func IsArray(s string) bool {
+	return len(s) >= 2 && strings.HasPrefix(s, "[") && strings.HasSuffix(s, "]")
+}

dfl/IsAttribute.go

@@ -0,0 +1,10 @@
+package dfl
+
+import (
+	"strings"
+	"unicode"
+)
+
+func IsAttribute(s string) bool {
+	return strings.HasPrefix(strings.TrimLeftFunc(s, unicode.IsSpace), "@")
+}

dfl/IsFunction.go

@@ -0,0 +1,9 @@
+package dfl
+
+import (
+	"strings"
+)
+
+func IsFunction(s string) bool {
+	return len(s) >= 3 && strings.Contains(s, "(") && strings.HasSuffix(s, ")")
+}

dfl/IsQuoted.go

@@ -0,0 +1,8 @@
+package dfl
+
+func IsQuoted(s string) bool {
+	if len(s) < 2 {
+		return false
+	}
+	return (s[0] == '\'' && s[len(s)-1] == '\'') || (s[0] == '"' && s[len(s)-1] == '"') || (s[0] == '`' && s[len(s)-1] == '`')
+}

dfl/IsSet.go

@@ -0,0 +1,9 @@
+package dfl
+
+import (
+	"strings"
+)
+
+func IsSet(s string) bool {
+	return len(s) >= 2 && strings.HasPrefix(s, "{") && strings.HasSuffix(s, "}")
+}

dfl/IsSub.go

@@ -0,0 +1,9 @@
+package dfl
+
+import (
+	"strings"
+)
+
+func IsSub(s string) bool {
+	return len(s) >= 2 && strings.HasPrefix(s, "(") && strings.HasSuffix(s, ")")
+}