[libc++] Fix SyntaxWarning messages from python 3.12 #93637
Conversation
This fixes "SyntaxWarning: invalid escape sequence" and "SyntaxWarning: "is" with 'int' literal". `transitive_includes.gen.py` was also reformatted with `darker` per style guide. Checked with: `cd libcxx && python -m compileall -d . -f -q .` Signed-off-by: Sv. Lockal <lockalsash@gmail.com>
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write If you have received no comments on your PR for a week, you can request a review If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: None (AngryLoki) ChangesThis fixes "SyntaxWarning: invalid escape sequence" and "SyntaxWarning: "is" with 'int' literal".
Checked with: PR split from #86806 Full diff: https://github.com/llvm/llvm-project/pull/93637.diff 3 Files Affected:
diff --git a/libcxx/test/libcxx/transitive_includes.gen.py b/libcxx/test/libcxx/transitive_includes.gen.py
index a67cab693b6e2..834f21f125437 100644
--- a/libcxx/test/libcxx/transitive_includes.gen.py
+++ b/libcxx/test/libcxx/transitive_includes.gen.py
@@ -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, '')}
@@ -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}>
-""")
+"""
+ )
diff --git a/libcxx/utils/generate_escaped_output_table.py b/libcxx/utils/generate_escaped_output_table.py
index 523a0be3a451d..c0b21f7731f64 100755
--- a/libcxx/utils/generate_escaped_output_table.py
+++ b/libcxx/utils/generate_escaped_output_table.py
@@ -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.
diff --git a/libcxx/utils/generate_width_estimation_table.py b/libcxx/utils/generate_width_estimation_table.py
index 918dae25fe49e..2fe51490449dd 100644
--- a/libcxx/utils/generate_width_estimation_table.py
+++ b/libcxx/utils/generate_width_estimation_table.py
@@ -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.
|
|
@AngryLoki Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested Please check whether problems have been caused by your change specifically, as How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
This fixes "SyntaxWarning: invalid escape sequence" and "SyntaxWarning: "is" with 'int' literal".
transitive_includes.gen.pywas also reformatted withdarkerper style guide.Checked with:
cd libcxx && python -m compileall -d . -f -q .PR split from #86806