From 979e7aa33ec92d903a0d062d5abff7669755bacf Mon Sep 17 00:00:00 2001 From: Elara Musayelyan Date: Fri, 3 Nov 2023 18:33:41 -0700 Subject: [PATCH] Implement in operator for maps --- README.md | 2 +- expr.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 61a8e70..e0e0bca 100644 --- a/README.md +++ b/README.md @@ -212,7 +212,7 @@ In this case, the expression will return the content of the `title` variable if ### The `in` operator -Salix's `in` operator allows you to check if a slice or array contains a specific element, or if a string contains a substring. Here's one example: +Salix's `in` operator allows you to check if a slice or array contains an element, if a map contains a key, or if a string contains a substring. Here's one example: ``` #("H" in "Hello") diff --git a/expr.go b/expr.go index 6d1ddec..d5b68ed 100644 --- a/expr.go +++ b/expr.go @@ -67,6 +67,12 @@ func (t *Template) performOp(a, b reflect.Value, op ast.Operator) (any, error) { } else { return nil, t.posError(op, "%w (%s and %s)", ErrTypeMismatch, a.Type(), b.Type()) } + case reflect.Map: + if a.CanConvert(b.Type().Key()) { + a = a.Convert(b.Type().Key()) + } else { + return nil, t.posError(op, "%w (%s and %s)", ErrTypeMismatch, a.Type(), b.Type()) + } case reflect.String: if a.Kind() != reflect.String { return nil, t.posError(op, "%w (%s and %s)", ErrTypeMismatch, a.Type(), b.Type()) @@ -179,7 +185,9 @@ func (t *Template) performOp(a, b reflect.Value, op ast.Operator) (any, error) { case "in": if a.Kind() == reflect.String && b.Kind() == reflect.String { return strings.Contains(b.String(), a.String()), nil - } else { + } else if b.Kind() == reflect.Map { + return b.MapIndex(a).IsValid(), nil + } else if b.Kind() == reflect.Slice || b.Kind() == reflect.Array { for i := 0; i < b.Len(); i++ { if a.Equal(b.Index(i)) { return true, nil