gh-104983: Fix test_peg_generator (#104985)
diff --git a/Lib/test/test_peg_generator/test_pegen.py b/Lib/test/test_peg_generator/test_pegen.py
index 2122242..876bf78 100644
--- a/Lib/test/test_peg_generator/test_pegen.py
+++ b/Lib/test/test_peg_generator/test_pegen.py
@@ -96,14 +96,14 @@ def test_gather(self) -> None:
[
[
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(
- 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(
- 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 @@ def test_expr_grammar(self) -> None:
self.assertEqual(
node,
[
- TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42"),
- TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), 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\n"),
],
)
@@ -137,19 +137,19 @@ def test_optional_operator(self) -> None:
[
[
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(
- OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2"
+ OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
),
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(
- 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 @@ def test_optional_operator(self) -> None:
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,
],
- 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 @@ def test_optional_literal(self) -> None:
[
[
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)
@@ -190,10 +190,10 @@ def test_optional_literal(self) -> None:
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,
],
- 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 @@ def test_alt_optional_operator(self) -> None:
[
[
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(
- OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2"
+ OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
),
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(
- 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 @@ def test_alt_optional_operator(self) -> None:
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,
],
- 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 @@ def test_repeat_0_simple(self) -> None:
self.assertEqual(
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(
- 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(
- 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(
- 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 @@ def test_repeat_0_simple(self) -> None:
self.assertEqual(
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 @@ def test_repeat_0_complex(self) -> None:
node,
[
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(
- 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(
NUMBER,
string="2",
start=(1, 4),
end=(1, 5),
- line="1 + 2 + 3",
+ line="1 + 2 + 3\n",
),
],
[
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(
NUMBER,
string="3",
start=(1, 8),
end=(1, 9),
- line="1 + 2 + 3",
+ line="1 + 2 + 3\n",
),
],
],
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 @@ def test_repeat_1_simple(self) -> None:
self.assertEqual(
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(
- 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(
- 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(
- 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 @@ def test_repeat_1_complex(self) -> None:
node,
[
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(
- 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(
NUMBER,
string="2",
start=(1, 4),
end=(1, 5),
- line="1 + 2 + 3",
+ line="1 + 2 + 3\n",
),
],
[
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(
NUMBER,
string="3",
start=(1, 8),
end=(1, 9),
- line="1 + 2 + 3",
+ line="1 + 2 + 3\n",
),
],
],
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 @@ def test_repeat_with_sep_simple(self) -> None:
[
[
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(
- 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(
- 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(
- 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 @@ def test_left_recursive(self) -> None:
string="1",
start=(1, 0),
end=(1, 1),
- line="1 + 2 + 3",
+ line="1 + 2 + 3\n",
),
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(
NUMBER,
string="2",
start=(1, 4),
end=(1, 5),
- line="1 + 2 + 3",
+ line="1 + 2 + 3\n",
),
],
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(
- 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(
- 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 @@ def test_mutually_left_recursive(self) -> None:
string="D",
start=(1, 0),
end=(1, 1),
- line="D A C A E",
+ line="D A C A E\n",
),
TokenInfo(
type=NAME,
string="A",
start=(1, 2),
end=(1, 3),
- line="D A C A E",
+ line="D A C A E\n",
),
],
TokenInfo(
@@ -567,7 +567,7 @@ def test_mutually_left_recursive(self) -> None:
string="C",
start=(1, 4),
end=(1, 5),
- line="D A C A E",
+ line="D A C A E\n",
),
],
TokenInfo(
@@ -575,11 +575,11 @@ def test_mutually_left_recursive(self) -> None:
string="A",
start=(1, 6),
end=(1, 7),
- line="D A C A E",
+ line="D A C A E\n",
),
],
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 @@ def test_mutually_left_recursive(self) -> None:
string="B",
start=(1, 0),
end=(1, 1),
- line="B C A E",
+ line="B C A E\n",
),
TokenInfo(
type=NAME,
string="C",
start=(1, 2),
end=(1, 3),
- line="B C A E",
+ line="B C A E\n",
),
],
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(
- 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 @@ def test_lookahead(self) -> None:
"""
parser_class = make_parser(grammar)
node = parse_string("foo = 12 + 12 .", parser_class)
+ self.maxDiff = None
self.assertEqual(
node,
[
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(
- 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(
@@ -665,7 +666,7 @@ def test_lookahead(self) -> None:
string="12",
start=(1, 6),
end=(1, 8),
- line="foo = 12 + 12 .",
+ line="foo = 12 + 12 .\n",
),
[
[
@@ -674,14 +675,14 @@ def test_lookahead(self) -> None:
string="+",
start=(1, 9),
end=(1, 10),
- line="foo = 12 + 12 .",
+ line="foo = 12 + 12 .\n",
),
TokenInfo(
NUMBER,
string="12",
start=(1, 11),
end=(1, 13),
- line="foo = 12 + 12 .",
+ line="foo = 12 + 12 .\n",
),
]
],
@@ -733,9 +734,9 @@ def test_cut(self) -> None:
self.assertEqual(
node,
[
- TokenInfo(OP, string="(", start=(1, 0), end=(1, 1), line="(1)"),
- TokenInfo(NUMBER, string="1", start=(1, 1), end=(1, 2), line="(1)"),
- TokenInfo(OP, string=")", start=(1, 2), end=(1, 3), 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)\n"),
+ TokenInfo(OP, string=")", start=(1, 2), end=(1, 3), line="(1)\n"),
],
)
