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.

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

Proof POWERED_FLIGHT_SUBROUTINES #624 #754

Merged

Conversation

serialhex
Copy link
Contributor

Proofread all comments and code. There are a few comments relating to white space.

  1. I used the white space conventions listed in CONTRIBUTING.md, namely:
  • Single space for new words.
  • Double space for new sentences.
  • Triple space for indentations.

I call this out specifically because the scans (at least for this file) seem to use 4 spaces for indentation and 3 spaces for new sentences. For example, in the following image the leading C in CDUTRIG would be over the I in COSINES if it used 3 spaces instead of 4, but instead it is over the E. Similarly, on the 4th line (there's and example on the 3rd but it's easier to see on the 4th) the period at the end of the line corresponds to a space above it, and then there are 3 spaces before the T in THESE starts.

Scan page 1259

  1. Some of the code seem to use spaces and tabs instead of just tabs. I mentioned it in the issue here: Proof POWERED_FLIGHT_SUBROUTINES #624 (comment) so I won't repeat myself.

Other than that this PR should be bug-compatible with the scans! 😜

@github-actions github-actions bot added the Type: Proof Comanche55 and Luminary99 files label Oct 12, 2020
@wopian wopian linked an issue Oct 12, 2020 that may be closed by this pull request
@wopian
Copy link
Collaborator

wopian commented Oct 12, 2020

I used the white space conventions listed in CONTRIBUTING.md, namely:

This was recently updated due to the wording being incorrect (well unhelpful and somewhat contradictory) - it's the general usage of spaces, but whatever the scans uses is what you use.

@wopian wopian self-requested a review October 12, 2020 23:57
@wopian wopian self-assigned this Oct 12, 2020
@wopian wopian added this to the Luminary099 milestone Oct 12, 2020
@chrislgarry
Copy link
Owner

Looks good to me. Thanks!

@chrislgarry chrislgarry merged commit 6b3d6ce into chrislgarry:master Oct 13, 2020
@serialhex
Copy link
Contributor Author

Good morning @wopian & @chrislgarry!

If @wopian 's comment is the way it should be, then my contributions are wrong, but easily fixed and it's only white space. If you like I can fix it and open another pull request. Though if that is the case I think that should be updated in the CONTRIBUTING.md file so it is clear that we want white space to match also. I'm happy to do this if it is desired, especially since I'm going to be doing more of these in the next week or so and I want them to be right.

p.s. it's really fun reading these comments, I'm not super much for editing or proofreading in general, it's nice to read code from exceptional engineers!

@chrislgarry
Copy link
Owner

Good morning @wopian & @chrislgarry!

If @wopian 's comment is the way it should be, then my contributions are wrong, but easily fixed and it's only white space. If you like I can fix it and open another pull request. Though if that is the case I think that should be updated in the CONTRIBUTING.md file so it is clear that we want white space to match also. I'm happy to do this if it is desired, especially since I'm going to be doing more of these in the next week or so and I want them to be right.

p.s. it's really fun reading these comments, I'm not super much for editing or proofreading in general, it's nice to read code from exceptional engineers!

@wopian has the final word. I may have missed the whitespace nuances since I was reviewing on my phone during my commute home. Regardless, we would be happy if you could submit a new PR accordingly.

@wopian
Copy link
Collaborator

wopian commented Oct 13, 2020

@serialhex I've reverted this PR. Unfortunately GitHub permanently closes PRs once they're merged, so you'll need to create a new branch off of this branch to open a new PR.

git checkout POWERED_FLIGHT_SUBROUTINES-proofread
git checkout -b POWERED_FLIGHT_SUBROUTINES-proofread2
git push
(create PR from POWERED_FLIGHT_SUBROUTINES-proofread2)

Edit: PR was already opened 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Revision Needed Type: Proof Comanche55 and Luminary99 files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proof POWERED_FLIGHT_SUBROUTINES
3 participants