Simplify matcher
Change-Id: I004f0bb72ca206484d65c94fe8e8b31807f8ad1d
diff --git a/matcher/matcher.go b/matcher/matcher.go
index 1630b1a..bf5aaa5 100644
--- a/matcher/matcher.go
+++ b/matcher/matcher.go
@@ -181,11 +181,7 @@
return nil
}
if len(simplified) == 1 {
- // If we have a single operand, return it directly
- // But only if we're not inside a Token
- if _, isToken := node.(*ast.Token); !isToken {
- return simplified[0]
- }
+ return simplified[0]
}
return &ast.TermGroup{
@@ -263,9 +259,7 @@
func (m *Matcher) tryMatchWrapped(node, pattern ast.Node) bool {
switch n := node.(type) {
case *ast.Token:
- if n.Wrap != nil {
- return m.matchNode(n.Wrap, pattern)
- }
+ return n.Wrap != nil && m.matchNode(n.Wrap, pattern)
case *ast.CatchallNode:
if n.Wrap != nil && m.matchNode(n.Wrap, pattern) {
return true