remove token hooks from transformer

Author: wpbonelli

flopy4/mf6/codec/reader/grammar/typed.lark

@@ -10,14 +10,14 @@ layered: "layered"i
 netcdf: "netcdf"i
 readarray: control [data]
 control: constant | internal | external
-constant: "constant"i _number
+constant: "constant"i double
 internal: "internal"i [factor] [iprn]
 external: "open/close"i filename [factor] [binary] [iprn]
-factor: "factor"i _number
-iprn: "iprn"i _integer
+factor: "factor"i double
+iprn: "iprn"i integer
 binary: "(binary)"i
 filename: ESCAPED_STRING | _word
-data: _number+
+data: double+
 
 _word: /[a-zA-Z0-9._'~,-\\(\\)]+/
 _number: SIGNED_NUMBER | NUMBER

flopy4/mf6/codec/reader/transformer.py

@@ -129,7 +129,7 @@ def binary(self, items: list[Any]) -> dict[str, bool]:
         return {"binary": True}
 
     def filename(self, items: list[Any]) -> Path:
-        return Path(items[0])
+        return Path(items[0].strip("\"'"))
 
     def string(self, items: list[Any]) -> str:
         return items[0].strip("\"'")
@@ -146,25 +146,6 @@ def data(self, items: list[Any]) -> np.ndarray:
     def netcdf(self, items: list[Any]) -> dict[str, bool]:
         return {"netcdf": True}
 
-    def NUMBER(self, token: Token) -> int | float:
-        return float(token)
-
-    def SIGNED_NUMBER(self, token: Token) -> int | float:
-        return self.NUMBER(token)
-
-    def INT(self, token: Token) -> int:
-        return int(token)
-
-    def SIGNED_INT(self, token: Token) -> int:
-        return int(token)
-
-    def ESCAPED_STRING(self, token: Token) -> str:
-        # Remove quotes from escaped string
-        value = str(token)
-        if value.startswith('"') and value.endswith('"'):
-            return value[1:-1]
-        return value
-
     @staticmethod
     def try_create_dataarray(array_info: dict) -> dict:
         control = array_info["control"]

test/test_parse_array.py renamed to test/test_parser.py

@@ -72,7 +72,7 @@ def test_parse_external_array_with_quotation_marks():
 
 def test_transform_internal_array():
     parser = make_typed_parser("start: array")
-    transformer = TypedTransformer()
+    transformer = TypedTransformer(visit_tokens=False)
     result = transformer.transform(
         parser.parse("""
 INTERNAL FACTOR 1.5 IPRN 3
@@ -90,19 +90,19 @@ def test_transform_internal_array():
 
 def test_transform_constant_array():
     parser = make_typed_parser("start: array")
-    transformer = TypedTransformer()
+    transformer = TypedTransformer(visit_tokens=False)
     result = transformer.transform(
         parser.parse("""
 CONSTANT 42.5
     """)
     )
     assert result["control"]["type"] == "constant"
-    assert result["data"] == 42.5
+    assert np.array_equal(result["data"], np.array(42.5))
 
 
 def test_transform_external_array():
     parser = make_typed_parser("start: array")
-    transformer = TypedTransformer()
+    transformer = TypedTransformer(visit_tokens=False)
     result = transformer.transform(
         parser.parse("""
 OPEN/CLOSE "data/heads.dat" FACTOR 1.0 (BINARY)
@@ -114,7 +114,7 @@ def test_transform_external_array():
 
 def test_transform_layered_array():
     parser = make_typed_parser("start: array")
-    transformer = TypedTransformer()
+    transformer = TypedTransformer(visit_tokens=False)
     result = transformer.transform(
         parser.parse("""
 LAYERED
@@ -192,7 +192,7 @@ def y(self, items: list[Any]) -> tuple[str, dict]:
         def z(self, items: list[Any]) -> tuple[str, dict]:
             return "z", TypedTransformer.try_create_dataarray(items[0])
 
-    transformer = BlockTransformer()
+    transformer = BlockTransformer(visit_tokens=False)
     result = transformer.transform(
         parser.parse("""
 BEGIN OPTIONS