foamlib 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

foamlib/__init__.py

@@ -1,6 +1,6 @@
 """A Python interface for interacting with OpenFOAM."""
 
-__version__ = "0.8.3"
+__version__ = "0.8.4"
 
 from ._cases import (
     AsyncFoamCase,

foamlib/_files/_files.py

@@ -308,15 +308,15 @@ class FoamFile(
                     self[(*keywords, k)] = v
 
             elif keywords:
+                val = dumps(data, kind=kind)
                 parsed.put(
                     keywords,
                     normalize(data, kind=kind),
                     before
                     + indentation
                     + dumps(keywords[-1])
-                    + b" "
-                    + dumps(data, kind=kind)
-                    + b";"
+                    + ((b" " + val) if val else b"")
+                    + (b";" if not keywords[-1].startswith("#") else b"")
                     + after,
                 )
 

foamlib/_files/_parsing.py

@@ -153,12 +153,19 @@ def _tensor_list(
 
 
 def _dict_of(
-    keyword: ParserElement, data: ParserElement, *, located: bool = False
+    keyword: ParserElement,
+    data: ParserElement,
+    *,
+    directive: ParserElement | None = None,
+    located: bool = False,
 ) -> ParserElement:
     dict_ = Forward()
 
     keyword_entry = keyword + (dict_ | (data + Literal(";").suppress()))
 
+    if directive is not None:
+        keyword_entry |= directive + data + LineEnd().suppress()  # type: ignore [no-untyped-call]
+
     if located:
         keyword_entry = Located(keyword_entry)
 
@@ -175,12 +182,17 @@ def _keyword_entry_of(
     keyword: ParserElement,
     data: ParserElement,
     *,
+    directive: ParserElement | None = None,
     located: bool = False,
 ) -> ParserElement:
     keyword_entry = keyword + (
-        _dict_of(keyword, data, located=located) | (data + Literal(";").suppress())
+        _dict_of(keyword, data, directive=directive, located=located)
+        | (data + Literal(";").suppress())
     )
 
+    if directive is not None:
+        keyword_entry |= directive + data + LineEnd().suppress()  # type: ignore [no-untyped-call]
+
     if located:
         keyword_entry = Located(keyword_entry)
     else:
@@ -240,7 +252,8 @@ _FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
         | _tensor_list(TensorKind.TENSOR, ignore=_COMMENT)
     )
 )
-_TOKEN = dbl_quoted_string | _IDENTIFIER
+_DIRECTIVE = Word("#", _IDENTBODYCHARS)
+_TOKEN = dbl_quoted_string | _IDENTIFIER | _DIRECTIVE
 _DATA = Forward()
 _KEYWORD_ENTRY = _keyword_entry_of(_TOKEN | _list_of(_IDENTIFIER), _DATA)
 _DICT = _dict_of(_TOKEN, _DATA)
@@ -259,18 +272,21 @@ _DATA <<= (
 
 
 def parse_data(s: str) -> Data:
+    if not s.strip():
+        return ""
     return cast(Data, _DATA.parse_string(s, parse_all=True)[0])
 
 
 _LOCATED_DICTIONARY = Group(
-    _keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True)
+    _keyword_entry_of(
+        _TOKEN, Opt(_DATA, default=""), directive=_DIRECTIVE, located=True
+    )
 )[...]
 _LOCATED_DATA = Group(Located(_DATA.copy().add_parse_action(lambda tks: ["", tks[0]])))
 
 _FILE = (
     Dict(_LOCATED_DICTIONARY + Opt(_LOCATED_DATA) + _LOCATED_DICTIONARY)
     .ignore(_COMMENT)
-    .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
     .parse_with_tabs()
 )
 

foamlib/_files/_serialization.py

@@ -111,7 +111,10 @@ def dumps(
 
     if isinstance(data, tuple) and kind == Kind.SINGLE_ENTRY and len(data) == 2:
         k, v = data
-        ret = dumps(k) + b" " + dumps(v)
+        ret = dumps(k)
+        val = dumps(v)
+        if val:
+            ret += b" " + val
         if not isinstance(v, Mapping):
             ret += b";"
         return ret

{foamlib-0.8.3.dist-info → foamlib-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foamlib
-Version: 0.8.3
+Version: 0.8.4
 Summary: A Python interface for interacting with OpenFOAM
 Project-URL: Homepage, https://github.com/gerlero/foamlib
 Project-URL: Repository, https://github.com/gerlero/foamlib

{foamlib-0.8.3.dist-info → foamlib-0.8.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foamlib/__init__.py,sha256=ZODAE7gaDlcc4N4EKtrB1AyZz5tuAbw9rgkfSM-WKew,452
+foamlib/__init__.py,sha256=xYSLuRubvL_srTiNR5-bYmOHuvUEv_y3cMIOAXMcCt8,452
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=_A1TTHuQfS9FH2_33lSEyLtOJZGFHZBco1tWJCVOHks,358
 foamlib/_cases/_async.py,sha256=onECxRLQCF7Kd-GeuLqH_Xv3gbMMhKOSbFaUG5Ttgmk,7822
@@ -9,12 +9,12 @@ foamlib/_cases/_subprocess.py,sha256=6BlBRxknj2-BFcGkx7oVcuL63_utSaY1Axmsc1qV9j8
 foamlib/_cases/_sync.py,sha256=2BJXB7Nzldb4OgPukqupgYqdceUGkI2mYhhtGPWEBrc,5901
 foamlib/_cases/_util.py,sha256=tK4SM5WT3eEgGsFLnidIySbom1qowBAua9z13gipKJk,1518
 foamlib/_files/__init__.py,sha256=q1vkjXnjnSZvo45jPAICpWeF2LZv5V6xfzAR6S8fS5A,96
-foamlib/_files/_files.py,sha256=5sxtHQuN25w1gszZBpSMOaF--KOJy2HLmM6CScLof9s,15331
+foamlib/_files/_files.py,sha256=V740S36NVunULv8pnyEsJ7lIWbSjk_-LwbP7BBqFsO0,15404
 foamlib/_files/_io.py,sha256=BGbbm6HKxL2ka0YMCmHqZQZ1R4PPQlkvWWb4FHMAS8k,2217
-foamlib/_files/_parsing.py,sha256=1lwXdcsYrHXONbNbLYkl9wvwFBCcBt3-eVJUVcL3pIM,13055
-foamlib/_files/_serialization.py,sha256=Tp3Sx5Kav4Bh1K98FAYiN0O7hBVizu8eP-sDC_ZDmfc,5176
+foamlib/_files/_parsing.py,sha256=_YCi1-ltrlQWyh5RvGDZgi47MzJ7FzFcsK6L_rAWksA,13489
+foamlib/_files/_serialization.py,sha256=PvMzNyTja6OKT_GUfExTulx9nMLBjfu0-9yThCKbvxs,5227
 foamlib/_files/_types.py,sha256=m-fFjJnS4sFSavDsijlXpAfEhnbh10RBumSHAT0GOgQ,3408
-foamlib-0.8.3.dist-info/METADATA,sha256=wJxGTASnWb3zZmfB0UWPdytUbVs13sJ8TogpaQJ8Pik,7968
-foamlib-0.8.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-foamlib-0.8.3.dist-info/licenses/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.8.3.dist-info/RECORD,,
+foamlib-0.8.4.dist-info/METADATA,sha256=YsjrAXLrG3ELANlB9PRyyHiciEJAU7rL0IP4AOsMV8A,7968
+foamlib-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+foamlib-0.8.4.dist-info/licenses/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.8.4.dist-info/RECORD,,