Skip to content

[libc++] Fix SyntaxWarning messages from python 3.12 #93637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions libcxx/test/libcxx/transitive_includes.gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,42 @@
regenerate_expected_results = False

if regenerate_expected_results:
print(f"""\
print(
f"""\
//--- generate-transitive-includes.sh.cpp
// RUN: mkdir %t
""")
"""
)

all_traces = []
for header in sorted(public_headers):
if header.endswith('.h'): # Skip C compatibility or detail headers
continue
all_traces = []
for header in sorted(public_headers):
if header.endswith(".h"): # Skip C compatibility or detail headers
continue

normalized_header = re.sub('/', '_', header)
print(f"""\
normalized_header = re.sub("/", "_", header)
print(
f"""\
// RUN: echo "#include <{header}>" | %{{cxx}} -xc++ - %{{flags}} %{{compile_flags}} --trace-includes -fshow-skipped-includes --preprocess > /dev/null 2> %t/trace-includes.{normalized_header}.txt
""")
all_traces.append(f'%t/trace-includes.{normalized_header}.txt')
"""
)
all_traces.append(f"%t/trace-includes.{normalized_header}.txt")

print(f"""\
print(
f"""\
// RUN: %{{python}} %{{libcxx-dir}}/test/libcxx/transitive_includes_to_csv.py {' '.join(all_traces)} > %{{libcxx-dir}}/test/libcxx/transitive_includes/%{{cxx_std}}.csv
""")
"""
)

else:
for header in public_headers:
if header.endswith('.h'): # Skip C compatibility or detail headers
continue
for header in public_headers:
if header.endswith(".h"): # Skip C compatibility or detail headers
continue

# Escape slashes for the awk command below
escaped_header = header.replace('/', '\/')
# Escape slashes for the awk command below
escaped_header = header.replace("/", "\\/")

print(f"""\
print(
f"""\
//--- {header}.sh.cpp
{lit_header_restrictions.get(header, '')}

Expand Down Expand Up @@ -89,4 +96,5 @@
// RUN: cat %{{libcxx-dir}}/test/libcxx/transitive_includes/%{{cxx_std}}.csv | awk '/^{escaped_header} / {{ print }}' > %t/expected_transitive_includes.csv
// RUN: diff -w %t/expected_transitive_includes.csv %t/actual_transitive_includes.csv
#include <{header}>
""")
"""
)
2 changes: 1 addition & 1 deletion libcxx/utils/generate_escaped_output_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
/// more details.

///
/// \pre The code point is a valid Unicode code point.
/// \\pre The code point is a valid Unicode code point.
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool __needs_escape(const char32_t __code_point) noexcept {{

// The entries in the gap at the end.
Expand Down
2 changes: 1 addition & 1 deletion libcxx/utils/generate_width_estimation_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:

/// Returns the estimated width of a Unicode code point.
///
/// \pre The code point is a valid Unicode code point.
/// \\pre The code point is a valid Unicode code point.
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr int __estimated_width(const char32_t __code_point) noexcept {{
// Since __table_upper_bound contains the unshifted range do the
// comparison without shifting.
Expand Down
Loading