diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java index 4821d2bea..793aa18bc 100644 --- a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java +++ b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java @@ -61,6 +61,38 @@ public class TracingSugarTest { return result; } + public IGeneratorNode _name(final Property target) { + EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); + ILocationData location = this.location(target, feature, -1); + CompositeGeneratorNode trace = this.trace(location); + this.append(trace, target.getName()); + return trace; + } + + public IGeneratorNode _name(final Property target, final boolean useForDebugging) { + EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); + ILocationData location = this.location(target, feature, -1); + CompositeGeneratorNode trace = this.trace(location, useForDebugging); + this.append(trace, target.getName()); + return trace; + } + + public IGeneratorNode _name(final Property target, final Function stringProvider) { + EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); + ILocationData location = this.location(target, feature, -1); + CompositeGeneratorNode trace = this.trace(location); + this.append(trace, stringProvider.apply(target.getName())); + return trace; + } + + public IGeneratorNode _extends(final Type target, final Function stringProvider) { + EStructuralFeature feature = target.eClass().getEStructuralFeature("extends"); + ILocationData location = this.location(target, feature, -1); + CompositeGeneratorNode trace = this.trace(location); + this.append(trace, stringProvider.apply(target.getExtends())); + return trace; + } + public IGeneratorNode _name(final Type target) { EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); ILocationData location = this.location(target, feature, -1); @@ -85,14 +117,6 @@ public class TracingSugarTest { return trace; } - public IGeneratorNode _extends(final Type target, final Function stringProvider) { - EStructuralFeature feature = target.eClass().getEStructuralFeature("extends"); - ILocationData location = this.location(target, feature, -1); - CompositeGeneratorNode trace = this.trace(location); - this.append(trace, stringProvider.apply(target.getExtends())); - return trace; - } - public IGeneratorNode _parentId(final Type target, final Function stringProvider) { EStructuralFeature feature = target.eClass().getEStructuralFeature("parentId"); ILocationData location = this.location(target, feature, -1); @@ -101,30 +125,6 @@ public class TracingSugarTest { return trace; } - public IGeneratorNode _name(final Property target) { - EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); - ILocationData location = this.location(target, feature, -1); - CompositeGeneratorNode trace = this.trace(location); - this.append(trace, target.getName()); - return trace; - } - - public IGeneratorNode _name(final Property target, final boolean useForDebugging) { - EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); - ILocationData location = this.location(target, feature, -1); - CompositeGeneratorNode trace = this.trace(location, useForDebugging); - this.append(trace, target.getName()); - return trace; - } - - public IGeneratorNode _name(final Property target, final Function stringProvider) { - EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); - ILocationData location = this.location(target, feature, -1); - CompositeGeneratorNode trace = this.trace(location); - this.append(trace, stringProvider.apply(target.getName())); - return trace; - } - public IGeneratorNode _name(final UnresolvedProxyProperty target) { EStructuralFeature feature = target.eClass().getEStructuralFeature("name"); ILocationData location = this.location(target, feature, -1); diff --git a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.g b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.g index 393ea1d79..b7c54262f 100644 --- a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.g +++ b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.g @@ -2889,9 +2889,9 @@ rule__InitBlock__Group__0__Impl } : ( - { before(grammarAccess.getInitBlockAccess().getStaticKeyword_0()); } - 'static' - { after(grammarAccess.getInitBlockAccess().getStaticKeyword_0()); } + { before(grammarAccess.getInitBlockAccess().getSetupKeyword_0()); } + 'setup' + { after(grammarAccess.getInitBlockAccess().getSetupKeyword_0()); } ) ; finally { diff --git a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.tokens b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.tokens index 25cc202a1..7d1fcaa32 100644 --- a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.tokens +++ b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtext.tokens @@ -34,7 +34,7 @@ 'hoistingDebug'=53 'import'=30 'returns'=34 -'static'=26 +'setup'=26 'terminal'=47 'tokenLimit'=25 'true'=18 diff --git a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java index 71d5a4224..13b83e1a8 100644 --- a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java +++ b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java @@ -371,10 +371,10 @@ public class InternalXtextLexer extends Lexer { try { int _type = T__26; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalXtext.g:25:7: ( 'static' ) - // InternalXtext.g:25:9: 'static' + // InternalXtext.g:25:7: ( 'setup' ) + // InternalXtext.g:25:9: 'setup' { - match("static"); + match("setup"); } @@ -1918,17 +1918,17 @@ public class InternalXtextLexer extends Lexer { protected DFA13 dfa13 = new DFA13(this); static final String DFA13_eotS = - "\1\uffff\1\54\1\uffff\1\57\1\61\4\64\3\uffff\1\64\1\100\2\64\1\uffff\1\105\1\uffff\1\64\6\uffff\1\64\3\uffff\1\52\3\64\2\52\2\uffff\3\52\2\uffff\1\136\6\uffff\2\64\1\uffff\6\64\3\uffff\1\64\2\uffff\1\150\1\64\4\uffff\1\64\6\uffff\1\64\4\uffff\4\64\10\uffff\11\64\1\uffff\3\64\1\174\5\64\1\u0082\4\64\1\u0087\4\64\1\uffff\1\u008c\2\64\1\u008f\1\64\1\uffff\4\64\1\uffff\4\64\1\uffff\2\64\1\uffff\5\64\1\u00a0\1\u00a1\2\64\1\u00a4\4\64\1\u00a9\1\64\2\uffff\1\u00ab\1\u00ac\1\uffff\1\64\1\u00ae\1\64\1\u00b0\1\uffff\1\u00b1\2\uffff\1\64\1\uffff\1\64\2\uffff\1\64\1\u00b5\1\64\1\uffff\2\64\1\u00b9\1\uffff"; + "\1\uffff\1\54\1\uffff\1\57\1\61\4\64\3\uffff\1\64\1\100\2\64\1\uffff\1\105\1\uffff\1\64\6\uffff\1\64\3\uffff\1\52\3\64\2\52\2\uffff\3\52\2\uffff\1\136\6\uffff\2\64\1\uffff\6\64\3\uffff\1\64\2\uffff\1\150\1\64\4\uffff\1\64\6\uffff\1\64\4\uffff\4\64\10\uffff\11\64\1\uffff\3\64\1\174\5\64\1\u0082\4\64\1\u0087\4\64\1\uffff\1\u008c\2\64\1\u008f\1\64\1\uffff\4\64\1\uffff\1\u0095\3\64\1\uffff\2\64\1\uffff\5\64\1\uffff\1\u00a0\2\64\1\u00a3\4\64\1\u00a8\1\64\1\uffff\1\u00aa\1\u00ab\1\uffff\1\64\1\u00ad\1\64\1\u00af\1\uffff\1\u00b0\2\uffff\1\64\1\uffff\1\64\2\uffff\1\64\1\u00b4\1\64\1\uffff\2\64\1\u00b8\1\uffff"; static final String DFA13_eofS = - "\u00ba\uffff"; + "\u00b9\uffff"; static final String DFA13_minS = - "\1\0\1\75\1\uffff\1\75\1\76\1\141\2\145\1\151\3\uffff\1\164\1\56\1\163\1\155\1\uffff\1\72\1\uffff\1\145\6\uffff\1\165\3\uffff\1\76\1\117\1\156\1\151\1\44\1\101\2\uffff\2\0\1\52\2\uffff\1\76\6\uffff\1\154\1\141\1\uffff\1\165\1\153\1\162\1\141\1\156\1\164\3\uffff\1\141\2\uffff\1\60\1\160\4\uffff\1\164\6\uffff\1\162\4\uffff\1\106\1\165\1\144\1\151\10\uffff\1\163\1\147\2\145\2\155\1\145\1\150\1\164\1\uffff\1\157\1\165\1\162\1\60\1\155\1\144\1\163\1\145\1\155\1\60\1\156\1\151\1\155\1\162\1\60\1\151\2\162\1\145\1\uffff\1\60\1\145\1\164\1\60\1\145\1\uffff\1\114\1\156\2\141\1\uffff\1\143\1\164\2\156\1\uffff\1\156\1\151\1\uffff\1\156\1\151\1\141\1\162\1\164\2\60\1\163\1\164\1\60\1\156\1\164\1\155\1\154\1\60\1\145\2\uffff\2\60\1\uffff\1\147\1\60\1\151\1\60\1\uffff\1\60\2\uffff\1\104\1\uffff\1\164\2\uffff\1\145\1\60\1\142\1\uffff\1\165\1\147\1\60\1\uffff"; + "\1\0\1\75\1\uffff\1\75\1\76\1\141\2\145\1\151\3\uffff\1\145\1\56\1\163\1\155\1\uffff\1\72\1\uffff\1\145\6\uffff\1\165\3\uffff\1\76\1\117\1\156\1\151\1\44\1\101\2\uffff\2\0\1\52\2\uffff\1\76\6\uffff\1\154\1\141\1\uffff\1\165\1\153\1\162\1\141\1\156\1\164\3\uffff\1\164\2\uffff\1\60\1\160\4\uffff\1\164\6\uffff\1\162\4\uffff\1\106\1\165\1\144\1\151\10\uffff\1\163\1\147\2\145\2\155\1\145\1\150\1\165\1\uffff\1\157\1\165\1\162\1\60\1\155\1\144\1\163\1\145\1\155\1\60\1\156\1\151\1\155\1\162\1\60\1\160\2\162\1\145\1\uffff\1\60\1\145\1\164\1\60\1\145\1\uffff\1\114\1\156\2\141\1\uffff\1\60\1\164\2\156\1\uffff\1\156\1\151\1\uffff\1\156\1\151\1\141\1\162\1\164\1\uffff\1\60\1\163\1\164\1\60\1\156\1\164\1\155\1\154\1\60\1\145\1\uffff\2\60\1\uffff\1\147\1\60\1\151\1\60\1\uffff\1\60\2\uffff\1\104\1\uffff\1\164\2\uffff\1\145\1\60\1\142\1\uffff\1\165\1\147\1\60\1\uffff"; static final String DFA13_maxS = - "\1\uffff\1\75\1\uffff\1\75\1\76\3\162\1\151\3\uffff\1\164\1\56\1\163\1\155\1\uffff\1\72\1\uffff\1\145\6\uffff\1\165\3\uffff\1\76\1\117\1\156\1\157\1\44\1\172\2\uffff\2\uffff\1\57\2\uffff\1\76\6\uffff\1\154\1\141\1\uffff\1\165\1\153\1\162\1\141\1\156\1\164\3\uffff\1\141\2\uffff\1\172\1\160\4\uffff\1\164\6\uffff\1\162\4\uffff\1\106\1\165\1\144\1\151\10\uffff\1\163\1\147\2\145\2\155\1\145\1\150\1\164\1\uffff\1\157\1\165\1\162\1\172\1\155\1\144\1\163\1\145\1\155\1\172\1\156\1\151\1\155\1\162\1\172\1\151\2\162\1\145\1\uffff\1\172\1\145\1\164\1\172\1\145\1\uffff\1\114\1\156\2\141\1\uffff\1\143\1\164\2\156\1\uffff\1\156\1\151\1\uffff\1\156\1\151\1\141\1\162\1\164\2\172\1\163\1\164\1\172\1\156\1\164\1\155\1\154\1\172\1\145\2\uffff\2\172\1\uffff\1\147\1\172\1\151\1\172\1\uffff\1\172\2\uffff\1\104\1\uffff\1\164\2\uffff\1\145\1\172\1\142\1\uffff\1\165\1\147\1\172\1\uffff"; + "\1\uffff\1\75\1\uffff\1\75\1\76\3\162\1\151\3\uffff\1\145\1\56\1\163\1\155\1\uffff\1\72\1\uffff\1\145\6\uffff\1\165\3\uffff\1\76\1\117\1\156\1\157\1\44\1\172\2\uffff\2\uffff\1\57\2\uffff\1\76\6\uffff\1\154\1\141\1\uffff\1\165\1\153\1\162\1\141\1\156\1\164\3\uffff\1\164\2\uffff\1\172\1\160\4\uffff\1\164\6\uffff\1\162\4\uffff\1\106\1\165\1\144\1\151\10\uffff\1\163\1\147\2\145\2\155\1\145\1\150\1\165\1\uffff\1\157\1\165\1\162\1\172\1\155\1\144\1\163\1\145\1\155\1\172\1\156\1\151\1\155\1\162\1\172\1\160\2\162\1\145\1\uffff\1\172\1\145\1\164\1\172\1\145\1\uffff\1\114\1\156\2\141\1\uffff\1\172\1\164\2\156\1\uffff\1\156\1\151\1\uffff\1\156\1\151\1\141\1\162\1\164\1\uffff\1\172\1\163\1\164\1\172\1\156\1\164\1\155\1\154\1\172\1\145\1\uffff\2\172\1\uffff\1\147\1\172\1\151\1\172\1\uffff\1\172\2\uffff\1\104\1\uffff\1\164\2\uffff\1\145\1\172\1\142\1\uffff\1\165\1\147\1\172\1\uffff"; static final String DFA13_acceptS = - "\2\uffff\1\2\6\uffff\1\13\1\14\1\15\4\uffff\1\24\1\uffff\1\26\1\uffff\1\30\1\31\1\33\1\34\1\36\1\37\1\uffff\1\41\1\42\1\43\6\uffff\1\56\1\57\3\uffff\1\63\1\64\1\uffff\1\1\1\2\1\5\1\3\1\54\1\4\2\uffff\1\56\6\uffff\1\13\1\14\1\15\1\uffff\1\47\1\20\2\uffff\1\24\1\32\1\25\1\26\1\uffff\1\30\1\31\1\33\1\34\1\36\1\37\1\uffff\1\41\1\42\1\43\1\45\4\uffff\1\55\1\57\1\60\1\61\1\62\1\63\1\35\1\10\11\uffff\1\22\23\uffff\1\46\5\uffff\1\7\4\uffff\1\12\4\uffff\1\50\2\uffff\1\6\20\uffff\1\17\1\23\2\uffff\1\51\4\uffff\1\11\1\uffff\1\27\1\40\1\uffff\1\53\1\uffff\1\44\1\21\3\uffff\1\16\3\uffff\1\52"; + "\2\uffff\1\2\6\uffff\1\13\1\14\1\15\4\uffff\1\24\1\uffff\1\26\1\uffff\1\30\1\31\1\33\1\34\1\36\1\37\1\uffff\1\41\1\42\1\43\6\uffff\1\56\1\57\3\uffff\1\63\1\64\1\uffff\1\1\1\2\1\5\1\3\1\54\1\4\2\uffff\1\56\6\uffff\1\13\1\14\1\15\1\uffff\1\47\1\20\2\uffff\1\24\1\32\1\25\1\26\1\uffff\1\30\1\31\1\33\1\34\1\36\1\37\1\uffff\1\41\1\42\1\43\1\45\4\uffff\1\55\1\57\1\60\1\61\1\62\1\63\1\35\1\10\11\uffff\1\22\23\uffff\1\46\5\uffff\1\7\4\uffff\1\12\4\uffff\1\50\2\uffff\1\6\5\uffff\1\17\12\uffff\1\23\2\uffff\1\51\4\uffff\1\11\1\uffff\1\27\1\40\1\uffff\1\53\1\uffff\1\44\1\21\3\uffff\1\16\3\uffff\1\52"; static final String DFA13_specialS = - "\1\1\45\uffff\1\2\1\0\u0092\uffff}>"; + "\1\2\45\uffff\1\1\1\0\u0091\uffff}>"; static final String[] DFA13_transitionS = DFA13_transitionS_.DFA13_transitionS; private static final class DFA13_transitionS_ { static final String[] DFA13_transitionS = { @@ -2068,7 +2068,7 @@ public class InternalXtextLexer extends Lexer { "\1\u0093", "\1\u0094", "", - "\1\u0095", + "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", "\1\u0096", "\1\u0097", "\1\u0098", @@ -2081,41 +2081,40 @@ public class InternalXtextLexer extends Lexer { "\1\u009d", "\1\u009e", "\1\u009f", + "", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", - "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", + "\1\u00a1", "\1\u00a2", - "\1\u00a3", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", + "\1\u00a4", "\1\u00a5", "\1\u00a6", "\1\u00a7", - "\1\u00a8", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", - "\1\u00aa", - "", + "\1\u00a9", "", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", "", - "\1\u00ad", + "\1\u00ac", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", - "\1\u00af", + "\1\u00ae", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", "", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", "", "", + "\1\u00b1", + "", "\1\u00b2", "", + "", "\1\u00b3", - "", - "", - "\1\u00b4", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", - "\1\u00b6", + "\1\u00b5", "", + "\1\u00b6", "\1\u00b7", - "\1\u00b8", "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64", "" }; @@ -2168,6 +2167,16 @@ public class InternalXtextLexer extends Lexer { if ( s>=0 ) return s; break; case 1 : + int LA13_38 = input.LA(1); + + s = -1; + if ( ((LA13_38>='\u0000' && LA13_38<='\uFFFF')) ) {s = 89;} + + else s = 42; + + if ( s>=0 ) return s; + break; + case 2 : int LA13_0 = input.LA(1); s = -1; @@ -2255,16 +2264,6 @@ public class InternalXtextLexer extends Lexer { else if ( ((LA13_0>='\u0000' && LA13_0<='\b')||(LA13_0>='\u000B' && LA13_0<='\f')||(LA13_0>='\u000E' && LA13_0<='\u001F')||LA13_0=='#'||LA13_0=='%'||LA13_0=='\\'||LA13_0=='`'||(LA13_0>='~' && LA13_0<='\uFFFF')) ) {s = 42;} - if ( s>=0 ) return s; - break; - case 2 : - int LA13_38 = input.LA(1); - - s = -1; - if ( ((LA13_38>='\u0000' && LA13_38<='\uFFFF')) ) {s = 89;} - - else s = 42; - if ( s>=0 ) return s; break; } diff --git a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextParser.java b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextParser.java index d8095550f..583dc8661 100644 --- a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextParser.java +++ b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextParser.java @@ -22,7 +22,7 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalXtextParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_JAVACODESTRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'?'", "'*'", "'+'", "'='", "'+='", "'false'", "'true'", "'?='", "'grammar'", "'with'", "','", "'('", "')'", "'tokenLimit'", "'static'", "'.'", "'generate'", "'as'", "'import'", "'@'", "':'", "';'", "'returns'", "'<'", "'>'", "'::'", "'|'", "'&'", "'?=>'", "'{'", "'}'", "'current'", "'!'", "'['", "']'", "'terminal'", "'->'", "'EOF'", "'..'", "'enum'", "'hidden'", "'hoistingDebug'", "'fragment'", "'=>'" + "", "", "", "", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_JAVACODESTRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'?'", "'*'", "'+'", "'='", "'+='", "'false'", "'true'", "'?='", "'grammar'", "'with'", "','", "'('", "')'", "'tokenLimit'", "'setup'", "'.'", "'generate'", "'as'", "'import'", "'@'", "':'", "';'", "'returns'", "'<'", "'>'", "'::'", "'|'", "'&'", "'?=>'", "'{'", "'}'", "'current'", "'!'", "'['", "']'", "'terminal'", "'->'", "'EOF'", "'..'", "'enum'", "'hidden'", "'hoistingDebug'", "'fragment'", "'=>'" }; public static final int T__50=50; public static final int T__19=19; @@ -9487,21 +9487,21 @@ public class InternalXtextParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__InitBlock__Group__0__Impl" - // InternalXtext.g:2886:1: rule__InitBlock__Group__0__Impl : ( 'static' ) ; + // InternalXtext.g:2886:1: rule__InitBlock__Group__0__Impl : ( 'setup' ) ; public final void rule__InitBlock__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalXtext.g:2890:1: ( ( 'static' ) ) - // InternalXtext.g:2891:1: ( 'static' ) + // InternalXtext.g:2890:1: ( ( 'setup' ) ) + // InternalXtext.g:2891:1: ( 'setup' ) { - // InternalXtext.g:2891:1: ( 'static' ) - // InternalXtext.g:2892:2: 'static' + // InternalXtext.g:2891:1: ( 'setup' ) + // InternalXtext.g:2892:2: 'setup' { - before(grammarAccess.getInitBlockAccess().getStaticKeyword_0()); + before(grammarAccess.getInitBlockAccess().getSetupKeyword_0()); match(input,26,FollowSets000.FOLLOW_2); - after(grammarAccess.getInitBlockAccess().getStaticKeyword_0()); + after(grammarAccess.getInitBlockAccess().getSetupKeyword_0()); } diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/Xtext.xtextbin b/org.eclipse.xtext/src-gen/org/eclipse/xtext/Xtext.xtextbin index fcf08591b..da0cb8e95 100644 Binary files a/org.eclipse.xtext/src-gen/org/eclipse/xtext/Xtext.xtextbin and b/org.eclipse.xtext/src-gen/org/eclipse/xtext/Xtext.xtextbin differ diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.g b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.g index 70c211d57..e782cbe19 100644 --- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.g +++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.g @@ -362,9 +362,9 @@ ruleInitBlock returns [EObject current=null] leaveRule(); }: ( - otherlv_0='static' + otherlv_0='setup' { - newLeafNode(otherlv_0, grammarAccess.getInitBlockAccess().getStaticKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getInitBlockAccess().getSetupKeyword_0()); } ( ( diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.tokens b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.tokens index 9d34ab994..373d61bcd 100644 --- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.tokens +++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtext.tokens @@ -34,7 +34,7 @@ 'hoistingDebug'=19 'import'=24 'returns'=28 -'static'=20 +'setup'=20 'terminal'=52 'tokenLimit'=18 'true'=44 diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java index e901ae113..857e644b2 100644 --- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java +++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java @@ -249,10 +249,10 @@ public class InternalXtextLexer extends Lexer { try { int _type = T__20; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalXtext.g:19:7: ( 'static' ) - // InternalXtext.g:19:9: 'static' + // InternalXtext.g:19:7: ( 'setup' ) + // InternalXtext.g:19:9: 'setup' { - match("static"); + match("setup"); } @@ -1918,17 +1918,17 @@ public class InternalXtextLexer extends Lexer { protected DFA13 dfa13 = new DFA13(this); static final String DFA13_eotS = - "\1\uffff\2\55\1\uffff\1\55\2\uffff\2\55\1\71\2\55\1\uffff\1\55\1\uffff\1\55\1\102\5\uffff\1\111\1\113\1\uffff\1\116\1\55\2\uffff\1\52\2\uffff\2\55\2\52\2\uffff\3\52\2\uffff\2\55\1\uffff\1\55\1\uffff\2\55\2\uffff\4\55\2\uffff\1\146\1\55\1\uffff\2\55\1\uffff\1\55\7\uffff\1\154\6\uffff\1\55\5\uffff\2\55\6\uffff\11\55\1\uffff\4\55\2\uffff\1\55\1\176\3\55\1\u0082\3\55\1\u0086\7\55\1\uffff\1\u008e\2\55\1\uffff\3\55\1\uffff\4\55\1\u0098\2\55\1\uffff\2\55\1\u009d\3\55\1\u00a1\1\u00a2\1\55\1\uffff\2\55\1\u00a6\1\55\1\uffff\3\55\2\uffff\1\55\1\u00ac\1\u00ad\1\uffff\1\u00ae\2\55\1\u00b1\1\u00b2\3\uffff\2\55\2\uffff\1\55\1\u00b6\1\55\1\uffff\1\55\1\u00b9\1\uffff"; + "\1\uffff\2\55\1\uffff\1\55\2\uffff\2\55\1\71\2\55\1\uffff\1\55\1\uffff\1\55\1\102\5\uffff\1\111\1\113\1\uffff\1\116\1\55\2\uffff\1\52\2\uffff\2\55\2\52\2\uffff\3\52\2\uffff\2\55\1\uffff\1\55\1\uffff\2\55\2\uffff\4\55\2\uffff\1\146\1\55\1\uffff\2\55\1\uffff\1\55\7\uffff\1\154\6\uffff\1\55\5\uffff\2\55\6\uffff\11\55\1\uffff\4\55\2\uffff\1\55\1\176\3\55\1\u0082\3\55\1\u0086\7\55\1\uffff\1\u008e\2\55\1\uffff\3\55\1\uffff\1\55\1\u0095\2\55\1\u0098\2\55\1\uffff\2\55\1\u009d\3\55\1\uffff\1\u00a1\1\55\1\uffff\2\55\1\u00a5\1\55\1\uffff\3\55\1\uffff\1\55\1\u00ab\1\u00ac\1\uffff\1\u00ad\2\55\1\u00b0\1\u00b1\3\uffff\2\55\2\uffff\1\55\1\u00b5\1\55\1\uffff\1\55\1\u00b8\1\uffff"; static final String DFA13_eofS = - "\u00ba\uffff"; + "\u00b9\uffff"; static final String DFA13_minS = - "\1\0\1\145\1\151\1\uffff\1\151\2\uffff\1\145\1\164\1\56\1\163\1\155\1\uffff\1\141\1\uffff\1\145\1\72\5\uffff\2\75\1\uffff\1\76\1\165\2\uffff\1\76\2\uffff\1\117\1\156\1\44\1\101\2\uffff\2\0\1\52\2\uffff\1\141\1\156\1\uffff\1\164\1\uffff\1\144\1\151\2\uffff\1\153\1\165\1\162\1\141\2\uffff\1\60\1\160\1\uffff\1\141\1\154\1\uffff\1\164\7\uffff\1\76\6\uffff\1\162\5\uffff\1\106\1\165\6\uffff\1\155\1\145\1\150\1\144\1\163\2\145\1\155\1\164\1\uffff\1\157\1\147\1\163\1\165\2\uffff\1\162\1\60\2\155\1\162\1\60\1\145\1\164\1\156\1\60\2\151\1\162\1\155\1\145\1\162\1\145\1\uffff\1\60\2\141\1\uffff\1\156\1\151\1\114\1\uffff\1\156\1\143\1\164\1\145\1\60\2\156\1\uffff\1\162\1\164\1\60\1\156\1\151\1\141\2\60\1\156\1\uffff\1\163\1\164\1\60\1\145\1\uffff\1\147\1\155\1\154\2\uffff\1\164\2\60\1\uffff\1\60\1\104\1\151\2\60\3\uffff\1\145\1\164\2\uffff\1\142\1\60\1\165\1\uffff\1\147\1\60\1\uffff"; + "\1\0\1\145\1\151\1\uffff\1\151\2\uffff\2\145\1\56\1\163\1\155\1\uffff\1\141\1\uffff\1\145\1\72\5\uffff\2\75\1\uffff\1\76\1\165\2\uffff\1\76\2\uffff\1\117\1\156\1\44\1\101\2\uffff\2\0\1\52\2\uffff\1\141\1\156\1\uffff\1\164\1\uffff\1\144\1\151\2\uffff\1\153\1\165\1\162\1\164\2\uffff\1\60\1\160\1\uffff\1\141\1\154\1\uffff\1\164\7\uffff\1\76\6\uffff\1\162\5\uffff\1\106\1\165\6\uffff\1\155\1\145\1\150\1\144\1\163\2\145\1\155\1\165\1\uffff\1\157\1\147\1\163\1\165\2\uffff\1\162\1\60\2\155\1\162\1\60\1\145\1\164\1\156\1\60\1\151\1\160\1\162\1\155\1\145\1\162\1\145\1\uffff\1\60\2\141\1\uffff\1\156\1\151\1\114\1\uffff\1\156\1\60\1\164\1\145\1\60\2\156\1\uffff\1\162\1\164\1\60\1\156\1\151\1\141\1\uffff\1\60\1\156\1\uffff\1\163\1\164\1\60\1\145\1\uffff\1\147\1\155\1\154\1\uffff\1\164\2\60\1\uffff\1\60\1\104\1\151\2\60\3\uffff\1\145\1\164\2\uffff\1\142\1\60\1\165\1\uffff\1\147\1\60\1\uffff"; static final String DFA13_maxS = - "\1\uffff\1\162\1\151\1\uffff\1\157\2\uffff\1\162\1\164\1\56\1\163\1\155\1\uffff\1\162\1\uffff\1\145\1\72\5\uffff\2\75\1\uffff\1\76\1\165\2\uffff\1\76\2\uffff\1\117\1\156\1\44\1\172\2\uffff\2\uffff\1\57\2\uffff\1\141\1\156\1\uffff\1\164\1\uffff\1\144\1\151\2\uffff\1\153\1\165\1\162\1\141\2\uffff\1\172\1\160\1\uffff\1\141\1\154\1\uffff\1\164\7\uffff\1\76\6\uffff\1\162\5\uffff\1\106\1\165\6\uffff\1\155\1\145\1\150\1\144\1\163\2\145\1\155\1\164\1\uffff\1\157\1\147\1\163\1\165\2\uffff\1\162\1\172\2\155\1\162\1\172\1\145\1\164\1\156\1\172\2\151\1\162\1\155\1\145\1\162\1\145\1\uffff\1\172\2\141\1\uffff\1\156\1\151\1\114\1\uffff\1\156\1\143\1\164\1\145\1\172\2\156\1\uffff\1\162\1\164\1\172\1\156\1\151\1\141\2\172\1\156\1\uffff\1\163\1\164\1\172\1\145\1\uffff\1\147\1\155\1\154\2\uffff\1\164\2\172\1\uffff\1\172\1\104\1\151\2\172\3\uffff\1\145\1\164\2\uffff\1\142\1\172\1\165\1\uffff\1\147\1\172\1\uffff"; + "\1\uffff\1\162\1\151\1\uffff\1\157\2\uffff\1\162\1\145\1\56\1\163\1\155\1\uffff\1\162\1\uffff\1\145\1\72\5\uffff\2\75\1\uffff\1\76\1\165\2\uffff\1\76\2\uffff\1\117\1\156\1\44\1\172\2\uffff\2\uffff\1\57\2\uffff\1\141\1\156\1\uffff\1\164\1\uffff\1\144\1\151\2\uffff\1\153\1\165\1\162\1\164\2\uffff\1\172\1\160\1\uffff\1\141\1\154\1\uffff\1\164\7\uffff\1\76\6\uffff\1\162\5\uffff\1\106\1\165\6\uffff\1\155\1\145\1\150\1\144\1\163\2\145\1\155\1\165\1\uffff\1\157\1\147\1\163\1\165\2\uffff\1\162\1\172\2\155\1\162\1\172\1\145\1\164\1\156\1\172\1\151\1\160\1\162\1\155\1\145\1\162\1\145\1\uffff\1\172\2\141\1\uffff\1\156\1\151\1\114\1\uffff\1\156\1\172\1\164\1\145\1\172\2\156\1\uffff\1\162\1\164\1\172\1\156\1\151\1\141\1\uffff\1\172\1\156\1\uffff\1\163\1\164\1\172\1\145\1\uffff\1\147\1\155\1\154\1\uffff\1\164\2\172\1\uffff\1\172\1\104\1\151\2\172\3\uffff\1\145\1\164\2\uffff\1\142\1\172\1\165\1\uffff\1\147\1\172\1\uffff"; static final String DFA13_acceptS = - "\3\uffff\1\3\1\uffff\1\5\1\6\5\uffff\1\16\1\uffff\1\20\2\uffff\1\23\1\24\1\25\1\27\1\30\2\uffff\1\34\2\uffff\1\40\1\43\1\uffff\1\47\1\50\4\uffff\1\56\1\57\3\uffff\1\63\1\64\2\uffff\1\56\1\uffff\1\3\2\uffff\1\5\1\6\4\uffff\1\53\1\12\2\uffff\1\16\2\uffff\1\20\1\uffff\1\26\1\22\1\23\1\24\1\25\1\27\1\30\1\uffff\1\32\1\36\1\33\1\34\1\44\1\35\1\uffff\1\40\1\43\1\45\1\47\1\50\2\uffff\1\55\1\57\1\60\1\61\1\62\1\63\11\uffff\1\14\4\uffff\1\31\1\46\21\uffff\1\52\3\uffff\1\2\3\uffff\1\41\7\uffff\1\54\11\uffff\1\42\4\uffff\1\4\3\uffff\1\11\1\15\3\uffff\1\1\5\uffff\1\21\1\37\1\13\2\uffff\1\51\1\17\3\uffff\1\7\2\uffff\1\10"; + "\3\uffff\1\3\1\uffff\1\5\1\6\5\uffff\1\16\1\uffff\1\20\2\uffff\1\23\1\24\1\25\1\27\1\30\2\uffff\1\34\2\uffff\1\40\1\43\1\uffff\1\47\1\50\4\uffff\1\56\1\57\3\uffff\1\63\1\64\2\uffff\1\56\1\uffff\1\3\2\uffff\1\5\1\6\4\uffff\1\53\1\12\2\uffff\1\16\2\uffff\1\20\1\uffff\1\26\1\22\1\23\1\24\1\25\1\27\1\30\1\uffff\1\32\1\36\1\33\1\34\1\44\1\35\1\uffff\1\40\1\43\1\45\1\47\1\50\2\uffff\1\55\1\57\1\60\1\61\1\62\1\63\11\uffff\1\14\4\uffff\1\31\1\46\21\uffff\1\52\3\uffff\1\2\3\uffff\1\41\7\uffff\1\54\6\uffff\1\11\2\uffff\1\42\4\uffff\1\4\3\uffff\1\15\3\uffff\1\1\5\uffff\1\21\1\37\1\13\2\uffff\1\51\1\17\3\uffff\1\7\2\uffff\1\10"; static final String DFA13_specialS = - "\1\2\45\uffff\1\1\1\0\u0092\uffff}>"; + "\1\2\45\uffff\1\1\1\0\u0091\uffff}>"; static final String[] DFA13_transitionS = DFA13_transitionS_.DFA13_transitionS; private static final class DFA13_transitionS_ { static final String[] DFA13_transitionS = { @@ -2068,7 +2068,7 @@ public class InternalXtextLexer extends Lexer { "\1\u0093", "", "\1\u0094", - "\1\u0095", + "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", "\1\u0096", "\1\u0097", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", @@ -2081,41 +2081,40 @@ public class InternalXtextLexer extends Lexer { "\1\u009e", "\1\u009f", "\1\u00a0", + "", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", - "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", + "\1\u00a2", + "", "\1\u00a3", - "", "\1\u00a4", - "\1\u00a5", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", - "\1\u00a7", + "\1\u00a6", "", + "\1\u00a7", "\1\u00a8", "\1\u00a9", + "", "\1\u00aa", - "", - "", - "\1\u00ab", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", "", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", + "\1\u00ae", "\1\u00af", - "\1\u00b0", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", "", "", "", + "\1\u00b2", "\1\u00b3", + "", + "", "\1\u00b4", - "", - "", - "\1\u00b5", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", - "\1\u00b7", + "\1\u00b6", "", - "\1\u00b8", + "\1\u00b7", "\12\55\7\uffff\32\55\4\uffff\1\55\1\uffff\32\55", "" }; diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextParser.java b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextParser.java index 5ef7d5771..00c307270 100644 --- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextParser.java +++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextParser.java @@ -21,7 +21,7 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalXtextParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_JAVACODESTRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'grammar'", "'with'", "','", "'hidden'", "'('", "')'", "'tokenLimit'", "'hoistingDebug'", "'static'", "'.'", "'generate'", "'as'", "'import'", "'@'", "'fragment'", "'*'", "'returns'", "':'", "';'", "'<'", "'>'", "'::'", "'|'", "'&'", "'?=>'", "'?'", "'+'", "'{'", "'='", "'+='", "'current'", "'}'", "'true'", "'false'", "'!'", "'=>'", "'->'", "'?='", "'['", "']'", "'terminal'", "'EOF'", "'..'", "'enum'" + "", "", "", "", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_JAVACODESTRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'grammar'", "'with'", "','", "'hidden'", "'('", "')'", "'tokenLimit'", "'hoistingDebug'", "'setup'", "'.'", "'generate'", "'as'", "'import'", "'@'", "'fragment'", "'*'", "'returns'", "':'", "';'", "'<'", "'>'", "'::'", "'|'", "'&'", "'?=>'", "'?'", "'+'", "'{'", "'='", "'+='", "'current'", "'}'", "'true'", "'false'", "'!'", "'=>'", "'->'", "'?='", "'['", "']'", "'terminal'", "'EOF'", "'..'", "'enum'" }; public static final int T__50=50; public static final int T__19=19; @@ -881,7 +881,7 @@ public class InternalXtextParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleInitBlock" - // InternalXtext.g:357:1: ruleInitBlock returns [EObject current=null] : (otherlv_0= 'static' ( (lv_code_1_0= ruleJavaCode ) ) ) ; + // InternalXtext.g:357:1: ruleInitBlock returns [EObject current=null] : (otherlv_0= 'setup' ( (lv_code_1_0= ruleJavaCode ) ) ) ; public final EObject ruleInitBlock() throws RecognitionException { EObject current = null; @@ -893,15 +893,15 @@ public class InternalXtextParser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalXtext.g:363:2: ( (otherlv_0= 'static' ( (lv_code_1_0= ruleJavaCode ) ) ) ) - // InternalXtext.g:364:2: (otherlv_0= 'static' ( (lv_code_1_0= ruleJavaCode ) ) ) + // InternalXtext.g:363:2: ( (otherlv_0= 'setup' ( (lv_code_1_0= ruleJavaCode ) ) ) ) + // InternalXtext.g:364:2: (otherlv_0= 'setup' ( (lv_code_1_0= ruleJavaCode ) ) ) { - // InternalXtext.g:364:2: (otherlv_0= 'static' ( (lv_code_1_0= ruleJavaCode ) ) ) - // InternalXtext.g:365:3: otherlv_0= 'static' ( (lv_code_1_0= ruleJavaCode ) ) + // InternalXtext.g:364:2: (otherlv_0= 'setup' ( (lv_code_1_0= ruleJavaCode ) ) ) + // InternalXtext.g:365:3: otherlv_0= 'setup' ( (lv_code_1_0= ruleJavaCode ) ) { otherlv_0=(Token)match(input,20,FollowSets000.FOLLOW_11); - newLeafNode(otherlv_0, grammarAccess.getInitBlockAccess().getStaticKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getInitBlockAccess().getSetupKeyword_0()); // InternalXtext.g:369:3: ( (lv_code_1_0= ruleJavaCode ) ) // InternalXtext.g:370:4: (lv_code_1_0= ruleJavaCode ) diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java b/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java index 0ac0bfa25..80c04f52b 100644 --- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java +++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java @@ -207,19 +207,19 @@ public class XtextGrammarAccess extends AbstractElementFinder.AbstractGrammarEle public class InitBlockElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.Xtext.InitBlock"); private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cStaticKeyword_0 = (Keyword)cGroup.eContents().get(0); + private final Keyword cSetupKeyword_0 = (Keyword)cGroup.eContents().get(0); private final Assignment cCodeAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cCodeJavaCodeParserRuleCall_1_0 = (RuleCall)cCodeAssignment_1.eContents().get(0); //InitBlock: - // 'static' code=JavaCode; + // 'setup' code=JavaCode; @Override public ParserRule getRule() { return rule; } - //'static' code=JavaCode + //'setup' code=JavaCode public Group getGroup() { return cGroup; } - //'static' - public Keyword getStaticKeyword_0() { return cStaticKeyword_0; } + //'setup' + public Keyword getSetupKeyword_0() { return cSetupKeyword_0; } //code=JavaCode public Assignment getCodeAssignment_1() { return cCodeAssignment_1; } @@ -2655,7 +2655,7 @@ public class XtextGrammarAccess extends AbstractElementFinder.AbstractGrammarEle } //InitBlock: - // 'static' code=JavaCode; + // 'setup' code=JavaCode; public InitBlockElements getInitBlockAccess() { return pInitBlock; } diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext b/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext index aa1a5c103..1001a2dea 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext +++ b/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext @@ -24,7 +24,7 @@ Grammar: ; InitBlock returns InitBlock: - 'static' code=JavaCode + 'setup' code=JavaCode ; GrammarID returns ecore::EString: diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/GeneratorNodeProcessor.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/GeneratorNodeProcessor.java index b9ad90619..9d7dde604 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/GeneratorNodeProcessor.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/GeneratorNodeProcessor.java @@ -255,12 +255,12 @@ public class GeneratorNodeProcessor { return this.delegate; } - public boolean contains(final ITextRegion arg0) { - return this.getDelegate().contains(arg0); + public boolean contains(final ITextRegion other) { + return this.getDelegate().contains(other); } - public boolean contains(final int arg0) { - return this.getDelegate().contains(arg0); + public boolean contains(final int offset) { + return this.getDelegate().contains(offset); } public int getEndLineNumber() { @@ -279,12 +279,12 @@ public class GeneratorNodeProcessor { return this.getDelegate().getOffset(); } - public ITextRegion merge(final ITextRegion arg0) { - return this.getDelegate().merge(arg0); + public ITextRegion merge(final ITextRegion region) { + return this.getDelegate().merge(region); } - public ITextRegionWithLineInformation merge(final ITextRegionWithLineInformation arg0) { - return this.getDelegate().merge(arg0); + public ITextRegionWithLineInformation merge(final ITextRegionWithLineInformation other) { + return this.getDelegate().merge(other); } }