Fix higher order function call parsing

Author: hermansje

pythonwhat/parsing.py

@@ -1,4 +1,6 @@
 import ast
+import re
+
 from pythonwhat.utils_ast import wrap_in_module
 from collections.abc import Sequence, Mapping
 from collections import OrderedDict
@@ -326,13 +328,15 @@ def visit_Dict(self, node):
     def visit_Call(self, node):
         if self.call_lookup_active:
             self.visit(node.func)
+            self.gen_name += "()"
         else:
             self.call_lookup_active = True
             self.visit(
                 node.func
             )  # Need to visit func to start recording the current function name.
 
             if self.gen_name:
+                self.gen_name = re.sub(r"(?:\(\))+(.)", "\\1", self.gen_name)
                 if self.gen_name not in self.out:
                     self.out[self.gen_name] = []
 

tests/test_check_function.py

@@ -522,18 +522,26 @@ def test_function_call_in_comparison(code):
     assert res["correct"]
 
 
-def test_ho_function():
-    # TODO: FunctionParser.visit_Call should append something to name to discern HOF calls
-    #  e.g. () if node.func is Func (this should only affect limited exercises)
-    sct = "Ex().check_function('hof').check_args(0).has_equal_value(override=2)"
+@pytest.mark.parametrize(
+    "sct",
+    [
+        "Ex().check_function('numpy.array')",
+        "Ex().check_function('hof').check_args(0).has_equal_value(override=1)",
+        "Ex().check_function('hof()').check_args(0).has_equal_value(override=2)",
+    ],
+)
+def test_ho_function(sct):
 
     code = """
+import numpy as np
+np.array([])
+
 def hof(arg1):
     def inner(arg2):
         return arg1, arg2
-    
+
     return inner
-    
+
 hof(1)(2)
     """