-
Notifications
You must be signed in to change notification settings - Fork 205
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
Added annotations to individual fields in a struct #347
base: master
Are you sure you want to change the base?
Conversation
Oh, terralist isn't in master yet? |
It looks like everything breaks when I try to port it to master. |
Did develop add a filter method to lists, or something?
|
Yeah, develop added filter and reduce methods to lists. They are quite handy and I am in favor of bringing all of the terralist changes back to master. It moved twice between master and develop. List was originally a small section in asdl.lua, but then it got moved to list.lua and then terralist.lua |
I'm fine with bringing that over, but just FYI, develop did a bunch of stuff with the way that lua files get packaged into the terra binary---which was mostly all for PUC Lua support and ended up being completely unnecessary in the new version of that patch. So watch out for changes there if you're bring it over; we don't want to bring along the entire set of changes to internalized files from the develop branch. |
This should be ready to merge now unless anyone sees an issue. |
Were the whitespace changes isolated in a single commit? We've got some pending PR's that I'd be slightly concerned about having merge conflicts with, and at least one of those (PUC Lua support) won't be ready to go any time soon. Probably what I should aim to do is having a separate PR for the whitespace, and then we can have a well-defined point at which we can expect the code to be clean for this. |
No, there were a couple of commits. I agree that we should fix all the whitespace issues. We should probably make a .editorconfig file and have code style guidelines |
Is there a good way in git to apply a cosmetic change to multiple branches simultaneously, so that after the change you don't get merge conflicts? Personally, I've been wanting to use clang-format on the source code, since it's not just the whitespace that's inconsistent, but I've been holding off because we continue to have long-term branches that would have massive merge conflicts if we did. |
Not that I know of. |
Now that the other things are merged, can this be merged too? |
Did we reach consensus on the syntax in #324? It looked like there was a new round of discussion there, and I'm not entirely caught up yet. |
Can we split the last commit into a separate PR, and also make sure we have a test case for mutable iterators? Thanks. |
Yeah... Sorry, my branches got a bit jumbled. I didn't expect to start working on other features before the first annotations draft got merged. |
I rebased this onto master at https://github.com/elliottslaughter/terra/tree/pr-347-rebase |
This is an initial implementation of #324
Only the basic syntax is implemented, so using commas to chain annotations doesn't yet work.