Rename _ENDINGS -> _EXTENSIONS. NFC (#23472)

This is the more common form I believe.

Author: sbc100

emcc.py

@@ -40,7 +40,7 @@
 from tools.shared import unsuffixed, unsuffixed_basename, get_file_suffix
 from tools.shared import run_process, exit_with_error, DEBUG
 from tools.shared import in_temp, OFormat
-from tools.shared import DYNAMICLIB_ENDINGS
+from tools.shared import DYLIB_EXTENSIONS
 from tools.response_file import substitute_response_files
 from tools import config
 from tools import cache
@@ -59,17 +59,17 @@
   bootstrap.check()
 
 # endings = dot + a suffix, compare against result of shared.suffix()
-C_ENDINGS = ['.c', '.i']
-CXX_ENDINGS = ['.cppm', '.pcm', '.cpp', '.cxx', '.cc', '.c++', '.CPP', '.CXX', '.C', '.CC', '.C++', '.ii']
-OBJC_ENDINGS = ['.m', '.mi']
-PREPROCESSED_ENDINGS = ['.i', '.ii']
-OBJCXX_ENDINGS = ['.mm', '.mii']
+C_EXTENSIONS = ['.c', '.i']
+CXX_EXTENSIONS = ['.cppm', '.pcm', '.cpp', '.cxx', '.cc', '.c++', '.CPP', '.CXX', '.C', '.CC', '.C++', '.ii']
+OBJC_EXTENSIONS = ['.m', '.mi']
+PREPROCESSED_EXTENSIONS = ['.i', '.ii']
+OBJCXX_EXTENSIONS = ['.mm', '.mii']
 SPECIAL_ENDINGLESS_FILENAMES = [os.devnull]
-C_ENDINGS += SPECIAL_ENDINGLESS_FILENAMES # consider the special endingless filenames like /dev/null to be C
+C_EXTENSIONS += SPECIAL_ENDINGLESS_FILENAMES # consider the special endingless filenames like /dev/null to be C
 
-SOURCE_ENDINGS = C_ENDINGS + CXX_ENDINGS + OBJC_ENDINGS + OBJCXX_ENDINGS + ['.bc', '.ll', '.S']
-ASSEMBLY_ENDINGS = ['.s']
-HEADER_ENDINGS = ['.h', '.hxx', '.hpp', '.hh', '.H', '.HXX', '.HPP', '.HH']
+SOURCE_EXTENSIONS = C_EXTENSIONS + CXX_EXTENSIONS + OBJC_EXTENSIONS + OBJCXX_EXTENSIONS + ['.bc', '.ll', '.S']
+ASSEMBLY_EXTENSIONS = ['.s']
+HEADER_EXTENSIONS = ['.h', '.hxx', '.hpp', '.hh', '.H', '.HXX', '.HPP', '.HH']
 
 # These symbol names are allowed in INCOMING_MODULE_JS_API but are not part of the
 # default set.
@@ -823,7 +823,7 @@ def phase_setup(options, state):
   """Second phase: configure and setup the compiler based on the specified settings and arguments.
   """
 
-  has_header_inputs = any(get_file_suffix(f) in HEADER_ENDINGS for f in options.input_files)
+  has_header_inputs = any(get_file_suffix(f) in HEADER_EXTENSIONS for f in options.input_files)
 
   if options.post_link:
     state.mode = Mode.POST_LINK_ONLY
@@ -983,7 +983,7 @@ def get_clang_command_asm():
   if state.mode == Mode.COMPILE_ONLY:
     if options.output_file and get_file_suffix(options.output_file) == '.bc' and not settings.LTO and '-emit-llvm' not in state.orig_args:
       diagnostics.warning('emcc', '.bc output file suffix used without -flto or -emit-llvm.  Consider using .o extension since emcc will output an object file, not a bitcode file')
-    if all(get_file_suffix(i) in ASSEMBLY_ENDINGS for i in options.input_files):
+    if all(get_file_suffix(i) in ASSEMBLY_EXTENSIONS for i in options.input_files):
       cmd = get_clang_command_asm() + newargs
     else:
       cmd = get_clang_command() + newargs
@@ -1011,9 +1011,9 @@ def compile_source_file(i, input_file):
     logger.debug(f'compiling source file: {input_file}')
     output_file = get_object_filename(input_file)
     linker_inputs.append((i, output_file))
-    if get_file_suffix(input_file) in ASSEMBLY_ENDINGS:
+    if get_file_suffix(input_file) in ASSEMBLY_EXTENSIONS:
       cmd = get_clang_command_asm()
-    elif get_file_suffix(input_file) in PREPROCESSED_ENDINGS:
+    elif get_file_suffix(input_file) in PREPROCESSED_EXTENSIONS:
       cmd = get_clang_command_preprocessed()
     else:
       cmd = get_clang_command()
@@ -1037,9 +1037,9 @@ def compile_source_file(i, input_file):
   # First, generate LLVM bitcode. For each input file, we get base.o with bitcode
   for i, input_file in input_files:
     file_suffix = get_file_suffix(input_file)
-    if file_suffix in SOURCE_ENDINGS + ASSEMBLY_ENDINGS or (options.dash_c and file_suffix == '.bc'):
+    if file_suffix in SOURCE_EXTENSIONS + ASSEMBLY_EXTENSIONS or (options.dash_c and file_suffix == '.bc'):
       compile_source_file(i, input_file)
-    elif file_suffix in DYNAMICLIB_ENDINGS:
+    elif file_suffix in DYLIB_EXTENSIONS:
       logger.debug(f'using shared library: {input_file}')
       linker_inputs.append((i, input_file))
     elif building.is_ar(input_file):

tools/link.py

@@ -36,7 +36,7 @@
 from .utils import read_file, write_file, delete_file
 from .utils import removeprefix, exit_with_error
 from .shared import in_temp, safe_copy, do_replace, OFormat
-from .shared import DEBUG, WINDOWS, DYNAMICLIB_ENDINGS
+from .shared import DEBUG, WINDOWS, DYLIB_EXTENSIONS
 from .shared import unsuffixed, unsuffixed_basename, get_file_suffix
 from .settings import settings, default_setting, user_settings, JS_ONLY_SETTINGS, DEPRECATED_SETTINGS
 from .minimal_runtime_shell import generate_minimal_runtime_html
@@ -56,7 +56,7 @@
 
 VALID_ENVIRONMENTS = ('web', 'webview', 'worker', 'node', 'shell')
 
-EXECUTABLE_ENDINGS = ['.wasm', '.html', '.js', '.mjs', '.out', '']
+EXECUTABLE_EXTENSIONS = ['.wasm', '.html', '.js', '.mjs', '.out', '']
 
 # Supported LLD flags which we will pass through to the linker.
 SUPPORTED_LINKER_FLAGS = (
@@ -742,7 +742,7 @@ def phase_linker_setup(options, state):  # noqa: C901, PLR0912, PLR0915
     # we support a compatibility mode where shared libraries are actually just
     # object files linked with `wasm-ld --relocatable` or `llvm-link` in the case
     # of LTO.
-    if final_suffix in EXECUTABLE_ENDINGS:
+    if final_suffix in EXECUTABLE_EXTENSIONS:
       diagnostics.warning('emcc', '-shared/-r used with executable output suffix. This behaviour is deprecated.  Please remove -shared/-r to build an executable or avoid the executable suffix (%s) when building object files.' % final_suffix)
     else:
       if options.shared:
@@ -2828,7 +2828,7 @@ def process_libraries(state):
       # when statically linking.  The native linker (wasm-ld) will otherwise
       # ignore .so files in this mode.
       found_dylib = False
-      for ext in DYNAMICLIB_ENDINGS:
+      for ext in DYLIB_EXTENSIONS:
         name = 'lib' + lib + ext
         path = find_library(name, state.lib_dirs)
         if path:
@@ -2892,7 +2892,7 @@ def replacement(self):
 def filter_out_dynamic_libs(options, inputs):
   # Filters out "fake" dynamic libraries that are really just intermediate object files.
   def check(input_file):
-    if get_file_suffix(input_file) in DYNAMICLIB_ENDINGS and not building.is_wasm_dylib(input_file):
+    if get_file_suffix(input_file) in DYLIB_EXTENSIONS and not building.is_wasm_dylib(input_file):
       if not options.ignore_dynamic_linking:
         diagnostics.warning('emcc', 'ignoring dynamic library %s because not compiling to JS or HTML, remember to link it when compiling to JS or HTML at the end', os.path.basename(input_file))
       return False
@@ -2908,7 +2908,7 @@ def filter_out_duplicate_dynamic_libs(inputs):
   # Filter out duplicate "fake" shared libraries (intermediate object files).
   # See test_core.py:test_redundant_link
   def check(input_file):
-    if get_file_suffix(input_file) in DYNAMICLIB_ENDINGS and not building.is_wasm_dylib(input_file):
+    if get_file_suffix(input_file) in DYLIB_EXTENSIONS and not building.is_wasm_dylib(input_file):
       abspath = os.path.abspath(input_file)
       if abspath in seen:
         return False

tools/shared.py

@@ -824,7 +824,7 @@ class OFormat(Enum):
 WASM_SOURCEMAP = bat_suffix(path_from_root('tools/wasm-sourcemap'))
 # Windows .dll suffix is not included in this list, since those are never
 # linked to directly on the command line.
-DYNAMICLIB_ENDINGS = ['.dylib', '.so']
+DYLIB_EXTENSIONS = ['.dylib', '.so']
 
 run_via_emxx = False