clay: make mark bushes optional in %tube#7328
Merged
Merged
Conversation
827dd1d to
5f15fff
Compare
5f15fff to
c1bf174
Compare
a81138d to
a56ef7a
Compare
e211dfb to
041a788
Compare
Contributor
Author
|
|
Contributor
Author
|
Had to revert 041a788 because in %groups some mark conversion gates are iron gates, so |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
@bonbud-macryg noticed that mounting a fresh desk created with
|new-deskno longer worked.It turns out that dependency graph construction for mark conversion gates was too strict: it required files for both marks to exist, even though only one mark core is actually needed (for either
+growor+grabcontents of the first or the seconds marks respectively). This led to a crash during%hoon -> %mimeconversion gate construction, as/mar/mime/hoondoes not exist in a fresh desk.This PR makes marks' bushes optional in
%tubecase of$bush, so it makes both the bush construction and the bush-to-vase computations more robust.Note that I removedI realized the mistake with that: we want to check the top-level battery only and not the entire namespace of a vase. This prompted me to add another arm existence check witharmcalculation that checked for+grabexistence: it seems to me unnecessary since forrabto be succesfull+grabat least needs to exist.+slobin+has-arm.Tested this by trying to reproduce the bug encountered by @bonbud-macryg, a new desk mounted fine.