[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2025-01-13 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 6f595ed1b04efa15b0085ae212f847163a131f17 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index b6f00657ec914c..c94a533f4c68f2 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -91,11 +91,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -106,9 +106,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -241,7 +241,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-12-25 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 511dda8045630f775d96805510f730aebbfc3680 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index b6f00657ec914c..c94a533f4c68f2 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -91,11 +91,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -106,9 +106,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -241,7 +241,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-12-10 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From e6ea87dd5ed5a2484f9526fe5b72c87178582a0e Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index b6f00657ec914c..c94a533f4c68f2 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -91,11 +91,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -106,9 +106,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -241,7 +241,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-11-29 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 93cb19e83e2b547f0a047a7f93ade40ffc4391c0 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d40985..d47111819a1e2d 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-11-19 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 8ebfa30beff75a80601ae88c878beffe31a3f310 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d40985..d47111819a1e2d 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-09-02 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 3d9fa04f2b42030f27eb6e21a6e238c8a6a74b20 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d40985..d47111819a1e2d 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-08-28 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 1358b29f145d83dc315f3209cf2e9f290cfb8e4c Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d40985..d47111819a1e2d 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0c..43968f4b1b6e8d 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-06-23 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm updated 
https://github.com/llvm/llvm-project/pull/94029

>From 5ad3e5603357698d08a66c7a7c92d198a3c24789 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d4098..d47111819a1e2 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0..43968f4b1b6e8 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-05-31 Thread via cfe-commits

llvmbot wrote:




@llvm/pr-subscribers-clang

Author: Eisuke Kawashima (e-kwsm)


Changes



---
Full diff: https://github.com/llvm/llvm-project/pull/94029.diff


2 Files Affected:

- (modified) clang/docs/tools/dump_ast_matchers.py (+5-5) 
- (modified) clang/test/Analysis/check-analyzer-fixit.py (+1-1) 


``diff
diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d4098..d47111819a1e2 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0..43968f4b1b6e8 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

``




https://github.com/llvm/llvm-project/pull/94029
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-05-31 Thread via cfe-commits

github-actions[bot] wrote:



Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

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
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using `@` followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from 
other developers.

If you have further questions, they may be answered by the [LLVM GitHub User 
Guide](https://llvm.org/docs/GitHub.html).

You can also ask questions in a comment on this PR, on the [LLVM 
Discord](https://discord.com/invite/xS7Z362) or on the 
[forums](https://discourse.llvm.org/).

https://github.com/llvm/llvm-project/pull/94029
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[clang] fix(clang/**.py): fix invalid escape sequences (PR #94029)

2024-05-31 Thread Eisuke Kawashima via cfe-commits

https://github.com/e-kwsm created 
https://github.com/llvm/llvm-project/pull/94029

None

>From 38272898d77ffd64215fbdbdaa7041d2d5e6016b Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima 
Date: Sat, 11 May 2024 02:39:21 +0900
Subject: [PATCH] fix(clang/**.py): fix invalid escape sequences

---
 clang/docs/tools/dump_ast_matchers.py   | 10 +-
 clang/test/Analysis/check-analyzer-fixit.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py 
b/clang/docs/tools/dump_ast_matchers.py
index 705ff0d4d4098..d47111819a1e2 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -86,11 +86,11 @@ def extract_result_types(comment):
 parsed.
 """
 result_types = []
-m = re.search(r"Usable as: Any Matcher[\s\n]*$", comment, re.S)
+m = re.search("Usable as: Any Matcher[\\s\n]*$", comment, re.S)
 if m:
 return ["*"]
 while True:
-m = re.match(r"^(.*)Matcher<([^>]+)>\s*,?[\s\n]*$", comment, re.S)
+m = re.match("^(.*)Matcher<([^>]+)>\\s*,?[\\s\n]*$", comment, re.S)
 if not m:
 if re.search(r"Usable as:\s*$", comment):
 return result_types
@@ -101,9 +101,9 @@ def extract_result_types(comment):
 
 
 def strip_doxygen(comment):
-"""Returns the given comment without \-escaped words."""
+r"""Returns the given comment without \-escaped words."""
 # If there is only a doxygen keyword in the line, delete the whole line.
-comment = re.sub(r"^\\[^\s]+\n", r"", comment, flags=re.M)
+comment = re.sub("^[^\\s]+\n", r"", comment, flags=re.M)
 
 # If there is a doxygen \see command, change the \see prefix into "See 
also:".
 # FIXME: it would be better to turn this into a link to the target instead.
@@ -236,7 +236,7 @@ def act_on_decl(declaration, comment, allowed_types):
 
 # Parse the various matcher definition macros.
 m = re.match(
-""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
+r""".*AST_TYPE(LOC)?_TRAVERSE_MATCHER(?:_DECL)?\(
\s*([^\s,]+\s*),
\s*(?:[^\s,]+\s*),
\s*AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)
diff --git a/clang/test/Analysis/check-analyzer-fixit.py 
b/clang/test/Analysis/check-analyzer-fixit.py
index b616255de89b0..43968f4b1b6e8 100644
--- a/clang/test/Analysis/check-analyzer-fixit.py
+++ b/clang/test/Analysis/check-analyzer-fixit.py
@@ -55,7 +55,7 @@ def run_test_once(args, extra_args):
 # themselves.  We need to keep the comments to preserve line numbers while
 # avoiding empty lines which could potentially trigger formatting-related
 # checks.
-cleaned_test = re.sub("// *CHECK-[A-Z0-9\-]*:[^\r\n]*", "//", input_text)
+cleaned_test = re.sub("// *CHECK-[A-Z0-9\\-]*:[^\r\n]*", "//", input_text)
 write_file(temp_file_name, cleaned_test)
 
 original_file_name = temp_file_name + ".orig"

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits