fix _as_tuple_member def and usage

cyberthirst · cyberthirst · commit 0cee75f211e7 · 2025-04-09T13:04:11.000+02:00
diff --git a/vyper/semantics/types/base.py b/vyper/semantics/types/base.py
@@ -50,6 +50,10 @@ class VyperType:
         The name of the type.
     _as_array: bool, optional
         If `True`, this type can be used as the base member for an array.
+    _as_hashmap_key: bool, optional
+        If `True`, this type can be used as a hashmap key
+    _as_tuple_member: bool, optional
+        If `True`, this type can be used as a tuple member
     _valid_literal : Tuple
         A tuple of Vyper ast classes that may be assigned this type.
     _invalid_locations : Tuple
@@ -78,6 +82,8 @@ class VyperType:
 
     _as_array: bool = False  # rename to something like can_be_array_member
     _as_hashmap_key: bool = False
+    _as_tuple_member: bool = True  # can be a tuple member
+
 
     _supports_external_calls: bool = False
     _attribute_in_annotation: bool = False
diff --git a/vyper/semantics/types/subscriptable.py b/vyper/semantics/types/subscriptable.py
@@ -330,6 +330,9 @@ class TupleT(VyperType):
 
     def __init__(self, member_types: Tuple[VyperType, ...]) -> None:
         super().__init__()
+        for mt in member_types:
+            if not mt._as_tuple_member:
+                raise StructureException(f"not a valid tuple member: {mt}")
         self.member_types = member_types
         self.key_type = UINT256_T  # API Compatibility
 
diff --git a/vyper/semantics/types/user.py b/vyper/semantics/types/user.py
@@ -337,6 +337,10 @@ class StructT(_UserType):
     def __init__(self, _id, members, ast_def=None):
         super().__init__(members)
 
+        for mt in members.values():
+            if not mt._as_tuple_member:
+                raise StructureException(f"not a valid struct member: {mt}")
+
         self._id = _id
 
         self.ast_def = ast_def
