Commit cbc4cccc authored by Stefan Behnel's avatar Stefan Behnel

cleanup

parent 64d2bdee
...@@ -3683,8 +3683,8 @@ class SequenceNode(ExprNode): ...@@ -3683,8 +3683,8 @@ class SequenceNode(ExprNode):
arg = self.args[i] arg = self.args[i]
if not skip_children: arg.analyse_types(env) if not skip_children: arg.analyse_types(env)
self.args[i] = arg.coerce_to_pyobject(env) self.args[i] = arg.coerce_to_pyobject(env)
self.type = py_object_type
self.is_temp = 1 self.is_temp = 1
# not setting self.type here, subtypes do this
def may_be_none(self): def may_be_none(self):
return False return False
...@@ -3888,7 +3888,6 @@ class TupleNode(SequenceNode): ...@@ -3888,7 +3888,6 @@ class TupleNode(SequenceNode):
self.is_literal = 1 self.is_literal = 1
else: else:
SequenceNode.analyse_types(self, env, skip_children) SequenceNode.analyse_types(self, env, skip_children)
self.type = tuple_type
def calculate_result_code(self): def calculate_result_code(self):
if len(self.args) > 0: if len(self.args) > 0:
...@@ -3945,6 +3944,7 @@ class ListNode(SequenceNode): ...@@ -3945,6 +3944,7 @@ class ListNode(SequenceNode):
# orignial_args [ExprNode] used internally # orignial_args [ExprNode] used internally
obj_conversion_errors = [] obj_conversion_errors = []
type = list_type
gil_message = "Constructing Python list" gil_message = "Constructing Python list"
...@@ -3963,7 +3963,6 @@ class ListNode(SequenceNode): ...@@ -3963,7 +3963,6 @@ class ListNode(SequenceNode):
hold_errors() hold_errors()
self.original_args = list(self.args) self.original_args = list(self.args)
SequenceNode.analyse_types(self, env) SequenceNode.analyse_types(self, env)
self.type = list_type
self.obj_conversion_errors = held_errors() self.obj_conversion_errors = held_errors()
release_errors(ignore=True) release_errors(ignore=True)
......
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