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.

Sign up for GitHub

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

Jump to bottom

First round of grammar review results #77

Merged
merged 13 commits into from
Jul 18, 2017
Merged

First round of grammar review results #77

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2c17bd7
Squashed commit of the following:
Jul 12, 2017
72ec770
Added comments according to review comments
Jul 14, 2017
3531d3d
Added clarifying comment to CustomN4JSParser
Jul 14, 2017
aa64482
Fixed IllegalArgumentExceptions in Guice module
Jul 14, 2017
0dd6bda
Squashed commit of the following:
Jul 12, 2017
9fb0499
Proposed changes in grammars
Jul 12, 2017
5412d83
Regenerated languages
Jul 12, 2017
df67b87
Updated GreedyPredicateTest after refactoring
Jul 12, 2017
93335cc
Fixed regression
Jul 12, 2017
bfacb26
Updated test expectation - error recovery is better now
Jul 13, 2017
a9ed528
Be more specific with return types of parser fragments
Jul 13, 2017
f2bf98c
Regenerated languages
Jul 13, 2017
4d3d79d
Merge remote-tracking branch 'upstream/master' into GrammarReview
mor-n4 Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 16 additions & 17 deletions ...org.eclipse.n4js.common.unicode/grammar-gen/org/eclipse/n4js/common/unicode/Unicode.xtext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ terminal fragment UNICODE_COMBINING_MARK_FRAGMENT:
| '\u0825'..'\u0827'
| '\u0829'..'\u082D'
| '\u0859'..'\u085B'
| '\u08E4'..'\u0903'
| '\u08E3'..'\u0903'
| '\u093A'..'\u093C'
| '\u093E'..'\u094F'
| '\u0951'..'\u0957'
Expand Down Expand Up @@ -181,8 +181,6 @@ terminal fragment UNICODE_COMBINING_MARK_FRAGMENT:
| '\u18A9'
| '\u1920'..'\u192B'
| '\u1930'..'\u193B'
| '\u19B0'..'\u19C0'
| '\u19C8'..'\u19C9'
| '\u1A17'..'\u1A1B'
| '\u1A55'..'\u1A5E'
| '\u1A60'..'\u1A7C'
Expand Down Expand Up @@ -212,7 +210,7 @@ terminal fragment UNICODE_COMBINING_MARK_FRAGMENT:
| '\u3099'..'\u309A'
| '\uA66F'
| '\uA674'..'\uA67D'
| '\uA69F'
| '\uA69E'..'\uA69F'
| '\uA6F0'..'\uA6F1'
| '\uA802'
| '\uA806'
Expand Down Expand Up @@ -241,7 +239,7 @@ terminal fragment UNICODE_COMBINING_MARK_FRAGMENT:
| '\uABEC'..'\uABED'
| '\uFB1E'
| '\uFE00'..'\uFE0F'
| '\uFE20'..'\uFE2D'
| '\uFE20'..'\uFE2F'
;
terminal fragment UNICODE_DIGIT_FRAGMENT:
// any character in the Unicode categories
Expand Down Expand Up @@ -350,7 +348,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u0824'
| '\u0828'
| '\u0840'..'\u0858'
| '\u08A0'..'\u08B2'
| '\u08A0'..'\u08B4'
| '\u0904'..'\u0939'
| '\u093D'
| '\u0950'
Expand Down Expand Up @@ -386,6 +384,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u0ABD'
| '\u0AD0'
| '\u0AE0'..'\u0AE1'
| '\u0AF9'
| '\u0B05'..'\u0B0C'
| '\u0B0F'..'\u0B10'
| '\u0B13'..'\u0B28'
Expand All @@ -412,7 +411,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u0C12'..'\u0C28'
| '\u0C2A'..'\u0C39'
| '\u0C3D'
| '\u0C58'..'\u0C59'
| '\u0C58'..'\u0C5A'
| '\u0C60'..'\u0C61'
| '\u0C85'..'\u0C8C'
| '\u0C8E'..'\u0C90'
Expand All @@ -428,7 +427,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u0D12'..'\u0D3A'
| '\u0D3D'
| '\u0D4E'
| '\u0D60'..'\u0D61'
| '\u0D5F'..'\u0D61'
| '\u0D7A'..'\u0D7F'
| '\u0D85'..'\u0D96'
| '\u0D9A'..'\u0DB1'
Expand Down Expand Up @@ -489,7 +488,8 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u1312'..'\u1315'
| '\u1318'..'\u135A'
| '\u1380'..'\u138F'
| '\u13A0'..'\u13F4'
| '\u13A0'..'\u13F5'
| '\u13F8'..'\u13FD'
| '\u1401'..'\u166C'
| '\u166F'..'\u167F'
| '\u1681'..'\u169A'
Expand All @@ -512,7 +512,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u1950'..'\u196D'
| '\u1970'..'\u1974'
| '\u1980'..'\u19AB'
| '\u19C1'..'\u19C7'
| '\u19B0'..'\u19C9'
| '\u1A00'..'\u1A16'
| '\u1A20'..'\u1A54'
| '\u1AA7'
Expand Down Expand Up @@ -597,7 +597,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\u31A0'..'\u31BA'
| '\u31F0'..'\u31FF'
| '\u3400'..'\u4DB5'
| '\u4E00'..'\u9FCC'
| '\u4E00'..'\u9FD5'
| '\uA000'..'\uA48C'
| '\uA4D0'..'\uA4FD'
| '\uA500'..'\uA60C'
Expand All @@ -608,9 +608,8 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\uA6A0'..'\uA6EF'
| '\uA717'..'\uA71F'
| '\uA722'..'\uA788'
| '\uA78B'..'\uA78E'
| '\uA790'..'\uA7AD'
| '\uA7B0'..'\uA7B1'
| '\uA78B'..'\uA7AD'
| '\uA7B0'..'\uA7B7'
| '\uA7F7'..'\uA801'
| '\uA803'..'\uA805'
| '\uA807'..'\uA80A'
Expand All @@ -619,6 +618,7 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\uA882'..'\uA8B3'
| '\uA8F2'..'\uA8F7'
| '\uA8FB'
| '\uA8FD'
| '\uA90A'..'\uA925'
| '\uA930'..'\uA946'
| '\uA960'..'\uA97C'
Expand Down Expand Up @@ -647,9 +647,8 @@ terminal fragment UNICODE_LETTER_FRAGMENT:
| '\uAB20'..'\uAB26'
| '\uAB28'..'\uAB2E'
| '\uAB30'..'\uAB5A'
| '\uAB5C'..'\uAB5F'
| '\uAB64'..'\uAB65'
| '\uABC0'..'\uABE2'
| '\uAB5C'..'\uAB65'
| '\uAB70'..'\uABE2'
| '\uAC00'..'\uD7A3'
| '\uD7B0'..'\uD7C6'
| '\uD7CB'..'\uD7FB'
Expand Down
Binary file modified .../org.eclipse.n4js.common.unicode/src-gen/org/eclipse/n4js/common/unicode/Unicode.xtextbin
View file
Open in desktop
Binary file not shown.
102 changes: 51 additions & 51 deletions ...common.unicode/src-gen/org/eclipse/n4js/common/unicode/services/UnicodeGrammarAccess.java
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions ...jsx.ui/src-gen/org/eclipse/n4js/n4jsx/ui/contentassist/AbstractN4JSXProposalProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
*/
public abstract class AbstractN4JSXProposalProvider extends N4JSProposalProvider {

public void completeIDLScript_Annotations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeIDLScript_ScriptElements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeJSXElement_JsxElementName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
Expand Down
2,003 changes: 978 additions & 1,025 deletions ...ipse.n4js.n4jsx.ui/src-gen/org/eclipse/n4js/n4jsx/ui/contentassist/antlr/N4JSXParser.java
View file
Open in desktop

Large diffs are not rendered by default.