Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 6 additions & 9 deletions babel/numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1201,14 +1201,11 @@ def _remove_trailing_zeros_after_decimal(string: str, decimal_symbol: str) -> st
return string


PREFIX_END = r'[^0-9@#.,]'
NUMBER_TOKEN = r'[0-9@#.,E+]'

PREFIX_PATTERN = r"(?P<prefix>(?:'[^']*'|%s)*)" % PREFIX_END
NUMBER_PATTERN = r"(?P<number>%s*)" % NUMBER_TOKEN
SUFFIX_PATTERN = r"(?P<suffix>.*)"

number_re = re.compile(f"{PREFIX_PATTERN}{NUMBER_PATTERN}{SUFFIX_PATTERN}")
_number_pattern_re = re.compile(
r"(?P<prefix>(?:[^'0-9@#.,]|'[^']*')*)"
r"(?P<number>[0-9@#.,E+]*)"
r"(?P<suffix>.*)",
)


def parse_grouping(p: str) -> tuple[int, int]:
Expand Down Expand Up @@ -1239,7 +1236,7 @@ def parse_pattern(pattern: NumberPattern | str) -> NumberPattern:
return pattern

def _match_number(pattern):
rv = number_re.search(pattern)
rv = _number_pattern_re.search(pattern)
if rv is None:
raise ValueError(f"Invalid number pattern {pattern!r}")
return rv.groups()
Expand Down
Loading