#234 Updated code as code review comments.

arr-ai · May 25, 2020 · 5f912d0 · 5f912d0
1 parent a5d4bd4
commit 5f912d0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/docs/std-seq.md b/docs/std-seq.md
@@ -30,7 +30,7 @@ Usage:
 | example | equals |
 |:-|:-|
 | `//seq.has_prefix("I'm", "I'm running out of stuff to write")` | `true` |
-| `//seq.has_prefix("to write", "I'm running out of stuff to write")` | `{}` which is equal to `false` |
+| `//seq.has_prefix("to write", "I'm running out of stuff to write")` | `false` |
 | `//seq.has_prefix(['A'],['A','B','C'])` | `true` |
 | `//seq.has_prefix([1, 2],[1, 2, 3])` | `true` |
 | `//seq.has_prefix([[1, 2]],[[1, 2], [3]])` | `true` |

diff --git a/syntax/std_seq.go b/syntax/std_seq.go
@@ -64,7 +64,7 @@ func stdSeq() rel.Attr {
 	return rel.NewTupleAttr("seq",
 		rel.NewNativeFunctionAttr("concat", stdSeqConcat),
 		rel.NewNativeFunctionAttr("repeat", stdSeqRepeat),
-		createNestedFuncAttr("contains", 2, func(args ...rel.Value) rel.Value {
+		createNestedFuncAttr("contains", 2, func(args ...rel.Value) rel.Value { //nolint:dupl
 			return includingProcess(func(args ...rel.Value) rel.Value {
 				sub, subject := args[0], args[1]
 				return rel.NewBool(strings.Contains(mustAsString(subject), mustAsString(sub)))
@@ -79,7 +79,7 @@ func stdSeq() rel.Attr {
 				},
 				args...)
 		}),
-		createNestedFuncAttr("has_prefix", 2, func(args ...rel.Value) rel.Value {
+		createNestedFuncAttr("has_prefix", 2, func(args ...rel.Value) rel.Value { //nolint:dupl
 			return includingProcess(func(args ...rel.Value) rel.Value {
 				sub, subject := args[0], args[1]
 				return rel.NewBool(strings.HasPrefix(mustAsString(subject), mustAsString(sub)))
@@ -94,7 +94,7 @@ func stdSeq() rel.Attr {
 				},
 				args...)
 		}),
-		createNestedFuncAttr("has_suffix", 2, func(args ...rel.Value) rel.Value {
+		createNestedFuncAttr("has_suffix", 2, func(args ...rel.Value) rel.Value { //nolint:dupl
 			return includingProcess(func(args ...rel.Value) rel.Value {
 				suffix, subject := args[0], args[1]
 				return rel.NewBool(strings.HasSuffix(mustAsString(subject), mustAsString(suffix)))
@@ -226,7 +226,7 @@ func includingProcess(
 	case rel.Bytes:
 		return bytesHandler(args...)
 	case rel.GenericSet:
-		if _, isSet := sub.(rel.GenericSet); isSet {
+		if emptySet, isSet := sub.(rel.GenericSet); isSet && !emptySet.IsTrue() {
 			return rel.NewBool(true)
 		}
 	}

diff --git a/syntax/std_seq_contains_test.go b/syntax/std_seq_contains_test.go
@@ -19,7 +19,7 @@ func TestStrContains(t *testing.T) {
 	assertExprPanics(t, `//seq.contains(1, "ABC")`)
 }
 
-func TestArrayContains(t *testing.T) {
+func TestArrayContains(t *testing.T) { //nolint:dupl
 	t.Parallel()
 	AssertCodesEvalToSameValue(t, `true`, `//seq.contains(['A'],['A', 'D','E'])`)
 	AssertCodesEvalToSameValue(t, `true`, `//seq.contains(['E'],['A','C','E'])`)

diff --git a/syntax/std_seq_split_test.go b/syntax/std_seq_split_test.go
@@ -27,7 +27,7 @@ func TestStrSplit(t *testing.T) {
 	assertExprPanics(t, `//seq.split(1,"ABC")`)
 }
 
-func TestArraySplit(t *testing.T) {
+func TestArraySplit(t *testing.T) { //nolint:dupl
 	t.Parallel()
 	AssertCodesEvalToSameValue(t, `[['A'], ['B']]`,
 		`//seq.split([],['A', 'B'])`)