WIP: use enums for most int values

Author: Joe-Downs

ompi/mpi/bindings/ompi_bindings/c_header.py

@@ -43,15 +43,17 @@ def comment(message, lang=Lang.C, indentation=0):
         if value["category"] == name:
             categories[name].append(value)
 
-def output_constant(const):
-    # TODO: Use enums for ints? (ask Howard)
+def output_constant(const, use_enum):
     name = const["name"]
     abi_value = const["abi_value"]
     c_type = const["handle_types"]["c"]["type"]
     if c_type is None:
         return None
     def_name = f"#define {name}"
-    if c_type == "int":
+    if use_enum:
+        def_name = f"    {name}"
+        value = f"= {abi_value},"
+    elif c_type == "int":
         value = f"{abi_value}"
     else:
         value = f"(({c_type}) {abi_value})"
@@ -73,10 +75,19 @@ def output_constant(const):
     # line as-is.
     if category:
         category = category.group(1)
+        use_enum = False
+        # Only some values should be in `enums`, otherwise just use `#define`s
+        if category in consts.ENUM_CATEGORIES:
+            use_enum = True
+        if use_enum:
+            output.append("enum {\n")
+        # Print out each `#define` / assignment for the constants
         for constant in categories[category]:
-            line = output_constant(constant)
+            line = output_constant(constant, use_enum)
             if line is not None:
                 output.append(line)
+        if use_enum:
+            output.append("};\n")
     else:
         output.append(line)
 

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -37,6 +37,34 @@ class Lang(Enum):
 #
 # C type: const int
 
+ENUM_CATEGORIES = [
+    "ERROR_CLASSES",
+    "MODE_CONSTANTS",
+    "ASSORTED_CONSTANTS",
+    "THREADS_CONSTANTS",
+    "FILE_OPERATIONS_CONSTANTS",
+    "DATATYPE_DECODING_CONSTANTS",
+    "F90_DATATYPE_MATCHING_CONSTANTS",
+    "COMMUNICATOR_GROUP_COMP_RESULTS",
+    "TOPOLOGIES",
+    "COMMUNICATOR_SPLIT_TYPE",
+    "WINDOW_LOCK_TYPE_CONSTANTS",
+    "WINDOW_CREATE_FLAVORS",
+    "WINDOW_MODELS",
+    "FILE_POS_CONSTANTS",
+    "FILE_OP_CONSTANTS",
+    "ENV_INQ_AND_ATTR_KEYS",
+    "FORTRAN_STATUS_ARRAY_SIZE_AND_INDEX_C",
+    "C_PREPROCESSOR_CONSTANTS_FORTRAN_PARAMETERS",
+    "TOOL_INFO_IFACE_VERBOSITY_LEVELS",
+    "TOOL_INFO_IFACE_VAR_ASSOCIATIONS",
+    "TOOL_INFO_IFACE_VAR_SCOPES",
+    "TOOL_INFO_IFACE_PVAR_CLASSES",
+    "TOOL_INFO_IFACE_SOURCE_ORDERINGS",
+    "TOOL_INFO_IFACE_CB_SAFETY_REQ_LEVELS",
+]
+
+
 C_OPAQUE_TYPES = {
     'MPI_Aint': 'intptr_t',
     'MPI_Offset': 'int64_t',