| author | szarnekow | 2009-03-10 15:09:58 (EDT) |
|---|---|---|
| committer | sefftinge | 2009-03-10 15:09:58 (EDT) |
| commit | 880fc151e36d750f59e50a9f7932e5e48132c9a1 (patch) (side-by-side diff) | |
| tree | 05add0c6cb9dc4950abfcb0013e2c7192550322a | |
| parent | f15fb29311493889062519fdac434b3adfa0e78d (diff) | |
| download | org.eclipse.xtext-880fc151e36d750f59e50a9f7932e5e48132c9a1.zip org.eclipse.xtext-880fc151e36d750f59e50a9f7932e5e48132c9a1.tar.gz org.eclipse.xtext-880fc151e36d750f59e50a9f7932e5e48132c9a1.tar.bz2 | |
Fix: Regenerated due to encoding issues with Moritz' commit
51 files changed, 186 insertions, 186 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi index 8d6675c..4aff921 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi @@ -158,7 +158,7 @@ <groups xsi:type="xtext:Keyword" value="ROT"/> <groups xsi:type="xtext:Keyword" value="BLAU"/> <groups xsi:type="xtext:Keyword" value="GELB"/> - <groups xsi:type="xtext:Keyword" value="GR‹N"/> + <groups xsi:type="xtext:Keyword" value="GRÜN"/> </terminal> </alternatives> </rules> diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java index 818a892..f1b398d 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java @@ -1148,11 +1148,11 @@ protected class Familie_7_Keyword extends KeywordToken { /************ begin Rule Farbe **************** * * Farbe: - * wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" ); + * wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ); * **/ -// wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" ) +// wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ) protected class Farbe_Assignment_wert extends AssignmentToken { public Farbe_Assignment_wert(IInstanceDescription curr, AbstractToken pred) { @@ -1192,7 +1192,7 @@ protected class Farbe_Assignment_wert extends AssignmentToken { if("GRÜN".equals(value)) { // xtext::Keyword type = AssignmentType.KW; - element = grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(); + element = grammarAccess.getFarbeAccess().getWertGRÜNKeyword_0_3(); return new Solution(obj); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g index 7ded1c1..f821c8b 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g @@ -637,9 +637,9 @@ ruleFarbe returns [EObject current=null] } - |'GR\u2039N' + |'GR\u00DCN' { - createLeafNode(grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(), "wert"); + createLeafNode(grammarAccess.getFarbeAccess().getWertGRÜNKeyword_0_3(), "wert"); } ) diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens index 812efac..cdbc2b6 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens @@ -5,8 +5,8 @@ RULE_INT=4 RULE_STRING=5 RULE_ANY_OTHER=10 RULE_SL_COMMENT=8 +'GR\u00DCN'=25 'ROT'=22 -'GR\u2039N'=25 'spielzeug'=18 'spielplatz'=11 ')'=16 diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java index 149872f..f163da2 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java @@ -307,10 +307,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mT25() throws RecognitionException { try { int _type = T25; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:5: ( 'GR\\u2039N' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:7: 'GR\\u2039N' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:5: ( 'GR\\u00DCN' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:7: 'GR\\u00DCN' { - match("GR\u2039N"); + match("GR\u00DCN"); } @@ -1201,7 +1201,7 @@ public class InternalReferenceGrammarLexer extends Lexer { { int LA12_35 = input.LA(3); - if ( (LA12_35=='\u2039') ) { + if ( (LA12_35=='\u00DC') ) { alt12=15; } else { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java index 9cecde8..cf1e7ac 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java @@ -23,7 +23,7 @@ import java.util.ArrayList; public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'familie'", "'keyword'", "','", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u2039N'", "'type'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'familie'", "'keyword'", "','", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u00DCN'", "'type'" }; public static final int RULE_ML_COMMENT=7; public static final int RULE_ID=6; @@ -1118,7 +1118,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFarbe - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; @@ -1127,13 +1127,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:6: ( (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:6: ( (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:6: lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:6: lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) int alt6=4; switch ( input.LA(1) ) { case 22: @@ -1158,7 +1158,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser break; default: NoViableAltException nvae = - new NoViableAltException("622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )", 6, 0, input); + new NoViableAltException("622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )", 6, 0, input); throw nvae; } @@ -1195,11 +1195,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 4 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GR\\u2039N' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GR\\u00DCN' { match(input,25,FOLLOW_25_in_ruleFarbe1292); - createLeafNode(grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(), "wert"); + createLeafNode(grammarAccess.getFarbeAccess().getWertGRÜNKeyword_0_3(), "wert"); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g index a7a7d47..274ba27 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g @@ -21,7 +21,7 @@ T21 : ',' ; T22 : 'ROT' ; T23 : 'BLAU' ; T24 : 'GELB' ; -T25 : 'GR\u2039N' ; +T25 : 'GR\u00DCN' ; T26 : 'type' ; // $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 710 diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java index b4ca334..2ce805b 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java @@ -142,11 +142,11 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { keyword$3$Consumer = new Keyword$3$Consumer(rule.getWertROTKeyword_0_0()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getWertBLAUKeyword_0_1()); keyword$5$Consumer = new Keyword$5$Consumer(rule.getWertGELBKeyword_0_2()); - keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRNKeyword_0_3()); + keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRÜNKeyword_0_3()); keyword$3$Consumer = new Keyword$3$Consumer(rule.getWertROTKeyword_0_0()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getWertBLAUKeyword_0_1()); keyword$5$Consumer = new Keyword$5$Consumer(rule.getWertGELBKeyword_0_2()); - keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRNKeyword_0_3()); + keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRÜNKeyword_0_3()); } @Override diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java index 4934825..28a38a8 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java @@ -348,16 +348,16 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Keyword cWertROTKeyword_0_0 = (Keyword)cWertAlternatives_0.eContents().get(0); private final Keyword cWertBLAUKeyword_0_1 = (Keyword)cWertAlternatives_0.eContents().get(1); private final Keyword cWertGELBKeyword_0_2 = (Keyword)cWertAlternatives_0.eContents().get(2); - private final Keyword cWertGRNKeyword_0_3 = (Keyword)cWertAlternatives_0.eContents().get(3); + private final Keyword cWertGRÜNKeyword_0_3 = (Keyword)cWertAlternatives_0.eContents().get(3); //Farbe: - // wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" ); + // wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ); public ParserRule getRule() { return rule; } - //wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" ) + //wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ) public Assignment getWertAssignment() { return cWertAssignment; } - //"ROT"|"BLAU"|"GELB"|"GR\u2039N" + //"ROT"|"BLAU"|"GELB"|"GR\u00DCN" public Alternatives getWertAlternatives_0() { return cWertAlternatives_0; } //"ROT" @@ -369,8 +369,8 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { //"GELB" public Keyword getWertGELBKeyword_0_2() { return cWertGELBKeyword_0_2; } - //"GR\u2039N" - public Keyword getWertGRNKeyword_0_3() { return cWertGRNKeyword_0_3; } + //"GR\u00DCN" + public Keyword getWertGRÜNKeyword_0_3() { return cWertGRÜNKeyword_0_3; } } public class CustomTypeParserRuleElements implements IParserRuleAccess { @@ -488,7 +488,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { } //Farbe: - // wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" ); + // wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ); public FarbeElements getFarbeAccess() { return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi index c2e4ead..d1bd662 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi @@ -98,9 +98,9 @@ <left value="A"/> <right value="Z"/> </groups> - <groups xsi:type="xtext:Keyword" value="ˆ"/> - <groups xsi:type="xtext:Keyword" value="‰"/> - <groups xsi:type="xtext:Keyword" value="¸"/> + <groups xsi:type="xtext:Keyword" value="ö"/> + <groups xsi:type="xtext:Keyword" value="ä"/> + <groups xsi:type="xtext:Keyword" value="ü"/> <groups xsi:type="xtext:Keyword" value="_"/> </tokens> <tokens xsi:type="xtext:Alternatives" cardinality="*"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi index 467e8ce..4f4d783 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi @@ -226,9 +226,9 @@ <left value="A"/> <right value="Z"/> </groups> - <groups xsi:type="xtext:Keyword" value="ˆ"/> - <groups xsi:type="xtext:Keyword" value="‰"/> - <groups xsi:type="xtext:Keyword" value="¸"/> + <groups xsi:type="xtext:Keyword" value="ö"/> + <groups xsi:type="xtext:Keyword" value="ä"/> + <groups xsi:type="xtext:Keyword" value="ü"/> <groups xsi:type="xtext:Keyword" value="_"/> </tokens> <tokens xsi:type="xtext:Alternatives" cardinality="*"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g index 077ead4..8a29590 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g @@ -804,7 +804,7 @@ ruleAbstractCallExtendedParserRule returns [EObject current=null] RULE_REAL : RULE_INT '.' RULE_INT; -RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'\u02C6'|'\u2030'|'\u00B8'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; +RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'\u00F6'|'\u00E4'|'\u00FC'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java index 4a11c08..78abdca 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java @@ -249,8 +249,8 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:807:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '\\u02C6' | '\\u2030' | '\\u00B8' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:807:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '\\u02C6' | '\\u2030' | '\\u00B8' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:807:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '\\u00F6' | '\\u00E4' | '\\u00FC' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:807:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '\\u00F6' | '\\u00E4' | '\\u00FC' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:807:11: ( '^' )? int alt1=2; @@ -270,7 +270,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } - if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||input.LA(1)=='\u00B8'||input.LA(1)=='\u02C6'||input.LA(1)=='\u2030' ) { + if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||input.LA(1)=='\u00E4'||input.LA(1)=='\u00F6'||input.LA(1)=='\u00FC' ) { input.consume(); } @@ -909,7 +909,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { "\1\145\1\154\1\145\1\154\1\60\1\155\1\60\1\uffff\1\145\1\uffff\1"+ "\156\1\164\1\60\1\uffff"; static final String DFA12_maxS = - "\1\ufffe\1\157\1\uffff\1\166\1\uffff\1\165\1\170\1\71\1\u2030\1"+ + "\1\ufffe\1\157\1\uffff\1\166\1\uffff\1\165\1\170\1\71\1\u00fc\1"+ "\uffff\2\ufffe\1\57\2\uffff\1\144\2\uffff\1\145\1\uffff\1\142\1"+ "\145\1\164\1\uffff\1\71\5\uffff\1\145\2\162\1\155\1\145\1\154\1"+ "\162\1\165\1\145\1\156\1\172\1\151\1\154\1\156\1\144\1\uffff\1\144"+ @@ -927,8 +927,8 @@ public class InternalConcreteTestLanguageLexer extends Lexer { static final String[] DFA12_transitionS = { "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\12\4\16\1\13\5\16\1"+ "\4\1\16\1\14\12\7\1\2\6\16\32\11\3\16\1\10\1\11\1\16\4\11\1"+ - "\6\7\11\1\1\1\11\1\3\3\11\1\5\7\11\75\16\1\11\u020d\16\1\11"+ - "\u1d69\16\1\11\udfce\16", + "\6\7\11\1\1\1\11\1\3\3\11\1\5\7\11\151\16\1\11\21\16\1\11\5"+ + "\16\1\11\uff02\16", "\1\17", "", "\1\22", @@ -936,8 +936,8 @@ public class InternalConcreteTestLanguageLexer extends Lexer { "\1\24", "\1\25\13\uffff\1\26", "\1\31\1\uffff\12\30", - "\32\20\4\uffff\1\20\1\uffff\32\20\75\uffff\1\20\u020d\uffff"+ - "\1\20\u1d69\uffff\1\20", + "\32\20\4\uffff\1\20\1\uffff\32\20\151\uffff\1\20\21\uffff\1"+ + "\20\5\uffff\1\20", "", "\uffff\32", "\uffff\32", diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g index 3986761..c4e3339 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g @@ -22,7 +22,7 @@ T21 : 'extendedmodel' ; RULE_REAL : RULE_INT '.' RULE_INT; // $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 807 -RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'\u02C6'|'\u2030'|'\u00B8'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; +RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'\u00F6'|'\u00E4'|'\u00FC'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; // $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 809 RULE_INT : ('0'..'9')+; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java index 78f32b7..17c3675 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java @@ -70,15 +70,15 @@ public final class AbstractTestLanguageIDConsumer extends AbstractRuleAwareTermi } protected boolean consumeKeyword$10() { - return readChar('\u02C6'); + return readChar('\u00F6'); } protected boolean consumeKeyword$11() { - return readChar('\u2030'); + return readChar('\u00E4'); } protected boolean consumeKeyword$12() { - return readChar('\u00B8'); + return readChar('\u00FC'); } protected boolean consumeKeyword$13() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java index 8433a00..79b8216 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java @@ -258,7 +258,7 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess { } //terminal ID: - // "^" ? ( "a" .. "z" | "A" .. "Z" | "\u02C6" | "\u2030" | "\u00B8" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *; + // "^" ? ( "a" .. "z" | "A" .. "Z" | "\u00F6" | "\u00E4" | "\u00FC" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *; public TerminalRule getIDRule() { return (tID != null) ? tID : (tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID")); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java index 791ac24..dfe418c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java @@ -435,7 +435,7 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess { return getInheritedParserRuleAccess().getRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@d1bc2d (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@f9aaf1 (name: OverridableParserRule) (definesHiddenTokens: false) + //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@456e30 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@f229cd (name: OverridableParserRule) (definesHiddenTokens: false) public AbstractTestLanguageGrammarAccess.AbstractCallOverridenParserRuleElements getAbstractCallOverridenParserRuleAccess() { return gaAbstractTestLanguage.getAbstractCallOverridenParserRuleAccess(); } @@ -444,7 +444,7 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess { return getAbstractCallOverridenParserRuleAccess().getRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@a04054 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@3bbd78 (name: ExtendableParserRule) (definesHiddenTokens: false) + //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@41d249 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@d1f3c3 (name: ExtendableParserRule) (definesHiddenTokens: false) public AbstractTestLanguageGrammarAccess.AbstractCallExtendedParserRuleElements getAbstractCallExtendedParserRuleAccess() { return gaAbstractTestLanguage.getAbstractCallExtendedParserRuleAccess(); } @@ -460,7 +460,7 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess { } //terminal ID: - // "^" ? ( "a" .. "z" | "A" .. "Z" | "\u02C6" | "\u2030" | "\u00B8" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *; + // "^" ? ( "a" .. "z" | "A" .. "Z" | "\u00F6" | "\u00E4" | "\u00FC" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *; public TerminalRule getIDRule() { return gaAbstractTestLanguage.getIDRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index 79099eb..eeaf503 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -99,7 +99,7 @@ <groups xsi:type="xtext:Keyword" value="ROT"/> <groups xsi:type="xtext:Keyword" value="BLAU"/> <groups xsi:type="xtext:Keyword" value="GELB"/> - <groups xsi:type="xtext:Keyword" value="GR‹N"/> + <groups xsi:type="xtext:Keyword" value="GRÜN"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Familie"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java index a361b42..b5a90e2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java @@ -824,11 +824,11 @@ protected class Spielzeug_4_Keyword extends KeywordToken { /************ begin Rule Farbe **************** * * Farbe: - * "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + * "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; * **/ -// "ROT"|"BLAU"|"GELB"|"GR\u2039N" +// "ROT"|"BLAU"|"GELB"|"GR\u00DCN" protected class Farbe_Alternatives extends AlternativesToken { public Farbe_Alternatives(IInstanceDescription curr, AbstractToken pred) { @@ -887,7 +887,7 @@ protected class Farbe_2_Keyword_GELB extends KeywordToken { } } -// "GR\u2039N" +// "GR\u00DCN" protected class Farbe_3_Keyword_GRN extends KeywordToken { public Farbe_3_Keyword_GRN(IInstanceDescription curr, AbstractToken pred) { @@ -895,7 +895,7 @@ protected class Farbe_3_Keyword_GRN extends KeywordToken { } public Keyword getGrammarElement() { - return grammarAccess.getFarbeAccess().getGRNKeyword_3(); + return grammarAccess.getFarbeAccess().getGRÜNKeyword_3(); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g index 7169357..284858d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g @@ -477,9 +477,9 @@ ruleFarbe returns [EObject current=null] createLeafNode(grammarAccess.getFarbeAccess().getGELBKeyword_2(), null); } - |'GR\u2039N' + |'GR\u00DCN' { - createLeafNode(grammarAccess.getFarbeAccess().getGRNKeyword_3(), null); + createLeafNode(grammarAccess.getFarbeAccess().getGRÜNKeyword_3(), null); } ); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens index cf1d15f..309a0d4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens @@ -5,9 +5,9 @@ RULE_INT=4 RULE_STRING=5 RULE_ANY_OTHER=10 RULE_SL_COMMENT=8 +'GR\u00DCN'=22 'ROT'=19 'spielzeug'=18 -'GR\u2039N'=22 'spielplatz'=11 ')'=16 'kind'=14 diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java index feaef23..c0d8836 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java @@ -250,10 +250,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer { public final void mT22() throws RecognitionException { try { int _type = T22; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GR\\u2039N' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GR\\u2039N' + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GR\\u00DCN' ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GR\\u00DCN' { - match("GR\u2039N"); + match("GR\u00DCN"); } @@ -1156,7 +1156,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer { { int LA12_33 = input.LA(3); - if ( (LA12_33=='\u2039') ) { + if ( (LA12_33=='\u00DC') ) { alt12=12; } else { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java index 5d0a097..b560176 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java @@ -23,7 +23,7 @@ import java.util.ArrayList; public class InternalReferenceGrammarTestLanguageParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u2039N'", "'familie'", "'keyword'", "','" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u00DCN'", "'familie'", "'keyword'", "','" }; public static final int RULE_ML_COMMENT=7; public static final int RULE_ID=6; @@ -825,17 +825,17 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal // $ANTLR start ruleFarbe - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:459:1: ruleFarbe returns [EObject current=null] : ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ; + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:459:1: ruleFarbe returns [EObject current=null] : ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:464:6: ( ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:464:6: ( ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) int alt4=4; switch ( input.LA(1) ) { case 19: @@ -860,7 +860,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal break; default: NoViableAltException nvae = - new NoViableAltException("465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )", 4, 0, input); + new NoViableAltException("465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )", 4, 0, input); throw nvae; } @@ -897,11 +897,11 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal } break; case 4 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:480:6: 'GR\\u2039N' + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:480:6: 'GR\\u00DCN' { match(input,22,FOLLOW_22_in_ruleFarbe965); - createLeafNode(grammarAccess.getFarbeAccess().getGRNKeyword_3(), null); + createLeafNode(grammarAccess.getFarbeAccess().getGRÜNKeyword_3(), null); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g index b501aab..662d950 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g @@ -18,7 +18,7 @@ T18 : 'spielzeug' ; T19 : 'ROT' ; T20 : 'BLAU' ; T21 : 'GELB' ; -T22 : 'GR\u2039N' ; +T22 : 'GR\u00DCN' ; T23 : 'familie' ; T24 : 'keyword' ; T25 : ',' ; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java index be59630..8f869bf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java @@ -126,7 +126,7 @@ public final class ReferenceGrammarTestLanguageFarbeConsumer extends NonTerminal keyword$2$Consumer = new Keyword$2$Consumer(rule.getROTKeyword_0()); keyword$3$Consumer = new Keyword$3$Consumer(rule.getBLAUKeyword_1()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getGELBKeyword_2()); - keyword$5$Consumer = new Keyword$5$Consumer(rule.getGRNKeyword_3()); + keyword$5$Consumer = new Keyword$5$Consumer(rule.getGRÜNKeyword_3()); } @Override diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java index 0cffddb..5f55786 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java @@ -239,13 +239,13 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess private final Keyword cROTKeyword_0 = (Keyword)cAlternatives.eContents().get(0); private final Keyword cBLAUKeyword_1 = (Keyword)cAlternatives.eContents().get(1); private final Keyword cGELBKeyword_2 = (Keyword)cAlternatives.eContents().get(2); - private final Keyword cGRNKeyword_3 = (Keyword)cAlternatives.eContents().get(3); + private final Keyword cGRÜNKeyword_3 = (Keyword)cAlternatives.eContents().get(3); //Farbe: - // "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + // "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; public ParserRule getRule() { return rule; } - //"ROT"|"BLAU"|"GELB"|"GR\u2039N" + //"ROT"|"BLAU"|"GELB"|"GR\u00DCN" public Alternatives getAlternatives() { return cAlternatives; } //"ROT" @@ -257,8 +257,8 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess //"GELB" public Keyword getGELBKeyword_2() { return cGELBKeyword_2; } - //"GR\u2039N" - public Keyword getGRNKeyword_3() { return cGRNKeyword_3; } + //"GR\u00DCN" + public Keyword getGRÜNKeyword_3() { return cGRÜNKeyword_3; } } public class FamilieElements implements IParserRuleAccess { @@ -441,7 +441,7 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess } //Farbe: - // "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + // "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; public FarbeElements getFarbeAccess() { return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements()); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext index dd0e13b..9080912 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext @@ -17,16 +17,10 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_classifier(TypeRef this): - allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_classifier(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_usedGrammars(Grammar this): - allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_hiddenTokens(ParserRule this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_hiddenTokens(Grammar this): @@ -35,16 +29,28 @@ List[IScopedElement] scope_hiddenTokens(Grammar this): List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_classifier(TypeRef this): + allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_classifier(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + List[IScopedElement] scope_metamodel(TypeRef this): allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_metamodel(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(ParserRule this): +List[IScopedElement] scope_usedGrammars(Grammar this): + allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_usedGrammars(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_rule(RuleCall this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): @@ -53,9 +59,3 @@ List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): List[IScopedElement] scope_ePackage(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(RuleCall this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_rule(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi index c2e4ead..d1bd662 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi @@ -98,9 +98,9 @@ <left value="A"/> <right value="Z"/> </groups> - <groups xsi:type="xtext:Keyword" value="ˆ"/> - <groups xsi:type="xtext:Keyword" value="‰"/> - <groups xsi:type="xtext:Keyword" value="¸"/> + <groups xsi:type="xtext:Keyword" value="ö"/> + <groups xsi:type="xtext:Keyword" value="ä"/> + <groups xsi:type="xtext:Keyword" value="ü"/> <groups xsi:type="xtext:Keyword" value="_"/> </tokens> <tokens xsi:type="xtext:Alternatives" cardinality="*"> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java index 78f32b7..17c3675 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java @@ -70,15 +70,15 @@ public final class AbstractTestLanguageIDConsumer extends AbstractRuleAwareTermi } protected boolean consumeKeyword$10() { - return readChar('\u02C6'); + return readChar('\u00F6'); } protected boolean consumeKeyword$11() { - return readChar('\u2030'); + return readChar('\u00E4'); } protected boolean consumeKeyword$12() { - return readChar('\u00B8'); + return readChar('\u00FC'); } protected boolean consumeKeyword$13() { diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java index 8433a00..79b8216 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java @@ -258,7 +258,7 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess { } //terminal ID: - // "^" ? ( "a" .. "z" | "A" .. "Z" | "\u02C6" | "\u2030" | "\u00B8" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *; + // "^" ? ( "a" .. "z" | "A" .. "Z" | "\u00F6" | "\u00E4" | "\u00FC" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *; public TerminalRule getIDRule() { return (tID != null) ? tID : (tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID")); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext index ba1f41a..e112e8f 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext @@ -16,10 +16,10 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_vater(Familie this): - allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_kinder(Familie this): + allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_vater(emf::EObject this) : +List[IScopedElement] scope_kinder(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_mutter(Familie this): @@ -28,9 +28,9 @@ List[IScopedElement] scope_mutter(Familie this): List[IScopedElement] scope_mutter(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_kinder(Familie this): - allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_vater(Familie this): + allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_kinder(emf::EObject this) : +List[IScopedElement] scope_vater(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index 79099eb..eeaf503 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -99,7 +99,7 @@ <groups xsi:type="xtext:Keyword" value="ROT"/> <groups xsi:type="xtext:Keyword" value="BLAU"/> <groups xsi:type="xtext:Keyword" value="GELB"/> - <groups xsi:type="xtext:Keyword" value="GR‹N"/> + <groups xsi:type="xtext:Keyword" value="GRÜN"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Familie"> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java index a361b42..b5a90e2 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java @@ -824,11 +824,11 @@ protected class Spielzeug_4_Keyword extends KeywordToken { /************ begin Rule Farbe **************** * * Farbe: - * "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + * "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; * **/ -// "ROT"|"BLAU"|"GELB"|"GR\u2039N" +// "ROT"|"BLAU"|"GELB"|"GR\u00DCN" protected class Farbe_Alternatives extends AlternativesToken { public Farbe_Alternatives(IInstanceDescription curr, AbstractToken pred) { @@ -887,7 +887,7 @@ protected class Farbe_2_Keyword_GELB extends KeywordToken { } } -// "GR\u2039N" +// "GR\u00DCN" protected class Farbe_3_Keyword_GRN extends KeywordToken { public Farbe_3_Keyword_GRN(IInstanceDescription curr, AbstractToken pred) { @@ -895,7 +895,7 @@ protected class Farbe_3_Keyword_GRN extends KeywordToken { } public Keyword getGrammarElement() { - return grammarAccess.getFarbeAccess().getGRNKeyword_3(); + return grammarAccess.getFarbeAccess().getGRÜNKeyword_3(); } } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g index 7169357..284858d 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g @@ -477,9 +477,9 @@ ruleFarbe returns [EObject current=null] createLeafNode(grammarAccess.getFarbeAccess().getGELBKeyword_2(), null); } - |'GR\u2039N' + |'GR\u00DCN' { - createLeafNode(grammarAccess.getFarbeAccess().getGRNKeyword_3(), null); + createLeafNode(grammarAccess.getFarbeAccess().getGRÜNKeyword_3(), null); } ); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens index cf1d15f..309a0d4 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens @@ -5,9 +5,9 @@ RULE_INT=4 RULE_STRING=5 RULE_ANY_OTHER=10 RULE_SL_COMMENT=8 +'GR\u00DCN'=22 'ROT'=19 'spielzeug'=18 -'GR\u2039N'=22 'spielplatz'=11 ')'=16 'kind'=14 diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java index 63b7890..5f3d4e2 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java @@ -250,10 +250,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer { public final void mT22() throws RecognitionException { try { int _type = T22; - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GR\\u2039N' ) - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GR\\u2039N' + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GR\\u00DCN' ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GR\\u00DCN' { - match("GR\u2039N"); + match("GR\u00DCN"); } @@ -1156,7 +1156,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer { { int LA12_33 = input.LA(3); - if ( (LA12_33=='\u2039') ) { + if ( (LA12_33=='\u00DC') ) { alt12=12; } else { diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java index 717e767..f883dd1 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java @@ -23,7 +23,7 @@ import java.util.ArrayList; public class InternalReferenceGrammarTestLanguageParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u2039N'", "'familie'", "'keyword'", "','" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u00DCN'", "'familie'", "'keyword'", "','" }; public static final int RULE_ML_COMMENT=7; public static final int RULE_ID=6; @@ -825,17 +825,17 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal // $ANTLR start ruleFarbe - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:459:1: ruleFarbe returns [EObject current=null] : ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ; + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:459:1: ruleFarbe returns [EObject current=null] : ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:464:6: ( ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:464:6: ( ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) { - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) int alt4=4; switch ( input.LA(1) ) { case 19: @@ -860,7 +860,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal break; default: NoViableAltException nvae = - new NoViableAltException("465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )", 4, 0, input); + new NoViableAltException("465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )", 4, 0, input); throw nvae; } @@ -897,11 +897,11 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal } break; case 4 : - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:480:6: 'GR\\u2039N' + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:480:6: 'GR\\u00DCN' { match(input,22,FOLLOW_22_in_ruleFarbe965); - createLeafNode(grammarAccess.getFarbeAccess().getGRNKeyword_3(), null); + createLeafNode(grammarAccess.getFarbeAccess().getGRÜNKeyword_3(), null); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g index 0e9b673..bc05939 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g @@ -18,7 +18,7 @@ T18 : 'spielzeug' ; T19 : 'ROT' ; T20 : 'BLAU' ; T21 : 'GELB' ; -T22 : 'GR\u2039N' ; +T22 : 'GR\u00DCN' ; T23 : 'familie' ; T24 : 'keyword' ; T25 : ',' ; diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java index be59630..8f869bf 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java @@ -126,7 +126,7 @@ public final class ReferenceGrammarTestLanguageFarbeConsumer extends NonTerminal keyword$2$Consumer = new Keyword$2$Consumer(rule.getROTKeyword_0()); keyword$3$Consumer = new Keyword$3$Consumer(rule.getBLAUKeyword_1()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getGELBKeyword_2()); - keyword$5$Consumer = new Keyword$5$Consumer(rule.getGRNKeyword_3()); + keyword$5$Consumer = new Keyword$5$Consumer(rule.getGRÜNKeyword_3()); } @Override diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java index 0cffddb..5f55786 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java @@ -239,13 +239,13 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess private final Keyword cROTKeyword_0 = (Keyword)cAlternatives.eContents().get(0); private final Keyword cBLAUKeyword_1 = (Keyword)cAlternatives.eContents().get(1); private final Keyword cGELBKeyword_2 = (Keyword)cAlternatives.eContents().get(2); - private final Keyword cGRNKeyword_3 = (Keyword)cAlternatives.eContents().get(3); + private final Keyword cGRÜNKeyword_3 = (Keyword)cAlternatives.eContents().get(3); //Farbe: - // "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + // "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; public ParserRule getRule() { return rule; } - //"ROT"|"BLAU"|"GELB"|"GR\u2039N" + //"ROT"|"BLAU"|"GELB"|"GR\u00DCN" public Alternatives getAlternatives() { return cAlternatives; } //"ROT" @@ -257,8 +257,8 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess //"GELB" public Keyword getGELBKeyword_2() { return cGELBKeyword_2; } - //"GR\u2039N" - public Keyword getGRNKeyword_3() { return cGRNKeyword_3; } + //"GR\u00DCN" + public Keyword getGRÜNKeyword_3() { return cGRÜNKeyword_3; } } public class FamilieElements implements IParserRuleAccess { @@ -441,7 +441,7 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess } //Farbe: - // "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + // "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; public FarbeElements getFarbeAccess() { return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements()); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext index 1bc87fb..1175afd 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext @@ -23,16 +23,16 @@ List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): List[IScopedElement] scope_ePackage(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(Grammar this): - allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_hiddenTokens(ParserRule this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_classifier(TypeRef this): - allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_hiddenTokens(Grammar this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_classifier(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_rule(RuleCall this): @@ -41,16 +41,16 @@ List[IScopedElement] scope_rule(RuleCall this): List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(ParserRule this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_classifier(TypeRef this): + allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_classifier(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(Grammar this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_usedGrammars(Grammar this): + allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_usedGrammars(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_metamodel(TypeRef this): diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext index efbcf20..7948696 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext @@ -16,6 +16,12 @@ extension org::eclipse::xtend::util::stdlib::io; */ +List[IScopedElement] scope_mutter(Familie this): + allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_mutter(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + List[IScopedElement] scope_kinder(Familie this): allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x)); @@ -28,9 +34,3 @@ List[IScopedElement] scope_vater(Familie this): List[IScopedElement] scope_vater(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_mutter(Familie this): - allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_mutter(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index 79099eb..eeaf503 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -99,7 +99,7 @@ <groups xsi:type="xtext:Keyword" value="ROT"/> <groups xsi:type="xtext:Keyword" value="BLAU"/> <groups xsi:type="xtext:Keyword" value="GELB"/> - <groups xsi:type="xtext:Keyword" value="GR‹N"/> + <groups xsi:type="xtext:Keyword" value="GRÜN"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Familie"> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java index a361b42..b5a90e2 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java @@ -824,11 +824,11 @@ protected class Spielzeug_4_Keyword extends KeywordToken { /************ begin Rule Farbe **************** * * Farbe: - * "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + * "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; * **/ -// "ROT"|"BLAU"|"GELB"|"GR\u2039N" +// "ROT"|"BLAU"|"GELB"|"GR\u00DCN" protected class Farbe_Alternatives extends AlternativesToken { public Farbe_Alternatives(IInstanceDescription curr, AbstractToken pred) { @@ -887,7 +887,7 @@ protected class Farbe_2_Keyword_GELB extends KeywordToken { } } -// "GR\u2039N" +// "GR\u00DCN" protected class Farbe_3_Keyword_GRN extends KeywordToken { public Farbe_3_Keyword_GRN(IInstanceDescription curr, AbstractToken pred) { @@ -895,7 +895,7 @@ protected class Farbe_3_Keyword_GRN extends KeywordToken { } public Keyword getGrammarElement() { - return grammarAccess.getFarbeAccess().getGRNKeyword_3(); + return grammarAccess.getFarbeAccess().getGRÜNKeyword_3(); } } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g index 7169357..284858d 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g @@ -477,9 +477,9 @@ ruleFarbe returns [EObject current=null] createLeafNode(grammarAccess.getFarbeAccess().getGELBKeyword_2(), null); } - |'GR\u2039N' + |'GR\u00DCN' { - createLeafNode(grammarAccess.getFarbeAccess().getGRNKeyword_3(), null); + createLeafNode(grammarAccess.getFarbeAccess().getGRÜNKeyword_3(), null); } ); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens index cf1d15f..309a0d4 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens @@ -5,9 +5,9 @@ RULE_INT=4 RULE_STRING=5 RULE_ANY_OTHER=10 RULE_SL_COMMENT=8 +'GR\u00DCN'=22 'ROT'=19 'spielzeug'=18 -'GR\u2039N'=22 'spielplatz'=11 ')'=16 'kind'=14 diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java index 5baa103..2c1fedb 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java @@ -250,10 +250,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer { public final void mT22() throws RecognitionException { try { int _type = T22; - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GR\\u2039N' ) - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GR\\u2039N' + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GR\\u00DCN' ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GR\\u00DCN' { - match("GR\u2039N"); + match("GR\u00DCN"); } @@ -1156,7 +1156,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer { { int LA12_33 = input.LA(3); - if ( (LA12_33=='\u2039') ) { + if ( (LA12_33=='\u00DC') ) { alt12=12; } else { diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java index 099e983..9e8d913 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java @@ -23,7 +23,7 @@ import java.util.ArrayList; public class InternalReferenceGrammarTestLanguageParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u2039N'", "'familie'", "'keyword'", "','" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u00DCN'", "'familie'", "'keyword'", "','" }; public static final int RULE_ML_COMMENT=7; public static final int RULE_ID=6; @@ -825,17 +825,17 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal // $ANTLR start ruleFarbe - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:459:1: ruleFarbe returns [EObject current=null] : ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ; + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:459:1: ruleFarbe returns [EObject current=null] : ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:464:6: ( ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:464:6: ( ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) { - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) int alt4=4; switch ( input.LA(1) ) { case 19: @@ -860,7 +860,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal break; default: NoViableAltException nvae = - new NoViableAltException("465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )", 4, 0, input); + new NoViableAltException("465:1: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )", 4, 0, input); throw nvae; } @@ -897,11 +897,11 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractInternal } break; case 4 : - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:480:6: 'GR\\u2039N' + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g:480:6: 'GR\\u00DCN' { match(input,22,FOLLOW_22_in_ruleFarbe965); - createLeafNode(grammarAccess.getFarbeAccess().getGRNKeyword_3(), null); + createLeafNode(grammarAccess.getFarbeAccess().getGRÜNKeyword_3(), null); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g index 1835da7..e7b676a 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g @@ -18,7 +18,7 @@ T18 : 'spielzeug' ; T19 : 'ROT' ; T20 : 'BLAU' ; T21 : 'GELB' ; -T22 : 'GR\u2039N' ; +T22 : 'GR\u00DCN' ; T23 : 'familie' ; T24 : 'keyword' ; T25 : ',' ; diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java index be59630..8f869bf 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java @@ -126,7 +126,7 @@ public final class ReferenceGrammarTestLanguageFarbeConsumer extends NonTerminal keyword$2$Consumer = new Keyword$2$Consumer(rule.getROTKeyword_0()); keyword$3$Consumer = new Keyword$3$Consumer(rule.getBLAUKeyword_1()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getGELBKeyword_2()); - keyword$5$Consumer = new Keyword$5$Consumer(rule.getGRNKeyword_3()); + keyword$5$Consumer = new Keyword$5$Consumer(rule.getGRÜNKeyword_3()); } @Override diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java index 0cffddb..5f55786 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java @@ -239,13 +239,13 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess private final Keyword cROTKeyword_0 = (Keyword)cAlternatives.eContents().get(0); private final Keyword cBLAUKeyword_1 = (Keyword)cAlternatives.eContents().get(1); private final Keyword cGELBKeyword_2 = (Keyword)cAlternatives.eContents().get(2); - private final Keyword cGRNKeyword_3 = (Keyword)cAlternatives.eContents().get(3); + private final Keyword cGRÜNKeyword_3 = (Keyword)cAlternatives.eContents().get(3); //Farbe: - // "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + // "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; public ParserRule getRule() { return rule; } - //"ROT"|"BLAU"|"GELB"|"GR\u2039N" + //"ROT"|"BLAU"|"GELB"|"GR\u00DCN" public Alternatives getAlternatives() { return cAlternatives; } //"ROT" @@ -257,8 +257,8 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess //"GELB" public Keyword getGELBKeyword_2() { return cGELBKeyword_2; } - //"GR\u2039N" - public Keyword getGRNKeyword_3() { return cGRNKeyword_3; } + //"GR\u00DCN" + public Keyword getGRÜNKeyword_3() { return cGRÜNKeyword_3; } } public class FamilieElements implements IParserRuleAccess { @@ -441,7 +441,7 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess } //Farbe: - // "ROT"|"BLAU"|"GELB"|"GR\u2039N"; + // "ROT"|"BLAU"|"GELB"|"GR\u00DCN"; public FarbeElements getFarbeAccess() { return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements()); } |