First round of grammar review results #77
Merged
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
added 12 commits
July 14, 2017 10:54
commit a3c70cf Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Wed Jul 12 11:18:07 2017 +0200 Minor reformatting Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> commit 1e5d59a Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Wed Jul 12 11:11:25 2017 +0200 Refactored tests commit afc166e Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:46:21 2017 +0200 Added more unit tests commit 71cea9e Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:45:37 2017 +0200 Fixed bug in template for parser commit ba47ac8 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:44:18 2017 +0200 Add an option that allows to shrink the content assist parser commit 1ec8a2d Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:42:49 2017 +0200 Fixed computation of the elements that should be parsed This helps to get rid of the NoSuchMethodExceptions when CA is invoked. commit 8485c5b Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:39:45 2017 +0200 Fixed bug in the computation of method names for CA commit be7a786 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:35:07 2017 +0200 Remove unnecessarily overridden method commit ca1ec21 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 10:42:28 2017 +0200 Refined content assist parser sanity test commit dabb3ac Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Mon Jul 10 14:18:42 2017 +0200 Added sanity check for generated code commit cdcf877 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Mon Jul 10 14:18:11 2017 +0200 Fixed typo in Javadoc Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
commit a3c70cf Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Wed Jul 12 11:18:07 2017 +0200 Minor reformatting Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> commit 1e5d59a Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Wed Jul 12 11:11:25 2017 +0200 Refactored tests commit afc166e Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:46:21 2017 +0200 Added more unit tests commit 71cea9e Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:45:37 2017 +0200 Fixed bug in template for parser commit ba47ac8 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:44:18 2017 +0200 Add an option that allows to shrink the content assist parser commit 1ec8a2d Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:42:49 2017 +0200 Fixed computation of the elements that should be parsed This helps to get rid of the NoSuchMethodExceptions when CA is invoked. commit 8485c5b Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:39:45 2017 +0200 Fixed bug in the computation of method names for CA commit be7a786 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 15:35:07 2017 +0200 Remove unnecessarily overridden method commit ca1ec21 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Tue Jul 11 10:42:28 2017 +0200 Refined content assist parser sanity test commit dabb3ac Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Mon Jul 10 14:18:42 2017 +0200 Added sanity check for generated code commit cdcf877 Author: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de> Date: Mon Jul 10 14:18:11 2017 +0200 Fixed typo in Javadoc Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
- Regenerated Unicode.xtext (eclipse-n4jsGH-59) - Extracted a few fragments to allow reuse - Removed unused rules Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
jpilgrim
approved these changes
Jul 17, 2017
| @@ -292,8 +279,8 @@ ArrowExpression <In, Yield> returns ArrowFunction: | |||
| ( | |||
| // we cannot use fragments here since we have to combine the terminals into a syntactic predicate | |||
| // also, we have to use explicit alternatives instead of making async optional due to a generation bug | |||
There was a problem hiding this comment.
comment is not true anymore
| '}'; | ||
|
|
||
| ArrowFunctionTypeExpression returns FunctionTypeExpression: | ||
| {FunctionTypeExpression} '(' TAnonymousFormalParameterList ')' '=>' returnTypeRef=PrimaryTypeExpression; | ||
| =>({FunctionTypeExpression} '(' TAnonymousFormalParameterList ')' '=>') returnTypeRef=PrimaryTypeExpression; |
There was a problem hiding this comment.
predicate will be propagated to caller
|
I will look into resolving the conflict and merging this ... |
# Conflicts: # plugins/org.eclipse.n4js.ui/src-gen/org/eclipse/n4js/ui/contentassist/antlr/N4JSParser.java # tests/org.eclipse.n4js.lang.tests/src/org/eclipse/n4js/tests/contentassist/CustomParserTest.xtend
|
new builds after merging-in master + re-generating code: |
|
Thank you very much @mor-n4 - looks like the build timeout in autoedit was spurious :( |
|
1st build is green; 2nd build hung after the initial build of n4js (without extensions). |
|
now both builds are green. Many thanks @szarnekow ! Merging this now ... |
|
@jpilgrim I tried to create a GitHub issue, but could not assign it to Sebastian. So I just used the ID of this PR (should be sufficient). |
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.
A few fragments were extracted, some unnecessary rule delegation was removed.
Added a few TODOs for cases, which would deserve an own abstraction in the EPackage.
@jpilgrim Please review.