Merge pull request #2309 from iamdefinitelyahuman/fix-list-literals

Fix: incorrect `TypeMismatch` when dealing with literals in lists

Author: fubuloubu

tests/parser/types/test_lists.py

@@ -1,4 +1,4 @@
-from vyper.exceptions import ArrayIndexException, TypeMismatch
+from vyper.exceptions import ArrayIndexException, OverflowException
 
 
 def test_list_tester_code(get_contract_with_gas_estimation):
@@ -252,10 +252,10 @@ def test_compile_time_bounds_check(get_contract_with_gas_estimation, assert_comp
     code = """
 @external
 def parse_list_fail():
-    xs: uint256[3] = [2**255, 1, 3]
+    xs: uint256[3] = [2**256, 1, 3]
     pass
     """
-    assert_compile_failed(lambda: get_contract_with_gas_estimation(code), TypeMismatch)
+    assert_compile_failed(lambda: get_contract_with_gas_estimation(code), OverflowException)
 
 
 def test_2d_array_input_1(get_contract):

vyper/parser/expr.py

@@ -938,20 +938,15 @@ def get_out_type(lll_node):
             return lll_node.typ
 
         lll_node = []
-        previous_type = None
         out_type = None
 
         for elt in self.expr.elements:
             current_lll_node = Expr(elt, self.context).lll_node
-            if not out_type:
+            if not out_type or not current_lll_node.typ.is_literal:
+                # prefer to use a non-literal type here, because literals can be ambiguous
+                # this should be removed altogether as we refactor types out of parser
                 out_type = current_lll_node.typ
-
-            current_type = get_out_type(current_lll_node)
-            if len(lll_node) > 0 and previous_type != current_type:
-                raise TypeMismatch("Lists may only contain one type", self.expr)
-            else:
-                lll_node.append(current_lll_node)
-                previous_type = current_type
+            lll_node.append(current_lll_node)
 
         return LLLnode.from_list(
             ["multi"] + lll_node, typ=ListType(out_type, len(lll_node)), pos=getpos(self.expr),