[libc++] [test] Check for another kind of modulemap typo in lint_modulemap.sh.py.

[• Quuxplusone]

Summary

Verify that the name of the private submodule matches the name of the detail header.
If CI is green, I'll land this.

libcxx/include/module.modulemap

module std [system] {
   module __availability      { private header "__availability"      export * }
   module __bit_reference     { private header "__bit_reference"     export * }
   module __bits              { private header "__bits"              export * }
   module __debug             {         header "__debug"             export * }
   module __errc              { private header "__errc"              export * }
   module __function_like     { private header "__function_like.h"   export * }
   module __hash_table        {         header "__hash_table"        export * }
   module __locale            { private header "__locale"            export * }
-  module __mbstate           { private header "__mbstate_t.h"       export * }
+  module __mbstate_t         { private header "__mbstate_t.h"       export * }
   module __mutex_base        { private header "__mutex_base"        export * }
   module __node_handle       { private header "__node_handle"       export * }
   module __nullptr           {         header "__nullptr"           export * }
   module __split_buffer      { private header "__split_buffer"      export * }
   module __std_stream        { private header "__std_stream"        export * }
   module __string            { private header "__string"            export * }
   module __threading_support {         header "__threading_support" export * }
   module __tree              {         header "__tree"              export * }

libcxx/test/libcxx/lint/lint_modulemap.sh.py

if __name__ == '__main__':
     modulemap_name = os.path.join(libcxx, 'include/module.modulemap')
     assert os.path.isfile(modulemap_name)
 
     okay = True
     prevline = None
     with open(modulemap_name, 'r') as f:
         for line in f.readlines():
             if re.match(r'^\s*module.*[{]\s*private', line):
+                # Check that these lines are all of the expected format.
+                # This incidentally checks for typos in the module name.
+                if re.match(r'^\s*module (\w+)\s+[{] private header "\1(.h)?"\s+export [*] [}]', line):
+                    # It's a top-level private header, such as <__bit_reference>.
+                    pass
+                elif re.match(r'^\s*module (\w+)\s+[{] private header "__\w+/\1[.]h" [}]', line):
+                    # It's a private submodule, such as <__utility/swap.h>.
+                    pass
+                else:
+                    okay = False
+                    print("LINE DOESN'T MATCH REGEX in libcxx/include/module.modulemap!")
+                    print(line)
+                # Check that these lines are alphabetized.
                 if (prevline is not None) and (line < prevline):
                     okay = False
                     print('LINES OUT OF ORDER in libcxx/include/module.modulemap!')
                     print(prevline)
                     print(line)
                 prevline = line
             else:
                 prevline = None
     assert okay