Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
abbd401
make async and await real keywords
JelleZijlstra Apr 16, 2017
8e16e6b
remove asyncio test that is now a SyntaxError
JelleZijlstra Apr 16, 2017
81dae40
update syntax tests in test_coroutines
JelleZijlstra Apr 16, 2017
9e65b47
regenerate symbol.py
JelleZijlstra Apr 16, 2017
f850135
fix tokenize.py
JelleZijlstra Apr 16, 2017
f95c992
fewer nested lists allowed
JelleZijlstra Apr 16, 2017
5c8bddc
regenerate keyword.py
JelleZijlstra Apr 16, 2017
ac04cff
fix lib2to3
JelleZijlstra Apr 16, 2017
8af009f
add some docs
JelleZijlstra Apr 22, 2017
4289253
fix test_parser.py
JelleZijlstra May 19, 2017
cf2f467
attempt to get pydoc to work
JelleZijlstra May 19, 2017
c824937
add blurb
JelleZijlstra Jul 21, 2017
ca85605
run make patchcheck to fix whitespace
JelleZijlstra Jul 21, 2017
505a66d
remove obsolete code from forbidden_name
JelleZijlstra Jul 22, 2017
57fb8ed
attempt to make it work without await_expr
JelleZijlstra Jul 22, 2017
e987d50
undo async_for-related changes
JelleZijlstra Jul 22, 2017
dacf3e6
minor CR fixes
JelleZijlstra Jul 22, 2017
d31627a
closer to yuri's code
JelleZijlstra Sep 27, 2017
ef28dea
undo unnecessary change
JelleZijlstra Aug 27, 2017
499aa40
fix whitespace (make patchcheck)
JelleZijlstra Sep 27, 2017
7c664e3
fix test_symbol
JelleZijlstra Sep 27, 2017
5659c8d
use a separate sync_comp_for (suggested by Yury)
JelleZijlstra Sep 30, 2017
2413e3e
regenerate symbol.py
JelleZijlstra Sep 30, 2017
cdbc7d5
simplify lib2to3 changes
JelleZijlstra Sep 30, 2017
38ba810
remove "again" from wording intoken.rst
JelleZijlstra Oct 5, 2017
78ddbde
fix lib2to3
JelleZijlstra Oct 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
run make patchcheck to fix whitespace
  • Loading branch information
JelleZijlstra committed Oct 6, 2017
commit ca856050976f6b2ef76e4848cca71734bc718913
118 changes: 59 additions & 59 deletions Include/token.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,75 +9,75 @@ extern "C" {

#undef TILDE /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */

#define ENDMARKER 0
#define NAME 1
#define NUMBER 2
#define STRING 3
#define NEWLINE 4
#define INDENT 5
#define DEDENT 6
#define LPAR 7
#define RPAR 8
#define LSQB 9
#define RSQB 10
#define COLON 11
#define COMMA 12
#define SEMI 13
#define PLUS 14
#define MINUS 15
#define STAR 16
#define SLASH 17
#define VBAR 18
#define AMPER 19
#define LESS 20
#define GREATER 21
#define EQUAL 22
#define DOT 23
#define PERCENT 24
#define LBRACE 25
#define RBRACE 26
#define EQEQUAL 27
#define NOTEQUAL 28
#define LESSEQUAL 29
#define GREATEREQUAL 30
#define TILDE 31
#define CIRCUMFLEX 32
#define LEFTSHIFT 33
#define RIGHTSHIFT 34
#define DOUBLESTAR 35
#define PLUSEQUAL 36
#define MINEQUAL 37
#define STAREQUAL 38
#define SLASHEQUAL 39
#define PERCENTEQUAL 40
#define AMPEREQUAL 41
#define VBAREQUAL 42
#define CIRCUMFLEXEQUAL 43
#define LEFTSHIFTEQUAL 44
#define RIGHTSHIFTEQUAL 45
#define DOUBLESTAREQUAL 46
#define DOUBLESLASH 47
#define ENDMARKER 0
#define NAME 1
#define NUMBER 2
#define STRING 3
#define NEWLINE 4
#define INDENT 5
#define DEDENT 6
#define LPAR 7
#define RPAR 8
#define LSQB 9
#define RSQB 10
#define COLON 11
#define COMMA 12
#define SEMI 13
#define PLUS 14
#define MINUS 15
#define STAR 16
#define SLASH 17
#define VBAR 18
#define AMPER 19
#define LESS 20
#define GREATER 21
#define EQUAL 22
#define DOT 23
#define PERCENT 24
#define LBRACE 25
#define RBRACE 26
#define EQEQUAL 27
#define NOTEQUAL 28
#define LESSEQUAL 29
#define GREATEREQUAL 30
#define TILDE 31
#define CIRCUMFLEX 32
#define LEFTSHIFT 33
#define RIGHTSHIFT 34
#define DOUBLESTAR 35
#define PLUSEQUAL 36
#define MINEQUAL 37
#define STAREQUAL 38
#define SLASHEQUAL 39
#define PERCENTEQUAL 40
#define AMPEREQUAL 41
#define VBAREQUAL 42
#define CIRCUMFLEXEQUAL 43
#define LEFTSHIFTEQUAL 44
#define RIGHTSHIFTEQUAL 45
#define DOUBLESTAREQUAL 46
#define DOUBLESLASH 47
#define DOUBLESLASHEQUAL 48
#define AT 49
#define ATEQUAL 50
#define ATEQUAL 50
#define RARROW 51
#define ELLIPSIS 52
/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
#define OP 53
#define ERRORTOKEN 54
#define OP 53
#define ERRORTOKEN 54
/* These aren't used by the C tokenizer but are needed for tokenize.py */
#define COMMENT 55
#define NL 56
#define ENCODING 57
#define N_TOKENS 58
#define COMMENT 55
#define NL 56
#define ENCODING 57
#define N_TOKENS 58

/* Special definitions for cooperation with parser */

#define NT_OFFSET 256
#define NT_OFFSET 256

#define ISTERMINAL(x) ((x) < NT_OFFSET)
#define ISNONTERMINAL(x) ((x) >= NT_OFFSET)
#define ISEOF(x) ((x) == ENDMARKER)
#define ISTERMINAL(x) ((x) < NT_OFFSET)
#define ISNONTERMINAL(x) ((x) >= NT_OFFSET)
#define ISEOF(x) ((x) == ENDMARKER)


PyAPI_DATA(const char *) _PyParser_TokenNames[]; /* Token names */
Expand Down