nielstron / opshin

91%

dev: 92%

push

github

Fix issue #5 with Model B

Summary of Changes:
The changes made attempt to improve the handling of `Self` type annotations by introducing a recursive processing function `_process_annotation_for_self` in the `RewriteImportTyping` class. This function is designed to replace `Self` with the actual class name within complex type annotations such as `Dict[Self, int]` or `Union[Self, int]`. Additionally, the `type_inference.py` file was updated to check for the presence of an `idSelf` attribute on `Name` nodes that represent `Self`, and to raise a more informative error if `Self` is not properly processed.

However, the issue has not been fully resolved because:

1. In `rewrite_import_typing.py`, the code still sets `annotation.idSelf = class_name` when it should likely be setting `annotation.id = class_name` to actually replace the identifier. The attribute `idSelf` does not change the actual type reference used later in the compilation process.

2. In `type_inference.py`, the code looks for `ann.idSelf` but the rewrite phase incorrectly assigns to `idSelf` instead of modifying the `id` attribute directly. This means the type inference phase will not find the rewritten type and will either fail to resolve `Self` or fall back to the error message, which was part of the original problem.

As a result, the core issue of properly resolving `Self` in complex type annotations like `Dict[Self, int]` remains unresolved, and the error messages, while potentially improved, do not indicate that the underlying functionality now works as expected.

Duration: 5m 23s

1916 of 2318 branches covered (82.66%)

Branch coverage included in aggregate %.

6 of 13 new or added lines in 2 files covered. (46.15%)

4761 of 5031 relevant lines covered (94.63%)

1.87 hits per line