Merge pull request #267 from gerlero/files

Improve parsing
gerlero · Nov 13, 2024 · 5994e93 · 5994e93
2 parents 25e5838 + 745a45d
commit 5994e93
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/foamlib/_files/_parsing.py b/foamlib/_files/_parsing.py
@@ -28,10 +28,10 @@
     ParserElement,
     ParseResults,
     QuotedString,
+    Regex,
     Word,
     common,
     counted_array,
-    cpp_style_comment,
     identchars,
     printables,
 )
@@ -96,6 +96,9 @@ def _unpack_binary_field(
     return [values]
 
 
+# https://github.com/pyparsing/pyparsing/pull/584
+_COMMENT = Regex(r"(?:/\*(?:[^*]|\*(?!/))*\*/)|(?://(?:\\\n|[^\n])*)")
+
 _IDENTCHARS = identchars + "$"
 _IDENTBODYCHARS = (
     printables.replace(";", "")
@@ -254,8 +257,12 @@ def _unpack_binary_field(
 )
 _TOKEN = QuotedString('"', unquote_results=False) | _IDENTIFIER
 DATA = Forward()
-KEYWORD = _TOKEN | _list_of(_IDENTIFIER).set_parse_action(
-    lambda tks: "(" + " ".join(tks[0]) + ")"
+KEYWORD = (
+    _TOKEN
+    | _list_of(_IDENTIFIER)
+    .set_parse_action(lambda tks: "(" + " ".join(tks[0]) + ")")
+    .ignore(_COMMENT)
+    .parse_with_tabs()
 )
 _KEYWORD_ENTRY = Dict(Group(_keyword_entry_of(KEYWORD, DATA)), asdict=True)
 _DATA_ENTRY = Forward()
@@ -264,25 +271,20 @@ def _unpack_binary_field(
 _NUMBER = common.signed_integer ^ common.ieee_float
 _DATA_ENTRY <<= _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | _NUMBER | _SWITCH | _TOKEN
 
-DATA <<= _DATA_ENTRY[1, ...].set_parse_action(
-    lambda tks: tuple(tks) if len(tks) > 1 else [tks[0]]
+DATA <<= (
+    _DATA_ENTRY[1, ...]
+    .set_parse_action(lambda tks: tuple(tks) if len(tks) > 1 else [tks[0]])
+    .ignore(_COMMENT)
+    .parse_with_tabs()
 )
 
 _FILE = (
     Dict(
         Group(_keyword_entry_of(KEYWORD, Opt(DATA, default=""), located=True))[...]
-        + Opt(
-            Group(
-                Located(
-                    _DATA_ENTRY[1, ...].set_parse_action(
-                        lambda tks: [None, tuple(tks) if len(tks) > 1 else tks[0]]
-                    )
-                )
-            )
-        )
+        + Opt(Group(Located(DATA.copy().add_parse_action(lambda tks: ["", tks[0]]))))
         + Group(_keyword_entry_of(KEYWORD, Opt(DATA, default=""), located=True))[...]
     )
-    .ignore(cpp_style_comment)
+    .ignore(_COMMENT)
     .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
     .parse_with_tabs()
 )
@@ -317,7 +319,8 @@ def _flatten_result(
         end = parse_result.locn_end
         assert isinstance(end, int)
         keyword, *data = item
-        if keyword is None:
+        assert isinstance(keyword, str)
+        if not keyword:
             assert not _keywords
             assert len(data) == 1
             assert not isinstance(data[0], ParseResults)