Merge branch 'main' into joss

Author: gerlero

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 @@ def __setitem__(self, keywords: str | tuple[str, ...] | None, data: Entry) -> No
                     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 count_parse_action(tks: ParseResults) -> None:
 
 
 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 @@ def _keyword_entry_of(
         | _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 @@ def _keyword_entry_of(
 
 
 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

tests/test_files/test_parsing.py

@@ -98,3 +98,11 @@ def test_parse_value() -> None:
     ]
     assert Parsed(b"[]")[()] == FoamFile.DimensionSet()
     assert Parsed(b"object f.1;")[("object",)] == "f.1"
+
+
+def test_parse_directive() -> None:
+    assert Parsed(b'#include "filename"')[("#include",)] == '"filename"'
+    assert (
+        Parsed(b"functions\n{\n#includeFunc funcName\n}")[("functions", "#includeFunc")]
+        == "funcName"
+    )