Skip to content

Improve wording of isAdditionalFlow/TaintStep qldoc #8638

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.

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

Merged

Conversation

smowton
Copy link
Contributor

@smowton smowton commented Apr 1, 2022

@Marcono1234 at #8616 asked that we avoid using must with the possible implication that this is a mandatory "waypoint" / "via" step, rather than an additional step that may or may not be used in a given path.

* Holds if the additional flow step from `node1` to `node2` must be taken
* into account in the analysis.
* Holds if the analysis should assume that data may flow from `node1` to `node2`
* in addition to the normal dataflow steps.
*/
predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a rather long way of phrasing "data may flow from node1 to node2". Would it be equally clear to just write:

Holds if data may flow from node1 to node2 in addition to the normal dataflow steps.
?

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: I believe we tend to write data-flow steps instead of dataflow steps.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

~400 matches for dataflow (including spaces, case-sensitive) and ~800 for data-flow, so I've gone with the majority but we're far from consistent

@smowton smowton added the no-change-note-required This PR does not need a change note label Apr 1, 2022
@smowton
Copy link
Contributor Author

smowton commented Apr 1, 2022

@jketema @MathiasVP taken both suggestions

jketema
jketema previously approved these changes Apr 1, 2022
Copy link
Contributor

@jketema jketema left a comment

Choose a reason for hiding this comment

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

LGTM

@intrigus-lgtm
Copy link
Contributor

While this is being changed, would it make sense to rename the parameters to something more intuitive/descriptive?
node1/node2 -> src/dest
node1/node2 -> src/target
node1/node2 -> pred/succ

@smowton
Copy link
Contributor Author

smowton commented Apr 1, 2022

@jketema please re-approve

@smowton smowton merged commit 3119885 into github:main Apr 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants