Undo fmap of None is None

evhub · evhub · commit 2f76fde4b794 · 2022-12-30T14:31:57.000-06:00
Closes #692.
diff --git a/coconut/compiler/compiler.py b/coconut/compiler/compiler.py
@@ -1290,7 +1290,7 @@ def leading_whitespace(self, inputstring):
         return "".join(leading_ws)
 
     def ind_proc(self, inputstring, **kwargs):
-        """Process indentation and ensures balanced parentheses."""
+        """Process indentation and ensure balanced parentheses."""
         lines = tuple(logical_lines(inputstring))
         new = []  # new lines
         current = None  # indentation level of previous line
diff --git a/coconut/compiler/templates/header.py_template b/coconut/compiler/templates/header.py_template
@@ -1384,8 +1384,6 @@ def fmap(func, obj, **kwargs):
     starmap_over_mappings = kwargs.pop("starmap_over_mappings", False)
     if kwargs:
         raise _coconut.TypeError("fmap() got unexpected keyword arguments " + _coconut.repr(kwargs))
-    if obj is None:
-        return None
     obj_fmap = _coconut.getattr(obj, "__fmap__", None)
     if obj_fmap is not None:
         try:
diff --git a/coconut/tests/src/cocotest/agnostic/main.coco b/coconut/tests/src/cocotest/agnostic/main.coco
@@ -1261,7 +1261,7 @@ def main_test() -> bool:
     assert cartesian_product(v, v).count((2, 1)) == 1 == cartesian_product(v, repeat=2).count((2, 1))
     assert cartesian_product(v, v).count((2, 0)) == 0 == cartesian_product(v, repeat=2).count((2, 0))
     assert not range(0, 0)
-    assert None |> fmap$(.+1) is None
+    assert_raises(const None ..> fmap$(.+1), TypeError)
     xs = [1] :: [2]
     assert xs |> list == [1, 2] == xs |> list
     ys = (_ for _ in range(2)) :: (_ for _ in range(2))
