From 8996b5c870b14bd43239e7f42909a779d6762e98 Mon Sep 17 00:00:00 2001 From: Zhang Eric Date: Mon, 25 May 2020 14:50:52 +0800 Subject: [PATCH] #234 Updated code as review comments. --- syntax/std_seq.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/syntax/std_seq.go b/syntax/std_seq.go index 3e01ceb3..0866d1ae 100644 --- a/syntax/std_seq.go +++ b/syntax/std_seq.go @@ -74,9 +74,8 @@ func stdSeq() rel.Attr { case rel.Bytes: return rel.NewBool(strings.Contains(asString(subject), asString(sub))) case rel.GenericSet: - if emptySet, isSet := sub.(rel.GenericSet); isSet && !emptySet.IsTrue() { - return rel.NewBool(true) - } + emptySet, isSet := sub.(rel.GenericSet) + return rel.NewBool(isSet && !emptySet.IsTrue()) } return rel.NewBool(false) @@ -91,9 +90,8 @@ func stdSeq() rel.Attr { case rel.Bytes: return rel.NewBool(strings.HasPrefix(asString(subject), asString(prefix))) case rel.GenericSet: - if emptySet, isSet := prefix.(rel.GenericSet); isSet && !emptySet.IsTrue() { - return rel.NewBool(true) - } + emptySet, isSet := prefix.(rel.GenericSet) + return rel.NewBool(isSet && !emptySet.IsTrue()) } return rel.NewBool(false) @@ -108,9 +106,8 @@ func stdSeq() rel.Attr { case rel.Bytes: return rel.NewBool(strings.HasSuffix(asString(subject), asString(suffix))) case rel.GenericSet: - if emptySet, isSet := suffix.(rel.GenericSet); isSet && !emptySet.IsTrue() { - return rel.NewBool(true) - } + emptySet, isSet := suffix.(rel.GenericSet) + return rel.NewBool(isSet && !emptySet.IsTrue()) } return rel.NewBool(false)