From 72db4a1e50b69aec5eb42380b2dcba584b3eeefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 20 Feb 2025 23:55:26 -0500 Subject: [PATCH] glapi: disable python escape sequences in strings that use invalid ones We use invalid escape sequences in a few string. r'...' disables escape sequences. This fixes validator errors: /home/marek/dev/mesa/src/mapi/mapi_abi.py:45: SyntaxWarning: invalid escape sequence '\w' '^(?P[\w\s*]+?)(?P\w+)(\[(?P\d+)\])?$') /home/marek/dev/mesa/src/mapi/glapi/gen/api_exec_init.py:43: SyntaxWarning: invalid escape sequence '\p' header = """/** /home/marek/dev/mesa/src/mapi/glapi/gen/gl_enums.py:64: SyntaxWarning: invalid escape sequence '\c' print(""" Reviewed-by: Adam Jackson Part-of: --- src/mapi/glapi/gen/api_exec_init.py | 4 ++-- src/mapi/glapi/gen/gl_enums.py | 4 ++-- src/mapi/mapi_abi.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mapi/glapi/gen/api_exec_init.py index 9c3af5e9eb7..a5e9698443a 100644 --- a/src/mapi/glapi/gen/api_exec_init.py +++ b/src/mapi/glapi/gen/api_exec_init.py @@ -40,8 +40,8 @@ exec_flavor_map = { } -header = """/** - * \\file api_exec_init.c +header = r"""/** + * \file api_exec_init.c * Initialize dispatch table. */ diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py index 8879163c161..00305c7dfff 100644 --- a/src/mapi/glapi/gen/gl_enums.py +++ b/src/mapi/glapi/gen/gl_enums.py @@ -61,7 +61,7 @@ class PrintGlEnums(gl_XML.gl_print_base): return def print_code(self): - print(""" + print(r""" typedef int (*cfunc)(const void *, const void *); /** @@ -102,7 +102,7 @@ _mesa_enum_to_string(int nr) else { /* this is not re-entrant safe, no big deal here */ snprintf(token_tmp, sizeof(token_tmp) - 1, "0x%x", nr); - token_tmp[sizeof(token_tmp) - 1] = '\\0'; + token_tmp[sizeof(token_tmp) - 1] = '\0'; return token_tmp; } } diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py index 7e93dc72d3a..49cde5afe1d 100644 --- a/src/mapi/mapi_abi.py +++ b/src/mapi/mapi_abi.py @@ -42,7 +42,7 @@ class ABIEntry(object): """Represent an ABI entry.""" _match_c_param = re.compile( - '^(?P[\w\s*]+?)(?P\w+)(\[(?P\d+)\])?$') + r'^(?P[\w\s*]+?)(?P\w+)(\[(?P\d+)\])?$') def __init__(self, cols, attrs, xml_data = None): self._parse(cols)