mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
![Yury Selivanov](/assets/img/avatar_default.png)
This commit fixes how one-line async-defs and defs are tracked by tokenizer. It allows to correctly parse invalid code such as: >>> async def f(): ... def g(): pass ... async = 10 and valid code such as: >>> async def f(): ... async def g(): pass ... await z As a consequence, is is now possible to have one-line 'async def foo(): await ..' functions: >>> async def foo(): return await bar()
99 lines
4.3 KiB
C
99 lines
4.3 KiB
C
#ifndef Py_TOKENIZER_H
|
|
#define Py_TOKENIZER_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include "object.h"
|
|
|
|
/* Tokenizer interface */
|
|
|
|
#include "token.h" /* For token types */
|
|
|
|
#define MAXINDENT 100 /* Max indentation level */
|
|
|
|
enum decoding_state {
|
|
STATE_INIT,
|
|
STATE_RAW,
|
|
STATE_NORMAL /* have a codec associated with input */
|
|
};
|
|
|
|
/* Tokenizer state */
|
|
struct tok_state {
|
|
/* Input state; buf <= cur <= inp <= end */
|
|
/* NB an entire line is held in the buffer */
|
|
char *buf; /* Input buffer, or NULL; malloc'ed if fp != NULL */
|
|
char *cur; /* Next character in buffer */
|
|
char *inp; /* End of data in buffer */
|
|
char *end; /* End of input buffer if buf != NULL */
|
|
char *start; /* Start of current token if not NULL */
|
|
int done; /* E_OK normally, E_EOF at EOF, otherwise error code */
|
|
/* NB If done != E_OK, cur must be == inp!!! */
|
|
FILE *fp; /* Rest of input; NULL if tokenizing a string */
|
|
int tabsize; /* Tab spacing */
|
|
int indent; /* Current indentation index */
|
|
int indstack[MAXINDENT]; /* Stack of indents */
|
|
int atbol; /* Nonzero if at begin of new line */
|
|
int pendin; /* Pending indents (if > 0) or dedents (if < 0) */
|
|
const char *prompt, *nextprompt; /* For interactive prompting */
|
|
int lineno; /* Current line number */
|
|
int level; /* () [] {} Parentheses nesting level */
|
|
/* Used to allow free continuations inside them */
|
|
/* Stuff for checking on different tab sizes */
|
|
#ifndef PGEN
|
|
/* pgen doesn't have access to Python codecs, it cannot decode the input
|
|
filename. The bytes filename might be kept, but it is only used by
|
|
indenterror() and it is not really needed: pgen only compiles one file
|
|
(Grammar/Grammar). */
|
|
PyObject *filename;
|
|
#endif
|
|
int altwarning; /* Issue warning if alternate tabs don't match */
|
|
int alterror; /* Issue error if alternate tabs don't match */
|
|
int alttabsize; /* Alternate tab spacing */
|
|
int altindstack[MAXINDENT]; /* Stack of alternate indents */
|
|
/* Stuff for PEP 0263 */
|
|
enum decoding_state decoding_state;
|
|
int decoding_erred; /* whether erred in decoding */
|
|
int read_coding_spec; /* whether 'coding:...' has been read */
|
|
char *encoding; /* Source encoding. */
|
|
int cont_line; /* whether we are in a continuation line. */
|
|
const char* line_start; /* pointer to start of current line */
|
|
#ifndef PGEN
|
|
PyObject *decoding_readline; /* open(...).readline */
|
|
PyObject *decoding_buffer;
|
|
#endif
|
|
const char* enc; /* Encoding for the current str. */
|
|
const char* str;
|
|
const char* input; /* Tokenizer's newline translated copy of the string. */
|
|
|
|
/* `def*` fields are for parsing async/await in a backwards compatible
|
|
way. They should be removed in 3.7, when they will become
|
|
regular constants. See PEP 492 for more details. */
|
|
int defstack[MAXINDENT]; /* Stack of funcs & indents where they
|
|
were defined. */
|
|
int deftypestack[MAXINDENT]; /* Stack of func flags, see DEFTYPE_*
|
|
constants. */
|
|
int def; /* Length of stack of func types/flags. */
|
|
int def_async_behind; /* 1 if there was an 'async' token before
|
|
a 'def' token. */
|
|
int def_in_async; /* Counter of how deep 'async def's
|
|
are nested. If greater than 0,
|
|
we are somewhere in an 'async def'
|
|
body, so 'async' and 'await' should
|
|
be parsed as keywords.*/
|
|
};
|
|
|
|
extern struct tok_state *PyTokenizer_FromString(const char *, int);
|
|
extern struct tok_state *PyTokenizer_FromUTF8(const char *, int);
|
|
extern struct tok_state *PyTokenizer_FromFile(FILE *, const char*,
|
|
const char *, const char *);
|
|
extern void PyTokenizer_Free(struct tok_state *);
|
|
extern int PyTokenizer_Get(struct tok_state *, char **, char **);
|
|
extern char * PyTokenizer_RestoreEncoding(struct tok_state* tok,
|
|
int len, int *offset);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_TOKENIZER_H */
|