QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Improve resolution of relative includes #980

Merged
zxq9 merged 6 commits from fix_relative_includes into master 2023-09-14 22:00:30 +09:00
Conversation 9 Commits 6 Files Changed 10 +96 -19
zxq9 commented 2023-09-08 05:23:58 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

Fixes #488

This PR is supported by the Æternity Crypto Foundation

*Created by: hanssv* Fixes #488 This PR is supported by the Æternity Crypto Foundation
ghallak (Migrated from gitlab.com) approved these changes 2023-09-08 05:23:58 +09:00
zxq9 commented 2023-09-08 15:46:57 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

I think it should be clearer on how they are improved. Also, this change should be documented - for example it is not clear which path takes priority if there is a file available relative to the current file and another one relative to cwd

*Created by: radrow* I think it should be clearer on how they are improved. Also, this change should be documented - for example it is not clear which path takes priority if there is a file available relative to the current file and another one relative to cwd
zxq9 commented 2023-09-08 15:48:55 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

Test needed

*Created by: radrow* Test needed
ghallak commented 2023-09-08 18:46:49 +09:00 (Migrated from gitlab.com)
Copy Link

Something like this explains the change in a better way.

- Resolve include paths relative to the including file path when the resolution relative to the root file path fails.
Something like this explains the change in a better way. ```suggestion:-0+0 - Resolve include paths relative to the including file path when the resolution relative to the root file path fails. ```
zxq9 commented 2023-09-08 23:31:51 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

Reformulated.

*Created by: hanssv* Reformulated.
zxq9 commented 2023-09-08 23:34:03 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

Added documentation + reformulated CHANGELOG.

Reworked the solution a bit, by always tracking the current src_dir in Options. This is slightly more verbose but a lot cleaner I think.

And added the missing test case from #488

*Created by: hanssv* Added documentation + reformulated CHANGELOG. Reworked the solution a bit, by always tracking the current src_dir in `Options`. This is slightly more verbose but a lot cleaner I think. And added the missing test case from #488
zxq9 commented 2023-09-13 20:16:49 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

Review: Approved

*Created by: radrow* **Review:** Approved
ghallak commented 2023-09-14 16:18:05 +09:00 (Migrated from gitlab.com)
Copy Link

approved this merge request

approved this merge request
zxq9 commented 2023-09-14 22:00:30 +09:00 (Migrated from gitlab.com)
Copy Link

Merged by: hanssv at 2023-09-14 13:00:30 UTC

*Merged by: hanssv at 2023-09-14 13:00:30 UTC*
Sign in to join this conversation.
Reviewers
No Reviewers
ghallak
Labels
Clear labels
WIP
bug
consensus-breaking
dependencies
documentation
duplicate
effort: high
effort: low
effort: medium
effort: trivial
enhancement
good first issue
help wanted
invalid
maintenance
question
task/feature
todo-in-rewrite
wontfix
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
pig lipstick
Muggle-facing enhancements
question
More information is needed
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: QPQ-AG/sophia#980
No description provided.
Delete Branch "fix_relative_includes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?