Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
2c53971b
Commit
2c53971b
authored
Sep 20, 2010
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add PyErr_SyntaxLocationEx, to support adding a column offset
parent
26d64aee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
1 deletion
+32
-1
Doc/c-api/exceptions.rst
Doc/c-api/exceptions.rst
+14
-0
Include/pyerrors.h
Include/pyerrors.h
+1
-0
Python/errors.c
Python/errors.c
+17
-1
No files found.
Doc/c-api/exceptions.rst
View file @
2c53971b
...
...
@@ -294,6 +294,20 @@ in various ways. There is a separate error indicator for each thread.
parameter specifying the exception type to be raised. Availability: Windows.
.. cfunction:: void PyErr_SyntaxLocationEx(char *filename, int lineno, int col_offset)
Set file, line, and offset information for the current exception. If the
current exception is not a :exc:`SyntaxError`, then it sets additional
attributes, which make the exception printing subsystem think the exception
is a :exc:`SyntaxError`.
.. cfunction:: void PyErr_SyntaxLocation(char *filename, int lineno)
Like :cfunc:`PyErr_SyntaxLocationExc`, but the col_offset parameter is
omitted.
.. cfunction:: void PyErr_BadInternalCall()
This is a shorthand for ``PyErr_SetString(PyExc_SystemError, message)``,
...
...
Include/pyerrors.h
View file @
2c53971b
...
...
@@ -229,6 +229,7 @@ int PySignal_SetWakeupFd(int fd);
/* Support for adding program text to SyntaxErrors */
PyAPI_FUNC
(
void
)
PyErr_SyntaxLocation
(
const
char
*
,
int
);
PyAPI_FUNC
(
void
)
PyErr_SyntaxLocationEx
(
const
char
*
,
int
,
int
);
PyAPI_FUNC
(
PyObject
*
)
PyErr_ProgramText
(
const
char
*
,
int
);
/* The following functions are used to create and modify unicode
...
...
Python/errors.c
View file @
2c53971b
...
...
@@ -780,12 +780,18 @@ PyErr_WriteUnraisable(PyObject *obj)
extern
PyObject
*
PyModule_GetWarningsModule
(
void
);
void
PyErr_SyntaxLocation
(
const
char
*
filename
,
int
lineno
)
{
PyErr_SyntaxLocationEx
(
filename
,
lineno
,
-
1
);
}
/* Set file and line information for the current exception.
If the exception is not a SyntaxError, also sets additional attributes
to make printing of exceptions believe it is a syntax error. */
void
PyErr_SyntaxLocation
(
const
char
*
filename
,
int
lineno
)
PyErr_SyntaxLocation
Ex
(
const
char
*
filename
,
int
lineno
,
int
col_offset
)
{
PyObject
*
exc
,
*
v
,
*
tb
,
*
tmp
;
...
...
@@ -802,6 +808,16 @@ PyErr_SyntaxLocation(const char *filename, int lineno)
PyErr_Clear
();
Py_DECREF
(
tmp
);
}
if
(
col_offset
>=
0
)
{
tmp
=
PyLong_FromLong
(
col_offset
);
if
(
tmp
==
NULL
)
PyErr_Clear
();
else
{
if
(
PyObject_SetAttrString
(
v
,
"offset"
,
tmp
))
PyErr_Clear
();
Py_DECREF
(
tmp
);
}
}
if
(
filename
!=
NULL
)
{
tmp
=
PyUnicode_FromString
(
filename
);
if
(
tmp
==
NULL
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment