| author | meysholdt | 2009-04-02 06:42:54 (EDT) |
|---|---|---|
| committer | sefftinge | 2009-04-02 06:42:54 (EDT) |
| commit | b52611c5955b2be740cfb5115e6c96d0b28f80ab (patch) (side-by-side diff) | |
| tree | f356ff5d3547c582ab19f24f587d39a3021b1c8a | |
| parent | a9ff67032c759d0a597067a2b377e8199e56a7d5 (diff) | |
| download | org.eclipse.xtext-b52611c5955b2be740cfb5115e6c96d0b28f80ab.zip org.eclipse.xtext-b52611c5955b2be740cfb5115e6c96d0b28f80ab.tar.gz org.eclipse.xtext-b52611c5955b2be740cfb5115e6c96d0b28f80ab.tar.bz2 | |
Added support for Actions without assignment in the serializer and fixed the cases of filenames of some .chk files
130 files changed, 521 insertions, 473 deletions
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 5f04e84..82fc11d 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 @@ -544,7 +544,8 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java index 9534380..422d1e7 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java @@ -768,7 +768,8 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java index 307bd4e..9fdce6a 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java @@ -1925,7 +1925,8 @@ public class EcoreDslGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoredslChecks.chk b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslChecks.chk index 2dbb59a..2dbb59a 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoredslChecks.chk +++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslChecks.chk diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java index 7e31deb..609749e 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java @@ -351,7 +351,8 @@ public class FowlerDslGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerdslChecks.chk b/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDslChecks.chk index c13de26..c13de26 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerdslChecks.chk +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDslChecks.chk diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/services/LazyLinkingTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/services/LazyLinkingTestLanguageGrammarAccess.java index c3934a7..819163e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/services/LazyLinkingTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/services/LazyLinkingTestLanguageGrammarAccess.java @@ -269,7 +269,8 @@ public class LazyLinkingTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java index 961fac5..87e1824 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java @@ -201,7 +201,8 @@ public class ImportUriTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java index 0e550b1..1ec90a1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java @@ -201,7 +201,8 @@ public class LangATestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java index b4266c0..4be72cc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java @@ -158,7 +158,8 @@ public class DummyTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java index c03df87..1e2f9c1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java @@ -229,7 +229,8 @@ public class EnumRulesTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/lowerCaseNamedTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/lowerCaseNamedTestLanguageGrammarAccess.java index 02b66d6..d2944e7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/lowerCaseNamedTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/lowerCaseNamedTestLanguageGrammarAccess.java @@ -103,7 +103,8 @@ public class lowerCaseNamedTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } 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 85ff520..bb266d9 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 @@ -294,7 +294,8 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java index 4d25300..066b9de 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java @@ -111,7 +111,8 @@ public class BaseInheritanceTestLanguageGrammarAccess implements IGrammarAccess return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } 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 c2ae1c9..21d0bda 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 @@ -436,7 +436,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@ec4d16 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@2eb8e3 (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@1aea0e (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@b25809 (name: OverridableParserRule) (definesHiddenTokens: false) public AbstractTestLanguageGrammarAccess.AbstractCallOverridenParserRuleElements getAbstractCallOverridenParserRuleAccess() { return gaAbstractTestLanguage.getAbstractCallOverridenParserRuleAccess(); } @@ -445,7 +445,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@f30d89 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@f7ced8 (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@4fc11d (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@d22f35 (name: ExtendableParserRule) (definesHiddenTokens: false) public AbstractTestLanguageGrammarAccess.AbstractCallExtendedParserRuleElements getAbstractCallExtendedParserRuleAccess() { return gaAbstractTestLanguage.getAbstractCallExtendedParserRuleAccess(); } @@ -496,7 +496,8 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess { return gaAbstractTestLanguage.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaAbstractTestLanguage.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java index 0c3bdb7..679a643 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java @@ -162,7 +162,8 @@ public class InheritanceTestLanguageGrammarAccess implements IGrammarAccess { return gaBaseInheritanceTestLanguage.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaBaseInheritanceTestLanguage.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java index c1c9457..018a8dc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java @@ -173,7 +173,8 @@ public class MetamodelRefTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java index 30db3a4..0b6942d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java @@ -142,7 +142,8 @@ public class MultiGenMMTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java index 2646121..a344ece 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java @@ -1702,12 +1702,12 @@ protected class Alternatives_1_0_Action_Alternatives_groups extends ActionToken @Override public Action getGrammarElement() { - return grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -1886,12 +1886,12 @@ protected class Group_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -2976,12 +2976,12 @@ protected class AssignableAlternatives_1_0_Action_Alternatives_groups extends Ac @Override public Action getGrammarElement() { - return grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -3518,12 +3518,12 @@ protected class CrossReferenceableAlternatives_1_0_Action_Alternatives_groups ex @Override public Action getGrammarElement() { - return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4012,12 +4012,12 @@ protected class TerminalAlternatives_1_0_Action_Alternatives_groups extends Acti @Override public Action getGrammarElement() { - return grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4196,12 +4196,12 @@ protected class TerminalGroup_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -4832,7 +4832,7 @@ protected class Wildcard_Group extends GroupToken { protected Solution createSolution() { Solution s1 = new Wildcard_1_Keyword(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new Wildcard_0_Action_Wildcard_null(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new Wildcard_0_Action_Wildcard(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 != null) { last = s2.getPredecessor(); return s2; @@ -4845,24 +4845,22 @@ protected class Wildcard_Group extends GroupToken { } // {Wildcard} -protected class Wildcard_0_Action_Wildcard_null extends ActionToken { +protected class Wildcard_0_Action_Wildcard extends ActionToken { - public Wildcard_0_Action_Wildcard_null(IInstanceDescription curr, AbstractToken pred) { + public Wildcard_0_Action_Wildcard(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Action getGrammarElement() { - return grammarAccess.getWildcardAccess().getWildcardnullAction_0(); + return grammarAccess.getWildcardAccess().getWildcardAction_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier())) return null; - Object val = current.getConsumable("", false); - if(val == null) return null; - if(!current.isConsumedWithLastConsumtion("")) return null; - return new Solution(getDescr((EObject)val)); + if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier())) return null; + if(!current.isConsumed()) return null; + return new Solution(current); } } @@ -4978,12 +4976,12 @@ protected class CharacterRange_1_0_Action_CharacterRange_left extends ActionToke @Override public Action getGrammarElement() { - return grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(); + return grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("left", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("left")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g index 8f38e3e..3202701 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g @@ -778,7 +778,7 @@ ruleAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -786,7 +786,7 @@ ruleAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -849,7 +849,7 @@ ruleGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -857,7 +857,7 @@ ruleGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1458,7 +1458,7 @@ ruleAssignableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1466,7 +1466,7 @@ ruleAssignableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1692,7 +1692,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1700,7 +1700,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1900,7 +1900,7 @@ ruleTerminalAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1908,7 +1908,7 @@ ruleTerminalAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1971,7 +1971,7 @@ ruleTerminalGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1979,7 +1979,7 @@ ruleTerminalGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2333,10 +2333,10 @@ ruleWildcard returns [EObject current=null] }: (( { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2378,7 +2378,7 @@ ruleCharacterRange returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -2386,7 +2386,7 @@ ruleCharacterRange returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index 403ea82..3f7e9f1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -1667,7 +1667,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:780:5: { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1675,7 +1675,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1851,7 +1851,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:851:5: { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1859,7 +1859,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3391,7 +3391,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1460:5: { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3399,7 +3399,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3977,7 +3977,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1694:5: { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3985,7 +3985,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4439,7 +4439,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1902:5: { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4447,7 +4447,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4623,7 +4623,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1973:5: { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4631,7 +4631,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5570,10 +5570,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2335:5: { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5688,7 +5688,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2380:5: { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -5696,7 +5696,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java index d5ef255..03e5229 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java @@ -373,7 +373,8 @@ public class DatatypeRulesTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java index c74c034..169a559 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java @@ -1814,7 +1814,8 @@ public class EpatchTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java index 232a890..9bfcf95 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java @@ -131,7 +131,8 @@ public class KeywordsTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java index 619d3d4..451f530 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java index 67036e4..d28e818 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageAssignableAlternativesConsumer extend group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAssignableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java index 28e4659..2db129b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java @@ -151,7 +151,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getKeywordParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeleftAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeLeftAction_1_0()); keyword$6$Consumer = new Keyword$6$Consumer(rule.getFullStopFullStopKeyword_1_1()); assignment$7$Consumer = new Assignment$7$Consumer(rule.getRightAssignment_1_2()); ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getRightKeywordParserRuleCall_1_2_0()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java index c52d473..e11d71f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageCrossReferenceableAlternativesConsume group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getCrossReferenceableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java index b87250d..efa4e0b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAbstractTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensAbstractTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java index f2c4a90..bb2b1b6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java index 56bb812..929ae71 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensTerminalTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java index 0792fb8..48ccec8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java @@ -86,7 +86,7 @@ public final class XtextGrammarTestLanguageWildcardConsumer extends NonTerminalC this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.getGroup()); - action$2$Consumer = new Action$2$Consumer(rule.getWildcardnullAction_0()); + action$2$Consumer = new Action$2$Consumer(rule.getWildcardAction_0()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getFullStopKeyword_1()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java index 6a4d740..ca4bacf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java @@ -1702,12 +1702,12 @@ protected class Alternatives_1_0_Action_Alternatives_groups extends ActionToken @Override public Action getGrammarElement() { - return grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -1886,12 +1886,12 @@ protected class Group_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -2976,12 +2976,12 @@ protected class AssignableAlternatives_1_0_Action_Alternatives_groups extends Ac @Override public Action getGrammarElement() { - return grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -3518,12 +3518,12 @@ protected class CrossReferenceableAlternatives_1_0_Action_Alternatives_groups ex @Override public Action getGrammarElement() { - return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4012,12 +4012,12 @@ protected class TerminalAlternatives_1_0_Action_Alternatives_groups extends Acti @Override public Action getGrammarElement() { - return grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4196,12 +4196,12 @@ protected class TerminalGroup_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -4832,7 +4832,7 @@ protected class Wildcard_Group extends GroupToken { protected Solution createSolution() { Solution s1 = new Wildcard_1_Keyword(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new Wildcard_0_Action_Wildcard_null(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new Wildcard_0_Action_Wildcard(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 != null) { last = s2.getPredecessor(); return s2; @@ -4845,24 +4845,22 @@ protected class Wildcard_Group extends GroupToken { } // {Wildcard} -protected class Wildcard_0_Action_Wildcard_null extends ActionToken { +protected class Wildcard_0_Action_Wildcard extends ActionToken { - public Wildcard_0_Action_Wildcard_null(IInstanceDescription curr, AbstractToken pred) { + public Wildcard_0_Action_Wildcard(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Action getGrammarElement() { - return grammarAccess.getWildcardAccess().getWildcardnullAction_0(); + return grammarAccess.getWildcardAccess().getWildcardAction_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier())) return null; - Object val = current.getConsumable("", false); - if(val == null) return null; - if(!current.isConsumedWithLastConsumtion("")) return null; - return new Solution(getDescr((EObject)val)); + if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier())) return null; + if(!current.isConsumed()) return null; + return new Solution(current); } } @@ -4978,12 +4976,12 @@ protected class CharacterRange_1_0_Action_CharacterRange_left extends ActionToke @Override public Action getGrammarElement() { - return grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(); + return grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("left", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("left")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g index 38eafdc..1216fcb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g @@ -778,7 +778,7 @@ ruleAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -786,7 +786,7 @@ ruleAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -849,7 +849,7 @@ ruleGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -857,7 +857,7 @@ ruleGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1458,7 +1458,7 @@ ruleAssignableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1466,7 +1466,7 @@ ruleAssignableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1692,7 +1692,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1700,7 +1700,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1900,7 +1900,7 @@ ruleTerminalAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1908,7 +1908,7 @@ ruleTerminalAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1971,7 +1971,7 @@ ruleTerminalGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1979,7 +1979,7 @@ ruleTerminalGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2333,10 +2333,10 @@ ruleWildcard returns [EObject current=null] }: (( { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2378,7 +2378,7 @@ ruleCharacterRange returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -2386,7 +2386,7 @@ ruleCharacterRange returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java index 9a83948..09b62d9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java @@ -1667,7 +1667,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:780:5: { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1675,7 +1675,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1851,7 +1851,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:851:5: { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1859,7 +1859,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3391,7 +3391,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1460:5: { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3399,7 +3399,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3977,7 +3977,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1694:5: { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3985,7 +3985,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4439,7 +4439,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1902:5: { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4447,7 +4447,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4623,7 +4623,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1973:5: { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4631,7 +4631,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5570,10 +5570,10 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2335:5: { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5688,7 +5688,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2380:5: { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -5696,7 +5696,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java index 1724c85..e37c62e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignableAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignableAlternativesConsumer.java index 268bf15..49df4a6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextTerminalsTestLanguageAssignableAlternativesConsumer exte group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAssignableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java index a37c710..6bbe820 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java @@ -151,7 +151,7 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getKeywordParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeleftAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeLeftAction_1_0()); keyword$6$Consumer = new Keyword$6$Consumer(rule.getFullStopFullStopKeyword_1_1()); assignment$7$Consumer = new Assignment$7$Consumer(rule.getRightAssignment_1_2()); ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getRightKeywordParserRuleCall_1_2_0()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceableAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceableAlternativesConsumer.java index 290dbb3..951229c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextTerminalsTestLanguageCrossReferenceableAlternativesConsu group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getCrossReferenceableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java index bb6663b..2f5b9f6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextTerminalsTestLanguageGroupConsumer extends NonTerminalCo group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAbstractTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensAbstractTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java index f7e5923..e69cb7e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextTerminalsTestLanguageTerminalAlternativesConsumer extend group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java index e7fefe6..f58e2c5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextTerminalsTestLanguageTerminalGroupConsumer extends NonTe group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensTerminalTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java index 784fa44..9457977 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java @@ -86,7 +86,7 @@ public final class XtextTerminalsTestLanguageWildcardConsumer extends NonTermina this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.getGroup()); - action$2$Consumer = new Action$2$Consumer(rule.getWildcardnullAction_0()); + action$2$Consumer = new Action$2$Consumer(rule.getWildcardAction_0()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getFullStopKeyword_1()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java index 4d930bf..88d8520 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java @@ -499,7 +499,8 @@ public class HiddenTerminalsTestLanguageGrammarAccess implements IGrammarAccess return (tWS != null) ? tWS : (tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS")); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return (tANY_OTHER != null) ? tANY_OTHER : (tANY_OTHER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANY_OTHER")); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java index aceaf52..5a80d0f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java @@ -153,7 +153,8 @@ public class TerminalRulesTestLanguageGrammarAccess implements IGrammarAccess { return (tWS != null) ? tWS : (tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS")); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return (tANY_OTHER != null) ? tANY_OTHER : (tANY_OTHER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANY_OTHER")); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java index 42008c9..6adfdeb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java @@ -473,7 +473,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -493,7 +493,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=Group)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -513,7 +513,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAbstractTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -531,7 +531,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=AbstractToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -833,7 +833,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAssignableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -853,7 +853,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=AssignableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -965,7 +965,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cCrossReferenceableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -985,7 +985,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=CrossReferenceableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1085,7 +1085,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -1105,7 +1105,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=TerminalGroup)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1125,7 +1125,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -1143,7 +1143,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=TerminalToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -1315,7 +1315,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public class WildcardElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Wildcard"); private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cWildcardnullAction_0 = (Action)cGroup.eContents().get(0); + private final Action cWildcardAction_0 = (Action)cGroup.eContents().get(0); private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); //Wildcard: @@ -1326,7 +1326,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup() { return cGroup; } //{Wildcard} - public Action getWildcardnullAction_0() { return cWildcardnullAction_0; } + public Action getWildcardAction_0() { return cWildcardAction_0; } //"." public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } @@ -1337,7 +1337,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cKeywordParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cCharacterRangeleftAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cCharacterRangeLeftAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Keyword cFullStopFullStopKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1); private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2); private final RuleCall cRightKeywordParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0); @@ -1356,7 +1356,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{CharacterRange.left=current} - public Action getCharacterRangeleftAction_1_0() { return cCharacterRangeleftAction_1_0; } + public Action getCharacterRangeLeftAction_1_0() { return cCharacterRangeLeftAction_1_0; } //".." public Keyword getFullStopFullStopKeyword_1_1() { return cFullStopFullStopKeyword_1_1; } @@ -1822,7 +1822,8 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { return (tWS != null) ? tWS : (tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS")); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return (tANY_OTHER != null) ? tANY_OTHER : (tANY_OTHER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANY_OTHER")); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java index 1810014..b951119 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java @@ -248,7 +248,8 @@ public class FormatterTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/ComplexReconstrTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/ComplexReconstrTestLanguageParsetreeConstructor.java index 167a8bf..c07f668 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/ComplexReconstrTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/ComplexReconstrTestLanguageParsetreeConstructor.java @@ -230,12 +230,12 @@ protected class Op_1_0_0_Action_Add_addOperands extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getOpAccess().getAddaddOperandsAction_1_0_0(); + return grammarAccess.getOpAccess().getAddAddOperandsAction_1_0_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getOpAccess().getAddaddOperandsAction_1_0_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getOpAccess().getAddAddOperandsAction_1_0_0().getType().getClassifier())) return null; Object val = current.getConsumable("addOperands", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("addOperands")) return null; @@ -330,12 +330,12 @@ protected class Op_1_1_0_Action_Minus_minusOperands extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getOpAccess().getMinusminusOperandsAction_1_1_0(); + return grammarAccess.getOpAccess().getMinusMinusOperandsAction_1_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getOpAccess().getMinusminusOperandsAction_1_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getOpAccess().getMinusMinusOperandsAction_1_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("minusOperands", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("minusOperands")) return null; @@ -781,12 +781,12 @@ protected class TrickyA_3_0_0_Action_TypeB_x extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTrickyAAccess().getTypeBxAction_3_0_0(); + return grammarAccess.getTrickyAAccess().getTypeBXAction_3_0_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTrickyAAccess().getTypeBxAction_3_0_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTrickyAAccess().getTypeBXAction_3_0_0().getType().getClassifier())) return null; Object val = current.getConsumable("x", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("x")) return null; @@ -844,12 +844,12 @@ protected class TrickyA_3_1_0_Action_TypeC_x extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTrickyAAccess().getTypeCxAction_3_1_0(); + return grammarAccess.getTrickyAAccess().getTypeCXAction_3_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTrickyAAccess().getTypeCxAction_3_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTrickyAAccess().getTypeCXAction_3_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("x", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("x")) return null; @@ -1215,12 +1215,12 @@ protected class TrickyC_2_0_Action_C1_x extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTrickyCAccess().getC1xAction_2_0(); + return grammarAccess.getTrickyCAccess().getC1XAction_2_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTrickyCAccess().getC1xAction_2_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTrickyCAccess().getC1XAction_2_0().getType().getClassifier())) return null; Object val = current.getConsumable("x", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("x")) return null; @@ -1278,12 +1278,12 @@ protected class TrickyC_3_0_Action_C2_y extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTrickyCAccess().getC2yAction_3_0(); + return grammarAccess.getTrickyCAccess().getC2YAction_3_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTrickyCAccess().getC2yAction_3_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTrickyCAccess().getC2YAction_3_0().getType().getClassifier())) return null; Object val = current.getConsumable("y", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("y")) return null; @@ -1341,12 +1341,12 @@ protected class TrickyC_4_0_Action_C3_z extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTrickyCAccess().getC3zAction_4_0(); + return grammarAccess.getTrickyCAccess().getC3ZAction_4_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTrickyCAccess().getC3zAction_4_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTrickyCAccess().getC3ZAction_4_0().getType().getClassifier())) return null; Object val = current.getConsumable("z", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("z")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/SimpleReconstrTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/SimpleReconstrTestLanguageParsetreeConstructor.java index df1e12d..0c2798e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/SimpleReconstrTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/SimpleReconstrTestLanguageParsetreeConstructor.java @@ -128,12 +128,12 @@ protected class Op_1_0_Action_Op_values extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getOpAccess().getOpvaluesAction_1_0(); + return grammarAccess.getOpAccess().getOpValuesAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getOpAccess().getOpvaluesAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getOpAccess().getOpValuesAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("values", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("values")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g index bc39e41..787d05b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g @@ -131,7 +131,7 @@ ruleOp returns [EObject current=null] } ((( { - temp=factory.create(grammarAccess.getOpAccess().getAddaddOperandsAction_1_0_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getOpAccess().getAddAddOperandsAction_1_0_0().getType().getClassifier()); try { factory.add(temp, "addOperands", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -139,7 +139,7 @@ ruleOp returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getAddaddOperandsAction_1_0_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getAddAddOperandsAction_1_0_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -173,7 +173,7 @@ ruleOp returns [EObject current=null] )) |(( { - temp=factory.create(grammarAccess.getOpAccess().getMinusminusOperandsAction_1_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getOpAccess().getMinusMinusOperandsAction_1_1_0().getType().getClassifier()); try { factory.add(temp, "minusOperands", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -181,7 +181,7 @@ ruleOp returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getMinusminusOperandsAction_1_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getMinusMinusOperandsAction_1_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageParser.java index 6b62fd4..7e9c910 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageParser.java @@ -280,7 +280,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractInternalA // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g:133:5: { - temp=factory.create(grammarAccess.getOpAccess().getAddaddOperandsAction_1_0_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getOpAccess().getAddAddOperandsAction_1_0_0().getType().getClassifier()); try { factory.add(temp, "addOperands", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -288,7 +288,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractInternalA } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getAddaddOperandsAction_1_0_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getAddAddOperandsAction_1_0_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -343,7 +343,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractInternalA // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g:175:5: { - temp=factory.create(grammarAccess.getOpAccess().getMinusminusOperandsAction_1_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getOpAccess().getMinusMinusOperandsAction_1_1_0().getType().getClassifier()); try { factory.add(temp, "minusOperands", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -351,7 +351,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractInternalA } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getMinusminusOperandsAction_1_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getMinusMinusOperandsAction_1_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage.g index b933ed4..6ef31ab 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage.g @@ -91,7 +91,7 @@ ruleOp returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getOpAccess().getOpvaluesAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getOpAccess().getOpValuesAction_1_0().getType().getClassifier()); try { factory.add(temp, "values", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -99,7 +99,7 @@ ruleOp returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getOpvaluesAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getOpValuesAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageParser.java index 5c97278..d07e2b4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageParser.java @@ -148,7 +148,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage.g:93:5: { - temp=factory.create(grammarAccess.getOpAccess().getOpvaluesAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getOpAccess().getOpValuesAction_1_0().getType().getClassifier()); try { factory.add(temp, "values", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -156,7 +156,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractInternalAn } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getOpvaluesAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getOpAccess().getOpValuesAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java index 78dae9c..0757d3e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java @@ -244,12 +244,12 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTermParserRuleCall_0()); alternatives$3$Consumer = new Alternatives$3$Consumer(rule.getAlternatives_1()); group$4$Consumer = new Group$4$Consumer(rule.getGroup_1_0()); - action$5$Consumer = new Action$5$Consumer(rule.getAddaddOperandsAction_1_0_0()); + action$5$Consumer = new Action$5$Consumer(rule.getAddAddOperandsAction_1_0_0()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getPlusSignKeyword_1_0_1()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getAddOperandsAssignment_1_0_2()); ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.getAddOperandsTermParserRuleCall_1_0_2_0()); group$10$Consumer = new Group$10$Consumer(rule.getGroup_1_1()); - action$11$Consumer = new Action$11$Consumer(rule.getMinusminusOperandsAction_1_1_0()); + action$11$Consumer = new Action$11$Consumer(rule.getMinusMinusOperandsAction_1_1_0()); keyword$13$Consumer = new Keyword$13$Consumer(rule.getHyphenMinusKeyword_1_1_1()); assignment$14$Consumer = new Assignment$14$Consumer(rule.getMinusOperandsAssignment_1_1_2()); ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.getMinusOperandsTermParserRuleCall_1_1_2_0()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java index 7e8acf3..8f80cd4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java @@ -276,10 +276,10 @@ public final class ComplexReconstrTestLanguageTrickyAConsumer extends NonTermina ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getNameIDTerminalRuleCall_2_0()); alternatives$6$Consumer = new Alternatives$6$Consumer(rule.getAlternatives_3()); group$7$Consumer = new Group$7$Consumer(rule.getGroup_3_0()); - action$8$Consumer = new Action$8$Consumer(rule.getTypeBxAction_3_0_0()); + action$8$Consumer = new Action$8$Consumer(rule.getTypeBXAction_3_0_0()); keyword$10$Consumer = new Keyword$10$Consumer(rule.getXKeyword_3_0_1()); group$11$Consumer = new Group$11$Consumer(rule.getGroup_3_1()); - action$12$Consumer = new Action$12$Consumer(rule.getTypeCxAction_3_1_0()); + action$12$Consumer = new Action$12$Consumer(rule.getTypeCXAction_3_1_0()); keyword$14$Consumer = new Keyword$14$Consumer(rule.getYKeyword_3_1_1()); assignment$15$Consumer = new Assignment$15$Consumer(rule.getNameAssignment_4()); ruleCall$16$Consumer = new RuleCall$16$Consumer(rule.getNameSTRINGTerminalRuleCall_4_0()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java index 2b16dbd..a65165a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java @@ -255,13 +255,13 @@ public final class ComplexReconstrTestLanguageTrickyCConsumer extends NonTermina assignment$3$Consumer = new Assignment$3$Consumer(rule.getNameAssignment_1()); ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getNameIDTerminalRuleCall_1_0()); group$5$Consumer = new Group$5$Consumer(rule.getGroup_2()); - action$6$Consumer = new Action$6$Consumer(rule.getC1xAction_2_0()); + action$6$Consumer = new Action$6$Consumer(rule.getC1XAction_2_0()); keyword$8$Consumer = new Keyword$8$Consumer(rule.getXKeyword_2_1()); group$9$Consumer = new Group$9$Consumer(rule.getGroup_3()); - action$10$Consumer = new Action$10$Consumer(rule.getC2yAction_3_0()); + action$10$Consumer = new Action$10$Consumer(rule.getC2YAction_3_0()); keyword$12$Consumer = new Keyword$12$Consumer(rule.getYKeyword_3_1()); group$13$Consumer = new Group$13$Consumer(rule.getGroup_4()); - action$14$Consumer = new Action$14$Consumer(rule.getC3zAction_4_0()); + action$14$Consumer = new Action$14$Consumer(rule.getC3ZAction_4_0()); keyword$16$Consumer = new Keyword$16$Consumer(rule.getZKeyword_4_1()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java index ce46d26..18efd96 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java @@ -131,7 +131,7 @@ public final class SimpleReconstrTestLanguageOpConsumer extends NonTerminalConsu group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTermParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getOpvaluesAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getOpValuesAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getValuesAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getValuesTermParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java index a29df53..61a4832 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java @@ -43,12 +43,12 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess private final RuleCall cTermParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1); private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0); - private final Action cAddaddOperandsAction_1_0_0 = (Action)cGroup_1_0.eContents().get(0); + private final Action cAddAddOperandsAction_1_0_0 = (Action)cGroup_1_0.eContents().get(0); private final Keyword cPlusSignKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1); private final Assignment cAddOperandsAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2); private final RuleCall cAddOperandsTermParserRuleCall_1_0_2_0 = (RuleCall)cAddOperandsAssignment_1_0_2.eContents().get(0); private final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1); - private final Action cMinusminusOperandsAction_1_1_0 = (Action)cGroup_1_1.eContents().get(0); + private final Action cMinusMinusOperandsAction_1_1_0 = (Action)cGroup_1_1.eContents().get(0); private final Keyword cHyphenMinusKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1); private final Assignment cMinusOperandsAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2); private final RuleCall cMinusOperandsTermParserRuleCall_1_1_2_0 = (RuleCall)cMinusOperandsAssignment_1_1_2.eContents().get(0); @@ -70,7 +70,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_1_0() { return cGroup_1_0; } //{Add.addOperands+=current} - public Action getAddaddOperandsAction_1_0_0() { return cAddaddOperandsAction_1_0_0; } + public Action getAddAddOperandsAction_1_0_0() { return cAddAddOperandsAction_1_0_0; } //"+" public Keyword getPlusSignKeyword_1_0_1() { return cPlusSignKeyword_1_0_1; } @@ -85,7 +85,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_1_1() { return cGroup_1_1; } //{Minus.minusOperands+=current} - public Action getMinusminusOperandsAction_1_1_0() { return cMinusminusOperandsAction_1_1_0; } + public Action getMinusMinusOperandsAction_1_1_0() { return cMinusMinusOperandsAction_1_1_0; } //"-" public Keyword getHyphenMinusKeyword_1_1_1() { return cHyphenMinusKeyword_1_1_1; } @@ -174,10 +174,10 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0); private final Alternatives cAlternatives_3 = (Alternatives)cGroup.eContents().get(3); private final Group cGroup_3_0 = (Group)cAlternatives_3.eContents().get(0); - private final Action cTypeBxAction_3_0_0 = (Action)cGroup_3_0.eContents().get(0); + private final Action cTypeBXAction_3_0_0 = (Action)cGroup_3_0.eContents().get(0); private final Keyword cXKeyword_3_0_1 = (Keyword)cGroup_3_0.eContents().get(1); private final Group cGroup_3_1 = (Group)cAlternatives_3.eContents().get(1); - private final Action cTypeCxAction_3_1_0 = (Action)cGroup_3_1.eContents().get(0); + private final Action cTypeCXAction_3_1_0 = (Action)cGroup_3_1.eContents().get(0); private final Keyword cYKeyword_3_1_1 = (Keyword)cGroup_3_1.eContents().get(1); private final Assignment cNameAssignment_4 = (Assignment)cGroup.eContents().get(4); private final RuleCall cNameSTRINGTerminalRuleCall_4_0 = (RuleCall)cNameAssignment_4.eContents().get(0); @@ -208,7 +208,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_3_0() { return cGroup_3_0; } //{TypeB.x=current} - public Action getTypeBxAction_3_0_0() { return cTypeBxAction_3_0_0; } + public Action getTypeBXAction_3_0_0() { return cTypeBXAction_3_0_0; } //"x" public Keyword getXKeyword_3_0_1() { return cXKeyword_3_0_1; } @@ -217,7 +217,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_3_1() { return cGroup_3_1; } //{TypeC.x=current} - public Action getTypeCxAction_3_1_0() { return cTypeCxAction_3_1_0; } + public Action getTypeCXAction_3_1_0() { return cTypeCXAction_3_1_0; } //"y" public Keyword getYKeyword_3_1_1() { return cYKeyword_3_1_1; } @@ -296,13 +296,13 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0); private final Group cGroup_2 = (Group)cGroup.eContents().get(2); - private final Action cC1xAction_2_0 = (Action)cGroup_2.eContents().get(0); + private final Action cC1XAction_2_0 = (Action)cGroup_2.eContents().get(0); private final Keyword cXKeyword_2_1 = (Keyword)cGroup_2.eContents().get(1); private final Group cGroup_3 = (Group)cGroup.eContents().get(3); - private final Action cC2yAction_3_0 = (Action)cGroup_3.eContents().get(0); + private final Action cC2YAction_3_0 = (Action)cGroup_3.eContents().get(0); private final Keyword cYKeyword_3_1 = (Keyword)cGroup_3.eContents().get(1); private final Group cGroup_4 = (Group)cGroup.eContents().get(4); - private final Action cC3zAction_4_0 = (Action)cGroup_4.eContents().get(0); + private final Action cC3ZAction_4_0 = (Action)cGroup_4.eContents().get(0); private final Keyword cZKeyword_4_1 = (Keyword)cGroup_4.eContents().get(1); //TrickyC: @@ -325,7 +325,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_2() { return cGroup_2; } //{C1.x=current} - public Action getC1xAction_2_0() { return cC1xAction_2_0; } + public Action getC1XAction_2_0() { return cC1XAction_2_0; } //"x" public Keyword getXKeyword_2_1() { return cXKeyword_2_1; } @@ -334,7 +334,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_3() { return cGroup_3; } //{C2.y=current} - public Action getC2yAction_3_0() { return cC2yAction_3_0; } + public Action getC2YAction_3_0() { return cC2YAction_3_0; } //"y" public Keyword getYKeyword_3_1() { return cYKeyword_3_1; } @@ -343,7 +343,7 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess public Group getGroup_4() { return cGroup_4; } //{C3.z=current} - public Action getC3zAction_4_0() { return cC3zAction_4_0; } + public Action getC3ZAction_4_0() { return cC3ZAction_4_0; } //"z" public Keyword getZKeyword_4_1() { return cZKeyword_4_1; } @@ -865,7 +865,8 @@ public class ComplexReconstrTestLanguageGrammarAccess implements IGrammarAccess return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java index 6c5e917..11f0c2c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java @@ -147,7 +147,8 @@ public class SerializationBug269362TestLanguageGrammarAccess implements IGrammar return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java index 31a9c40..75c86cc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java @@ -22,7 +22,7 @@ public class SimpleReconstrTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTermParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cOpvaluesAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cOpValuesAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cValuesAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cValuesTermParserRuleCall_1_1_0 = (RuleCall)cValuesAssignment_1_1.eContents().get(0); @@ -40,7 +40,7 @@ public class SimpleReconstrTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Op.values+=current} - public Action getOpvaluesAction_1_0() { return cOpvaluesAction_1_0; } + public Action getOpValuesAction_1_0() { return cOpValuesAction_1_0; } //values+=Term public Assignment getValuesAssignment_1_1() { return cValuesAssignment_1_1; } @@ -538,7 +538,8 @@ public class SimpleReconstrTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java index c726410..47128db 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java @@ -248,7 +248,8 @@ public class TransientValuesTestGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index cf1010d..c848fd4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -474,7 +474,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -494,7 +494,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=Group)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -514,7 +514,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAbstractTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -532,7 +532,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=AbstractToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -834,7 +834,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAssignableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -854,7 +854,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=AssignableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -966,7 +966,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cCrossReferenceableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -986,7 +986,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=CrossReferenceableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1086,7 +1086,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -1106,7 +1106,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=TerminalGroup)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1126,7 +1126,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -1144,7 +1144,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=TerminalToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -1316,7 +1316,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public class WildcardElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Wildcard"); private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cWildcardnullAction_0 = (Action)cGroup.eContents().get(0); + private final Action cWildcardAction_0 = (Action)cGroup.eContents().get(0); private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); //Wildcard: @@ -1327,7 +1327,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup() { return cGroup; } //{Wildcard} - public Action getWildcardnullAction_0() { return cWildcardnullAction_0; } + public Action getWildcardAction_0() { return cWildcardAction_0; } //"." public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } @@ -1338,7 +1338,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cKeywordParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cCharacterRangeleftAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cCharacterRangeLeftAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Keyword cFullStopFullStopKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1); private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2); private final RuleCall cRightKeywordParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0); @@ -1357,7 +1357,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{CharacterRange.left=current} - public Action getCharacterRangeleftAction_1_0() { return cCharacterRangeleftAction_1_0; } + public Action getCharacterRangeLeftAction_1_0() { return cCharacterRangeLeftAction_1_0; } //".." public Keyword getFullStopFullStopKeyword_1_1() { return cFullStopFullStopKeyword_1_1; } @@ -1824,7 +1824,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ActionTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ActionTestLanguageParsetreeConstructor.java index 59ffcdd..4089213 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ActionTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ActionTestLanguageParsetreeConstructor.java @@ -120,12 +120,12 @@ protected class Model_1_0_Action_Parent_left extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getModelAccess().getParentleftAction_1_0(); + return grammarAccess.getModelAccess().getParentLeftAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getModelAccess().getParentleftAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getModelAccess().getParentLeftAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("left", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("left")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/SimpleExpressionsTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/SimpleExpressionsTestLanguageParsetreeConstructor.java index 0502978..c46c792 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/SimpleExpressionsTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/SimpleExpressionsTestLanguageParsetreeConstructor.java @@ -124,12 +124,12 @@ protected class Sequence_1_0_Action_Sequence_expressions extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getSequenceAccess().getSequenceexpressionsAction_1_0(); + return grammarAccess.getSequenceAccess().getSequenceExpressionsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getSequenceAccess().getSequenceexpressionsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getSequenceAccess().getSequenceExpressionsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("expressions", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("expressions")) return null; @@ -271,12 +271,12 @@ protected class Addition_1_0_Action_Op_values extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getAdditionAccess().getOpvaluesAction_1_0(); + return grammarAccess.getAdditionAccess().getOpValuesAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAdditionAccess().getOpvaluesAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAdditionAccess().getOpValuesAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("values", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("values")) return null; @@ -452,12 +452,12 @@ protected class Multiplication_1_0_Action_Op_values extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getMultiplicationAccess().getOpvaluesAction_1_0(); + return grammarAccess.getMultiplicationAccess().getOpValuesAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getMultiplicationAccess().getOpvaluesAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getMultiplicationAccess().getOpValuesAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("values", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("values")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TestLanguageParsetreeConstructor.java index 23f9505..b78e60f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TestLanguageParsetreeConstructor.java @@ -361,12 +361,12 @@ protected class ReducibleRule_2_0_Action_ReducibleComposite_actionFeature extend @Override public Action getGrammarElement() { - return grammarAccess.getReducibleRuleAccess().getReducibleCompositeactionFeatureAction_2_0(); + return grammarAccess.getReducibleRuleAccess().getReducibleCompositeActionFeatureAction_2_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getReducibleRuleAccess().getReducibleCompositeactionFeatureAction_2_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getReducibleRuleAccess().getReducibleCompositeActionFeatureAction_2_0().getType().getClassifier())) return null; Object val = current.getConsumable("actionFeature", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("actionFeature")) return null; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g index 474cc00..0119707 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g @@ -91,7 +91,7 @@ ruleModel returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getModelAccess().getParentleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getModelAccess().getParentLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -99,7 +99,7 @@ ruleModel returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getModelAccess().getParentleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getModelAccess().getParentLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageParser.java index f9f0cd4..d77d7e6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageParser.java @@ -144,7 +144,7 @@ public class InternalActionTestLanguageParser extends AbstractInternalAntlrParse // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g:93:5: { - temp=factory.create(grammarAccess.getModelAccess().getParentleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getModelAccess().getParentLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -152,7 +152,7 @@ public class InternalActionTestLanguageParser extends AbstractInternalAntlrParse } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getModelAccess().getParentleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getModelAccess().getParentLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g index ea79be3..6aa3570 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g @@ -91,7 +91,7 @@ ruleSequence returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getSequenceAccess().getSequenceexpressionsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getSequenceAccess().getSequenceExpressionsAction_1_0().getType().getClassifier()); try { factory.add(temp, "expressions", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -99,7 +99,7 @@ ruleSequence returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getSequenceAccess().getSequenceexpressionsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getSequenceAccess().getSequenceExpressionsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -158,7 +158,7 @@ ruleAddition returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAdditionAccess().getOpvaluesAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAdditionAccess().getOpValuesAction_1_0().getType().getClassifier()); try { factory.add(temp, "values", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -166,7 +166,7 @@ ruleAddition returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAdditionAccess().getOpvaluesAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAdditionAccess().getOpValuesAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -253,7 +253,7 @@ ruleMultiplication returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getMultiplicationAccess().getOpvaluesAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getMultiplicationAccess().getOpValuesAction_1_0().getType().getClassifier()); try { factory.add(temp, "values", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -261,7 +261,7 @@ ruleMultiplication returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getMultiplicationAccess().getOpvaluesAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getMultiplicationAccess().getOpValuesAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageParser.java index cbd56d9..e1aa9f0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageParser.java @@ -148,7 +148,7 @@ public class InternalSimpleExpressionsTestLanguageParser extends AbstractInterna // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g:93:5: { - temp=factory.create(grammarAccess.getSequenceAccess().getSequenceexpressionsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getSequenceAccess().getSequenceExpressionsAction_1_0().getType().getClassifier()); try { factory.add(temp, "expressions", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -156,7 +156,7 @@ public class InternalSimpleExpressionsTestLanguageParser extends AbstractInterna } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getSequenceAccess().getSequenceexpressionsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getSequenceAccess().getSequenceExpressionsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -307,7 +307,7 @@ public class InternalSimpleExpressionsTestLanguageParser extends AbstractInterna // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g:160:5: { - temp=factory.create(grammarAccess.getAdditionAccess().getOpvaluesAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAdditionAccess().getOpValuesAction_1_0().getType().getClassifier()); try { factory.add(temp, "values", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -315,7 +315,7 @@ public class InternalSimpleExpressionsTestLanguageParser extends AbstractInterna } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAdditionAccess().getOpvaluesAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAdditionAccess().getOpValuesAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -524,7 +524,7 @@ public class InternalSimpleExpressionsTestLanguageParser extends AbstractInterna // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g:255:5: { - temp=factory.create(grammarAccess.getMultiplicationAccess().getOpvaluesAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getMultiplicationAccess().getOpValuesAction_1_0().getType().getClassifier()); try { factory.add(temp, "values", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -532,7 +532,7 @@ public class InternalSimpleExpressionsTestLanguageParser extends AbstractInterna } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getMultiplicationAccess().getOpvaluesAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getMultiplicationAccess().getOpValuesAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g index bffe5b5..9aa6ee6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g @@ -243,7 +243,7 @@ ruleReducibleRule returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getReducibleRuleAccess().getReducibleCompositeactionFeatureAction_2_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getReducibleRuleAccess().getReducibleCompositeActionFeatureAction_2_0().getType().getClassifier()); try { factory.add(temp, "actionFeature", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -251,7 +251,7 @@ ruleReducibleRule returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getReducibleRuleAccess().getReducibleCompositeactionFeatureAction_2_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getReducibleRuleAccess().getReducibleCompositeActionFeatureAction_2_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageParser.java index 162ae7c..c038aa3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageParser.java @@ -519,7 +519,7 @@ public class InternalTestLanguageParser extends AbstractInternalAntlrParser { // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g:245:5: { - temp=factory.create(grammarAccess.getReducibleRuleAccess().getReducibleCompositeactionFeatureAction_2_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getReducibleRuleAccess().getReducibleCompositeActionFeatureAction_2_0().getType().getClassifier()); try { factory.add(temp, "actionFeature", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -527,7 +527,7 @@ public class InternalTestLanguageParser extends AbstractInternalAntlrParser { } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getReducibleRuleAccess().getReducibleCompositeactionFeatureAction_2_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getReducibleRuleAccess().getReducibleCompositeActionFeatureAction_2_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java index a856556..138514a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java @@ -131,7 +131,7 @@ public final class ActionTestLanguageModelConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getChildParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getParentleftAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getParentLeftAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getRightAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getRightChildParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java index 6822865..0f3f854 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java @@ -198,7 +198,7 @@ public final class SimpleExpressionsTestLanguageAdditionConsumer extends NonTerm group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getMultiplicationParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getOpvaluesAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getOpValuesAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getOperatorAssignment_1_1()); alternatives$7$Consumer = new Alternatives$7$Consumer(rule.getOperatorAlternatives_1_1_0()); keyword$8$Consumer = new Keyword$8$Consumer(rule.getOperatorPlusSignKeyword_1_1_0_0()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java index 2197969..6f87e1c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java @@ -198,7 +198,7 @@ public final class SimpleExpressionsTestLanguageMultiplicationConsumer extends N group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTermParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getOpvaluesAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getOpValuesAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getOperatorAssignment_1_1()); alternatives$7$Consumer = new Alternatives$7$Consumer(rule.getOperatorAlternatives_1_1_0()); keyword$8$Consumer = new Keyword$8$Consumer(rule.getOperatorAsteriskKeyword_1_1_0_0()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java index b8f7c32..c267d4c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java @@ -131,7 +131,7 @@ public final class SimpleExpressionsTestLanguageSequenceConsumer extends NonTerm group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAdditionParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getSequenceexpressionsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getSequenceExpressionsAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getExpressionsAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getExpressionsAdditionParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java index 505cb27..19c8d12 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java @@ -152,7 +152,7 @@ public final class TestLanguageReducibleRuleConsumer extends NonTerminalConsumer keyword$2$Consumer = new Keyword$2$Consumer(rule.getReducibleKeyword_0()); ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.getTerminalRuleParserRuleCall_1()); group$4$Consumer = new Group$4$Consumer(rule.getGroup_2()); - action$5$Consumer = new Action$5$Consumer(rule.getReducibleCompositeactionFeatureAction_2_0()); + action$5$Consumer = new Action$5$Consumer(rule.getReducibleCompositeActionFeatureAction_2_0()); assignment$7$Consumer = new Assignment$7$Consumer(rule.getActionFeatureAssignment_2_1()); ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getActionFeatureTerminalRuleParserRuleCall_2_1_0()); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java index 72c01b8..a4d1877 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java @@ -22,7 +22,7 @@ public class ActionTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cChildParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cParentleftAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cParentLeftAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cRightAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cRightChildParserRuleCall_1_1_0 = (RuleCall)cRightAssignment_1_1.eContents().get(0); @@ -40,7 +40,7 @@ public class ActionTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Parent.left=current} - public Action getParentleftAction_1_0() { return cParentleftAction_1_0; } + public Action getParentLeftAction_1_0() { return cParentLeftAction_1_0; } //right=Child public Assignment getRightAssignment_1_1() { return cRightAssignment_1_1; } @@ -146,7 +146,8 @@ public class ActionTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java index f52e457..1b2a092 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java @@ -279,7 +279,8 @@ public class ContentAssistTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java index b9cfcb7..96bec3d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java @@ -351,7 +351,8 @@ public class FowlerDslTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java index b3c7a3c..0117e82 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java @@ -143,7 +143,8 @@ public class LexerTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java index 6247003..4bd679a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java @@ -357,7 +357,8 @@ public class LookaheadTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java index a2976e1..a1dda8f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java @@ -138,7 +138,8 @@ public class OptionalEmptyTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java index 6be4155..bf167bf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java @@ -542,7 +542,8 @@ public class PartialParserTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } 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 ed73a90..d1756f9 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 @@ -497,7 +497,8 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java index ed256a6..3099868 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java @@ -22,7 +22,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAdditionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cSequenceexpressionsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cSequenceExpressionsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cExpressionsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cExpressionsAdditionParserRuleCall_1_1_0 = (RuleCall)cExpressionsAssignment_1_1.eContents().get(0); @@ -40,7 +40,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces public Group getGroup_1() { return cGroup_1; } //{Sequence.expressions+=current} - public Action getSequenceexpressionsAction_1_0() { return cSequenceexpressionsAction_1_0; } + public Action getSequenceExpressionsAction_1_0() { return cSequenceExpressionsAction_1_0; } //expressions+=Addition public Assignment getExpressionsAssignment_1_1() { return cExpressionsAssignment_1_1; } @@ -54,7 +54,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cMultiplicationParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cOpvaluesAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cOpValuesAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cOperatorAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final Alternatives cOperatorAlternatives_1_1_0 = (Alternatives)cOperatorAssignment_1_1.eContents().get(0); private final Keyword cOperatorPlusSignKeyword_1_1_0_0 = (Keyword)cOperatorAlternatives_1_1_0.eContents().get(0); @@ -76,7 +76,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces public Group getGroup_1() { return cGroup_1; } //{Op.values+=current} - public Action getOpvaluesAction_1_0() { return cOpvaluesAction_1_0; } + public Action getOpValuesAction_1_0() { return cOpValuesAction_1_0; } //operator=( "+" | "-" ) public Assignment getOperatorAssignment_1_1() { return cOperatorAssignment_1_1; } @@ -102,7 +102,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTermParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cOpvaluesAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cOpValuesAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cOperatorAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final Alternatives cOperatorAlternatives_1_1_0 = (Alternatives)cOperatorAssignment_1_1.eContents().get(0); private final Keyword cOperatorAsteriskKeyword_1_1_0_0 = (Keyword)cOperatorAlternatives_1_1_0.eContents().get(0); @@ -124,7 +124,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces public Group getGroup_1() { return cGroup_1; } //{Op.values+=current} - public Action getOpvaluesAction_1_0() { return cOpvaluesAction_1_0; } + public Action getOpValuesAction_1_0() { return cOpValuesAction_1_0; } //operator=( "*" | "/" ) public Assignment getOperatorAssignment_1_1() { return cOperatorAssignment_1_1; } @@ -330,7 +330,8 @@ public class SimpleExpressionsTestLanguageGrammarAccess implements IGrammarAcces return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java index d0215e8..2e232a5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java @@ -91,7 +91,7 @@ public class TestLanguageGrammarAccess implements IGrammarAccess { private final Keyword cReducibleKeyword_0 = (Keyword)cGroup.eContents().get(0); private final RuleCall cTerminalRuleParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1); private final Group cGroup_2 = (Group)cGroup.eContents().get(2); - private final Action cReducibleCompositeactionFeatureAction_2_0 = (Action)cGroup_2.eContents().get(0); + private final Action cReducibleCompositeActionFeatureAction_2_0 = (Action)cGroup_2.eContents().get(0); private final Assignment cActionFeatureAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1); private final RuleCall cActionFeatureTerminalRuleParserRuleCall_2_1_0 = (RuleCall)cActionFeatureAssignment_2_1.eContents().get(0); @@ -112,7 +112,7 @@ public class TestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_2() { return cGroup_2; } //{ReducibleComposite.actionFeature+=current} - public Action getReducibleCompositeactionFeatureAction_2_0() { return cReducibleCompositeactionFeatureAction_2_0; } + public Action getReducibleCompositeActionFeatureAction_2_0() { return cReducibleCompositeActionFeatureAction_2_0; } //actionFeature+=TerminalRule public Assignment getActionFeatureAssignment_2_1() { return cActionFeatureAssignment_2_1; } @@ -251,7 +251,8 @@ public class TestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java index baec41a..e18fbbf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java @@ -166,7 +166,8 @@ public class TreeTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java index ce5a082..2c54112 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java @@ -474,7 +474,8 @@ public class Bug250313GrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java index 719728e..ae0fc29 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java @@ -103,7 +103,8 @@ public class MultiValueFeatureTestLanguageGrammarAccess implements IGrammarAcces return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/actions/ParserTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/actions/ParserTest.java index cc8f1eb..c269023 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/actions/ParserTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/actions/ParserTest.java @@ -117,7 +117,7 @@ public abstract class ParserTest extends AbstractXtextTests { assertNotNull("adapter", adapter); CompositeNode node = adapter.getParserNode(); assertNotNull("node", node); - assertEquals("node.grammarElement", grammarAccess.getModelAccess().getParentleftAction_1_0(), node.getGrammarElement()); + assertEquals("node.grammarElement", grammarAccess.getModelAccess().getParentLeftAction_1_0(), node.getGrammarElement()); assertEquals(node.getChildren().toString(), 2, node.getChildren().size()); CompositeNode firstChildNode = (CompositeNode) node.getChildren().get(0); assertEquals("firstChildNode.grammarElement", grammarAccess.getModelRule(), firstChildNode.getGrammarElement()); @@ -142,7 +142,7 @@ public abstract class ParserTest extends AbstractXtextTests { CompositeNode rootNode = resource.getParseResult().getRootNode(); assertNotNull("rootNode", rootNode); - assertEquals("rootNode.grammarElement", grammarAccess.getModelAccess().getParentleftAction_1_0(), rootNode.getGrammarElement()); + assertEquals("rootNode.grammarElement", grammarAccess.getModelAccess().getParentLeftAction_1_0(), rootNode.getGrammarElement()); assertEquals(node, rootNode); } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/LowerCaseNamedTestLanguageChecks.chk b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageChecks.chk index 6143a43..6143a43 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/LowerCaseNamedTestLanguageChecks.chk +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageChecks.chk diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormattertestlanguageChecks.chk b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageChecks.chk index 816b7d6..816b7d6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormattertestlanguageChecks.chk +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageChecks.chk diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientvaluestestChecks.chk b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestChecks.chk index 2041bbc..2041bbc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientvaluestestChecks.chk +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestChecks.chk diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java index c03df87..1e2f9c1 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java @@ -229,7 +229,8 @@ public class EnumRulesTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } 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 85ff520..bb266d9 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 @@ -294,7 +294,8 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java index 2646121..a344ece 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java @@ -1702,12 +1702,12 @@ protected class Alternatives_1_0_Action_Alternatives_groups extends ActionToken @Override public Action getGrammarElement() { - return grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -1886,12 +1886,12 @@ protected class Group_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -2976,12 +2976,12 @@ protected class AssignableAlternatives_1_0_Action_Alternatives_groups extends Ac @Override public Action getGrammarElement() { - return grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -3518,12 +3518,12 @@ protected class CrossReferenceableAlternatives_1_0_Action_Alternatives_groups ex @Override public Action getGrammarElement() { - return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4012,12 +4012,12 @@ protected class TerminalAlternatives_1_0_Action_Alternatives_groups extends Acti @Override public Action getGrammarElement() { - return grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4196,12 +4196,12 @@ protected class TerminalGroup_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -4832,7 +4832,7 @@ protected class Wildcard_Group extends GroupToken { protected Solution createSolution() { Solution s1 = new Wildcard_1_Keyword(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new Wildcard_0_Action_Wildcard_null(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new Wildcard_0_Action_Wildcard(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 != null) { last = s2.getPredecessor(); return s2; @@ -4845,24 +4845,22 @@ protected class Wildcard_Group extends GroupToken { } // {Wildcard} -protected class Wildcard_0_Action_Wildcard_null extends ActionToken { +protected class Wildcard_0_Action_Wildcard extends ActionToken { - public Wildcard_0_Action_Wildcard_null(IInstanceDescription curr, AbstractToken pred) { + public Wildcard_0_Action_Wildcard(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Action getGrammarElement() { - return grammarAccess.getWildcardAccess().getWildcardnullAction_0(); + return grammarAccess.getWildcardAccess().getWildcardAction_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier())) return null; - Object val = current.getConsumable("", false); - if(val == null) return null; - if(!current.isConsumedWithLastConsumtion("")) return null; - return new Solution(getDescr((EObject)val)); + if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier())) return null; + if(!current.isConsumed()) return null; + return new Solution(current); } } @@ -4978,12 +4976,12 @@ protected class CharacterRange_1_0_Action_CharacterRange_left extends ActionToke @Override public Action getGrammarElement() { - return grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(); + return grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("left", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("left")) return null; diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g index 8f38e3e..3202701 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g @@ -778,7 +778,7 @@ ruleAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -786,7 +786,7 @@ ruleAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -849,7 +849,7 @@ ruleGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -857,7 +857,7 @@ ruleGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1458,7 +1458,7 @@ ruleAssignableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1466,7 +1466,7 @@ ruleAssignableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1692,7 +1692,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1700,7 +1700,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1900,7 +1900,7 @@ ruleTerminalAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1908,7 +1908,7 @@ ruleTerminalAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1971,7 +1971,7 @@ ruleTerminalGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1979,7 +1979,7 @@ ruleTerminalGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2333,10 +2333,10 @@ ruleWildcard returns [EObject current=null] }: (( { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2378,7 +2378,7 @@ ruleCharacterRange returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -2386,7 +2386,7 @@ ruleCharacterRange returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index 8312200..099d48b 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -1667,7 +1667,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:780:5: { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1675,7 +1675,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1851,7 +1851,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:851:5: { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1859,7 +1859,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3391,7 +3391,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1460:5: { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3399,7 +3399,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3977,7 +3977,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1694:5: { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3985,7 +3985,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4439,7 +4439,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1902:5: { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4447,7 +4447,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4623,7 +4623,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1973:5: { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4631,7 +4631,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5570,10 +5570,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2335:5: { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5688,7 +5688,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2380:5: { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -5696,7 +5696,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java index 232a890..9bfcf95 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java @@ -131,7 +131,8 @@ public class KeywordsTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java index 619d3d4..451f530 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java index 67036e4..d28e818 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageAssignableAlternativesConsumer extend group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAssignableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java index 28e4659..2db129b 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java @@ -151,7 +151,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getKeywordParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeleftAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeLeftAction_1_0()); keyword$6$Consumer = new Keyword$6$Consumer(rule.getFullStopFullStopKeyword_1_1()); assignment$7$Consumer = new Assignment$7$Consumer(rule.getRightAssignment_1_2()); ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getRightKeywordParserRuleCall_1_2_0()); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java index c52d473..e11d71f 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageCrossReferenceableAlternativesConsume group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getCrossReferenceableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java index b87250d..efa4e0b 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAbstractTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensAbstractTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java index f2c4a90..bb2b1b6 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java index 56bb812..929ae71 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensTerminalTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java index 0792fb8..48ccec8 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java @@ -86,7 +86,7 @@ public final class XtextGrammarTestLanguageWildcardConsumer extends NonTerminalC this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.getGroup()); - action$2$Consumer = new Action$2$Consumer(rule.getWildcardnullAction_0()); + action$2$Consumer = new Action$2$Consumer(rule.getWildcardAction_0()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getFullStopKeyword_1()); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index cf1010d..c848fd4 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -474,7 +474,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -494,7 +494,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=Group)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -514,7 +514,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAbstractTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -532,7 +532,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=AbstractToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -834,7 +834,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAssignableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -854,7 +854,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=AssignableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -966,7 +966,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cCrossReferenceableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -986,7 +986,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=CrossReferenceableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1086,7 +1086,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -1106,7 +1106,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=TerminalGroup)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1126,7 +1126,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -1144,7 +1144,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=TerminalToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -1316,7 +1316,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public class WildcardElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Wildcard"); private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cWildcardnullAction_0 = (Action)cGroup.eContents().get(0); + private final Action cWildcardAction_0 = (Action)cGroup.eContents().get(0); private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); //Wildcard: @@ -1327,7 +1327,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup() { return cGroup; } //{Wildcard} - public Action getWildcardnullAction_0() { return cWildcardnullAction_0; } + public Action getWildcardAction_0() { return cWildcardAction_0; } //"." public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } @@ -1338,7 +1338,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cKeywordParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cCharacterRangeleftAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cCharacterRangeLeftAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Keyword cFullStopFullStopKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1); private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2); private final RuleCall cRightKeywordParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0); @@ -1357,7 +1357,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{CharacterRange.left=current} - public Action getCharacterRangeleftAction_1_0() { return cCharacterRangeleftAction_1_0; } + public Action getCharacterRangeLeftAction_1_0() { return cCharacterRangeLeftAction_1_0; } //".." public Keyword getFullStopFullStopKeyword_1_1() { return cFullStopFullStopKeyword_1_1; } @@ -1824,7 +1824,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java index f52e457..1b2a092 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java @@ -279,7 +279,8 @@ public class ContentAssistTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } 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 ed73a90..d1756f9 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 @@ -497,7 +497,8 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java index baec41a..e18fbbf 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java @@ -166,7 +166,8 @@ public class TreeTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java index 34f3b61..e77f460 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java @@ -158,7 +158,8 @@ public class TwoContextsTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java index 2085b46..d0528ac 100644 --- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java @@ -138,7 +138,8 @@ public class TestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.ext index 15a17c7..4984bf8 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.ext @@ -17,7 +17,8 @@ extension org::eclipse::xtend::util::stdlib::io; * Represents a generated, default implementation of interface {@link IProposalProvider}. * * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider - */ + */ + List[ICompletionProposal] completeGrammar_Name(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) : debug("completeGrammar_Name feature '" + assignment.feature + "' terminal '" + assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '" diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java index 2646121..a344ece 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java @@ -1702,12 +1702,12 @@ protected class Alternatives_1_0_Action_Alternatives_groups extends ActionToken @Override public Action getGrammarElement() { - return grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -1886,12 +1886,12 @@ protected class Group_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -2976,12 +2976,12 @@ protected class AssignableAlternatives_1_0_Action_Alternatives_groups extends Ac @Override public Action getGrammarElement() { - return grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -3518,12 +3518,12 @@ protected class CrossReferenceableAlternatives_1_0_Action_Alternatives_groups ex @Override public Action getGrammarElement() { - return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4012,12 +4012,12 @@ protected class TerminalAlternatives_1_0_Action_Alternatives_groups extends Acti @Override public Action getGrammarElement() { - return grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(); + return grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("groups", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("groups")) return null; @@ -4196,12 +4196,12 @@ protected class TerminalGroup_1_0_Action_Group_tokens extends ActionToken { @Override public Action getGrammarElement() { - return grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(); + return grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("tokens", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("tokens")) return null; @@ -4832,7 +4832,7 @@ protected class Wildcard_Group extends GroupToken { protected Solution createSolution() { Solution s1 = new Wildcard_1_Keyword(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new Wildcard_0_Action_Wildcard_null(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new Wildcard_0_Action_Wildcard(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 != null) { last = s2.getPredecessor(); return s2; @@ -4845,24 +4845,22 @@ protected class Wildcard_Group extends GroupToken { } // {Wildcard} -protected class Wildcard_0_Action_Wildcard_null extends ActionToken { +protected class Wildcard_0_Action_Wildcard extends ActionToken { - public Wildcard_0_Action_Wildcard_null(IInstanceDescription curr, AbstractToken pred) { + public Wildcard_0_Action_Wildcard(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Action getGrammarElement() { - return grammarAccess.getWildcardAccess().getWildcardnullAction_0(); + return grammarAccess.getWildcardAccess().getWildcardAction_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier())) return null; - Object val = current.getConsumable("", false); - if(val == null) return null; - if(!current.isConsumedWithLastConsumtion("")) return null; - return new Solution(getDescr((EObject)val)); + if(!current.isInstanceOf(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier())) return null; + if(!current.isConsumed()) return null; + return new Solution(current); } } @@ -4978,12 +4976,12 @@ protected class CharacterRange_1_0_Action_CharacterRange_left extends ActionToke @Override public Action getGrammarElement() { - return grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(); + return grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(); } @Override protected Solution createSolution() { - if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier())) return null; + if(!current.isInstanceOf(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier())) return null; Object val = current.getConsumable("left", false); if(val == null) return null; if(!current.isConsumedWithLastConsumtion("left")) return null; diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g index 8f38e3e..3202701 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g @@ -778,7 +778,7 @@ ruleAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -786,7 +786,7 @@ ruleAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -849,7 +849,7 @@ ruleGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -857,7 +857,7 @@ ruleGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1458,7 +1458,7 @@ ruleAssignableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1466,7 +1466,7 @@ ruleAssignableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1692,7 +1692,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1700,7 +1700,7 @@ ruleCrossReferenceableAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1900,7 +1900,7 @@ ruleTerminalAlternatives returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1908,7 +1908,7 @@ ruleTerminalAlternatives returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1971,7 +1971,7 @@ ruleTerminalGroup returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1979,7 +1979,7 @@ ruleTerminalGroup returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2333,10 +2333,10 @@ ruleWildcard returns [EObject current=null] }: (( { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -2378,7 +2378,7 @@ ruleCharacterRange returns [EObject current=null] } (( { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", $current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -2386,7 +2386,7 @@ ruleCharacterRange returns [EObject current=null] } $current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index a399894..6aff316 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -1667,7 +1667,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:780:5: { - temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1675,7 +1675,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -1851,7 +1851,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:851:5: { - temp=factory.create(grammarAccess.getGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -1859,7 +1859,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3391,7 +3391,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1460:5: { - temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3399,7 +3399,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getAssignableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -3977,7 +3977,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1694:5: { - temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -3985,7 +3985,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCrossReferenceableAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4439,7 +4439,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1902:5: { - temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0().getType().getClassifier()); try { factory.add(temp, "groups", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4447,7 +4447,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesgroupsAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalAlternativesAccess().getAlternativesGroupsAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -4623,7 +4623,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1973:5: { - temp=factory.create(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0().getType().getClassifier()); try { factory.add(temp, "tokens", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -4631,7 +4631,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGrouptokensAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getTerminalGroupAccess().getGroupTokensAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5570,10 +5570,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2335:5: { - temp=factory.create(grammarAccess.getWildcardAccess().getWildcardnullAction_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getWildcardAccess().getWildcardAction_0().getType().getClassifier()); current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardnullAction_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getWildcardAccess().getWildcardAction_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; @@ -5688,7 +5688,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2380:5: { - temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0().getType().getClassifier()); + temp=factory.create(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0().getType().getClassifier()); try { factory.set(temp, "left", current, null /*ParserRule*/, currentNode); } catch(ValueConverterException vce) { @@ -5696,7 +5696,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } current = temp; temp = null; - CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeleftAction_1_0(), currentNode.getParent()); + CompositeNode newNode = createCompositeNode(grammarAccess.getCharacterRangeAccess().getCharacterRangeLeftAction_1_0(), currentNode.getParent()); newNode.getChildren().add(currentNode); moveLookaheadInfo(currentNode, newNode); currentNode = newNode; diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java index 232a890..9bfcf95 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java @@ -131,7 +131,8 @@ public class KeywordsTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java index 619d3d4..451f530 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java index 67036e4..d28e818 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageAssignableAlternativesConsumer extend group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAssignableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java index 28e4659..2db129b 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java @@ -151,7 +151,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getKeywordParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeleftAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getCharacterRangeLeftAction_1_0()); keyword$6$Consumer = new Keyword$6$Consumer(rule.getFullStopFullStopKeyword_1_1()); assignment$7$Consumer = new Assignment$7$Consumer(rule.getRightAssignment_1_2()); ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getRightKeywordParserRuleCall_1_2_0()); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java index c52d473..e11d71f 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceableAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageCrossReferenceableAlternativesConsume group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getCrossReferenceableTerminalParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java index b87250d..efa4e0b 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getAbstractTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensAbstractTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java index f2c4a90..bb2b1b6 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java @@ -165,7 +165,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalGroupParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getAlternativesgroupsAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getAlternativesGroupsAction_1_0()); group$6$Consumer = new Group$6$Consumer(rule.getGroup_1_1()); keyword$7$Consumer = new Keyword$7$Consumer(rule.getVerticalLineKeyword_1_1_0()); assignment$8$Consumer = new Assignment$8$Consumer(rule.getGroupsAssignment_1_1_1()); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java index 56bb812..929ae71 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java @@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm group$1$Consumer = new Group$1$Consumer(rule.getGroup()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getTerminalTokenParserRuleCall_0()); group$3$Consumer = new Group$3$Consumer(rule.getGroup_1()); - action$4$Consumer = new Action$4$Consumer(rule.getGrouptokensAction_1_0()); + action$4$Consumer = new Action$4$Consumer(rule.getGroupTokensAction_1_0()); assignment$6$Consumer = new Assignment$6$Consumer(rule.getTokensAssignment_1_1()); ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTokensTerminalTokenParserRuleCall_1_1_0()); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java index 0792fb8..48ccec8 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java @@ -86,7 +86,7 @@ public final class XtextGrammarTestLanguageWildcardConsumer extends NonTerminalC this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.getGroup()); - action$2$Consumer = new Action$2$Consumer(rule.getWildcardnullAction_0()); + action$2$Consumer = new Action$2$Consumer(rule.getWildcardAction_0()); keyword$4$Consumer = new Keyword$4$Consumer(rule.getFullStopKeyword_1()); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index cf1010d..c848fd4 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -474,7 +474,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -494,7 +494,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=Group)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -514,7 +514,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAbstractTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -532,7 +532,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=AbstractToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -834,7 +834,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cAssignableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -854,7 +854,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=AssignableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -966,7 +966,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cCrossReferenceableTerminalParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -986,7 +986,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=CrossReferenceableTerminal)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1086,7 +1086,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalGroupParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cAlternativesgroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cAlternativesGroupsAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1); private final Keyword cVerticalLineKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0); private final Assignment cGroupsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); @@ -1106,7 +1106,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Alternatives.groups+=current} - public Action getAlternativesgroupsAction_1_0() { return cAlternativesgroupsAction_1_0; } + public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //("|" groups+=TerminalGroup)+ public Group getGroup_1_1() { return cGroup_1_1; } @@ -1126,7 +1126,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cTerminalTokenParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cGrouptokensAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cGroupTokensAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Assignment cTokensAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cTokensTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); @@ -1144,7 +1144,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{Group.tokens+=current} - public Action getGrouptokensAction_1_0() { return cGrouptokensAction_1_0; } + public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //(tokens+=TerminalToken)+ public Assignment getTokensAssignment_1_1() { return cTokensAssignment_1_1; } @@ -1316,7 +1316,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public class WildcardElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Wildcard"); private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cWildcardnullAction_0 = (Action)cGroup.eContents().get(0); + private final Action cWildcardAction_0 = (Action)cGroup.eContents().get(0); private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); //Wildcard: @@ -1327,7 +1327,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup() { return cGroup; } //{Wildcard} - public Action getWildcardnullAction_0() { return cWildcardnullAction_0; } + public Action getWildcardAction_0() { return cWildcardAction_0; } //"." public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } @@ -1338,7 +1338,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final RuleCall cKeywordParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Action cCharacterRangeleftAction_1_0 = (Action)cGroup_1.eContents().get(0); + private final Action cCharacterRangeLeftAction_1_0 = (Action)cGroup_1.eContents().get(0); private final Keyword cFullStopFullStopKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1); private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2); private final RuleCall cRightKeywordParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0); @@ -1357,7 +1357,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public Group getGroup_1() { return cGroup_1; } //{CharacterRange.left=current} - public Action getCharacterRangeleftAction_1_0() { return cCharacterRangeleftAction_1_0; } + public Action getCharacterRangeLeftAction_1_0() { return cCharacterRangeLeftAction_1_0; } //".." public Keyword getFullStopFullStopKeyword_1_1() { return cFullStopFullStopKeyword_1_1; } @@ -1824,7 +1824,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java index f52e457..1b2a092 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java @@ -279,7 +279,8 @@ public class ContentAssistTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } 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 ed73a90..d1756f9 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 @@ -497,7 +497,8 @@ public class ReferenceGrammarTestLanguageGrammarAccess implements IGrammarAccess return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java index baec41a..e18fbbf 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java @@ -166,7 +166,8 @@ public class TreeTestLanguageGrammarAccess implements IGrammarAccess { return gaTerminals.getWSRule(); } - //org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed. + //terminal ANY_OTHER: + // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); } |