From a251331683f040be0154f1319b9a9bf5d3aa2a92 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 30 Aug 2015 13:01:59 +0200
Subject: [PATCH] awful.rules: factor out `matches`

This factors out `matches` and uses it in `matches_list` (renamed
from `does_match`) to short-circuit the successful case - where not all
rules have to get checked.

Closes https://github.com/awesomeWM/awesome/pull/431.
---
 lib/awful/rules.lua | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/awful/rules.lua b/lib/awful/rules.lua
index 6b1a7f2af..54af8ea88 100644
--- a/lib/awful/rules.lua
+++ b/lib/awful/rules.lua
@@ -130,6 +130,16 @@ function rules.match_any(c, rule)
     return false
 end
 
+--- Does a given rule entry match a client?
+-- @client c The client.
+-- @tab entry Rule entry (with keys `rule`, `rule_any`, `except` and/or
+-- `except_any`).
+-- @treturn bool
+function rules.matches(c, entry)
+    return (rules.match(c, entry.rule) or rules.match_any(c, entry.rule_any)) and
+        (not rules.match(c, entry.except) and not rules.match_any(c, entry.except_any))
+end
+
 --- Get list of matching rules for a client.
 -- @client c The client.
 -- @tab _rules The rules to check. List with "rule", "rule_any", "except" and
@@ -138,8 +148,7 @@ end
 function rules.matching_rules(c, _rules)
     local result = {}
     for _, entry in ipairs(_rules) do
-        if (rules.match(c, entry.rule) or rules.match_any(c, entry.rule_any)) and
-            (not rules.match(c, entry.except) and not rules.match_any(c, entry.except_any)) then
+        if (rules.matches(c, entry)) then
             table.insert(result, entry)
         end
     end
@@ -148,12 +157,16 @@ end
 
 --- Check if a client matches a given set of rules.
 -- @client c The client.
--- @tab _rules The rules to check. List with "rule", "rule_any", "except" and
---            "except_any" keys.
+-- @tab _rules The rules to check. List of tables with `rule`, `rule_any`,
+--   `except` and `except_any` keys.
 -- @treturn bool True if at least one rule is matched, false otherwise.
-function rules.does_match(c, _rules)
-    local result = rules.matching_rules(c, _rules)
-    return #result == 0 and false or result
+function rules.matches_list(c, _rules)
+    for _, entry in ipairs(_rules) do
+        if (rules.matches(c, entry)) then
+            return true
+        end
+    end
+    return false
 end
 
 --- Apply awful.rules.rules to a client.