Fix parser tests

Author: sobolevn

Parser/action_helpers.c

@@ -2,7 +2,6 @@
 #include "pycore_pystate.h"         // _PyInterpreterState_GET()
 #include "pycore_runtime.h"         // _PyRuntime
 #include "pycore_unicodeobject.h"   // _PyUnicode_InternImmortal()
-#include "pycore_pyerrors.h"        // _PyErr_EmitSyntaxWarning()
 
 #include "pegen.h"
 #include "string_parser.h"          // _PyPegen_decode_string()
@@ -1996,7 +1995,7 @@ _warn_relative_import_of_lazy(Parser *p, asdl_seq *dots, expr_ty module)
     }
 
     int count = _PyPegen_seq_count_dots(dots);
-    char *buf = PyMem_RawMalloc(sizeof(char *) * (count + 1));
+    char *buf = malloc(sizeof(char *) * (count + 1));
     if (buf == NULL) {
         PyErr_NoMemory();
         return -1;
@@ -2013,10 +2012,9 @@ _warn_relative_import_of_lazy(Parser *p, asdl_seq *dots, expr_ty module)
         return -1;
     }
 
-    return _PyErr_EmitSyntaxWarning(msg, p->tok->filename,
-                                    module->lineno, module->col_offset,
-                                    module->end_lineno, module->end_col_offset,
-                                    p->tok->module);
+    int result = _PyPegen_set_syntax_warning(p, msg, module);
+    Py_DECREF(msg);
+    return result;
 }
 
 stmt_ty

Parser/pegen.h

@@ -181,6 +181,7 @@ void *_PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
                                           Py_ssize_t lineno, Py_ssize_t col_offset,
                                           Py_ssize_t end_lineno, Py_ssize_t end_col_offset,
                                           const char *errmsg, va_list va);
+int _PyPegen_set_syntax_warning(Parser* p, PyObject *msg, expr_ty context);
 void _Pypegen_set_syntax_error(Parser* p, Token* last_token);
 void _Pypegen_stack_overflow(Parser *p);
 

Parser/pegen_errors.c

@@ -411,6 +411,38 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
     return NULL;
 }
 
+/* Emits a SyntaxWarning and returns 0 on success.
+   If a SyntaxWarning is raised as error, replaces it with a SyntaxError
+   and returns -1.
+*/
+int
+_PyPegen_set_syntax_warning(Parser* p, PyObject *msg, expr_ty context)
+{
+    PyObject *filename = p->tok->filename;
+    PyObject *mod =  p->tok->module;
+    int lineno = context->lineno;
+    int col_offset = context->col_offset;
+    int end_lineno = context->end_lineno;
+    int end_col_offset = context->end_col_offset;
+
+    // Copied from `_PyErr_EmitSyntaxWarning`:
+    if (PyErr_WarnExplicitObject(PyExc_SyntaxWarning, msg, filename, lineno,
+                                 mod, NULL) < 0)
+    {
+        if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
+            /* Replace the SyntaxWarning exception with a SyntaxError
+               to get a more accurate error report */
+            PyErr_Clear();
+            RAISE_ERROR_KNOWN_LOCATION(p, PyExc_SyntaxError,
+                                       lineno, col_offset,
+                                       end_lineno, end_col_offset,
+                                       "%U", msg);
+        }
+        return -1;
+    }
+    return 0;
+}
+
 void
 _Pypegen_set_syntax_error(Parser* p, Token* last_token) {
     // Existing syntax error