Implement short-circuit evaluation for group.include.all.

glotzerlab · Aug 20, 2024 · d9d7abe · d9d7abe
1 parent cf2ae5f
commit d9d7abe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/doc/src/release-notes.md b/doc/src/release-notes.md
@@ -18,6 +18,7 @@
 * `clean` now cleans all caches by default.
 * Submit jobs with `--constraint="scratch"` by default on Delta.
 * Submit jobs with `--constraint="nvme"` by default on Frontier.
+* `group.include.all` now employs short circuit evaluation.
 
 *Fixed:*
 

diff --git a/src/project.rs b/src/project.rs
@@ -211,7 +211,7 @@ impl Project {
                                         Error::JSONPointerNotFound(name.clone(), include.clone())
                                     })?;
 
-                                    if expr::evaluate_json_comparison(comparison, actual, expected)
+                                    if !expr::evaluate_json_comparison(comparison, actual, expected)
                                         .ok_or_else(|| {
                                             Error::CannotCompareInclude(
                                                 actual.clone(),
@@ -220,8 +220,9 @@ impl Project {
                                             )
                                         })?
                                     {
-                                        matches += 1;
+                                        break;
                                     }
+                                    matches += 1;
                                 }
                                 Ok(matches == conditions.len())
                             }