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

Various fixes for preproc #609

Merged
merged 4 commits into from
Nov 28, 2022
Merged

Various fixes for preproc #609

merged 4 commits into from
Nov 28, 2022

Conversation

sampottinger
Copy link
Collaborator

@sampottinger sampottinger commented Nov 27, 2022

Addresses some small misc issues in preproc…

@sampottinger sampottinger marked this pull request as ready for review November 27, 2022 19:22
@sampottinger
Copy link
Collaborator Author

@benfry - addressed #602 but looking at #607

@sampottinger
Copy link
Collaborator Author

@benfry - I was able to get most of this sorted except for indent. The problem is I have to keep the EDT and Javac in sync with each other when edits are made by preproc so errors and warnings go to the right place when they try to find token locations. However, newlines are not tokens on their own in Antlr. So, doing that indent will take a little more thought to ensure I don’t introduce any new bugs.

I’d recommend merging this without the indent fix and addressing indent in a separate PR.

@benfry benfry merged commit c310896 into main Nov 28, 2022
@benfry benfry deleted the preproc_fix_space_equation branch November 28, 2022 00:56
@benfry
Copy link
Owner

benfry commented Nov 28, 2022

Ok, the indent fix is more about avoiding the extra space before each public seen here:

Screen Shot 2022-11-27 at 7 56 13 PM

I'm far less worried about adding indents (especially if ANTLR isn't giving you newlines, I totally get that), but we shouldn't be adding extra spaces in there.

@sampottinger
Copy link
Collaborator Author

@benfry - Sorry for the confusion. I think the extra space in front was resolved!

@benfry
Copy link
Owner

benfry commented Nov 28, 2022

Perfect, thanks!

@benfry
Copy link
Owner

benfry commented Nov 28, 2022

And #519 is still open, right? (Totally fine, just wrapping up the release here.)

@sampottinger
Copy link
Collaborator Author

sampottinger commented Nov 28, 2022 via email

@benfry
Copy link
Owner

benfry commented Nov 28, 2022

No problem, thanks again.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

size(863,863/2) not working as first line of setup() function in a simple sketch
2 participants