mirrors/cpython
mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-01 03:01:36 +01:00
Code Issues Releases Activity
6695ba89de
cpython/Include/parsetok.h

49 lines
1.3 KiB
C
Raw Normal View History

Added copyright notice.
1991-02-19 13:39:46 +01:00
Initial revision
1990-10-14 13:07:46 +01:00
/* Parser-tokenizer link interface */
ANSI-fication and Py_PROTO extermination.
2000-07-09 01:37:28 +02:00
#ifndef Py_PARSETOK_H
#define Py_PARSETOK_H
#ifdef __cplusplus
extern "C" {
#endif
Merge alpha100 branch back to main trunk
1994-08-01 13:34:53 +02:00
typedef struct {
ANSI-fication and Py_PROTO extermination.
2000-07-09 01:37:28 +02:00
int error;
Constify filenames and scripts. Fixes #651362.
2002-12-11 15:04:59 +01:00
const char *filename;
ANSI-fication and Py_PROTO extermination.
2000-07-09 01:37:28 +02:00
int lineno;
int offset;
char *text;
Create two new exceptions: IndentationError and TabError. These are used for indentation related errors. This patch includes Ping's improvements for indentation-related error messages. Closes SourceForge patches #100734 and #100856.
2000-07-11 19:53:00 +02:00
int token;
int expected;
Merge alpha100 branch back to main trunk
1994-08-01 13:34:53 +02:00
} perrdetail;
Disable the parser hacks that enabled the "yield" keyword using a future statement.
2002-03-23 00:53:36 +01:00
#if 0
Ugly. A pile of new xxxFlags() functions, to communicate to the parser that 'yield' is a keyword. This doesn't help test_generators at all! I don't know why not. These things do work now (and didn't before this patch): 1. "from __future__ import generators" now works in a native shell. 2. Similarly "python -i xxx.py" now has generators enabled in the shell if xxx.py had them enabled. 3. This program (which was my doctest proxy) works fine: from __future__ import generators source = """\ def f(): yield 1 """ exec compile(source, "", "single") in globals() print type(f())
2001-07-16 07:37:24 +02:00
#define PyPARSE_YIELD_IS_KEYWORD 0x0001
Disable the parser hacks that enabled the "yield" keyword using a future statement.
2002-03-23 00:53:36 +01:00
#endif
Ugly. A pile of new xxxFlags() functions, to communicate to the parser that 'yield' is a keyword. This doesn't help test_generators at all! I don't know why not. These things do work now (and didn't before this patch): 1. "from __future__ import generators" now works in a native shell. 2. Similarly "python -i xxx.py" now has generators enabled in the shell if xxx.py had them enabled. 3. This program (which was my doctest proxy) works fine: from __future__ import generators source = """\ def f(): yield 1 """ exec compile(source, "", "single") in globals() print type(f())
2001-07-16 07:37:24 +02:00
- Finally fixed the bug in compile() and exec where a string ending with an indented code block but no newline would raise SyntaxError. This would have been a four-line change in parsetok.c... Except codeop.py depends on this behavior, so a compilation flag had to be invented that causes the tokenizer to revert to the old behavior; this required extra changes to 2 .h files, 2 .c files, and 2 .py files. (Fixes SF bug #501622.)
2003-02-13 23:07:59 +01:00
#define PyPARSE_DONT_IMPLY_DEDENT 0x0002
Constify filenames and scripts. Fixes #651362.
2002-12-11 15:04:59 +01:00
PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
ANSI-fication and Py_PROTO extermination.
2000-07-09 01:37:28 +02:00
perrdetail *);
Constify filenames and scripts. Fixes #651362.
2002-12-11 15:04:59 +01:00
PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int,
ANSI-fication and Py_PROTO extermination.
2000-07-09 01:37:28 +02:00
char *, char *, perrdetail *);
* Added support for X11 modules. * Makefile: change location of FORMS library. * posixmodule.c: turn #if 0 into #ifdef MSDOS (stuff in unistd.h or not) * Almost all .h files: added CPP magic to avoid duplicate inclusions and to support inclusion from C++.
1993-07-28 11:05:47 +02:00
Constify filenames and scripts. Fixes #651362.
2002-12-11 15:04:59 +01:00
PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int,
Ugly. A pile of new xxxFlags() functions, to communicate to the parser that 'yield' is a keyword. This doesn't help test_generators at all! I don't know why not. These things do work now (and didn't before this patch): 1. "from __future__ import generators" now works in a native shell. 2. Similarly "python -i xxx.py" now has generators enabled in the shell if xxx.py had them enabled. 3. This program (which was my doctest proxy) works fine: from __future__ import generators source = """\ def f(): yield 1 """ exec compile(source, "", "single") in globals() print type(f())
2001-07-16 07:37:24 +02:00
perrdetail *, int);
Constify filenames and scripts. Fixes #651362.
2002-12-11 15:04:59 +01:00
PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *,
Ugly. A pile of new xxxFlags() functions, to communicate to the parser that 'yield' is a keyword. This doesn't help test_generators at all! I don't know why not. These things do work now (and didn't before this patch): 1. "from __future__ import generators" now works in a native shell. 2. Similarly "python -i xxx.py" now has generators enabled in the shell if xxx.py had them enabled. 3. This program (which was my doctest proxy) works fine: from __future__ import generators source = """\ def f(): yield 1 """ exec compile(source, "", "single") in globals() print type(f())
2001-07-16 07:37:24 +02:00
int, char *, char *,
perrdetail *, int);
Constify filenames and scripts. Fixes #651362.
2002-12-11 15:04:59 +01:00
PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *,
const char *,
Fix SF Bug 564931: compile() traceback must include filename.
2002-07-09 11:23:27 +02:00
grammar *, int,
perrdetail *, int);
Changes from Jonathan Riehl to allow his pgen extension (PEP 269) to work. This includes some more code that used to be part of pgen in the main parser; I'm okay with that. I'll see if the Windows build needs work next.
2003-04-17 16:55:42 +02:00
/* Note that he following function is defined in pythonrun.c not parsetok.c. */
PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
* Added support for X11 modules. * Makefile: change location of FORMS library. * posixmodule.c: turn #if 0 into #ifdef MSDOS (stuff in unistd.h or not) * Almost all .h files: added CPP magic to avoid duplicate inclusions and to support inclusion from C++.
1993-07-28 11:05:47 +02:00
#ifdef __cplusplus
}
#endif
#endif /* !Py_PARSETOK_H */
Copy Permalink