Skip to content

Commit 446d6fa

Browse files
authored
Reject non-lowercase special float literals (#628)
1 parent 89cdcc7 commit 446d6fa

2 files changed

Lines changed: 63 additions & 0 deletions

File tree

‎tests/test_parser.py‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
import math
12
import sys
23

34
import pytest
45

6+
from tomlkit import dumps
7+
from tomlkit import parse
58
from tomlkit.exceptions import EmptyTableNameError
69
from tomlkit.exceptions import InternalParserError
710
from tomlkit.exceptions import InvalidNumberError
@@ -269,3 +272,59 @@ def test_parser_accepts_uppercase_exponent_after_leading_zero() -> None:
269272
value = Parser(f"a = {raw}").parse()["a"]
270273
assert isinstance(value, Float)
271274
assert value == float(raw)
275+
276+
277+
@pytest.mark.parametrize("sign", ["", "+", "-"])
278+
@pytest.mark.parametrize(
279+
"raw",
280+
[
281+
"Inf",
282+
"iNf",
283+
"inF",
284+
"INf",
285+
"InF",
286+
"iNF",
287+
"INF",
288+
"Nan",
289+
"nAn",
290+
"naN",
291+
"NAn",
292+
"NaN",
293+
"nAN",
294+
"NAN",
295+
],
296+
)
297+
def test_parser_rejects_non_lowercase_special_floats(raw: str, sign: str) -> None:
298+
with pytest.raises(ParseError):
299+
parse(f"v = {sign}{raw}")
300+
301+
302+
@pytest.mark.parametrize(
303+
"raw,expected",
304+
[
305+
("inf", math.inf),
306+
("+inf", math.inf),
307+
("-inf", -math.inf),
308+
("nan", math.nan),
309+
("+nan", math.nan),
310+
("-nan", math.nan),
311+
("0E2", 0.0),
312+
("+0E+2", 0.0),
313+
("-0E-2", -0.0),
314+
("1_2.3_4E+2", 1234.0),
315+
("0xDe_Ad", 0xDEAD),
316+
("0o7_5", 0o75),
317+
("0b1_0", 0b10),
318+
("1_000", 1000),
319+
],
320+
)
321+
def test_parser_preserves_valid_numeric_literals(raw: str, expected: float) -> None:
322+
content = f"v = {raw} # number\n"
323+
document = parse(content)
324+
value = document["v"]
325+
assert isinstance(value, (Integer, Float))
326+
if math.isnan(expected):
327+
assert math.isnan(value)
328+
else:
329+
assert value == expected
330+
assert dumps(document) == content

‎tomlkit/parser.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,10 @@ def _parse_number(self, raw: str, trivia: Trivia) -> Item | None:
778778
if "_" in clean:
779779
return None
780780

781+
# Special float values must be lowercase in the original token.
782+
if clean in ("inf", "nan") and raw != clean:
783+
return None
784+
781785
if clean.endswith(".") or (
782786
not clean.startswith("0x") and clean.split("e", 1)[0].endswith(".")
783787
):

0 commit comments

Comments
 (0)