mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-104983: Fix test_peg_generator (#104985)

Browse source
This commit is contained in:
Lysandros Nikolaou 2023-05-26 19:06:45 +02:00 • committed by GitHub
parent 61c1d6760f
commit 95f1b1fef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

143
Lib/test/test_peg_generator/test_pegen.py
View file

@ -96,14 +96,14 @@ class TestPegen(unittest.TestCase):
[ [
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2" NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2\n"
), ),
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 4), end=(1, 5), line="1, 2" NEWLINE, string="\n", start=(1, 4), end=(1, 5), line="1, 2\n"
), ),
], ],
) )
@ -119,8 +119,8 @@ class TestPegen(unittest.TestCase):
self.assertEqual( self.assertEqual(
node, node,
[ [
TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42"), TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42\n"),
TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42"), TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42\n"),
], ],
) )
@ -137,19 +137,19 @@ class TestPegen(unittest.TestCase):
[ [
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n"
), ),
[ [
TokenInfo( TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2" OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2" NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n"
), ),
], ],
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2" NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"
), ),
], ],
) )
@ -158,10 +158,10 @@ class TestPegen(unittest.TestCase):
node, node,
[ [
[ [
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"), TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
None, None,
], ],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"), TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
], ],
) )
@ -178,11 +178,11 @@ class TestPegen(unittest.TestCase):
[ [
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+\n"
), ),
TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+"), TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+\n"),
], ],
TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="1+"), TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="1+\n"),
], ],
) )
node = parse_string("1\n", parser_class) node = parse_string("1\n", parser_class)
@ -190,10 +190,10 @@ class TestPegen(unittest.TestCase):
node, node,
[ [
[ [
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"), TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
None, None,
], ],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"), TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
], ],
) )
@ -210,19 +210,19 @@ class TestPegen(unittest.TestCase):
[ [
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n"
), ),
[ [
TokenInfo( TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2" OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2" NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n"
), ),
], ],
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2" NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"
), ),
], ],
) )
@ -231,10 +231,10 @@ class TestPegen(unittest.TestCase):
node, node,
[ [
[ [
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"), TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
None, None,
], ],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"), TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
], ],
) )
@ -248,17 +248,17 @@ class TestPegen(unittest.TestCase):
self.assertEqual( self.assertEqual(
node, node,
[ [
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3"), TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n"),
[ [
TokenInfo( TokenInfo(
NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3" NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3" NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n"
), ),
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3" NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"
), ),
], ],
) )
@ -266,9 +266,9 @@ class TestPegen(unittest.TestCase):
self.assertEqual( self.assertEqual(
node, node,
[ [
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1"), TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
[], [],
TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1"), TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
], ],
) )
@ -283,36 +283,36 @@ class TestPegen(unittest.TestCase):
node, node,
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n"
), ),
[ [
[ [
TokenInfo( TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3" OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, NUMBER,
string="2", string="2",
start=(1, 4), start=(1, 4),
end=(1, 5), end=(1, 5),
line="1 + 2 + 3", line="1 + 2 + 3\n",
), ),
], ],
[ [
TokenInfo( TokenInfo(
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3" OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, NUMBER,
string="3", string="3",
start=(1, 8), start=(1, 8),
end=(1, 9), end=(1, 9),
line="1 + 2 + 3", line="1 + 2 + 3\n",
), ),
], ],
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3" NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
), ),
], ],
) )
@ -327,17 +327,17 @@ class TestPegen(unittest.TestCase):
self.assertEqual( self.assertEqual(
node, node,
[ [
TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3"), TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n"),
[ [
TokenInfo( TokenInfo(
NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3" NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3" NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n"
), ),
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3" NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"
), ),
], ],
) )
@ -355,36 +355,36 @@ class TestPegen(unittest.TestCase):
node, node,
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n"
), ),
[ [
[ [
TokenInfo( TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3" OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, NUMBER,
string="2", string="2",
start=(1, 4), start=(1, 4),
end=(1, 5), end=(1, 5),
line="1 + 2 + 3", line="1 + 2 + 3\n",
), ),
], ],
[ [
TokenInfo( TokenInfo(
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3" OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, NUMBER,
string="3", string="3",
start=(1, 8), start=(1, 8),
end=(1, 9), end=(1, 9),
line="1 + 2 + 3", line="1 + 2 + 3\n",
), ),
], ],
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3" NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
), ),
], ],
) )
@ -403,17 +403,17 @@ class TestPegen(unittest.TestCase):
[ [
[ [
TokenInfo( TokenInfo(
NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2, 3" NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2, 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2, 3" NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2, 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="3", start=(1, 6), end=(1, 7), line="1, 2, 3" NUMBER, string="3", start=(1, 6), end=(1, 7), line="1, 2, 3\n"
), ),
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 7), end=(1, 8), line="1, 2, 3" NEWLINE, string="\n", start=(1, 7), end=(1, 8), line="1, 2, 3\n"
), ),
], ],
) )
@ -447,28 +447,28 @@ class TestPegen(unittest.TestCase):
string="1", string="1",
start=(1, 0), start=(1, 0),
end=(1, 1), end=(1, 1),
line="1 + 2 + 3", line="1 + 2 + 3\n",
), ),
TokenInfo( TokenInfo(
OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3" OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, NUMBER,
string="2", string="2",
start=(1, 4), start=(1, 4),
end=(1, 5), end=(1, 5),
line="1 + 2 + 3", line="1 + 2 + 3\n",
), ),
], ],
TokenInfo( TokenInfo(
OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3" OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
), ),
TokenInfo( TokenInfo(
NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3" NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3\n"
), ),
], ],
TokenInfo( TokenInfo(
NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3" NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
), ),
], ],
) )
@ -552,14 +552,14 @@ class TestPegen(unittest.TestCase):
string="D", string="D",
start=(1, 0), start=(1, 0),
end=(1, 1), end=(1, 1),
line="D A C A E", line="D A C A E\n",
), ),
TokenInfo( TokenInfo(
type=NAME, type=NAME,
string="A", string="A",
start=(1, 2), start=(1, 2),
end=(1, 3), end=(1, 3),
line="D A C A E", line="D A C A E\n",
), ),
], ],
TokenInfo( TokenInfo(
@ -567,7 +567,7 @@ class TestPegen(unittest.TestCase):
string="C", string="C",
start=(1, 4), start=(1, 4),
end=(1, 5), end=(1, 5),
line="D A C A E", line="D A C A E\n",
), ),
], ],
TokenInfo( TokenInfo(
@ -575,11 +575,11 @@ class TestPegen(unittest.TestCase):
string="A", string="A",
start=(1, 6), start=(1, 6),
end=(1, 7), end=(1, 7),
line="D A C A E", line="D A C A E\n",
), ),
], ],
TokenInfo( TokenInfo(
type=NAME, string="E", start=(1, 8), end=(1, 9), line="D A C A E" type=NAME, string="E", start=(1, 8), end=(1, 9), line="D A C A E\n"
), ),
], ],
) )
@ -594,22 +594,22 @@ class TestPegen(unittest.TestCase):
string="B", string="B",
start=(1, 0), start=(1, 0),
end=(1, 1), end=(1, 1),
line="B C A E", line="B C A E\n",
), ),
TokenInfo( TokenInfo(
type=NAME, type=NAME,
string="C", string="C",
start=(1, 2), start=(1, 2),
end=(1, 3), end=(1, 3),
line="B C A E", line="B C A E\n",
), ),
], ],
TokenInfo( TokenInfo(
type=NAME, string="A", start=(1, 4), end=(1, 5), line="B C A E" type=NAME, string="A", start=(1, 4), end=(1, 5), line="B C A E\n"
), ),
], ],
TokenInfo( TokenInfo(
type=NAME, string="E", start=(1, 6), end=(1, 7), line="B C A E" type=NAME, string="E", start=(1, 6), end=(1, 7), line="B C A E\n"
), ),
], ],
) )
@ -650,14 +650,15 @@ class TestPegen(unittest.TestCase):
""" """
parser_class = make_parser(grammar) parser_class = make_parser(grammar)
node = parse_string("foo = 12 + 12 .", parser_class) node = parse_string("foo = 12 + 12 .", parser_class)
self.maxDiff = None
self.assertEqual( self.assertEqual(
node, node,
[ [
TokenInfo( TokenInfo(
NAME, string="foo", start=(1, 0), end=(1, 3), line="foo = 12 + 12 ." NAME, string="foo", start=(1, 0), end=(1, 3), line="foo = 12 + 12 .\n"
), ),
TokenInfo( TokenInfo(
OP, string="=", start=(1, 4), end=(1, 5), line="foo = 12 + 12 ." OP, string="=", start=(1, 4), end=(1, 5), line="foo = 12 + 12 .\n"
), ),
[ [
TokenInfo( TokenInfo(
@ -665,7 +666,7 @@ class TestPegen(unittest.TestCase):
string="12", string="12",
start=(1, 6), start=(1, 6),
end=(1, 8), end=(1, 8),
line="foo = 12 + 12 .", line="foo = 12 + 12 .\n",
), ),
[ [
[ [
@ -674,14 +675,14 @@ class TestPegen(unittest.TestCase):
string="+", string="+",
start=(1, 9), start=(1, 9),
end=(1, 10), end=(1, 10),
line="foo = 12 + 12 .", line="foo = 12 + 12 .\n",
), ),
TokenInfo( TokenInfo(
NUMBER, NUMBER,
string="12", string="12",
start=(1, 11), start=(1, 11),
end=(1, 13), end=(1, 13),
line="foo = 12 + 12 .", line="foo = 12 + 12 .\n",
), ),
] ]
], ],
@ -733,9 +734,9 @@ class TestPegen(unittest.TestCase):
self.assertEqual( self.assertEqual(
node, node,
[ [
TokenInfo(OP, string="(", start=(1, 0), end=(1, 1), line="(1)"), TokenInfo(OP, string="(", start=(1, 0), end=(1, 1), line="(1)\n"),
TokenInfo(NUMBER, string="1", start=(1, 1), end=(1, 2), line="(1)"), TokenInfo(NUMBER, string="1", start=(1, 1), end=(1, 2), line="(1)\n"),
TokenInfo(OP, string=")", start=(1, 2), end=(1, 3), line="(1)"), TokenInfo(OP, string=")", start=(1, 2), end=(1, 3), line="(1)\n"),
], ],
) )