Merge pull request #731 from gerlero/parser

Improve ASCII numeric parsing performance

Author: gerlero

src/foamlib/_files/_parsing/_parser.py

@@ -122,7 +122,7 @@ def _expect(contents: bytes | bytearray, pos: int, expected: bytes | bytearray)
 
 _COMMENTS = re.compile(rb"(?:(?:/\*(?:[^*]|\*(?!/))*\*/)|(?://(?:\\\n|[^\n])*))+")
 _SKIP = re.compile(rb"(?:\s+|" + _COMMENTS.pattern + rb")+")
-_ITEM = re.compile(rb"[\w\.\-\+]+")
+_ITEM = re.compile(rb"[0-9.\-+einfnatyEINFNATY]+", re.ASCII)
 
 
 class _ASCIINumericListParser(Generic[_NT, _ElShape]):

tests/test_files/test_parsing/test_basic.py

@@ -46,6 +46,12 @@ def test_parse_value() -> None:
     assert isinstance(field, np.ndarray)
     assert field.dtype == float
     assert np.array_equal(field, [1.0, 1.0])
+    field = ParsedFile(b"nonuniform List<vector> 2((nan InFiNiTy -NaN)(1e3 .1 0.))")[()]
+    assert isinstance(field, np.ndarray)
+    assert field.dtype == float
+    assert field.shape == (2, 3)
+    assert np.array_equal(field[0], [np.nan, np.inf, -np.nan], equal_nan=True)
+    assert np.array_equal(field[1], [1e3, 0.1, 0.0])
     field = ParsedFile(b"nonuniform List<symmTensor> 0()")[()]
     assert isinstance(field, np.ndarray)
     assert field.dtype == float