Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit da05f45

Browse files
meadorimeadori
committed
Issue #13629: Renumber the tokens in token.h to match the _PyParser_TokenNames indexes.
2 parents 2d49600 + 3388060 commit da05f45

4 files changed

Lines changed: 78 additions & 76 deletions

File tree

‎Include/token.h‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,38 +34,37 @@ extern "C" {
3434
#define EQUAL 22
3535
#define DOT 23
3636
#define PERCENT 24
37-
/* #define BACKQUOTE 25 */
38-
#define LBRACE 26
39-
#define RBRACE 27
40-
#define EQEQUAL 28
41-
#define NOTEQUAL 29
42-
#define LESSEQUAL 30
43-
#define GREATEREQUAL 31
44-
#define TILDE 32
45-
#define CIRCUMFLEX 33
46-
#define LEFTSHIFT 34
47-
#define RIGHTSHIFT 35
48-
#define DOUBLESTAR 36
49-
#define PLUSEQUAL 37
50-
#define MINEQUAL 38
51-
#define STAREQUAL 39
52-
#define SLASHEQUAL 40
53-
#define PERCENTEQUAL 41
54-
#define AMPEREQUAL 42
55-
#define VBAREQUAL 43
56-
#define CIRCUMFLEXEQUAL 44
57-
#define LEFTSHIFTEQUAL 45
58-
#define RIGHTSHIFTEQUAL 46
59-
#define DOUBLESTAREQUAL 47
60-
#define DOUBLESLASH 48
61-
#define DOUBLESLASHEQUAL 49
62-
#define AT 50
63-
#define RARROW 51
64-
#define ELLIPSIS 52
37+
#define LBRACE 25
38+
#define RBRACE 26
39+
#define EQEQUAL 27
40+
#define NOTEQUAL 28
41+
#define LESSEQUAL 29
42+
#define GREATEREQUAL 30
43+
#define TILDE 31
44+
#define CIRCUMFLEX 32
45+
#define LEFTSHIFT 33
46+
#define RIGHTSHIFT 34
47+
#define DOUBLESTAR 35
48+
#define PLUSEQUAL 36
49+
#define MINEQUAL 37
50+
#define STAREQUAL 38
51+
#define SLASHEQUAL 39
52+
#define PERCENTEQUAL 40
53+
#define AMPEREQUAL 41
54+
#define VBAREQUAL 42
55+
#define CIRCUMFLEXEQUAL 43
56+
#define LEFTSHIFTEQUAL 44
57+
#define RIGHTSHIFTEQUAL 45
58+
#define DOUBLESTAREQUAL 46
59+
#define DOUBLESLASH 47
60+
#define DOUBLESLASHEQUAL 48
61+
#define AT 49
62+
#define RARROW 50
63+
#define ELLIPSIS 51
6564
/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
66-
#define OP 53
67-
#define ERRORTOKEN 54
68-
#define N_TOKENS 55
65+
#define OP 52
66+
#define ERRORTOKEN 53
67+
#define N_TOKENS 54
6968

7069
/* Special definitions for cooperation with parser */
7170

‎Lib/token.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,36 @@
3535
EQUAL = 22
3636
DOT = 23
3737
PERCENT = 24
38-
LBRACE = 26
39-
RBRACE = 27
40-
EQEQUAL = 28
41-
NOTEQUAL = 29
42-
LESSEQUAL = 30
43-
GREATEREQUAL = 31
44-
TILDE = 32
45-
CIRCUMFLEX = 33
46-
LEFTSHIFT = 34
47-
RIGHTSHIFT = 35
48-
DOUBLESTAR = 36
49-
PLUSEQUAL = 37
50-
MINEQUAL = 38
51-
STAREQUAL = 39
52-
SLASHEQUAL = 40
53-
PERCENTEQUAL = 41
54-
AMPEREQUAL = 42
55-
VBAREQUAL = 43
56-
CIRCUMFLEXEQUAL = 44
57-
LEFTSHIFTEQUAL = 45
58-
RIGHTSHIFTEQUAL = 46
59-
DOUBLESTAREQUAL = 47
60-
DOUBLESLASH = 48
61-
DOUBLESLASHEQUAL = 49
62-
AT = 50
63-
RARROW = 51
64-
ELLIPSIS = 52
65-
OP = 53
66-
ERRORTOKEN = 54
67-
N_TOKENS = 55
38+
LBRACE = 25
39+
RBRACE = 26
40+
EQEQUAL = 27
41+
NOTEQUAL = 28
42+
LESSEQUAL = 29
43+
GREATEREQUAL = 30
44+
TILDE = 31
45+
CIRCUMFLEX = 32
46+
LEFTSHIFT = 33
47+
RIGHTSHIFT = 34
48+
DOUBLESTAR = 35
49+
PLUSEQUAL = 36
50+
MINEQUAL = 37
51+
STAREQUAL = 38
52+
SLASHEQUAL = 39
53+
PERCENTEQUAL = 40
54+
AMPEREQUAL = 41
55+
VBAREQUAL = 42
56+
CIRCUMFLEXEQUAL = 43
57+
LEFTSHIFTEQUAL = 44
58+
RIGHTSHIFTEQUAL = 45
59+
DOUBLESTAREQUAL = 46
60+
DOUBLESLASH = 47
61+
DOUBLESLASHEQUAL = 48
62+
AT = 49
63+
RARROW = 50
64+
ELLIPSIS = 51
65+
OP = 52
66+
ERRORTOKEN = 53
67+
N_TOKENS = 54
6868
NT_OFFSET = 256
6969
#--end constants--
7070

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
1010
Core and Builtins
1111
-----------------
1212

13+
- Issue #13629: Renumber the tokens in token.h so that they match the indexes
14+
into _PyParser_TokenNames.
15+
1316
- Issue #13752: Add a casefold() method to str.
1417

1518
- Issue #13761: Add a "flush" keyword argument to the print() function,

‎Python/graminit.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,7 @@ static label labels[169] = {
19951995
{258, 0},
19961996
{327, 0},
19971997
{259, 0},
1998-
{50, 0},
1998+
{49, 0},
19991999
{289, 0},
20002000
{7, 0},
20012001
{330, 0},
@@ -2007,7 +2007,7 @@ static label labels[169] = {
20072007
{1, "def"},
20082008
{1, 0},
20092009
{263, 0},
2010-
{51, 0},
2010+
{50, 0},
20112011
{302, 0},
20122012
{11, 0},
20132013
{301, 0},
@@ -2016,7 +2016,7 @@ static label labels[169] = {
20162016
{22, 0},
20172017
{12, 0},
20182018
{16, 0},
2019-
{36, 0},
2019+
{35, 0},
20202020
{266, 0},
20212021
{267, 0},
20222022
{270, 0},
@@ -2033,6 +2033,7 @@ static label labels[169] = {
20332033
{273, 0},
20342034
{336, 0},
20352035
{311, 0},
2036+
{36, 0},
20362037
{37, 0},
20372038
{38, 0},
20382039
{39, 0},
@@ -2043,8 +2044,7 @@ static label labels[169] = {
20432044
{44, 0},
20442045
{45, 0},
20452046
{46, 0},
2046-
{47, 0},
2047-
{49, 0},
2047+
{48, 0},
20482048
{1, "del"},
20492049
{326, 0},
20502050
{1, "pass"},
@@ -2063,7 +2063,7 @@ static label labels[169] = {
20632063
{1, "import"},
20642064
{288, 0},
20652065
{23, 0},
2066-
{52, 0},
2066+
{51, 0},
20672067
{287, 0},
20682068
{285, 0},
20692069
{1, "as"},
@@ -2105,38 +2105,38 @@ static label labels[169] = {
21052105
{310, 0},
21062106
{20, 0},
21072107
{21, 0},
2108-
{28, 0},
2109-
{31, 0},
2108+
{27, 0},
21102109
{30, 0},
21112110
{29, 0},
2112-
{29, 0},
2111+
{28, 0},
2112+
{28, 0},
21132113
{1, "is"},
21142114
{313, 0},
21152115
{18, 0},
21162116
{314, 0},
2117-
{33, 0},
2117+
{32, 0},
21182118
{315, 0},
21192119
{19, 0},
21202120
{316, 0},
2121+
{33, 0},
21212122
{34, 0},
2122-
{35, 0},
21232123
{317, 0},
21242124
{14, 0},
21252125
{15, 0},
21262126
{318, 0},
21272127
{17, 0},
21282128
{24, 0},
2129-
{48, 0},
2130-
{32, 0},
2129+
{47, 0},
2130+
{31, 0},
21312131
{319, 0},
21322132
{320, 0},
21332133
{322, 0},
21342134
{321, 0},
21352135
{9, 0},
21362136
{10, 0},
2137-
{26, 0},
2137+
{25, 0},
21382138
{328, 0},
2139-
{27, 0},
2139+
{26, 0},
21402140
{2, 0},
21412141
{3, 0},
21422142
{1, "None"},

0 commit comments

Comments
 (0)