Commit 9a688de2 authored by Robert Bradshaw's avatar Robert Bradshaw

cleanup

parent 995d565e
...@@ -4958,13 +4958,12 @@ class CallNode(ExprNode): ...@@ -4958,13 +4958,12 @@ class CallNode(ExprNode):
alternatives = self.function.entry.all_alternatives() alternatives = self.function.entry.all_alternatives()
arg_types = [arg.infer_type(env) for arg in self.args] arg_types = [arg.infer_type(env) for arg in self.args]
func_entry = PyrexTypes.best_match( func_entry = PyrexTypes.best_match(
arg_types, alternatives, self.pos, env) arg_types, alternatives, None, env)
if func_entry: if func_entry:
func_type = func_entry.type func_type = func_entry.type
if func_type.is_ptr: if func_type.is_ptr:
func_type = func_type.base_type func_type = func_type.base_type
return func_type.return_type return func_type.return_type
return func_type.return_type return func_type.return_type
elif func_type is type_type: elif func_type is type_type:
if function.is_name and function.entry and function.entry.type: if function.is_name and function.entry and function.entry.type:
......
...@@ -475,7 +475,6 @@ class SimpleAssignmentTypeInferer(object): ...@@ -475,7 +475,6 @@ class SimpleAssignmentTypeInferer(object):
for assmt in entry.cf_assignments] for assmt in entry.cf_assignments]
new_type = spanning_type(types, entry.might_overflow, entry.pos, scope) new_type = spanning_type(types, entry.might_overflow, entry.pos, scope)
if new_type != entry.type: if new_type != entry.type:
print "FOUND", entry, entry.type, new_type, type(new_type)
self.set_entry_type(entry, new_type) self.set_entry_type(entry, new_type)
dirty = True dirty = True
return dirty return dirty
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment