Separate "passes" from "_passes" in custom actions

Our custom argparse actions (SplitStore and ExtendMatch) have special behavior
when the destination is specified as "passes", because accurately emulating
compiler behavior for different passes has proven very complicated.

This change allows standard argparse actions (e.g., store_const) to append to
the "passes" variable while our custom argparse actions modify "_passes".
These two variables can then be combined after the fact to produce the final
list of active compiler passes.

Signed-off-by: John Pennycook <john.pennycook@intel.com>

Author: Pennycook

codebasin/config.py

@@ -105,7 +105,7 @@ def __call__(
             template = string.Template(self.format)
             split_values = [template.substitute(value=v) for v in split_values]
         if self.dest == "passes":
-            passes = getattr(namespace, self.dest)
+            passes = getattr(namespace, "_passes")
             passes[option_string] = split_values
         else:
             setattr(namespace, self.dest, split_values)
@@ -144,7 +144,7 @@ def __call__(
             template = string.Template(self.format)
             matches = [template.substitute(value=v) for v in matches]
         if self.dest == "passes":
-            passes = getattr(namespace, self.dest)
+            passes = getattr(namespace, "_passes")
             if self.flag_name not in passes:
                 passes[self.flag_name] = []
             if self.override:

tests/compilers/test_actions.py

@@ -30,7 +30,7 @@ def test_store_split_init(self):
     def test_store_split(self):
         """Check that argparse calls store_split correctly"""
         namespace = argparse.Namespace()
-        namespace.passes = {}
+        namespace._passes = {}
 
         parser = argparse.ArgumentParser()
         parser.add_argument("--foo", action=_StoreSplitAction, sep=",")
@@ -58,7 +58,7 @@ def test_store_split(self):
             args, _ = parser.parse_known_args(["--baz=1"], namespace)
 
         args, _ = parser.parse_known_args(["--qux=one,two"], namespace)
-        self.assertEqual(args.passes, {"--qux": ["one", "two"]})
+        self.assertEqual(args._passes, {"--qux": ["one", "two"]})
 
     def test_extend_match_init(self):
         """Check that extend_match recognizes custom arguments"""
@@ -127,30 +127,30 @@ def test_extend_match(self):
 
         # Check that the default pass defined by --qux always exists.
         # Note that the caller must initialize the default.
-        namespace.passes = {"--qux": ["0"]}
+        namespace._passes = {"--qux": ["0"]}
         args, _ = parser.parse_known_args(
             [],
             namespace,
         )
-        self.assertEqual(args.passes, {"--qux": ["0"]})
+        self.assertEqual(args._passes, {"--qux": ["0"]})
 
         # Check that the default pass is overridden by use of --qux.
         # Note that the caller must initialize the default.
-        namespace.passes = {"--qux": ["0"]}
+        namespace._passes = {"--qux": ["0"]}
         args, _ = parser.parse_known_args(
             ["--qux=option_1,option_2"],
             namespace,
         )
-        self.assertEqual(args.passes, {"--qux": ["1", "2"]})
+        self.assertEqual(args._passes, {"--qux": ["1", "2"]})
 
-        namespace.passes = {}
+        namespace._passes = {}
         args, _ = parser.parse_known_args(
             ["--one=option_1", "--two=option_2"],
             namespace,
         )
-        self.assertEqual(args.passes, {"--one": ["1", "2"]})
+        self.assertEqual(args._passes, {"--one": ["1", "2"]})
 
-        namespace.passes = {}
+        namespace._passes = {}
 
 
 if __name__ == "__main__":