Renaming idents, second stage: use proper renaming in scalc and Python #666
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CI fails because of a bug in the python printer, independent from this (an ident became longer, which triggered a line cut at a point that python doesn't like) |
vincent-botbol
approved these changes
Aug 28, 2024
There was a problem hiding this comment.
The outputs look much better overall. The surrounding parenthesis in the generated python code is unfortunate but, at least, it works.
Same remark as for #664: I'm not sufficiently knowledgeable for super relevant remarks but based on the output, it looks good to me.
it's not very satisfying, but we make it pass through renaming for now. A better approach could be to make this special handling structural, or to have something more specific than an id to hold onto.
Statements are often flattened, in which case their idents need to be conflict-free. We pass along the renaming context to handle this.
matches can bind, but switches cannot, so we can assume the switch argument should always be bound to a name ; this allow the intermediate variable to be better renamed.
I can't find where the line cut triggering the error at https://github.com/CatalaLang/catala/actions/runs/10304111306/job/28522272547?pr=666 came from: ``` /home/ocaml/french-law/_python_venv/lib/python3.12/site-packages/french_law/Aides_logement.py:27785: error: invalid syntax [syntax] ``` the file at this point contains: ``` def traitement_aide_finale_montee_en_charge_saint_pierre_miquelon1( aide_finale4:Money): → traitement_aide_finale_montee_en_charge_saint_pierre_miquelon4 = handle_exceptions( [], [] ) ``` This workaround adds parens after `=`, which ensures the syntax will be correct.
Thanks @vincent-botbol Co-authored-by: vbot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This completes (and builds on top of) #664 :
renaming is now in its own module, customisable enough, and called with the proper options for each backend. In particular, this simplifies the generated Python code, while being at the same time much more reliable.