Better type hints for attribute definitions

.github/workflows/python-app.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.gitignore

@@ -138,4 +138,5 @@ dmypy.json
 cython_debug/
 
 # PyCharm IDE
-*.idea/
+*.idea/
+.vscode/settings.json

pyproject.toml

@@ -3,4 +3,8 @@ requires = [
     "setuptools>=42",
     "wheel"
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
+
+[tool.pyright]
+reportImportCycles = false
+reportUnnecessaryIsInstance = false

src/xdsl/diagnostic.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Dict, List
+from typing import Dict, List, Union, Type
 from dataclasses import dataclass, field
 
 from xdsl.ir import Block, Operation, Region
@@ -18,10 +18,11 @@ def add_message(self, op: Operation, message: str) -> None:
         """Add a message to an operation."""
         self.op_messages.setdefault(op, []).append(message)
 
-    def raise_exception(self,
-                        message,
-                        ir: Union[Operation, Block, Region],
-                        exception_type=DiagnosticException) -> None:
+    def raise_exception(
+            self,
+            message: str,
+            ir: Union[Operation, Block, Region],
+            exception_type: Type[Exception] = DiagnosticException) -> None:
         """Raise an exception, that will also print all messages in the IR."""
         from xdsl.printer import Printer
         f = StringIO()
@@ -30,9 +31,9 @@ def raise_exception(self,
         if isinstance(toplevel, Operation):
             p.print_op(toplevel)
         elif isinstance(toplevel, Block):
-            p._print_named_block(toplevel)
+            p._print_named_block(toplevel)  # type: ignore
         elif isinstance(toplevel, Region):
-            p._print_region(toplevel)
+            p._print_region(toplevel)  # type: ignore
         else:
             assert "xDSL internal error: get_toplevel_object returned unknown construct"
 

src/xdsl/dialects/affine.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
-from typing import Union
 
-from xdsl.ir import Operation, SSAValue
+from typing import Union, List
 from dataclasses import dataclass
-from xdsl.dialects.builtin import IntegerAttr, IndexType
-from xdsl.irdl import irdl_op_definition, AttributeDef, OperandDef, RegionDef, VarResultDef, VarOperandDef, AnyAttr
+
+from xdsl.ir import Operation, SSAValue, MLContext, Block, Region
+from xdsl.dialects.builtin import IntegerAttr, IndexType, IndexType
+from xdsl.irdl import irdl_op_definition, AttributeDef, RegionDef, VarResultDef, VarOperandDef, AnyAttr
 
 
 @dataclass
@@ -68,7 +69,7 @@ def from_region(operands: List[Union[Operation, SSAValue]],
     def from_callable(operands: List[Union[Operation, SSAValue]],
                       lower_bound: Union[int, IntegerAttr],
                       upper_bound: Union[int, IntegerAttr],
-                      body: Callable[[BlockArgument, ...], List[Operation]],
+                      body: Block.BlockCallback,
                       step: Union[int, IntegerAttr] = 1) -> For:
         arg_types = [IndexType()] + [SSAValue.get(op).typ for op in operands]
         return For.from_region(
@@ -83,5 +84,6 @@ class Yield(Operation):
     arguments = VarOperandDef(AnyAttr())
 
     @staticmethod
-    def get(*operands: Union[Operation, SSAValue]) -> Yield:
-        return Yield.create(operands=[operand for operand in operands])
+    def get(*operands: SSAValue | Operation) -> Yield:
+        return Yield.create(
+            operands=[SSAValue.get(operand) for operand in operands])

src/xdsl/dialects/arith.py

@@ -2,7 +2,7 @@
 from xdsl.ir import *
 from xdsl.irdl import *
 from xdsl.util import *
-from xdsl.dialects.builtin import IntegerType, Float32Type, IntegerAttr, FlatSymbolRefAttr
+from xdsl.dialects.builtin import IntegerType, Float32Type, IntegerAttr
 
 
 @dataclass
@@ -125,9 +125,9 @@ def verify_(self) -> None:
 
     @staticmethod
     def get(operand1: Union[Operation, SSAValue],
-            operand2: Union[Operation, SSAValue]) -> FloordiviSigned:
-        return FloordiviSigned.build(operands=[operand1, operand2],
-                                     result_types=[IntegerType.from_width(32)])
+            operand2: Union[Operation, SSAValue]) -> FloorDiviSI:
+        return FloorDiviSI.build(operands=[operand1, operand2],
+                                 result_types=[IntegerType.from_width(32)])
 
 
 @irdl_op_definition
@@ -145,9 +145,9 @@ def verify_(self) -> None:
 
     @staticmethod
     def get(operand1: Union[Operation, SSAValue],
-            operand2: Union[Operation, SSAValue]) -> RemiSigned:
-        return RemiSigned.build(operands=[operand1, operand2],
-                                result_types=[IntegerType.from_width(32)])
+            operand2: Union[Operation, SSAValue]) -> RemSI:
+        return RemSI.build(operands=[operand1, operand2],
+                           result_types=[IntegerType.from_width(32)])
 
 
 @irdl_op_definition
@@ -185,10 +185,10 @@ def verify_(self) -> None:
 
     @staticmethod
     def get(operand1: Union[Operation, SSAValue],
-            operand2: Union[Operation, SSAValue]) -> Or:
+            operand2: Union[Operation, SSAValue]) -> OrI:
 
-        return Or.build(operands=[operand1, operand2],
-                        result_types=[SSAValue.get(operand1).typ])
+        return OrI.build(operands=[operand1, operand2],
+                         result_types=[SSAValue.get(operand1).typ])
 
 
 @irdl_op_definition
@@ -206,9 +206,9 @@ def verify_(self) -> None:
 
     @staticmethod
     def get(operand1: Union[Operation, SSAValue],
-            operand2: Union[Operation, SSAValue]) -> Xor:
-        return Xor.build(operands=[operand1, operand2],
-                         result_types=[SSAValue.get(operand1).typ])
+            operand2: Union[Operation, SSAValue]) -> XOrI:
+        return XOrI.build(operands=[operand1, operand2],
+                          result_types=[SSAValue.get(operand1).typ])
 
 
 @irdl_op_definition