gh-159672: Fix keyword diagnostics across build environments

Author: pablogsal

Lib/test/test_traceback.py

@@ -1962,6 +1962,7 @@ def test_keyword_hint_in_interactive_interpreter(self):
         self.assertIn("Did you mean 'import'", output.getvalue())
 
     @requires_subprocess()
+    @force_not_colorized
     def test_keyword_hint_does_not_reopen_source(self):
         with tempfile.TemporaryDirectory() as script_dir:
             make_script(script_dir, "sitecustomize", textwrap.dedent('''
@@ -1981,7 +1982,8 @@ def audit(event, args):
                 if keyword is not None:
                     self.assertIn(f"Did you mean '{keyword}'".encode(), error)
                 if keyword == "and":
-                    self.assertIn(b"line 1\n    result = (one\n", error)
+                    self.assertIn(b"line 1\n    result = (one\n",
+                                  error.replace(b"\r\n", b"\n"))
             self.assertGreater(counts[0], 0)
             self.assertEqual(counts, [counts[0]] * len(cases))
 

Parser/pegen.c

@@ -1086,6 +1086,11 @@ typedef struct {
     int is_alias;
 } KeywordTypo;
 
+typedef struct {
+    const char * const name;
+    const char * const keyword;
+} KeywordAlias;
+
 #define MAX_KEYWORD_TYPO_CANDIDATES 32
 #define MAX_KEYWORD_TYPO_STEPS 5000000
 
@@ -1303,10 +1308,7 @@ collect_keyword_typos(Parser *p, PySyntaxErrorObject *error, KeywordTypo *candid
             start = i + 1;
         }
     }
-    static const struct {
-        const char *name;
-        const char *keyword;
-    } aliases[] = {
+    static const KeywordAlias aliases[] = {
         {"switch", "match"},
         {"delete", "del"},
         {"function", "def"},