Addresses review comments.

Author: mordante

libcxx/test/libcxx/feature_test_macro/get_dialect_versions.sh.py renamed to libcxx/test/libcxx/feature_test_macro/implemented_ftms.sh.py

@@ -1,4 +1,3 @@
-# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/utils/data/feature_test_macros/test_data.json
 # ===----------------------------------------------------------------------===##
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,19 +6,21 @@
 #
 # ===----------------------------------------------------------------------===##
 
+# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/utils/data/feature_test_macros/test_data.json
+
 import sys
 
 sys.path.append(sys.argv[1])
-from generate_feature_test_macro_components import feature_test_macros
+from generate_feature_test_macro_components import FeatureTestMacros
 
 
 def test(output, expected):
     assert output == expected, f"expected\n{expected}\n\noutput\n{output}"
 
 
-fmt = feature_test_macros(sys.argv[2])
+ftm = FeatureTestMacros(sys.argv[2])
 test(
-    fmt.get_dialect_versions(),
+    ftm.implemented_ftms,
     {
         "__cpp_lib_any": {
             "c++17": "201606L",

libcxx/test/libcxx/feature_test_macro/invalid.sh.py

@@ -1,4 +1,3 @@
-# RUN: %{python} %s %{libcxx-dir}/utils %t
 # ===----------------------------------------------------------------------===##
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,11 +6,13 @@
 #
 # ===----------------------------------------------------------------------===##
 
+# RUN: %{python} %s %{libcxx-dir}/utils %t
+
 import sys
 import json
 
 sys.path.append(sys.argv[1])
-from generate_feature_test_macro_components import feature_test_macros
+from generate_feature_test_macro_components import FeatureTestMacros
 
 
 def test(output, expected):
@@ -22,9 +23,9 @@ def test_error(data, type, message):
     tmp = sys.argv[2]
     with open(tmp, "w") as file:
         file.write(json.dumps(data))
-    fmt = feature_test_macros(tmp)
+    ftm = FeatureTestMacros(tmp)
     try:
-        fmt.get_dialect_versions()
+        ftm.implemented_ftms
     except type as error:
         test(str(error), message)
     else:

libcxx/test/libcxx/feature_test_macro/get_std_dialect_versions.sh.py renamed to libcxx/test/libcxx/feature_test_macro/standard_ftms.sh.py

@@ -1,4 +1,3 @@
-# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/utils/data/feature_test_macros/test_data.json
 # ===----------------------------------------------------------------------===##
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,19 +6,21 @@
 #
 # ===----------------------------------------------------------------------===##
 
+# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/utils/data/feature_test_macros/test_data.json
+
 import sys
 
 sys.path.append(sys.argv[1])
-from generate_feature_test_macro_components import feature_test_macros
+from generate_feature_test_macro_components import FeatureTestMacros
 
 
 def test(output, expected):
     assert output == expected, f"expected\n{expected}\n\noutput\n{output}"
 
 
-fmt = feature_test_macros(sys.argv[2])
+ftm = FeatureTestMacros(sys.argv[2])
 test(
-    fmt.get_std_dialect_versions(),
+    ftm.standard_ftms,
     {
         "__cpp_lib_any": {
             "c++17": "201606L",

libcxx/test/libcxx/feature_test_macro/get_std_dialects.sh.py renamed to libcxx/test/libcxx/feature_test_macro/std_dialects.sh.py

@@ -1,4 +1,3 @@
-# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/utils/data/feature_test_macros/test_data.json
 # ===----------------------------------------------------------------------===##
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,19 +6,21 @@
 #
 # ===----------------------------------------------------------------------===##
 
+# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/utils/data/feature_test_macros/test_data.json
+
 import sys
 
 sys.path.append(sys.argv[1])
-from generate_feature_test_macro_components import feature_test_macros
+from generate_feature_test_macro_components import FeatureTestMacros
 
 
 def test(output, expected):
     assert output == expected, f"expected\n{expected}\n\noutput\n{output}"
 
 
-fmt = feature_test_macros(sys.argv[2])
+ftm = FeatureTestMacros(sys.argv[2])
 test(
-    fmt.get_std_dialects(),
+    ftm.std_dialects,
     [
         "c++17",
         "c++20",

libcxx/utils/generate_feature_test_macro_components.py

@@ -3,6 +3,7 @@
 import os
 from builtins import range
 from functools import reduce
+import functools
 import json
 
 
@@ -1868,17 +1869,6 @@ def produce_docs():
         f.write(doc_str)
 
 
-def get_std_dialects(data):
-    """Impementation for feature_test_macros.get_std_dialects()."""
-    dialects = set()
-    for feature in data:
-        keys = feature["values"].keys()
-        assert len(keys) > 0, "'values' is empty"
-        dialects |= keys
-
-    return sorted(dialects)
-
-
 def get_dialect_versions(data, std_dialects, use_implemented_status):
     """Impementation for feature_test_macros.get_(std_|)dialect_versions()."""
     result = dict()
@@ -1916,8 +1906,8 @@ def get_dialect_versions(data, std_dialects, use_implemented_status):
     return result
 
 
-class feature_test_macros:
-    """Provides all feature-test macro (FMT) output components.
+class FeatureTestMacros:
+    """Provides all feature-test macro (FTM) output components.
 
     The class has several generators to use the feature-test macros in libc++:
     - FTM status page
@@ -2007,20 +1997,15 @@ class feature_test_macros:
     ]
     """
 
-    # The JSON data structor.
+    # The JSON data structure.
     __data = None
 
-    # These values are used internally multiple times. They are lazily loaded
-    # and cached. Values that are expected to be used once are not cached.
-    __std_dialects = None
-    __std_dialect_versions = None
-    __dialect_versions = None
-
     def __init__(self, filename):
         """Initializes the class with the JSON data in the file 'filename'."""
         self.__data = json.load(open(filename))
 
-    def get_std_dialects(self):
+    @functools.cached_property
+    def std_dialects(self):
         """Returns the C++ dialects avaiable.
 
         The available dialects are based on the 'c++xy' keys found the 'values'
@@ -2030,12 +2015,16 @@ def get_std_dialects(self):
         The return value is a sorted list with the C++ dialects used. Since FTM
         were added in C++14 the list will not contain C++98 or C++11.
         """
-        if not self.__std_dialects:
-            self.__std_dialects = get_std_dialects(self.__data)
+        dialects = set()
+        for feature in self.__data:
+            keys = feature["values"].keys()
+            assert len(keys) > 0, "'values' is empty"
+            dialects |= keys
 
-        return self.__std_dialects
+        return sorted(list(dialects))
 
-    def get_std_dialect_versions(self):
+    @functools.cached_property
+    def standard_ftms(self):
         """Returns the FTM versions per dialect in the Standard.
 
         This function does not use the 'implemented' flag. The output contains
@@ -2049,14 +2038,10 @@ def get_std_dialect_versions(self):
           * key: The version of the C++ dialect.
           * value: The value of the feature-test macro.
         """
-        if not self.__std_dialect_versions:
-            self.__std_dialect_versions = get_dialect_versions(
-                self.__data, self.get_std_dialects(), False
-            )
+        return get_dialect_versions(self.__data, self.std_dialects, False)
 
-        return self.__std_dialect_versions
-
-    def get_dialect_versions(self):
+    @functools.cached_property
+    def implemented_ftms(self):
         """Returns the FTM versions per dialect implemented in libc++.
 
         Unlike `get_std_dialect_versions` this function uses the 'implemented'
@@ -2069,12 +2054,8 @@ def get_dialect_versions(self):
           * value: The value of the feature-test macro. When a feature-test
             macro is not implemented its value is None.
         """
-        if not self.__dialect_versions:
-            self.__dialect_versions = get_dialect_versions(
-                self.__data, self.get_std_dialects(), True
-            )
 
-        return self.__dialect_versions
+        return get_dialect_versions(self.__data, self.std_dialects, True)
 
 
 def main():