Simplify and fix Table.set_span
#53
Closed
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
In `Table.set_span` there are a bunch of redundant checks for borders and number of bordered edges that this commit simplifies. Additionally the vertical and horizontal spans are independent of each other, therefore these checks can be untangled. I think that this actually uncovered a bug in the old implementation. For the cases where both horizontally and vertically only one of both edges are bordered there are differences with this commit. | left | right | top | bottom | vspan/hspan before | vspan/hspan after | | ----- | ----- | --- | ------ | ------------------ | ----------------- | | true | false | true | false | false | true | | true | false | false | true | false | true | | false | true | true | false | false | true | | false | true | false | true | false | true | This change in behaviour of the `Table.set_span` method is a bug fix. I guess in the original code it was missed that a cell could both horizontally and vertically span to other cells if the two bordered edges are not on the same direction.
|
This is now locally tested and does pass. But I didn't check whether the tests would catch the different hspan/vspan results. I probably should add tests for that.. |
The attributes `vspan` and `hspan` depend only on other attributes inside `Cell`, therefore there is no need to use a mutating method `set_span` to recover the invariants of `Cell`.
|
After the change to use properties for |
The condition `hspan and not left` expands to `(not left or not right) and not left` which simplifies to `not left`. After this change `Cell.hspan` and `Cell.vspan` aren't used anymore in this codebase. They stay because they are part of the API.
|
Merged in #226 |
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.
In
Table.set_spanthere are a bunch of redundant checks for borders and number of bordered edges that this commit simplifies. Additionally the vertical and horizontal spans are independent of each other, therefore these checks can be untangled.I think that this actually uncovered a bug in the old implementation. For the cases where both horizontally and vertically only one of both edges are bordered there are differences with this commit.
This change in behaviour of the
Table.set_spanmethod is a bug fix. I guess in the original code it was missed that a cell could both horizontally and vertically span to other cells if the two bordered edges are not on the same direction.