Merge pull request #721 from linsword13/expander

Add expander support for NotIn

Author: douglasjacobsen

lib/ramble/ramble/expander.py

@@ -798,9 +798,12 @@ def _eval_bool_op(self, node):
     def _eval_comparisons(self, node):
         """Handle a comparison node in the ast"""
 
-        # Extract In nodes, and call their helper
-        if len(node.ops) == 1 and isinstance(node.ops[0], ast.In):
-            return self._eval_comp_in(node)
+        # Extract In or NotIn nodes, and call their helper
+        if len(node.ops) == 1 and isinstance(node.ops[0], (ast.In, ast.NotIn)):
+            is_in = self._eval_comp_in(node)
+            if isinstance(node.ops[0], ast.NotIn):
+                return not is_in
+            return is_in
 
         if len(node.ops) == 1 and isinstance(node.ops[0], ast.Is):
             raise RambleSyntaxError("Encountered unsupported operator `is`")
@@ -830,7 +833,7 @@ def _eval_comparisons(self, node):
             raise SyntaxError("Unsupported binary comparison operator")
 
     def _eval_comp_in(self, node):
-        """Handle in nodes in the ast
+        """Handle in node in the ast
 
         Perform extraction of `<variable> in <experiment>` syntax.
         Raises an exception if the experiment does not exist.

lib/ramble/ramble/test/expander.py

@@ -73,11 +73,15 @@ def exp_dict():
         (r"\\{experiment_name\\}", "baz", set(), 3),
         ('"2.1.1" in ["2.1.1", "3.1.1", "4.2.1"]', "True", set(), 1),
         ('"2.1.2" in ["2.1.1", "3.1.1", "4.2.1"]', "False", set(), 1),
+        ('"3.1.2" not in ["2.1.1", "3.1.1", "4.2.1"]', "True", set(), 1),
+        ('"2.1.1" not in ["2.1.1", "3.1.1", "4.2.1"]', "False", set(), 1),
         ("{test_mask}", "0x0", {"test_mask"}, 1),
         ('re_search(r"bz$", {experiment_name})', "False", set(), 1),
         ('re_search("o+\\\\.b", {env_name})', "True", set(), 1),
         ('"foo" in "{env_name}"', "True", set(), 1),
         ('"c" in "{experiment_name}"', "False", set(), 1),
+        ('"foo123" not in "{env_name}"', "True", set(), 1),
+        ('"foo" not in "{env_name}"', "False", set(), 1),
         ('"{env_name}"[:{max_len}:1]', "spack_foo", set(), 1),
     ],
 )