Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Depreciation of . by :: in paths #1694

Merged
merged 30 commits into from
Aug 23, 2024
Merged

Depreciation of . by :: in paths #1694

merged 30 commits into from
Aug 23, 2024

Conversation

gzanitti
Copy link
Collaborator

No description provided.

chriseth
chriseth reviewed Aug 16, 2024
View reviewed changes
airgen/src/lib.rs Outdated Show resolved Hide resolved
chriseth
chriseth reviewed Aug 16, 2024
View reviewed changes
ast/src/parsed/asm.rs Outdated Show resolved Hide resolved
chriseth
chriseth reviewed Aug 16, 2024
View reviewed changes
ast/src/parsed/asm.rs Outdated Show resolved Hide resolved
chriseth
chriseth reviewed Aug 16, 2024
View reviewed changes
analysis/README.md Outdated Show resolved Hide resolved
@Schaeff
Copy link
Collaborator

Schaeff commented Aug 16, 2024

There are at least two .asm files which can be simplified with this, since they currently use a deeper module tree to avoid .-separated paths:
test_data/asm/vm_args_relative_path.asm and importer/test_data/instruction.asm

chriseth
chriseth reviewed Aug 16, 2024
View reviewed changes
ast/src/parsed/display.rs Outdated Show resolved Hide resolved
chriseth
chriseth reviewed Aug 16, 2024
View reviewed changes
backend/src/estark/json_exporter/mod.rs Outdated
@@ -197,7 +197,7 @@ fn fixup_name(name: &str) -> String {
if name.contains('.') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This cannot be the case any more, but I think the part you changed should remain as it is, shouldn't it? It replaces the last :: by a ..

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not being replaced correctly. With the original code, a::b::c becomes a::b.:c, with this change, it now returns a::b.c which I understand is the correct version.

gzanitti
gzanitti commented Aug 18, 2024
View reviewed changes
pipeline/tests/asm.rs Outdated Show resolved Hide resolved
@gzanitti gzanitti changed the title [WIP] Depreciation of . by :: in paths Depreciation of . by :: in paths Aug 18, 2024
@gzanitti gzanitti marked this pull request as ready for review August 18, 2024 18:40
gzanitti added a commit to gzanitti/powdr that referenced this pull request Aug 20, 2024
@gzanitti
TODO for powdr-labs#1694
67671b4
@gzanitti gzanitti mentioned this pull request Aug 20, 2024
Merged
@gzanitti gzanitti requested a review from chriseth August 21, 2024 02:14
chriseth
chriseth reviewed Aug 21, 2024
View reviewed changes
ast/src/parsed/asm.rs Outdated Show resolved Hide resolved
chriseth
chriseth reviewed Aug 21, 2024
View reviewed changes
ast/src/parsed/asm.rs Outdated Show resolved Hide resolved
@chriseth chriseth added this pull request to the merge queue Aug 23, 2024
Merged via the queue into powdr-labs:main with commit 0dc3ae7 Aug 23, 2024
14 checks passed
@Schaeff Schaeff mentioned this pull request Aug 23, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 23, 2024
@Schaeff
Simplify test files after #1694 (#1720)
b65ff65 
Now that #1694 is merged we don't need convoluted module trees.
@gzanitti gzanitti deleted the unify_path_syntax branch August 26, 2024 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Schaeff Schaeff Schaeff left review comments

@chriseth chriseth chriseth approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gzanitti @Schaeff @chriseth