Merge pull request #584 from gerlero/files

Update parsing of binary lists

Author: gerlero

foamlib/_files/_parsing/_elements.py

@@ -151,39 +151,42 @@ def parseImpl(
 
 
 def binary_numeric_list(
-    dtype: DTypeLike, *, nested: int | None = None, empty_ok: bool = False
+    dtype: DTypeLike, elshape: tuple[()] | tuple[int] = (), *, empty_ok: bool = False
 ) -> ParserElement:
     dtype = np.dtype(dtype)
 
-    elsize = nested if nested is not None else 1
-
     list_ = Forward()
 
     def process_count(tks: ParseResults) -> None:
         nonlocal list_
-        (size,) = tks
-        assert isinstance(size, int)
+        (count,) = tks
+        assert isinstance(count, int)
 
-        if size == 0 and not empty_ok:
+        if count == 0 and not empty_ok:
             list_ <<= NoMatch()
             return
 
-        list_ <<= Regex(rf"\((?s:{'.' * dtype.itemsize * elsize}){{{size}}}\)")
+        if not elshape:
+            elsize = 1
+        else:
+            (elsize,) = elshape
+
+        list_ <<= Regex(rf"\((?s:{'.' * dtype.itemsize * elsize}){{{count}}}\)")
 
     def to_array(
         tks: ParseResults,
     ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.integer | np.floating]]:
-        size, s = tks
-        assert isinstance(size, int)
-        assert isinstance(s, str)
-        assert s[0] == "("
-        assert s[-1] == ")"
-        s = s[1:-1]
+        count, contents = tks
+        assert isinstance(count, int)
+        assert isinstance(contents, str)
+        assert contents[0] == "("
+        assert contents[-1] == ")"
+        contents = contents[1:-1]
 
-        ret = np.frombuffer(s.encode("latin-1"), dtype=dtype)
+        ret = np.frombuffer(contents.encode("latin-1"), dtype=dtype)
 
-        if nested is not None:
-            ret = ret.reshape(-1, nested)
+        if elshape:
+            ret = ret.reshape(count, *elshape)
 
         return ret
 

foamlib/_files/_parsing/_grammar.py

@@ -91,8 +91,8 @@
             ).suppress()
             + (
                 ASCIINumericList(dtype=float, elshape=(3,), empty_ok=True)
-                | binary_numeric_list(np.float64, nested=3, empty_ok=True)
-                | binary_numeric_list(np.float32, nested=3, empty_ok=True)
+                | binary_numeric_list(np.float64, elshape=(3,), empty_ok=True)
+                | binary_numeric_list(np.float32, elshape=(3,), empty_ok=True)
             )
         )
         | (
@@ -101,8 +101,8 @@
             ).suppress()
             + (
                 ASCIINumericList(dtype=float, elshape=(6,), empty_ok=True)
-                | binary_numeric_list(np.float64, nested=6, empty_ok=True)
-                | binary_numeric_list(np.float32, nested=6, empty_ok=True)
+                | binary_numeric_list(np.float64, elshape=(6,), empty_ok=True)
+                | binary_numeric_list(np.float32, elshape=(6,), empty_ok=True)
             )
         )
         | (
@@ -111,8 +111,8 @@
             ).suppress()
             + (
                 ASCIINumericList(dtype=float, elshape=(9,), empty_ok=True)
-                | binary_numeric_list(np.float64, nested=9, empty_ok=True)
-                | binary_numeric_list(np.float32, nested=9, empty_ok=True)
+                | binary_numeric_list(np.float64, elshape=(9,), empty_ok=True)
+                | binary_numeric_list(np.float32, elshape=(9,), empty_ok=True)
             )
         )
     )
@@ -156,8 +156,8 @@
         binary_numeric_list(dtype=np.int32) + Opt(binary_numeric_list(dtype=np.int32))
     ).add_parse_action(lambda tks: tuple(tks) if len(tks) > 1 else tks[0])
     | binary_numeric_list(dtype=np.float64)
-    | binary_numeric_list(dtype=np.float64, nested=3)
-    | binary_numeric_list(dtype=np.float32, nested=3)
+    | binary_numeric_list(dtype=np.float64, elshape=(3,))
+    | binary_numeric_list(dtype=np.float32, elshape=(3,))
     | _DATA
 ).add_parse_action(lambda tks: [None, tks[0]])