Merge pull request #27 from gerlero/dictionary

Update parsing

foamlib/_dictionaries.py

@@ -29,11 +29,8 @@
     Keyword,
     Literal,
     Opt,
-    QuotedString,
-    Word,
+    ParseException,
     common,
-    identchars,
-    identbodychars,
 )
 
 FoamDimensionSet = namedtuple(
@@ -77,10 +74,6 @@ def __post_init__(self) -> None:
 
 _YES = Keyword("yes").set_parse_action(lambda s, loc, tks: True)
 _NO = Keyword("no").set_parse_action(lambda s, loc, tks: False)
-_WORDS = Word(identchars, identbodychars + "(),")[1, ...].set_parse_action(
-    lambda s, loc, tks: " ".join(tks)
-)
-_STRING = QuotedString('"', unquote_results=False)
 _VALUE = Forward()
 _LIST = Opt(
     Literal("List") + Literal("<") + common.identifier + Literal(">")
@@ -105,21 +98,14 @@ def __post_init__(self) -> None:
     lambda s, loc, tks: FoamDimensioned(tks[0], tks[1], tks[2].as_list())
 )
 
-_VALUE << (
-    _FIELD
-    | _LIST
-    | _DIMENSIONED
-    | _DIMENSIONS
-    | common.number
-    | _YES
-    | _NO
-    | _WORDS
-    | _STRING
-)
+_VALUE << (_FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | common.number | _YES | _NO)
 
 
 def _parse(value: str) -> FoamValue:
-    return cast(FoamValue, _VALUE.parse_string(value, parse_all=True).as_list()[0])
+    try:
+        return cast(FoamValue, _VALUE.parse_string(value, parse_all=True).as_list()[0])
+    except ParseException:
+        return value
 
 
 def _serialize_bool(value: Any) -> str:

tests/test_dictionaries.py

@@ -34,6 +34,10 @@ def test_parse() -> None:
     assert _parse("g [1 1 -2 0 0 0 0] (0 0 -9.81)") == FoamDimensioned(
         "g", FoamDimensionSet(mass=1, length=1, time=-2), [0, 0, -9.81]
     )
+    assert (
+        _parse("hex (0 1 2 3 4 5 6 7) (1 1 1) simpleGrading (1 1 1)")
+        == "hex (0 1 2 3 4 5 6 7) (1 1 1) simpleGrading (1 1 1)"
+    )
 
 
 def test_write_read(tmp_path: Path) -> None: