| author | szarnekow | 2009-03-03 12:48:13 (EST) |
|---|---|---|
| committer | sefftinge | 2009-03-03 12:48:13 (EST) |
| commit | 4131c14e004d9c08277426225290ee7ae57874a6 (patch) (side-by-side diff) | |
| tree | 64e5cf65e494ee9681cbe9cea591851fafcb0673 | |
| parent | bb58e307a88e5cff42ebb7d87556631616e2cdfc (diff) | |
| download | org.eclipse.xtext-4131c14e004d9c08277426225290ee7ae57874a6.zip org.eclipse.xtext-4131c14e004d9c08277426225290ee7ae57874a6.tar.gz org.eclipse.xtext-4131c14e004d9c08277426225290ee7ae57874a6.tar.bz2 | |
Introduced more constraint on concrete syntax level (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266435)
Reviewed and fixed property names of Xtext grammar (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266441)
756 files changed, 47561 insertions, 32294 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi index 39c2792..4aff921 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi @@ -9,18 +9,18 @@ </metamodelDeclarations> <rules xsi:type="xtext:ParserRule" name="Spielplatz"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Spielplatz"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Spielplatz"/> </type> <alternatives xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="spielplatz"/> - <abstractTokens xsi:type="xtext:Assignment" feature="groesse" operator="="> + <tokens xsi:type="xtext:Keyword" value="spielplatz"/> + <tokens xsi:type="xtext:Assignment" feature="groesse" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="beschreibung" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" cardinality="?" feature="beschreibung" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="kinder" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/> </groups> @@ -36,13 +36,13 @@ <groups xsi:type="xtext:Assignment" feature="types" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.7"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Person"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Person"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Person"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.2"/> @@ -51,103 +51,107 @@ </rules> <rules xsi:type="xtext:ParserRule" name="Kind"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="kind"/> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="kind"/> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Erwachsener"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="erwachsener"/> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="erwachsener"/> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Spielzeug"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Spielzeug"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Spielzeug"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="spielzeug"/> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="spielzeug"/> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="farbe" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="farbe" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Familie"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Familie"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Familie"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="familie"/> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="familie"/> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="keyword"/> <groups xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> <groups xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="mutter" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="mutter" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="vater" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="vater" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="kinder" operator="+="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="kinder" operator="+="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="kinder" operator="+="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="kinder" operator="+="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Farbe"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Farbe"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Farbe"/> </type> <alternatives xsi:type="xtext:Assignment" feature="wert" operator="="> <terminal xsi:type="xtext:Alternatives"> @@ -160,13 +164,13 @@ </rules> <rules xsi:type="xtext:ParserRule" name="CustomTypeParserRule"> <type metamodel="/0/@metamodelDeclarations.1"> - <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceModel#//CustomType"/> + <classifier xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceModel#//CustomType"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="type"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="type"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> + </tokens> </alternatives> </rules> </xtext:Grammar> @@ -176,11 +180,11 @@ </metamodelDeclarations> <rules xsi:type="xtext:TerminalRule" name="ID"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="^"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="^"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:CharacterRange"> <left value="a"/> <right value="z"/> @@ -190,8 +194,8 @@ <right value="Z"/> </groups> <groups xsi:type="xtext:Keyword" value="_"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:CharacterRange"> <left value="a"/> <right value="z"/> @@ -205,12 +209,12 @@ <left value="0"/> <right value="9"/> </groups> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="INT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> <alternatives xsi:type="xtext:CharacterRange" cardinality="+"> <left value="0"/> @@ -219,15 +223,15 @@ </rules> <rules xsi:type="xtext:TerminalRule" name="STRING"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="""/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="""/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="\"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="\"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="b"/> <groups xsi:type="xtext:Keyword" value="t"/> <groups xsi:type="xtext:Keyword" value="n"/> @@ -236,7 +240,7 @@ <groups xsi:type="xtext:Keyword" value="""/> <groups xsi:type="xtext:Keyword" value="'"/> <groups xsi:type="xtext:Keyword" value="\"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:NegatedToken"> <terminal xsi:type="xtext:Alternatives"> @@ -244,15 +248,15 @@ <groups xsi:type="xtext:Keyword" value="""/> </terminal> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="""/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="""/> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="'"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="'"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="\"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="\"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="b"/> <groups xsi:type="xtext:Keyword" value="t"/> <groups xsi:type="xtext:Keyword" value="n"/> @@ -261,7 +265,7 @@ <groups xsi:type="xtext:Keyword" value="""/> <groups xsi:type="xtext:Keyword" value="'"/> <groups xsi:type="xtext:Keyword" value="\"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:NegatedToken"> <terminal xsi:type="xtext:Alternatives"> @@ -269,43 +273,43 @@ <groups xsi:type="xtext:Keyword" value="'"/> </terminal> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="'"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="'"/> </groups> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UntilToken"> + <tokens xsi:type="xtext:Keyword" value="/*"/> + <tokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="//"/> - <abstractTokens xsi:type="xtext:NegatedToken" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="//"/> + <tokens xsi:type="xtext:NegatedToken" cardinality="*"> <terminal xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="
"/> <groups xsi:type="xtext:Keyword" value="
"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="
"/> - <abstractTokens xsi:type="xtext:Keyword" value="
"/> - </abstractTokens> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="
"/> + <tokens xsi:type="xtext:Keyword" value="
"/> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="WS"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives" cardinality="+"> <groups xsi:type="xtext:Keyword" value=" "/> @@ -316,7 +320,7 @@ </rules> <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Wildcard"/> </rules> diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java index a99f4ba..d618202 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java @@ -22,14 +22,14 @@ public class ReferenceGrammarParsetreeConstructor extends AbstractParseTreeConst protected Solution internalSerialize(EObject obj) { IInstanceDescription inst = getDescr(obj); Solution s; - if(inst.isInstanceOf(grammarAccess.prSpielplatz().getRule().getType().getType()) && (s = new Spielplatz_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prPerson().getRule().getType().getType()) && (s = new Person_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prKind().getRule().getType().getType()) && (s = new Kind_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getType()) && (s = new Erwachsener_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getType()) && (s = new Spielzeug_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getType()) && (s = new Familie_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getType()) && (s = new Farbe_Assignment_wert(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getType()) && (s = new CustomTypeParserRule_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prSpielplatz().getRule().getType().getClassifier()) && (s = new Spielplatz_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prPerson().getRule().getType().getClassifier()) && (s = new Person_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prKind().getRule().getType().getClassifier()) && (s = new Kind_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getClassifier()) && (s = new Erwachsener_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getClassifier()) && (s = new Spielzeug_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getClassifier()) && (s = new Familie_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getClassifier()) && (s = new Farbe_Assignment_wert(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier()) && (s = new CustomTypeParserRule_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; return null; } @@ -204,7 +204,7 @@ protected class Spielplatz_4_0_Assignment_kinder extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prKind().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prKind().getRule().getType().getClassifier())) { Solution s = new Kind_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -237,7 +237,7 @@ protected class Spielplatz_4_1_Assignment_erzieher extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getClassifier())) { Solution s = new Erwachsener_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -270,7 +270,7 @@ protected class Spielplatz_4_2_Assignment_spielzeuge extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getClassifier())) { Solution s = new Spielzeug_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -303,7 +303,7 @@ protected class Spielplatz_4_3_Assignment_familie extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getClassifier())) { Solution s = new Familie_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -336,7 +336,7 @@ protected class Spielplatz_4_4_Assignment_types extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier())) { Solution s = new CustomTypeParserRule_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -410,7 +410,7 @@ protected class Person_0_RuleCall_Kind extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Kind_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prKind().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prKind().getRule().getType().getClassifier())) return null; return new Kind_Group(current, this).firstSolution(); } } @@ -430,7 +430,7 @@ protected class Person_1_RuleCall_Erwachsener extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Erwachsener_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getClassifier())) return null; return new Erwachsener_Group(current, this).firstSolution(); } } @@ -834,7 +834,7 @@ protected class Spielzeug_3_Assignment_farbe extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getClassifier())) { Solution s = new Farbe_Assignment_wert(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1004,9 +1004,9 @@ protected class Familie_3_Assignment_mutter extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("mutter"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFamilie().ele30CrossReferenceEStringErwachsener().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prFamilie().ele30CrossReferenceEStringErwachsener(); + element = grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener(); return new Solution(obj); } } @@ -1032,9 +1032,9 @@ protected class Familie_4_Assignment_vater extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("vater"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFamilie().ele40CrossReferenceEStringErwachsener().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prFamilie().ele40CrossReferenceEStringErwachsener(); + element = grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener(); return new Solution(obj); } } @@ -1060,9 +1060,9 @@ protected class Familie_5_Assignment_kinder extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("kinder"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFamilie().ele50CrossReferenceEStringKind().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFamilie().ele50CrossReferenceIDKind().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prFamilie().ele50CrossReferenceEStringKind(); + element = grammarAccess.prFamilie().ele50CrossReferenceIDKind(); return new Solution(obj); } } @@ -1130,9 +1130,9 @@ protected class Familie_6_1_Assignment_kinder extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("kinder"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFamilie().ele610CrossReferenceEStringKind().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFamilie().ele610CrossReferenceIDKind().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prFamilie().ele610CrossReferenceEStringKind(); + element = grammarAccess.prFamilie().ele610CrossReferenceIDKind(); return new Solution(obj); } } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g index 89f52be..e8f7b9d 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g @@ -93,7 +93,7 @@ ruleSpielplatz returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -113,7 +113,7 @@ ruleSpielplatz returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -137,7 +137,7 @@ ruleSpielplatz returns [EObject current=null] lv_kinder_4=ruleKind { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -159,7 +159,7 @@ ruleSpielplatz returns [EObject current=null] lv_erzieher_5=ruleErwachsener { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -181,7 +181,7 @@ ruleSpielplatz returns [EObject current=null] lv_spielzeuge_6=ruleSpielzeug { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -203,7 +203,7 @@ ruleSpielplatz returns [EObject current=null] lv_familie_7=ruleFamilie { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -225,7 +225,7 @@ ruleSpielplatz returns [EObject current=null] lv_types_8=ruleCustomTypeParserRule { if ($current==null) { - $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -281,7 +281,7 @@ ruleKind returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prKind().getRule().getType().getType()); + $current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -301,7 +301,7 @@ ruleKind returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prKind().getRule().getType().getType()); + $current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -354,7 +354,7 @@ ruleErwachsener returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType()); + $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -374,7 +374,7 @@ ruleErwachsener returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType()); + $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -427,7 +427,7 @@ ruleSpielzeug returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -447,7 +447,7 @@ ruleSpielzeug returns [EObject current=null] lv_farbe_3=ruleFarbe { if ($current==null) { - $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -513,7 +513,7 @@ ruleFamilie returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -529,13 +529,13 @@ ruleFamilie returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele30CrossReferenceEStringErwachsener(), "mutter"); + createLeafNode(grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener(), "mutter"); } // TODO assign feature to currentNode @@ -545,13 +545,13 @@ ruleFamilie returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele40CrossReferenceEStringErwachsener(), "vater"); + createLeafNode(grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener(), "vater"); } // TODO assign feature to currentNode @@ -561,13 +561,13 @@ ruleFamilie returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele50CrossReferenceEStringKind(), "kinder"); + createLeafNode(grammarAccess.prFamilie().ele50CrossReferenceIDKind(), "kinder"); } // TODO assign feature to currentNode @@ -581,13 +581,13 @@ ruleFamilie returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele610CrossReferenceEStringKind(), "kinder"); + createLeafNode(grammarAccess.prFamilie().ele610CrossReferenceIDKind(), "kinder"); } // TODO assign feature to currentNode @@ -646,7 +646,7 @@ ruleFarbe returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prFarbe().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFarbe().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -691,7 +691,7 @@ ruleCustomTypeParserRule returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getType()); + $current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java index 2542603..9f6a135 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java @@ -148,7 +148,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -179,7 +179,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -248,7 +248,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -280,7 +280,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -312,7 +312,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -344,7 +344,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -376,7 +376,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -498,7 +498,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prKind().getRule().getType().getType()); + current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -521,7 +521,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prKind().getRule().getType().getType()); + current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -630,7 +630,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType()); + current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -653,7 +653,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType()); + current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -763,7 +763,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -788,7 +788,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType()); + current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -951,7 +951,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -969,13 +969,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1056); - createLeafNode(grammarAccess.prFamilie().ele30CrossReferenceEStringErwachsener(), "mutter"); + createLeafNode(grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener(), "mutter"); } @@ -985,13 +985,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1081); - createLeafNode(grammarAccess.prFamilie().ele40CrossReferenceEStringErwachsener(), "vater"); + createLeafNode(grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener(), "vater"); } @@ -1001,13 +1001,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1106); - createLeafNode(grammarAccess.prFamilie().ele50CrossReferenceEStringKind(), "kinder"); + createLeafNode(grammarAccess.prFamilie().ele50CrossReferenceIDKind(), "kinder"); } @@ -1036,13 +1036,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prFamilie().getRule().getType().getType()); + current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1141); - createLeafNode(grammarAccess.prFamilie().ele610CrossReferenceEStringKind(), "kinder"); + createLeafNode(grammarAccess.prFamilie().ele610CrossReferenceIDKind(), "kinder"); } @@ -1209,7 +1209,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prFarbe().getRule().getType().getType()); + current = factory.create(grammarAccess.prFarbe().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1306,7 +1306,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser if (current==null) { - current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getType()); + current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java index f7f4205..56c537e 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java @@ -145,17 +145,17 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura getSpielzeugConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); getSpielzeugConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); getSpielzeugConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); - getFamilieConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); - getFamilieConsumer().setCrossReference$13$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); - getFamilieConsumer().setCrossReference$16$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); - getFamilieConsumer().setCrossReference$21$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); getFamilieConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$5$Delimiter); getFamilieConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); getFamilieConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$5$Delimiter); - getFamilieConsumer().setKeyword$19$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); - getFamilieConsumer().setKeyword$23$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); + getFamilieConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); + getFamilieConsumer().setKeyword$27$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$10$Delimiter); getFamilieConsumer().setRuleCall$7$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$7$Delimiter); getFamilieConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); + getFamilieConsumer().setRuleCall$12$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); + getFamilieConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); + getFamilieConsumer().setRuleCall$20$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); + getFamilieConsumer().setRuleCall$26$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$34$Delimiter); getFarbeConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$5$Delimiter); getFarbeConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$5$Delimiter); getFarbeConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.keyword$5$Delimiter); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java index f0d2ef9..578f7f4 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java @@ -118,7 +118,7 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java index f9395d4..f8b857a 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java @@ -192,7 +192,7 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java index 3a2e78b..d70f4dc 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java @@ -50,31 +50,23 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { private IElementConsumer crossReference$10$Consumer; - private IElementConsumer assignment$12$Consumer; + private IElementConsumer assignment$13$Consumer; - private IElementConsumer crossReference$13$Consumer; + private IElementConsumer crossReference$14$Consumer; - private IElementConsumer assignment$15$Consumer; + private IElementConsumer assignment$17$Consumer; - private IElementConsumer crossReference$16$Consumer; + private IElementConsumer crossReference$18$Consumer; - private IElementConsumer group$18$Consumer; + private IElementConsumer group$21$Consumer; - private IElementConsumer keyword$19$Consumer; + private IElementConsumer keyword$22$Consumer; - private IElementConsumer assignment$20$Consumer; + private IElementConsumer assignment$23$Consumer; - private IElementConsumer crossReference$21$Consumer; + private IElementConsumer crossReference$24$Consumer; - private IElementConsumer keyword$23$Consumer; - - private ISequenceMatcher crossReference$10$Delimiter; - - private ISequenceMatcher crossReference$13$Delimiter; - - private ISequenceMatcher crossReference$16$Delimiter; - - private ISequenceMatcher crossReference$21$Delimiter; + private IElementConsumer keyword$27$Consumer; private ICharacterClass keyword$2$Delimiter; @@ -82,14 +74,22 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { private ICharacterClass keyword$6$Delimiter; - private ICharacterClass keyword$19$Delimiter; + private ICharacterClass keyword$22$Delimiter; - private ICharacterClass keyword$23$Delimiter; + private ICharacterClass keyword$27$Delimiter; private ISequenceMatcher ruleCall$7$Delimiter; private ISequenceMatcher ruleCall$8$Delimiter; + private ISequenceMatcher ruleCall$12$Delimiter; + + private ISequenceMatcher ruleCall$16$Delimiter; + + private ISequenceMatcher ruleCall$20$Delimiter; + + private ISequenceMatcher ruleCall$26$Delimiter; + protected class Group$1$Consumer extends GroupConsumer { protected Group$1$Consumer(final Group group) { @@ -102,10 +102,10 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { acceptor.accept(keyword$3$Consumer); acceptor.accept(assignment$4$Consumer); acceptor.accept(assignment$9$Consumer); - acceptor.accept(assignment$12$Consumer); - acceptor.accept(assignment$15$Consumer); - acceptor.accept(group$18$Consumer); - acceptor.accept(keyword$23$Consumer); + acceptor.accept(assignment$13$Consumer); + acceptor.accept(assignment$17$Consumer); + acceptor.accept(group$21$Consumer); + acceptor.accept(keyword$27$Consumer); } } @@ -215,132 +215,132 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "mutter", false, false, getElement(), getCrossReference$10$Delimiter(), optional); + return consumeTerminal(idConsumer, "mutter", false, false, getElement(), getRuleCall$12$Delimiter(), optional); } } - protected class Assignment$12$Consumer extends AssignmentConsumer { + protected class Assignment$13$Consumer extends AssignmentConsumer { - protected Assignment$12$Consumer(final Assignment assignment) { + protected Assignment$13$Consumer(final Assignment assignment) { super(assignment); } @Override protected IElementConsumer getConsumer() { - return crossReference$13$Consumer; + return crossReference$14$Consumer; } } - protected class CrossReference$13$Consumer extends ElementConsumer<CrossReference> { + protected class CrossReference$14$Consumer extends ElementConsumer<CrossReference> { - protected CrossReference$13$Consumer(final CrossReference crossReference) { + protected CrossReference$14$Consumer(final CrossReference crossReference) { super(crossReference); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "vater", false, false, getElement(), getCrossReference$13$Delimiter(), optional); + return consumeTerminal(idConsumer, "vater", false, false, getElement(), getRuleCall$16$Delimiter(), optional); } } - protected class Assignment$15$Consumer extends AssignmentConsumer { + protected class Assignment$17$Consumer extends AssignmentConsumer { - protected Assignment$15$Consumer(final Assignment assignment) { + protected Assignment$17$Consumer(final Assignment assignment) { super(assignment); } @Override protected IElementConsumer getConsumer() { - return crossReference$16$Consumer; + return crossReference$18$Consumer; } } - protected class CrossReference$16$Consumer extends ElementConsumer<CrossReference> { + protected class CrossReference$18$Consumer extends ElementConsumer<CrossReference> { - protected CrossReference$16$Consumer(final CrossReference crossReference) { + protected CrossReference$18$Consumer(final CrossReference crossReference) { super(crossReference); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "kinder", true, false, getElement(), getCrossReference$16$Delimiter(), optional); + return consumeTerminal(idConsumer, "kinder", true, false, getElement(), getRuleCall$20$Delimiter(), optional); } } - protected class Group$18$Consumer extends LoopGroupConsumer { + protected class Group$21$Consumer extends LoopGroupConsumer { - protected Group$18$Consumer(final Group group) { + protected Group$21$Consumer(final Group group) { super(group); } @Override protected void doGetConsumers(ConsumerAcceptor acceptor) { - acceptor.accept(keyword$19$Consumer); - acceptor.accept(assignment$20$Consumer); + acceptor.accept(keyword$22$Consumer); + acceptor.accept(assignment$23$Consumer); } } - protected class Keyword$19$Consumer extends ElementConsumer<Keyword> { + protected class Keyword$22$Consumer extends ElementConsumer<Keyword> { - protected Keyword$19$Consumer(final Keyword keyword) { + protected Keyword$22$Consumer(final Keyword keyword) { super(keyword); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeKeyword(getElement(), null, false, false, getKeyword$19$Delimiter(), optional); + return consumeKeyword(getElement(), null, false, false, getKeyword$22$Delimiter(), optional); } } - protected class Assignment$20$Consumer extends AssignmentConsumer { + protected class Assignment$23$Consumer extends AssignmentConsumer { - protected Assignment$20$Consumer(final Assignment assignment) { + protected Assignment$23$Consumer(final Assignment assignment) { super(assignment); } @Override protected IElementConsumer getConsumer() { - return crossReference$21$Consumer; + return crossReference$24$Consumer; } } - protected class CrossReference$21$Consumer extends ElementConsumer<CrossReference> { + protected class CrossReference$24$Consumer extends ElementConsumer<CrossReference> { - protected CrossReference$21$Consumer(final CrossReference crossReference) { + protected CrossReference$24$Consumer(final CrossReference crossReference) { super(crossReference); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "kinder", true, false, getElement(), getCrossReference$21$Delimiter(), optional); + return consumeTerminal(idConsumer, "kinder", true, false, getElement(), getRuleCall$26$Delimiter(), optional); } } - protected class Keyword$23$Consumer extends ElementConsumer<Keyword> { + protected class Keyword$27$Consumer extends ElementConsumer<Keyword> { - protected Keyword$23$Consumer(final Keyword keyword) { + protected Keyword$27$Consumer(final Keyword keyword) { super(keyword); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeKeyword(getElement(), null, false, false, getKeyword$23$Delimiter(), optional); + return consumeKeyword(getElement(), null, false, false, getKeyword$27$Delimiter(), optional); } } public ReferenceGrammarFamilieConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); - crossReference$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - crossReference$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - crossReference$16$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - crossReference$21$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$19$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$23$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$22$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$27$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$12$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$16$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$26$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } @Override @@ -367,16 +367,16 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele201TerminalRuleCallSTRING()); ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele202TerminalRuleCallID()); assignment$9$Consumer = new Assignment$9$Consumer(rule.ele3AssignmentMutter()); - crossReference$10$Consumer = new CrossReference$10$Consumer(rule.ele30CrossReferenceEStringErwachsener()); - assignment$12$Consumer = new Assignment$12$Consumer(rule.ele4AssignmentVater()); - crossReference$13$Consumer = new CrossReference$13$Consumer(rule.ele40CrossReferenceEStringErwachsener()); - assignment$15$Consumer = new Assignment$15$Consumer(rule.ele5AssignmentKinder()); - crossReference$16$Consumer = new CrossReference$16$Consumer(rule.ele50CrossReferenceEStringKind()); - group$18$Consumer = new Group$18$Consumer(rule.ele6Group()); - keyword$19$Consumer = new Keyword$19$Consumer(rule.ele60KeywordComma()); - assignment$20$Consumer = new Assignment$20$Consumer(rule.ele61AssignmentKinder()); - crossReference$21$Consumer = new CrossReference$21$Consumer(rule.ele610CrossReferenceEStringKind()); - keyword$23$Consumer = new Keyword$23$Consumer(rule.ele7KeywordRightParenthesis()); + crossReference$10$Consumer = new CrossReference$10$Consumer(rule.ele30CrossReferenceIDErwachsener()); + assignment$13$Consumer = new Assignment$13$Consumer(rule.ele4AssignmentVater()); + crossReference$14$Consumer = new CrossReference$14$Consumer(rule.ele40CrossReferenceIDErwachsener()); + assignment$17$Consumer = new Assignment$17$Consumer(rule.ele5AssignmentKinder()); + crossReference$18$Consumer = new CrossReference$18$Consumer(rule.ele50CrossReferenceIDKind()); + group$21$Consumer = new Group$21$Consumer(rule.ele6Group()); + keyword$22$Consumer = new Keyword$22$Consumer(rule.ele60KeywordComma()); + assignment$23$Consumer = new Assignment$23$Consumer(rule.ele61AssignmentKinder()); + crossReference$24$Consumer = new CrossReference$24$Consumer(rule.ele610CrossReferenceIDKind()); + keyword$27$Consumer = new Keyword$27$Consumer(rule.ele7KeywordRightParenthesis()); } @Override @@ -386,7 +386,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { @@ -397,38 +397,6 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { this.stringConsumer = stringConsumer; } - public ISequenceMatcher getCrossReference$10$Delimiter() { - return crossReference$10$Delimiter; - } - - public void setCrossReference$10$Delimiter(ISequenceMatcher matcher) { - crossReference$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ISequenceMatcher getCrossReference$13$Delimiter() { - return crossReference$13$Delimiter; - } - - public void setCrossReference$13$Delimiter(ISequenceMatcher matcher) { - crossReference$13$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ISequenceMatcher getCrossReference$16$Delimiter() { - return crossReference$16$Delimiter; - } - - public void setCrossReference$16$Delimiter(ISequenceMatcher matcher) { - crossReference$16$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ISequenceMatcher getCrossReference$21$Delimiter() { - return crossReference$21$Delimiter; - } - - public void setCrossReference$21$Delimiter(ISequenceMatcher matcher) { - crossReference$21$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - public ICharacterClass getKeyword$2$Delimiter() { return keyword$2$Delimiter; } @@ -453,20 +421,20 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$19$Delimiter() { - return keyword$19$Delimiter; + public ICharacterClass getKeyword$22$Delimiter() { + return keyword$22$Delimiter; } - public void setKeyword$19$Delimiter(ICharacterClass characterClass) { - keyword$19$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$22$Delimiter(ICharacterClass characterClass) { + keyword$22$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$23$Delimiter() { - return keyword$23$Delimiter; + public ICharacterClass getKeyword$27$Delimiter() { + return keyword$27$Delimiter; } - public void setKeyword$23$Delimiter(ICharacterClass characterClass) { - keyword$23$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$27$Delimiter(ICharacterClass characterClass) { + keyword$27$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ISequenceMatcher getRuleCall$7$Delimiter() { @@ -485,4 +453,36 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ISequenceMatcher getRuleCall$12$Delimiter() { + return ruleCall$12$Delimiter; + } + + public void setRuleCall$12$Delimiter(ISequenceMatcher matcher) { + ruleCall$12$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + + public ISequenceMatcher getRuleCall$16$Delimiter() { + return ruleCall$16$Delimiter; + } + + public void setRuleCall$16$Delimiter(ISequenceMatcher matcher) { + ruleCall$16$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + + public ISequenceMatcher getRuleCall$20$Delimiter() { + return ruleCall$20$Delimiter; + } + + public void setRuleCall$20$Delimiter(ISequenceMatcher matcher) { + ruleCall$20$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + + public ISequenceMatcher getRuleCall$26$Delimiter() { + return ruleCall$26$Delimiter; + } + + public void setRuleCall$26$Delimiter(ISequenceMatcher matcher) { + ruleCall$26$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java index a3b052c..1a3d258 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java @@ -156,7 +156,7 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public ICharacterClass getKeyword$3$Delimiter() { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java index 9a81c90..f7d9918 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java @@ -192,7 +192,7 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java index aa8af39..ece438f 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java @@ -96,7 +96,7 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setErwachsenerConsumer(INonTerminalConsumer erwachsenerConsumer) { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java index 44c58ea..dde92a9 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java @@ -374,7 +374,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setCustomTypeParserRuleConsumer(INonTerminalConsumer customTypeParserRuleConsumer) { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java index 16e812f..ad401f1 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java @@ -190,7 +190,7 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setFarbeConsumer(INonTerminalConsumer farbeConsumer) { 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 778d082..8dc29bd 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 @@ -247,15 +247,19 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final RuleCall c201TerminalRuleCallSTRING = (RuleCall)c20Alternatives.eContents().get(1); private final RuleCall c202TerminalRuleCallID = (RuleCall)c20Alternatives.eContents().get(2); private final Assignment c3AssignmentMutter = (Assignment)cGroup.eContents().get(3); - private final CrossReference c30CrossReferenceEStringErwachsener = (CrossReference)c3AssignmentMutter.eContents().get(0); + private final CrossReference c30CrossReferenceIDErwachsener = (CrossReference)c3AssignmentMutter.eContents().get(0); + private final RuleCall c301TerminalRuleCallID = (RuleCall)c30CrossReferenceIDErwachsener.eContents().get(1); private final Assignment c4AssignmentVater = (Assignment)cGroup.eContents().get(4); - private final CrossReference c40CrossReferenceEStringErwachsener = (CrossReference)c4AssignmentVater.eContents().get(0); + private final CrossReference c40CrossReferenceIDErwachsener = (CrossReference)c4AssignmentVater.eContents().get(0); + private final RuleCall c401TerminalRuleCallID = (RuleCall)c40CrossReferenceIDErwachsener.eContents().get(1); private final Assignment c5AssignmentKinder = (Assignment)cGroup.eContents().get(5); - private final CrossReference c50CrossReferenceEStringKind = (CrossReference)c5AssignmentKinder.eContents().get(0); + private final CrossReference c50CrossReferenceIDKind = (CrossReference)c5AssignmentKinder.eContents().get(0); + private final RuleCall c501TerminalRuleCallID = (RuleCall)c50CrossReferenceIDKind.eContents().get(1); private final Group c6Group = (Group)cGroup.eContents().get(6); private final Keyword c60KeywordComma = (Keyword)c6Group.eContents().get(0); private final Assignment c61AssignmentKinder = (Assignment)c6Group.eContents().get(1); - private final CrossReference c610CrossReferenceEStringKind = (CrossReference)c61AssignmentKinder.eContents().get(0); + private final CrossReference c610CrossReferenceIDKind = (CrossReference)c61AssignmentKinder.eContents().get(0); + private final RuleCall c6101TerminalRuleCallID = (RuleCall)c610CrossReferenceIDKind.eContents().get(1); private final Keyword c7KeywordRightParenthesis = (Keyword)cGroup.eContents().get(7); // not supported @@ -289,19 +293,28 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele3AssignmentMutter() { return c3AssignmentMutter; } // not supported - public CrossReference ele30CrossReferenceEStringErwachsener() { return c30CrossReferenceEStringErwachsener; } + public CrossReference ele30CrossReferenceIDErwachsener() { return c30CrossReferenceIDErwachsener; } + + // not supported + public RuleCall ele301TerminalRuleCallID() { return c301TerminalRuleCallID; } // not supported public Assignment ele4AssignmentVater() { return c4AssignmentVater; } // not supported - public CrossReference ele40CrossReferenceEStringErwachsener() { return c40CrossReferenceEStringErwachsener; } + public CrossReference ele40CrossReferenceIDErwachsener() { return c40CrossReferenceIDErwachsener; } + + // not supported + public RuleCall ele401TerminalRuleCallID() { return c401TerminalRuleCallID; } // not supported public Assignment ele5AssignmentKinder() { return c5AssignmentKinder; } // not supported - public CrossReference ele50CrossReferenceEStringKind() { return c50CrossReferenceEStringKind; } + public CrossReference ele50CrossReferenceIDKind() { return c50CrossReferenceIDKind; } + + // not supported + public RuleCall ele501TerminalRuleCallID() { return c501TerminalRuleCallID; } // not supported public Group ele6Group() { return c6Group; } @@ -313,7 +326,10 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele61AssignmentKinder() { return c61AssignmentKinder; } // not supported - public CrossReference ele610CrossReferenceEStringKind() { return c610CrossReferenceEStringKind; } + public CrossReference ele610CrossReferenceIDKind() { return c610CrossReferenceIDKind; } + + // not supported + public RuleCall ele6101TerminalRuleCallID() { return c6101TerminalRuleCallID; } // not supported public Keyword ele7KeywordRightParenthesis() { return c7KeywordRightParenthesis; } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi index 0f1f111..1cfef2c 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi @@ -9,31 +9,31 @@ </metamodelDeclarations> <rules xsi:type="xtext:ParserRule" name="File"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//File"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//File"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="imports" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="imports" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="namedElements" operator="+="> + </tokens> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="namedElements" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Import"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Import"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Import"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="import"/> - <abstractTokens xsi:type="xtext:Assignment" feature="importURI" operator="="> + <tokens xsi:type="xtext:Keyword" value="import"/> + <tokens xsi:type="xtext:Assignment" feature="importURI" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="NamedElement"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//NamedElement"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//NamedElement"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.3"/> @@ -42,23 +42,23 @@ </rules> <rules xsi:type="xtext:ParserRule" name="Package"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Package"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Package"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="package"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="package"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="namedElements" operator="+="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="namedElements" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Type"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Type"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Type"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> @@ -67,44 +67,45 @@ </rules> <rules xsi:type="xtext:ParserRule" name="DataType"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//DataType"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//DataType"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="datatype"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="datatype"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Entity"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Entity"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Entity"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="entity"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="entity"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="extends"/> - <abstractTokens xsi:type="xtext:Assignment" feature="superType" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="extends"/> + <tokens xsi:type="xtext:Assignment" feature="superType" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Entity"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Entity"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="features" operator="+="> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="features" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.7"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Feature"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Feature"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Feature"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.8"/> @@ -113,7 +114,7 @@ </rules> <rules xsi:type="xtext:ParserRule" name="StructuralFeature"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//StructuralFeature"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//StructuralFeature"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.9"/> @@ -122,88 +123,89 @@ </rules> <rules xsi:type="xtext:ParserRule" name="Attribute"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Attribute"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Attribute"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="attr"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="attr"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=":"/> - <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value=":"/> + <tokens xsi:type="xtext:Assignment" feature="type" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Reference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Reference"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Reference"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="ref"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="ref"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=":"/> - <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value=":"/> + <tokens xsi:type="xtext:Assignment" feature="type" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="opposite"/> - <abstractTokens xsi:type="xtext:Assignment" feature="opposite" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="opposite"/> + <tokens xsi:type="xtext:Assignment" feature="opposite" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Reference"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Reference"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - </abstractTokens> + </tokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Operation"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Operation"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Operation"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="op"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Keyword" value="op"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Assignment" feature="params" operator="+="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Assignment" feature="params" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.12"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="params" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="params" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.12"/> - </abstractTokens> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> - <abstractTokens xsi:type="xtext:Keyword" value=":"/> - <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> + </tokens> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> + <tokens xsi:type="xtext:Keyword" value=":"/> + <tokens xsi:type="xtext:Assignment" feature="type" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="Parameter"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Parameter"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Parameter"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="type" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="TypedElement"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//TypedElement"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//TypedElement"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.7"/> @@ -212,26 +214,27 @@ </rules> <rules xsi:type="xtext:ParserRule" name="TypeRef"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//TypeRef"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//TypeRef"/> </type> <alternatives xsi:type="xtext:Assignment" feature="referenced" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Type"/> + <classifier xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Type"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="QualifiedName"> <type metamodel="/0/@metamodelDeclarations.1"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value="."/> - <abstractTokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> + <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="."/> + <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> + </tokens> </alternatives> </rules> </xtext:Grammar> @@ -241,11 +244,11 @@ </metamodelDeclarations> <rules xsi:type="xtext:TerminalRule" name="ID"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="^"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="^"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:CharacterRange"> <left value="a"/> <right value="z"/> @@ -255,8 +258,8 @@ <right value="Z"/> </groups> <groups xsi:type="xtext:Keyword" value="_"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:CharacterRange"> <left value="a"/> <right value="z"/> @@ -270,12 +273,12 @@ <left value="0"/> <right value="9"/> </groups> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="INT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> <alternatives xsi:type="xtext:CharacterRange" cardinality="+"> <left value="0"/> @@ -284,15 +287,15 @@ </rules> <rules xsi:type="xtext:TerminalRule" name="STRING"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="""/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="""/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="\"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="\"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="b"/> <groups xsi:type="xtext:Keyword" value="t"/> <groups xsi:type="xtext:Keyword" value="n"/> @@ -301,7 +304,7 @@ <groups xsi:type="xtext:Keyword" value="""/> <groups xsi:type="xtext:Keyword" value="'"/> <groups xsi:type="xtext:Keyword" value="\"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:NegatedToken"> <terminal xsi:type="xtext:Alternatives"> @@ -309,15 +312,15 @@ <groups xsi:type="xtext:Keyword" value="""/> </terminal> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="""/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="""/> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="'"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="'"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="\"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="\"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="b"/> <groups xsi:type="xtext:Keyword" value="t"/> <groups xsi:type="xtext:Keyword" value="n"/> @@ -326,7 +329,7 @@ <groups xsi:type="xtext:Keyword" value="""/> <groups xsi:type="xtext:Keyword" value="'"/> <groups xsi:type="xtext:Keyword" value="\"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:NegatedToken"> <terminal xsi:type="xtext:Alternatives"> @@ -334,43 +337,43 @@ <groups xsi:type="xtext:Keyword" value="'"/> </terminal> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="'"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="'"/> </groups> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UntilToken"> + <tokens xsi:type="xtext:Keyword" value="/*"/> + <tokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="//"/> - <abstractTokens xsi:type="xtext:NegatedToken" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="//"/> + <tokens xsi:type="xtext:NegatedToken" cardinality="*"> <terminal xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="
"/> <groups xsi:type="xtext:Keyword" value="
"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="
"/> - <abstractTokens xsi:type="xtext:Keyword" value="
"/> - </abstractTokens> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="
"/> + <tokens xsi:type="xtext:Keyword" value="
"/> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="WS"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives" cardinality="+"> <groups xsi:type="xtext:Keyword" value=" "/> @@ -381,7 +384,7 @@ </rules> <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Wildcard"/> </rules> diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java index 47626a2..6827ecd 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java @@ -22,21 +22,21 @@ public class DomainmodelParsetreeConstructor extends AbstractParseTreeConstructo protected Solution internalSerialize(EObject obj) { IInstanceDescription inst = getDescr(obj); Solution s; - if(inst.isInstanceOf(grammarAccess.prFile().getRule().getType().getType()) && (s = new File_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prImport().getRule().getType().getType()) && (s = new Import_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getType()) && (s = new NamedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prPackage().getRule().getType().getType()) && (s = new Package_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prType().getRule().getType().getType()) && (s = new Type_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prDataType().getRule().getType().getType()) && (s = new DataType_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEntity().getRule().getType().getType()) && (s = new Entity_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prFeature().getRule().getType().getType()) && (s = new Feature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getType()) && (s = new StructuralFeature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getType()) && (s = new Attribute_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prReference().getRule().getType().getType()) && (s = new Reference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prOperation().getRule().getType().getType()) && (s = new Operation_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType()) && (s = new Parameter_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prTypedElement().getRule().getType().getType()) && (s = new TypedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType()) && (s = new TypeRef_Assignment_referenced(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prFile().getRule().getType().getClassifier()) && (s = new File_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prImport().getRule().getType().getClassifier()) && (s = new Import_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getClassifier()) && (s = new NamedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prPackage().getRule().getType().getClassifier()) && (s = new Package_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prType().getRule().getType().getClassifier()) && (s = new Type_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prDataType().getRule().getType().getClassifier()) && (s = new DataType_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEntity().getRule().getType().getClassifier()) && (s = new Entity_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prFeature().getRule().getType().getClassifier()) && (s = new Feature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getClassifier()) && (s = new StructuralFeature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getClassifier()) && (s = new Attribute_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prReference().getRule().getType().getClassifier()) && (s = new Reference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prOperation().getRule().getType().getClassifier()) && (s = new Operation_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier()) && (s = new Parameter_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prTypedElement().getRule().getType().getClassifier()) && (s = new TypedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier()) && (s = new TypeRef_Assignment_referenced(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; return null; } @@ -97,7 +97,7 @@ protected class File_0_Assignment_imports extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prImport().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prImport().getRule().getType().getClassifier())) { Solution s = new Import_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -130,7 +130,7 @@ protected class File_1_Assignment_namedElements extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getClassifier())) { Solution s = new NamedElement_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -269,7 +269,7 @@ protected class NamedElement_0_RuleCall_Package extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Package_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prPackage().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prPackage().getRule().getType().getClassifier())) return null; return new Package_Group(current, this).firstSolution(); } } @@ -289,7 +289,7 @@ protected class NamedElement_1_RuleCall_Type extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Type_Alternatives.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prType().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prType().getRule().getType().getClassifier())) return null; return new Type_Alternatives(current, this).firstSolution(); } } @@ -417,7 +417,7 @@ protected class Package_3_Assignment_namedElements extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getClassifier())) { Solution s = new NamedElement_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -490,7 +490,7 @@ protected class Type_0_RuleCall_Entity extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Entity_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prEntity().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prEntity().getRule().getType().getClassifier())) return null; return new Entity_Group(current, this).firstSolution(); } } @@ -510,7 +510,7 @@ protected class Type_1_RuleCall_DataType extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(DataType_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prDataType().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prDataType().getRule().getType().getClassifier())) return null; return new DataType_Group(current, this).firstSolution(); } } @@ -747,9 +747,9 @@ protected class Entity_2_1_Assignment_superType extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("superType"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEntity().ele210CrossReferenceEStringEntity().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEntity().ele210CrossReferenceIDEntity().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEntity().ele210CrossReferenceEStringEntity(); + element = grammarAccess.prEntity().ele210CrossReferenceIDEntity(); return new Solution(obj); } } @@ -789,7 +789,7 @@ protected class Entity_4_Assignment_features extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prFeature().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prFeature().getRule().getType().getClassifier())) { Solution s = new Feature_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -862,7 +862,7 @@ protected class Feature_0_RuleCall_StructuralFeature extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(StructuralFeature_Alternatives.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getClassifier())) return null; return new StructuralFeature_Alternatives(current, this).firstSolution(); } } @@ -882,7 +882,7 @@ protected class Feature_1_RuleCall_Operation extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Operation_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prOperation().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prOperation().getRule().getType().getClassifier())) return null; return new Operation_Group(current, this).firstSolution(); } } @@ -934,7 +934,7 @@ protected class StructuralFeature_0_RuleCall_Attribute extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Attribute_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getClassifier())) return null; return new Attribute_Group(current, this).firstSolution(); } } @@ -954,7 +954,7 @@ protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Reference_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prReference().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prReference().getRule().getType().getClassifier())) return null; return new Reference_Group(current, this).firstSolution(); } } @@ -1076,7 +1076,7 @@ protected class Attribute_3_Assignment_type extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) { Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1211,7 +1211,7 @@ protected class Reference_3_Assignment_type extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) { Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1285,9 +1285,9 @@ protected class Reference_4_1_Assignment_opposite extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("opposite"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prReference().ele410CrossReferenceEStringReference().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prReference().ele410CrossReferenceIDReference().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prReference().ele410CrossReferenceEStringReference(); + element = grammarAccess.prReference().ele410CrossReferenceIDReference(); return new Solution(obj); } } @@ -1455,7 +1455,7 @@ protected class Operation_3_0_Assignment_params extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier())) { Solution s = new Parameter_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1530,7 +1530,7 @@ protected class Operation_3_1_1_Assignment_params extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier())) { Solution s = new Parameter_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1589,7 +1589,7 @@ protected class Operation_6_Assignment_type extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) { Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1688,7 +1688,7 @@ protected class Parameter_1_Assignment_type extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) { Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1749,7 +1749,7 @@ protected class TypedElement_0_RuleCall_Feature extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Feature_Alternatives.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prFeature().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prFeature().getRule().getType().getClassifier())) return null; return new Feature_Alternatives(current, this).firstSolution(); } } @@ -1769,7 +1769,7 @@ protected class TypedElement_1_RuleCall_Parameter extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(Parameter_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier())) return null; return new Parameter_Group(current, this).firstSolution(); } } @@ -1803,9 +1803,9 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken { IInstanceDescription obj = current.cloneAndConsume("referenced"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prTypeRef().ele0CrossReferenceEStringType().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prTypeRef().ele0CrossReferenceIDType().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prTypeRef().ele0CrossReferenceEStringType(); + element = grammarAccess.prTypeRef().ele0CrossReferenceIDType(); return new Solution(obj); } } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g index aa8fe6b..c6f6576 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g @@ -89,7 +89,7 @@ ruleFile returns [EObject current=null] lv_imports_0=ruleImport { if ($current==null) { - $current = factory.create(grammarAccess.prFile().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -110,7 +110,7 @@ ruleFile returns [EObject current=null] lv_namedElements_1=ruleNamedElement { if ($current==null) { - $current = factory.create(grammarAccess.prFile().getRule().getType().getType()); + $current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -156,7 +156,7 @@ ruleImport returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prImport().getRule().getType().getType()); + $current = factory.create(grammarAccess.prImport().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -249,7 +249,7 @@ rulePackage returns [EObject current=null] lv_name_1=ruleQualifiedName { if ($current==null) { - $current = factory.create(grammarAccess.prPackage().getRule().getType().getType()); + $current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -274,7 +274,7 @@ rulePackage returns [EObject current=null] lv_namedElements_3=ruleNamedElement { if ($current==null) { - $current = factory.create(grammarAccess.prPackage().getRule().getType().getType()); + $current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -372,7 +372,7 @@ ruleDataType returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prDataType().getRule().getType().getType()); + $current = factory.create(grammarAccess.prDataType().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -417,7 +417,7 @@ ruleEntity returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEntity().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -437,13 +437,13 @@ ruleEntity returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEntity().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEntity().ele210CrossReferenceEStringEntity(), "superType"); + createLeafNode(grammarAccess.prEntity().ele210CrossReferenceIDEntity(), "superType"); } // TODO assign feature to currentNode @@ -461,7 +461,7 @@ ruleEntity returns [EObject current=null] lv_features_5=ruleFeature { if ($current==null) { - $current = factory.create(grammarAccess.prEntity().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -607,7 +607,7 @@ ruleAttribute returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prAttribute().getRule().getType().getType()); + $current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -631,7 +631,7 @@ ruleAttribute returns [EObject current=null] lv_type_3=ruleTypeRef { if ($current==null) { - $current = factory.create(grammarAccess.prAttribute().getRule().getType().getType()); + $current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -677,7 +677,7 @@ ruleReference returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prReference().getRule().getType().getType()); + $current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -701,7 +701,7 @@ ruleReference returns [EObject current=null] lv_type_3=ruleTypeRef { if ($current==null) { - $current = factory.create(grammarAccess.prReference().getRule().getType().getType()); + $current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -722,13 +722,13 @@ ruleReference returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prReference().getRule().getType().getType()); + $current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prReference().ele410CrossReferenceEStringReference(), "opposite"); + createLeafNode(grammarAccess.prReference().ele410CrossReferenceIDReference(), "opposite"); } // TODO assign feature to currentNode @@ -767,7 +767,7 @@ ruleOperation returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -791,7 +791,7 @@ ruleOperation returns [EObject current=null] lv_params_3=ruleParameter { if ($current==null) { - $current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -816,7 +816,7 @@ ruleOperation returns [EObject current=null] lv_params_5=ruleParameter { if ($current==null) { - $current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -845,7 +845,7 @@ ruleOperation returns [EObject current=null] lv_type_8=ruleTypeRef { if ($current==null) { - $current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -887,7 +887,7 @@ ruleParameter returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prParameter().getRule().getType().getType()); + $current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -907,7 +907,7 @@ ruleParameter returns [EObject current=null] lv_type_1=ruleTypeRef { if ($current==null) { - $current = factory.create(grammarAccess.prParameter().getRule().getType().getType()); + $current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -947,13 +947,13 @@ ruleTypeRef returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prTypeRef().getRule().getType().getType()); + $current = factory.create(grammarAccess.prTypeRef().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); + createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceIDType(), "referenced"); } // TODO assign feature to currentNode diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java index c8a0b4c..79e17b0 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java @@ -142,7 +142,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prFile().getRule().getType().getType()); + current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -186,7 +186,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prFile().getRule().getType().getType()); + current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -293,7 +293,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prImport().getRule().getType().getType()); + current = factory.create(grammarAccess.prImport().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -528,7 +528,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prPackage().getRule().getType().getType()); + current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -570,7 +570,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prPackage().getRule().getType().getType()); + current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -811,7 +811,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prDataType().getRule().getType().getType()); + current = factory.create(grammarAccess.prDataType().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -913,7 +913,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEntity().getRule().getType().getType()); + current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -946,13 +946,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { { if (current==null) { - current = factory.create(grammarAccess.prEntity().getRule().getType().getType()); + current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity969); - createLeafNode(grammarAccess.prEntity().ele210CrossReferenceEStringEntity(), "superType"); + createLeafNode(grammarAccess.prEntity().ele210CrossReferenceIDEntity(), "superType"); } @@ -991,7 +991,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEntity().getRule().getType().getType()); + current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1364,7 +1364,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prAttribute().getRule().getType().getType()); + current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1393,7 +1393,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prAttribute().getRule().getType().getType()); + current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1496,7 +1496,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prReference().getRule().getType().getType()); + current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1525,7 +1525,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prReference().getRule().getType().getType()); + current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1559,13 +1559,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { { if (current==null) { - current = factory.create(grammarAccess.prReference().getRule().getType().getType()); + current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1631); - createLeafNode(grammarAccess.prReference().ele410CrossReferenceEStringReference(), "opposite"); + createLeafNode(grammarAccess.prReference().ele410CrossReferenceIDReference(), "opposite"); } @@ -1669,7 +1669,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1709,7 +1709,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1754,7 +1754,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1803,7 +1803,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prOperation().getRule().getType().getType()); + current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1902,7 +1902,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prParameter().getRule().getType().getType()); + current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1927,7 +1927,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prParameter().getRule().getType().getType()); + current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2014,13 +2014,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { { if (current==null) { - current = factory.create(grammarAccess.prTypeRef().getRule().getType().getType()); + current = factory.create(grammarAccess.prTypeRef().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2126); - createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); + createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceIDType(), "referenced"); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java index deafd02..a163cc6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java @@ -201,20 +201,20 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration getPackageConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getDataTypeConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$12$Delimiter); getDataTypeConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); - getEntityConsumer().setCrossReference$8$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getEntityConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$12$Delimiter); getEntityConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$12$Delimiter); - getEntityConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); - getEntityConsumer().setKeyword$13$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); + getEntityConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); + getEntityConsumer().setKeyword$14$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getEntityConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); + getEntityConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getAttributeConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$12$Delimiter); getAttributeConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getAttributeConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); - getReferenceConsumer().setCrossReference$11$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getReferenceConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$12$Delimiter); getReferenceConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getReferenceConsumer().setKeyword$9$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$12$Delimiter); getReferenceConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); + getReferenceConsumer().setRuleCall$13$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getOperationConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getOperationConsumer().setKeyword$13$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getOperationConsumer().setKeyword$14$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); @@ -222,7 +222,7 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration getOperationConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getOperationConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getParameterConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); - getTypeRefConsumer().setCrossReference$2$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); + getTypeRefConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getQualifiedNameConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.keyword$26$Delimiter); getQualifiedNameConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); getQualifiedNameConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$40$Delimiter); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java index 9b670a2..f3ee478 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java @@ -171,7 +171,7 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java index da67b9f..182b087 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java @@ -118,7 +118,7 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java index 6a19791..b6053d3 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java @@ -46,26 +46,26 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { private IElementConsumer crossReference$8$Consumer; - private IElementConsumer keyword$10$Consumer; + private IElementConsumer keyword$11$Consumer; - private IElementConsumer assignment$11$Consumer; + private IElementConsumer assignment$12$Consumer; - private IElementConsumer ruleCall$12$Consumer; + private IElementConsumer ruleCall$13$Consumer; - private IElementConsumer keyword$13$Consumer; - - private ISequenceMatcher crossReference$8$Delimiter; + private IElementConsumer keyword$14$Consumer; private ICharacterClass keyword$2$Delimiter; private ICharacterClass keyword$6$Delimiter; - private ICharacterClass keyword$10$Delimiter; + private ICharacterClass keyword$11$Delimiter; - private ICharacterClass keyword$13$Delimiter; + private ICharacterClass keyword$14$Delimiter; private ISequenceMatcher ruleCall$4$Delimiter; + private ISequenceMatcher ruleCall$10$Delimiter; + protected class Group$1$Consumer extends GroupConsumer { protected Group$1$Consumer(final Group group) { @@ -77,9 +77,9 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { acceptor.accept(keyword$2$Consumer); acceptor.accept(assignment$3$Consumer); acceptor.accept(group$5$Consumer); - acceptor.accept(keyword$10$Consumer); - acceptor.accept(assignment$11$Consumer); - acceptor.accept(keyword$13$Consumer); + acceptor.accept(keyword$11$Consumer); + acceptor.accept(assignment$12$Consumer); + acceptor.accept(keyword$14$Consumer); } } @@ -164,37 +164,37 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "superType", false, false, getElement(), getCrossReference$8$Delimiter(), optional); + return consumeTerminal(idConsumer, "superType", false, false, getElement(), getRuleCall$10$Delimiter(), optional); } } - protected class Keyword$10$Consumer extends ElementConsumer<Keyword> { + protected class Keyword$11$Consumer extends ElementConsumer<Keyword> { - protected Keyword$10$Consumer(final Keyword keyword) { + protected Keyword$11$Consumer(final Keyword keyword) { super(keyword); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeKeyword(getElement(), null, false, false, getKeyword$10$Delimiter(), optional); + return consumeKeyword(getElement(), null, false, false, getKeyword$11$Delimiter(), optional); } } - protected class Assignment$11$Consumer extends LoopAssignmentConsumer { + protected class Assignment$12$Consumer extends LoopAssignmentConsumer { - protected Assignment$11$Consumer(final Assignment assignment) { + protected Assignment$12$Consumer(final Assignment assignment) { super(assignment); } @Override protected IElementConsumer getConsumer() { - return ruleCall$12$Consumer; + return ruleCall$13$Consumer; } } - protected class RuleCall$12$Consumer extends ElementConsumer<RuleCall> { + protected class RuleCall$13$Consumer extends ElementConsumer<RuleCall> { - protected RuleCall$12$Consumer(final RuleCall ruleCall) { + protected RuleCall$13$Consumer(final RuleCall ruleCall) { super(ruleCall); } @@ -204,26 +204,26 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { } } - protected class Keyword$13$Consumer extends ElementConsumer<Keyword> { + protected class Keyword$14$Consumer extends ElementConsumer<Keyword> { - protected Keyword$13$Consumer(final Keyword keyword) { + protected Keyword$14$Consumer(final Keyword keyword) { super(keyword); } @Override protected int doConsume(boolean optional) throws Exception { - return consumeKeyword(getElement(), null, false, false, getKeyword$13$Delimiter(), optional); + return consumeKeyword(getElement(), null, false, false, getKeyword$14$Delimiter(), optional); } } public DomainmodelEntityConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); - crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } @Override @@ -245,11 +245,11 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { group$5$Consumer = new Group$5$Consumer(rule.ele2Group()); keyword$6$Consumer = new Keyword$6$Consumer(rule.ele20KeywordExtends()); assignment$7$Consumer = new Assignment$7$Consumer(rule.ele21AssignmentSuperType()); - crossReference$8$Consumer = new CrossReference$8$Consumer(rule.ele210CrossReferenceEStringEntity()); - keyword$10$Consumer = new Keyword$10$Consumer(rule.ele3KeywordLeftCurlyBracket()); - assignment$11$Consumer = new Assignment$11$Consumer(rule.ele4AssignmentFeatures()); - ruleCall$12$Consumer = new RuleCall$12$Consumer(rule.ele40ParserRuleCallFeature()); - keyword$13$Consumer = new Keyword$13$Consumer(rule.ele5KeywordRightCurlyBracket()); + crossReference$8$Consumer = new CrossReference$8$Consumer(rule.ele210CrossReferenceIDEntity()); + keyword$11$Consumer = new Keyword$11$Consumer(rule.ele3KeywordLeftCurlyBracket()); + assignment$12$Consumer = new Assignment$12$Consumer(rule.ele4AssignmentFeatures()); + ruleCall$13$Consumer = new RuleCall$13$Consumer(rule.ele40ParserRuleCallFeature()); + keyword$14$Consumer = new Keyword$14$Consumer(rule.ele5KeywordRightCurlyBracket()); } @Override @@ -259,7 +259,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setFeatureConsumer(INonTerminalConsumer featureConsumer) { @@ -270,14 +270,6 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { this.idConsumer = idConsumer; } - public ISequenceMatcher getCrossReference$8$Delimiter() { - return crossReference$8$Delimiter; - } - - public void setCrossReference$8$Delimiter(ISequenceMatcher matcher) { - crossReference$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - public ICharacterClass getKeyword$2$Delimiter() { return keyword$2$Delimiter; } @@ -294,20 +286,20 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$10$Delimiter() { - return keyword$10$Delimiter; + public ICharacterClass getKeyword$11$Delimiter() { + return keyword$11$Delimiter; } - public void setKeyword$10$Delimiter(ICharacterClass characterClass) { - keyword$10$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$11$Delimiter(ICharacterClass characterClass) { + keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$13$Delimiter() { - return keyword$13$Delimiter; + public ICharacterClass getKeyword$14$Delimiter() { + return keyword$14$Delimiter; } - public void setKeyword$13$Delimiter(ICharacterClass characterClass) { - keyword$13$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$14$Delimiter(ICharacterClass characterClass) { + keyword$14$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ISequenceMatcher getRuleCall$4$Delimiter() { @@ -318,4 +310,12 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ISequenceMatcher getRuleCall$10$Delimiter() { + return ruleCall$10$Delimiter; + } + + public void setRuleCall$10$Delimiter(ISequenceMatcher matcher) { + ruleCall$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java index 2ca013b..6484ad9 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java @@ -96,7 +96,7 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setOperationConsumer(INonTerminalConsumer operationConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java index b08aabf..dca2508 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java @@ -127,7 +127,7 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setImportConsumer(INonTerminalConsumer importConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java index b2ece58..a77bd0b 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java @@ -118,7 +118,7 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setStringConsumer(ITerminalConsumer stringConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java index 7d24505..a5f6565 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java @@ -96,7 +96,7 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setPackageConsumer(INonTerminalConsumer packageConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java index 538432c..b788dbb 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java @@ -322,7 +322,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java index 5b27f56..adcd55b 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java @@ -186,7 +186,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setNamedElementConsumer(INonTerminalConsumer namedElementConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java index 30a6ad6..0df7149 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java @@ -131,7 +131,7 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java index 8b5ee53..acdaaf4 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java @@ -136,7 +136,7 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java index 7237d0e..51c2106 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java @@ -52,8 +52,6 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { private IElementConsumer crossReference$11$Consumer; - private ISequenceMatcher crossReference$11$Delimiter; - private ICharacterClass keyword$2$Delimiter; private ICharacterClass keyword$5$Delimiter; @@ -62,6 +60,8 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$4$Delimiter; + private ISequenceMatcher ruleCall$13$Delimiter; + protected class Group$1$Consumer extends GroupConsumer { protected Group$1$Consumer(final Group group) { @@ -195,17 +195,17 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "opposite", false, false, getElement(), getCrossReference$11$Delimiter(), optional); + return consumeTerminal(idConsumer, "opposite", false, false, getElement(), getRuleCall$13$Delimiter(), optional); } } public DomainmodelReferenceConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); - crossReference$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } @Override @@ -230,7 +230,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { group$8$Consumer = new Group$8$Consumer(rule.ele4Group()); keyword$9$Consumer = new Keyword$9$Consumer(rule.ele40KeywordOpposite()); assignment$10$Consumer = new Assignment$10$Consumer(rule.ele41AssignmentOpposite()); - crossReference$11$Consumer = new CrossReference$11$Consumer(rule.ele410CrossReferenceEStringReference()); + crossReference$11$Consumer = new CrossReference$11$Consumer(rule.ele410CrossReferenceIDReference()); } @Override @@ -240,7 +240,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { @@ -251,14 +251,6 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { this.typeRefConsumer = typeRefConsumer; } - public ISequenceMatcher getCrossReference$11$Delimiter() { - return crossReference$11$Delimiter; - } - - public void setCrossReference$11$Delimiter(ISequenceMatcher matcher) { - crossReference$11$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - public ICharacterClass getKeyword$2$Delimiter() { return keyword$2$Delimiter; } @@ -291,4 +283,12 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ISequenceMatcher getRuleCall$13$Delimiter() { + return ruleCall$13$Delimiter; + } + + public void setRuleCall$13$Delimiter(ISequenceMatcher matcher) { + ruleCall$13$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java index 4f5ac88..00f22eb 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java @@ -96,7 +96,7 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setAttributeConsumer(INonTerminalConsumer attributeConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java index 2da6843..ae68cf6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java @@ -96,7 +96,7 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setDataTypeConsumer(INonTerminalConsumer dataTypeConsumer) { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java index 2b64f5a..f06749d 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java @@ -8,6 +8,7 @@ import org.eclipse.emf.ecore.EClassifier; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.Assignment; import org.eclipse.xtext.CrossReference; +import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.parser.packrat.consumers.IElementConsumer; import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfiguration; @@ -27,7 +28,7 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer { private IElementConsumer crossReference$2$Consumer; - private ISequenceMatcher crossReference$2$Delimiter; + private ISequenceMatcher ruleCall$4$Delimiter; protected class Assignment$1$Consumer extends AssignmentConsumer { @@ -49,13 +50,13 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer { @Override protected int doConsume(boolean optional) throws Exception { - return consumeTerminal(idConsumer, "referenced", false, false, getElement(), getCrossReference$2$Delimiter(), optional); + return consumeTerminal(idConsumer, "referenced", false, false, getElement(), getRuleCall$4$Delimiter(), optional); } } public DomainmodelTypeRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); - crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } @Override @@ -71,7 +72,7 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer { this.rule = rule; assignment$1$Consumer = new Assignment$1$Consumer(rule.eleAssignmentReferenced()); - crossReference$2$Consumer = new CrossReference$2$Consumer(rule.ele0CrossReferenceEStringType()); + crossReference$2$Consumer = new CrossReference$2$Consumer(rule.ele0CrossReferenceIDType()); } @Override @@ -81,19 +82,19 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setIdConsumer(ITerminalConsumer idConsumer) { this.idConsumer = idConsumer; } - public ISequenceMatcher getCrossReference$2$Delimiter() { - return crossReference$2$Delimiter; + public ISequenceMatcher getRuleCall$4$Delimiter() { + return ruleCall$4$Delimiter; } - public void setCrossReference$2$Delimiter(ISequenceMatcher matcher) { - crossReference$2$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setRuleCall$4$Delimiter(ISequenceMatcher matcher) { + ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java index 564a32a..18e616f 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java @@ -96,7 +96,7 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer { @Override protected EClassifier getDefaultType() { - return getGrammarElement().getType().getType(); + return getGrammarElement().getType().getClassifier(); } public void setFeatureConsumer(INonTerminalConsumer featureConsumer) { 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 e6368c4..8a9f7a9 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 @@ -176,7 +176,8 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group c2Group = (Group)cGroup.eContents().get(2); private final Keyword c20KeywordExtends = (Keyword)c2Group.eContents().get(0); private final Assignment c21AssignmentSuperType = (Assignment)c2Group.eContents().get(1); - private final CrossReference c210CrossReferenceEStringEntity = (CrossReference)c21AssignmentSuperType.eContents().get(0); + private final CrossReference c210CrossReferenceIDEntity = (CrossReference)c21AssignmentSuperType.eContents().get(0); + private final RuleCall c2101TerminalRuleCallID = (RuleCall)c210CrossReferenceIDEntity.eContents().get(1); private final Keyword c3KeywordLeftCurlyBracket = (Keyword)cGroup.eContents().get(3); private final Assignment c4AssignmentFeatures = (Assignment)cGroup.eContents().get(4); private final RuleCall c40ParserRuleCallFeature = (RuleCall)c4AssignmentFeatures.eContents().get(0); @@ -207,7 +208,10 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele21AssignmentSuperType() { return c21AssignmentSuperType; } // not supported - public CrossReference ele210CrossReferenceEStringEntity() { return c210CrossReferenceEStringEntity; } + public CrossReference ele210CrossReferenceIDEntity() { return c210CrossReferenceIDEntity; } + + // not supported + public RuleCall ele2101TerminalRuleCallID() { return c2101TerminalRuleCallID; } // not supported public Keyword ele3KeywordLeftCurlyBracket() { return c3KeywordLeftCurlyBracket; } @@ -307,7 +311,8 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group c4Group = (Group)cGroup.eContents().get(4); private final Keyword c40KeywordOpposite = (Keyword)c4Group.eContents().get(0); private final Assignment c41AssignmentOpposite = (Assignment)c4Group.eContents().get(1); - private final CrossReference c410CrossReferenceEStringReference = (CrossReference)c41AssignmentOpposite.eContents().get(0); + private final CrossReference c410CrossReferenceIDReference = (CrossReference)c41AssignmentOpposite.eContents().get(0); + private final RuleCall c4101TerminalRuleCallID = (RuleCall)c410CrossReferenceIDReference.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -343,7 +348,10 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele41AssignmentOpposite() { return c41AssignmentOpposite; } // not supported - public CrossReference ele410CrossReferenceEStringReference() { return c410CrossReferenceEStringReference; } + public CrossReference ele410CrossReferenceIDReference() { return c410CrossReferenceIDReference; } + + // not supported + public RuleCall ele4101TerminalRuleCallID() { return c4101TerminalRuleCallID; } } public class OperationElements implements IParserRuleAccess { @@ -466,7 +474,8 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public class TypeRefElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TypeRef"); private final Assignment cAssignmentReferenced = (Assignment)rule.eContents().get(1); - private final CrossReference c0CrossReferenceEStringType = (CrossReference)cAssignmentReferenced.eContents().get(0); + private final CrossReference c0CrossReferenceIDType = (CrossReference)cAssignmentReferenced.eContents().get(0); + private final RuleCall c01TerminalRuleCallID = (RuleCall)c0CrossReferenceIDType.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -475,7 +484,10 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment eleAssignmentReferenced() { return cAssignmentReferenced; } // not supported - public CrossReference ele0CrossReferenceEStringType() { return c0CrossReferenceEStringType; } + public CrossReference ele0CrossReferenceIDType() { return c0CrossReferenceIDType; } + + // not supported + public RuleCall ele01TerminalRuleCallID() { return c01TerminalRuleCallID; } } public class QualifiedNameElements implements IParserRuleAccess { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi index 7a110a6..53179a6 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi @@ -9,96 +9,96 @@ </metamodelDeclarations> <rules xsi:type="xtext:ParserRule" name="EcoreDsl"> <type metamodel="/0/@metamodelDeclarations.1"> - <type xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//EcoreDsl"/> + <classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//EcoreDsl"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="imports" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="imports" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="package" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="package" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="ImportStatementDecl"> <type metamodel="/0/@metamodelDeclarations.1"> - <type xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//ImportStatementDecl"/> + <classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//ImportStatementDecl"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="import"/> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Assignment" feature="alias" operator="="> + <tokens xsi:type="xtext:Keyword" value="import"/> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Assignment" feature="alias" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="="/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="importURI" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="="/> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="importURI" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value=";"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EPackageDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="package"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="package"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.21"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="nsURI"/> - <abstractTokens xsi:type="xtext:Keyword" value="="/> - <abstractTokens xsi:type="xtext:Assignment" feature="nsURI" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="nsURI"/> + <tokens xsi:type="xtext:Keyword" value="="/> + <tokens xsi:type="xtext:Assignment" feature="nsURI" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="nsPrefix"/> - <abstractTokens xsi:type="xtext:Keyword" value="="/> - <abstractTokens xsi:type="xtext:Assignment" feature="nsPrefix" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="nsPrefix"/> + <tokens xsi:type="xtext:Keyword" value="="/> + <tokens xsi:type="xtext:Assignment" feature="nsPrefix" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.21"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="eSubpackages" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.3"/> </groups> <groups xsi:type="xtext:Assignment" feature="eClassifiers" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.4"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="SubEPackageDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="package"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="package"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="eSubpackages" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.3"/> </groups> <groups xsi:type="xtext:Assignment" feature="eClassifiers" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.4"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EClassifierDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.7"/> @@ -107,126 +107,127 @@ </rules> <rules xsi:type="xtext:ParserRule" name="EDataTypeDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EDataType"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EDataType"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="serializable" operator="?="> + </tokens> + <tokens xsi:type="xtext:Assignment" cardinality="?" feature="serializable" operator="?="> <terminal xsi:type="xtext:Keyword" value="!serializable"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="datatype"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Group"> + <tokens xsi:type="xtext:Keyword" value="datatype"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=":"/> - <abstractTokens xsi:type="xtext:Assignment" feature="instanceClassName" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value=":"/> + <tokens xsi:type="xtext:Assignment" feature="instanceClassName" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.22"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=";"/> - </abstractTokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=";"/> + </tokens> </groups> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.11"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EAnnotationDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAnnotation"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAnnotation"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="@"/> - <abstractTokens xsi:type="xtext:Assignment" feature="source" operator="="> + <tokens xsi:type="xtext:Keyword" value="@"/> + <tokens xsi:type="xtext:Assignment" feature="source" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="eModelElement" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + <tokens xsi:type="xtext:Assignment" cardinality="?" feature="eModelElement" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Assignment" feature="contents" operator="+="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Assignment" feature="contents" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.18"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="contents" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="contents" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.18"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EClassDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="abstract" operator="?="> + </tokens> + <tokens xsi:type="xtext:Assignment" cardinality="?" feature="abstract" operator="?="> <terminal xsi:type="xtext:Keyword" value="abstract"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives"> + </tokens> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Assignment" feature="interface" operator="?="> <terminal xsi:type="xtext:Keyword" value="interface"/> </groups> <groups xsi:type="xtext:Keyword" value="class"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="<"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="<"/> + <tokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.13"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.13"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=">"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="extends"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericSuperTypes" operator="+="> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=">"/> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="extends"/> + <tokens xsi:type="xtext:Assignment" feature="eGenericSuperTypes" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericSuperTypes" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eGenericSuperTypes" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value=":"/> - <abstractTokens xsi:type="xtext:Assignment" feature="instanceClassName" operator="="> + </tokens> + </tokens> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value=":"/> + <tokens xsi:type="xtext:Assignment" feature="instanceClassName" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.22"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="eStructuralFeatures" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/> </groups> <groups xsi:type="xtext:Assignment" feature="eOperations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.16"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EStructuralFeatureDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/0/@rules.9"/> @@ -235,13 +236,13 @@ </rules> <rules xsi:type="xtext:ParserRule" name="EAttributeDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="iD" operator="?="> <terminal xsi:type="xtext:Keyword" value="ID"/> </groups> @@ -266,45 +267,45 @@ <groups xsi:type="xtext:Assignment" feature="derived" operator="?="> <terminal xsi:type="xtext:Keyword" value="derived"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="attr"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericType" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="attr"/> + <tokens xsi:type="xtext:Assignment" feature="eGenericType" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="["/> - <abstractTokens xsi:type="xtext:Assignment" feature="lowerBound" operator="="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="["/> + <tokens xsi:type="xtext:Assignment" feature="lowerBound" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value=".."/> - <abstractTokens xsi:type="xtext:Assignment" feature="upperBound" operator="="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value=".."/> + <tokens xsi:type="xtext:Assignment" feature="upperBound" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.23"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="]"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value="]"/> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="="/> - <abstractTokens xsi:type="xtext:Assignment" feature="defaultValueLiteral" operator="="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="="/> + <tokens xsi:type="xtext:Assignment" feature="defaultValueLiteral" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=";"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EReferenceDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="resolveProxies" operator="?="> <terminal xsi:type="xtext:Keyword" value="local"/> </groups> @@ -329,304 +330,309 @@ <groups xsi:type="xtext:Assignment" feature="derived" operator="?="> <terminal xsi:type="xtext:Keyword" value="derived"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives"> + </tokens> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Assignment" feature="containment" operator="?="> <terminal xsi:type="xtext:Keyword" value="val"/> </groups> <groups xsi:type="xtext:Keyword" value="ref"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericType" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="eGenericType" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="["/> - <abstractTokens xsi:type="xtext:Assignment" feature="lowerBound" operator="="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="["/> + <tokens xsi:type="xtext:Assignment" feature="lowerBound" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value=".."/> - <abstractTokens xsi:type="xtext:Assignment" feature="upperBound" operator="="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value=".."/> + <tokens xsi:type="xtext:Assignment" feature="upperBound" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.23"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="]"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="#"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eOpposite" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value="]"/> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="#"/> + <tokens xsi:type="xtext:Assignment" feature="eOpposite" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value=";"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EEnumDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EEnum"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EEnum"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="enum"/> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="enum"/> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="{"/> - <abstractTokens xsi:type="xtext:Assignment" cardinality="+" feature="eLiterals" operator="+="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="{"/> + <tokens xsi:type="xtext:Assignment" cardinality="+" feature="eLiterals" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.12"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="}"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="}"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EEnumLiteralDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumLiteral"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumLiteral"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="="/> - <abstractTokens xsi:type="xtext:Assignment" feature="value" operator="="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="="/> + <tokens xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="literal" operator="="> + </tokens> + </tokens> + <tokens xsi:type="xtext:Assignment" cardinality="?" feature="literal" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value=";"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="ETypeParameterDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="extends"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eBounds" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="extends"/> + <tokens xsi:type="xtext:Assignment" feature="eBounds" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> - </abstractTokens> + </tokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EGenericTypeReferenceDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EGenericType"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EGenericType"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="eClassifier" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + <tokens xsi:type="xtext:Assignment" feature="eClassifier" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="<"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="<"/> + <tokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=">"/> - </abstractTokens> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=">"/> + </tokens> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="#"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeParameter" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + <tokens xsi:type="xtext:Keyword" value="#"/> + <tokens xsi:type="xtext:Assignment" feature="eTypeParameter" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> + </tokens> </groups> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EGenericTypeDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EGenericType"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EGenericType"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="eClassifier" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + <tokens xsi:type="xtext:Assignment" feature="eClassifier" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="<"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="<"/> + <tokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eTypeArguments" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=">"/> - </abstractTokens> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=">"/> + </tokens> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="#"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeParameter" operator="="> - <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0"> + <tokens xsi:type="xtext:Keyword" value="#"/> + <tokens xsi:type="xtext:Assignment" feature="eTypeParameter" operator="="> + <terminal xsi:type="xtext:CrossReference"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> </type> + <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> </terminal> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="?"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="?"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="extends"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eUpperBound" operator="="> + <tokens xsi:type="xtext:Keyword" value="extends"/> + <tokens xsi:type="xtext:Assignment" feature="eUpperBound" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="super"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eLowerBound" operator="="> + <tokens xsi:type="xtext:Keyword" value="super"/> + <tokens xsi:type="xtext:Assignment" feature="eLowerBound" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/> - </abstractTokens> + </tokens> </groups> - </abstractTokens> + </tokens> </groups> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EOperationDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EOperation"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EOperation"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Assignment" feature="unique" operator="?="> <terminal xsi:type="xtext:Keyword" value="bag"/> </groups> <groups xsi:type="xtext:Assignment" feature="ordered" operator="?="> <terminal xsi:type="xtext:Keyword" value="random"/> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="op"/> - <abstractTokens xsi:type="xtext:Alternatives"> + </tokens> + <tokens xsi:type="xtext:Keyword" value="op"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Assignment" feature="eGenericType" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> </groups> <groups xsi:type="xtext:Keyword" value="void"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="<"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="<"/> + <tokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.13"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eTypeParameters" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.13"/> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=">"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Assignment" feature="eParameters" operator="+="> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=">"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="("/> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Assignment" feature="eParameters" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.17"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eParameters" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eParameters" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.17"/> - </abstractTokens> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=")"/> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value="throws"/> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericExceptions" operator="+="> + </tokens> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=")"/> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" value="throws"/> + <tokens xsi:type="xtext:Assignment" feature="eGenericExceptions" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Keyword" value=","/> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericExceptions" operator="+="> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value=","/> + <tokens xsi:type="xtext:Assignment" feature="eGenericExceptions" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - </abstractTokens> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </tokens> + </tokens> + </tokens> + <tokens xsi:type="xtext:Keyword" value=";"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="EParameterDecl"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EParameter"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EParameter"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> + <tokens xsi:type="xtext:Assignment" cardinality="*" feature="eAnnotations" operator="+="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="eGenericType" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="eGenericType" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + </tokens> + <tokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="MapEntrySuper"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> + <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </type> <alternatives xsi:type="xtext:RuleCall" rule="/0/@rules.19"/> </rules> <rules xsi:type="xtext:ParserRule" name="MapEntry"> <type metamodel="/0/@metamodelDeclarations.1"> - <type xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//MapEntry"/> + <classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//MapEntry"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="detailKey" operator="="> + <tokens xsi:type="xtext:Assignment" feature="detailKey" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="="/> - <abstractTokens xsi:type="xtext:Assignment" feature="detailValue" operator="="> + </tokens> + <tokens xsi:type="xtext:Keyword" value="="/> + <tokens xsi:type="xtext:Assignment" feature="detailValue" operator="="> <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="MultiplicityExpr"> <type metamodel="/0/@metamodelDeclarations.1"> - <type xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//MultiplicityExpr"/> + <classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//MultiplicityExpr"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="+"/> @@ -636,22 +642,22 @@ </rules> <rules xsi:type="xtext:ParserRule" name="QID"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - <abstractTokens xsi:type="xtext:Group" cardinality="*"> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> + <tokens xsi:type="xtext:Group" cardinality="*"> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="."/> <groups xsi:type="xtext:Keyword" value="$"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> - </abstractTokens> + </tokens> + <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="STRING_OR_QID"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall" rule="/1/@rules.2"/> @@ -660,11 +666,11 @@ </rules> <rules xsi:type="xtext:ParserRule" name="SINT"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="-"/> - <abstractTokens xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="-"/> + <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.1"/> </alternatives> </rules> </xtext:Grammar> @@ -674,11 +680,11 @@ </metamodelDeclarations> <rules xsi:type="xtext:TerminalRule" name="ID"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="^"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="^"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:CharacterRange"> <left value="a"/> <right value="z"/> @@ -688,8 +694,8 @@ <right value="Z"/> </groups> <groups xsi:type="xtext:Keyword" value="_"/> - </abstractTokens> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + </tokens> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:CharacterRange"> <left value="a"/> <right value="z"/> @@ -703,12 +709,12 @@ <left value="0"/> <right value="9"/> </groups> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="INT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> <alternatives xsi:type="xtext:CharacterRange" cardinality="+"> <left value="0"/> @@ -717,15 +723,15 @@ </rules> <rules xsi:type="xtext:TerminalRule" name="STRING"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="""/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="""/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="\"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="\"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="b"/> <groups xsi:type="xtext:Keyword" value="t"/> <groups xsi:type="xtext:Keyword" value="n"/> @@ -734,7 +740,7 @@ <groups xsi:type="xtext:Keyword" value="""/> <groups xsi:type="xtext:Keyword" value="'"/> <groups xsi:type="xtext:Keyword" value="\"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:NegatedToken"> <terminal xsi:type="xtext:Alternatives"> @@ -742,15 +748,15 @@ <groups xsi:type="xtext:Keyword" value="""/> </terminal> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="""/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="""/> </groups> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="'"/> - <abstractTokens xsi:type="xtext:Alternatives" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="'"/> + <tokens xsi:type="xtext:Alternatives" cardinality="*"> <groups xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="\"/> - <abstractTokens xsi:type="xtext:Alternatives"> + <tokens xsi:type="xtext:Keyword" value="\"/> + <tokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="b"/> <groups xsi:type="xtext:Keyword" value="t"/> <groups xsi:type="xtext:Keyword" value="n"/> @@ -759,7 +765,7 @@ <groups xsi:type="xtext:Keyword" value="""/> <groups xsi:type="xtext:Keyword" value="'"/> <groups xsi:type="xtext:Keyword" value="\"/> - </abstractTokens> + </tokens> </groups> <groups xsi:type="xtext:NegatedToken"> <terminal xsi:type="xtext:Alternatives"> @@ -767,43 +773,43 @@ <groups xsi:type="xtext:Keyword" value="'"/> </terminal> </groups> - </abstractTokens> - <abstractTokens xsi:type="xtext:Keyword" value="'"/> + </tokens> + <tokens xsi:type="xtext:Keyword" value="'"/> </groups> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UntilToken"> + <tokens xsi:type="xtext:Keyword" value="/*"/> + <tokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> - </abstractTokens> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Keyword" value="//"/> - <abstractTokens xsi:type="xtext:NegatedToken" cardinality="*"> + <tokens xsi:type="xtext:Keyword" value="//"/> + <tokens xsi:type="xtext:NegatedToken" cardinality="*"> <terminal xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="
"/> <groups xsi:type="xtext:Keyword" value="
"/> </terminal> - </abstractTokens> - <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="
"/> - <abstractTokens xsi:type="xtext:Keyword" value="
"/> - </abstractTokens> + </tokens> + <tokens xsi:type="xtext:Group" cardinality="?"> + <tokens xsi:type="xtext:Keyword" cardinality="?" value="
"/> + <tokens xsi:type="xtext:Keyword" value="
"/> + </tokens> </alternatives> </rules> <rules xsi:type="xtext:TerminalRule" name="WS"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Alternatives" cardinality="+"> <groups xsi:type="xtext:Keyword" value=" "/> @@ -814,7 +820,7 @@ </rules> <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER"> <type metamodel="/1/@metamodelDeclarations.0"> - <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> <alternatives xsi:type="xtext:Wildcard"/> </rules> diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java index f421748..2d2758d 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java @@ -22,27 +22,27 @@ public class EcoreDslParsetreeConstructor extends AbstractParseTreeConstructor { protected Solution internalSerialize(EObject obj) { IInstanceDescription inst = getDescr(obj); Solution s; - if(inst.isInstanceOf(grammarAccess.prEcoreDsl().getRule().getType().getType()) && (s = new EcoreDsl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prImportStatementDecl().getRule().getType().getType()) && (s = new ImportStatementDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEPackageDecl().getRule().getType().getType()) && (s = new EPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getType()) && (s = new SubEPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getType()) && (s = new EClassifierDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEDataTypeDecl().getRule().getType().getType()) && (s = new EDataTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType()) && (s = new EAnnotationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEClassDecl().getRule().getType().getType()) && (s = new EClassDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEStructuralFeatureDecl().getRule().getType().getType()) && (s = new EStructuralFeatureDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEAttributeDecl().getRule().getType().getType()) && (s = new EAttributeDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEReferenceDecl().getRule().getType().getType()) && (s = new EReferenceDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEEnumDecl().getRule().getType().getType()) && (s = new EEnumDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType()) && (s = new EEnumLiteralDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType()) && (s = new ETypeParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType()) && (s = new EGenericTypeReferenceDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()) && (s = new EGenericTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEOperationDecl().getRule().getType().getType()) && (s = new EOperationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getType()) && (s = new EParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getType()) && (s = new MapEntrySuper_RuleCall_MapEntry(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prMapEntry().getRule().getType().getType()) && (s = new MapEntry_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prMultiplicityExpr().getRule().getType().getType()) && (s = new MultiplicityExpr_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEcoreDsl().getRule().getType().getClassifier()) && (s = new EcoreDsl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prImportStatementDecl().getRule().getType().getClassifier()) && (s = new ImportStatementDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()) && (s = new EPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()) && (s = new SubEPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getClassifier()) && (s = new EClassifierDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()) && (s = new EDataTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()) && (s = new EAnnotationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEClassDecl().getRule().getType().getClassifier()) && (s = new EClassDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEStructuralFeatureDecl().getRule().getType().getClassifier()) && (s = new EStructuralFeatureDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()) && (s = new EAttributeDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()) && (s = new EReferenceDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEEnumDecl().getRule().getType().getClassifier()) && (s = new EEnumDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEEnumLiteralDecl().getRule().getType().getClassifier()) && (s = new EEnumLiteralDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier()) && (s = new ETypeParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier()) && (s = new EGenericTypeReferenceDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()) && (s = new EGenericTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()) && (s = new EOperationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getClassifier()) && (s = new EParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getClassifier()) && (s = new MapEntrySuper_RuleCall_MapEntry(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prMapEntry().getRule().getType().getClassifier()) && (s = new MapEntry_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prMultiplicityExpr().getRule().getType().getClassifier()) && (s = new MultiplicityExpr_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; return null; } @@ -103,7 +103,7 @@ protected class EcoreDsl_0_Assignment_imports extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prImportStatementDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prImportStatementDecl().getRule().getType().getClassifier())) { Solution s = new ImportStatementDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -136,7 +136,7 @@ protected class EcoreDsl_1_Assignment_package extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEPackageDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEPackageDecl().getRule().getType().getClassifier())) { Solution s = new EPackageDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -416,7 +416,7 @@ protected class EPackageDecl_0_Assignment_eAnnotations extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -621,7 +621,7 @@ protected class EPackageDecl_10_0_Assignment_eSubpackages extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier())) { Solution s = new SubEPackageDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -654,7 +654,7 @@ protected class EPackageDecl_10_1_Assignment_eClassifiers extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getClassifier())) { Solution s = new EClassifierDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -757,7 +757,7 @@ protected class SubEPackageDecl_0_Assignment_eAnnotations extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -860,7 +860,7 @@ protected class SubEPackageDecl_4_0_Assignment_eSubpackages extends AssignmentTo if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier())) { Solution s = new SubEPackageDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -893,7 +893,7 @@ protected class SubEPackageDecl_4_1_Assignment_eClassifiers extends AssignmentTo if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getClassifier())) { Solution s = new EClassifierDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -967,7 +967,7 @@ protected class EClassifierDecl_0_RuleCall_EClassDecl extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(EClassDecl_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prEClassDecl().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prEClassDecl().getRule().getType().getClassifier())) return null; return new EClassDecl_Group(current, this).firstSolution(); } } @@ -987,7 +987,7 @@ protected class EClassifierDecl_1_RuleCall_EDataTypeDecl extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(EDataTypeDecl_Alternatives.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prEDataTypeDecl().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier())) return null; return new EDataTypeDecl_Alternatives(current, this).firstSolution(); } } @@ -1077,7 +1077,7 @@ protected class EDataTypeDecl_0_0_Assignment_eAnnotations extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1265,7 +1265,7 @@ protected class EDataTypeDecl_1_RuleCall_EEnumDecl extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(EEnumDecl_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prEEnumDecl().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prEEnumDecl().getRule().getType().getClassifier())) return null; return new EEnumDecl_Group(current, this).firstSolution(); } } @@ -1386,9 +1386,9 @@ protected class EAnnotationDecl_2_Assignment_eModelElement extends AssignmentTok IInstanceDescription obj = current.cloneAndConsume("eModelElement"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().ele20CrossReferenceEStringEModelElement().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().ele20CrossReferenceIDEModelElement().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEAnnotationDecl().ele20CrossReferenceEStringEModelElement(); + element = grammarAccess.prEAnnotationDecl().ele20CrossReferenceIDEModelElement(); return new Solution(obj); } } @@ -1427,7 +1427,7 @@ protected class EAnnotationDecl_4_Assignment_contents extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getClassifier())) { Solution s = new MapEntrySuper_RuleCall_MapEntry(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1502,7 +1502,7 @@ protected class EAnnotationDecl_5_1_Assignment_contents extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getClassifier())) { Solution s = new MapEntrySuper_RuleCall_MapEntry(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1621,7 +1621,7 @@ protected class EClassDecl_0_Assignment_eAnnotations extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1817,7 +1817,7 @@ protected class EClassDecl_4_1_Assignment_eTypeParameters extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier())) { Solution s = new ETypeParameterDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1892,7 +1892,7 @@ protected class EClassDecl_4_2_1_Assignment_eTypeParameters extends AssignmentTo if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier())) { Solution s = new ETypeParameterDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -1985,7 +1985,7 @@ protected class EClassDecl_5_1_Assignment_eGenericSuperTypes extends AssignmentT if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -2060,7 +2060,7 @@ protected class EClassDecl_5_2_1_Assignment_eGenericSuperTypes extends Assignmen if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -2198,7 +2198,7 @@ protected class EClassDecl_8_0_Assignment_eStructuralFeatures extends Assignment if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEStructuralFeatureDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEStructuralFeatureDecl().getRule().getType().getClassifier())) { Solution s = new EStructuralFeatureDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -2231,7 +2231,7 @@ protected class EClassDecl_8_1_Assignment_eOperations extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEOperationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEOperationDecl().getRule().getType().getClassifier())) { Solution s = new EOperationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -2305,7 +2305,7 @@ protected class EStructuralFeatureDecl_0_RuleCall_EAttributeDecl extends RuleCal @Override protected Solution createSolution() { if(checkForRecursion(EAttributeDecl_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prEAttributeDecl().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier())) return null; return new EAttributeDecl_Group(current, this).firstSolution(); } } @@ -2325,7 +2325,7 @@ protected class EStructuralFeatureDecl_1_RuleCall_EReferenceDecl extends RuleCal @Override protected Solution createSolution() { if(checkForRecursion(EReferenceDecl_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prEReferenceDecl().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier())) return null; return new EReferenceDecl_Group(current, this).firstSolution(); } } @@ -2414,7 +2414,7 @@ protected class EAttributeDecl_0_Assignment_eAnnotations extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -2703,7 +2703,7 @@ protected class EAttributeDecl_3_Assignment_eGenericType extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -3064,7 +3064,7 @@ protected class EReferenceDecl_0_Assignment_eAnnotations extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -3402,7 +3402,7 @@ protected class EReferenceDecl_3_Assignment_eGenericType extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -3634,9 +3634,9 @@ protected class EReferenceDecl_5_1_Assignment_eOpposite extends AssignmentToken IInstanceDescription obj = current.cloneAndConsume("eOpposite"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEReferenceDecl().ele510CrossReferenceEStringEReference().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEReferenceDecl().ele510CrossReferenceIDEReference().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEReferenceDecl().ele510CrossReferenceEStringEReference(); + element = grammarAccess.prEReferenceDecl().ele510CrossReferenceIDEReference(); return new Solution(obj); } } @@ -3758,7 +3758,7 @@ protected class EEnumDecl_0_Assignment_eAnnotations extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -3840,7 +3840,7 @@ protected class EEnumDecl_4_Assignment_eLiterals extends AssignmentToken { if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEEnumLiteralDecl().getRule().getType().getClassifier())) { Solution s = new EEnumLiteralDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -3938,7 +3938,7 @@ protected class EEnumLiteralDecl_0_Assignment_eAnnotations extends AssignmentTok if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -4209,7 +4209,7 @@ protected class ETypeParameterDecl_1_1_Assignment_eBounds extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -4304,9 +4304,9 @@ protected class EGenericTypeReferenceDecl_0_0_Assignment_eClassifier extends Ass IInstanceDescription obj = current.cloneAndConsume("eClassifier"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceIDEClassifier().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier(); + element = grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceIDEClassifier(); return new Solution(obj); } } @@ -4383,7 +4383,7 @@ protected class EGenericTypeReferenceDecl_0_1_1_Assignment_eTypeArguments extend if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -4458,7 +4458,7 @@ protected class EGenericTypeReferenceDecl_0_1_2_1_Assignment_eTypeArguments exte if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -4547,9 +4547,9 @@ protected class EGenericTypeReferenceDecl_1_1_Assignment_eTypeParameter extends IInstanceDescription obj = current.cloneAndConsume("eTypeParameter"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceIDETypeParameter().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter(); + element = grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceIDETypeParameter(); return new Solution(obj); } } @@ -4639,9 +4639,9 @@ protected class EGenericTypeDecl_0_0_Assignment_eClassifier extends AssignmentTo IInstanceDescription obj = current.cloneAndConsume("eClassifier"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().ele000CrossReferenceEStringEClassifier().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().ele000CrossReferenceIDEClassifier().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEGenericTypeDecl().ele000CrossReferenceEStringEClassifier(); + element = grammarAccess.prEGenericTypeDecl().ele000CrossReferenceIDEClassifier(); return new Solution(obj); } } @@ -4718,7 +4718,7 @@ protected class EGenericTypeDecl_0_1_1_Assignment_eTypeArguments extends Assignm if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -4793,7 +4793,7 @@ protected class EGenericTypeDecl_0_1_2_1_Assignment_eTypeArguments extends Assig if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -4882,9 +4882,9 @@ protected class EGenericTypeDecl_1_1_Assignment_eTypeParameter extends Assignmen IInstanceDescription obj = current.cloneAndConsume("eTypeParameter"); if(value instanceof EObject) { // xtext::CrossReference IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().ele110CrossReferenceEStringETypeParameter().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().ele110CrossReferenceIDETypeParameter().getType().getClassifier())) { type = AssignmentType.CR; - element = grammarAccess.prEGenericTypeDecl().ele110CrossReferenceEStringETypeParameter(); + element = grammarAccess.prEGenericTypeDecl().ele110CrossReferenceIDETypeParameter(); return new Solution(obj); } } @@ -5017,7 +5017,7 @@ protected class EGenericTypeDecl_2_1_0_1_Assignment_eUpperBound extends Assignme if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5093,7 +5093,7 @@ protected class EGenericTypeDecl_2_1_1_1_Assignment_eLowerBound extends Assignme if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5206,7 +5206,7 @@ protected class EOperationDecl_0_Assignment_eAnnotations extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5348,7 +5348,7 @@ protected class EOperationDecl_3_0_Assignment_eGenericType extends AssignmentTok if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5469,7 +5469,7 @@ protected class EOperationDecl_5_1_Assignment_eTypeParameters extends Assignment if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier())) { Solution s = new ETypeParameterDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5544,7 +5544,7 @@ protected class EOperationDecl_5_2_1_Assignment_eTypeParameters extends Assignme if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier())) { Solution s = new ETypeParameterDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5633,7 +5633,7 @@ protected class EOperationDecl_7_0_Assignment_eParameters extends AssignmentToke if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getClassifier())) { Solution s = new EParameterDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5708,7 +5708,7 @@ protected class EOperationDecl_7_1_1_Assignment_eParameters extends AssignmentTo if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getClassifier())) { Solution s = new EParameterDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5801,7 +5801,7 @@ protected class EOperationDecl_9_1_Assignment_eGenericExceptions extends Assignm if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5876,7 +5876,7 @@ protected class EOperationDecl_9_2_1_Assignment_eGenericExceptions extends Assig if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -5968,7 +5968,7 @@ protected class EParameterDecl_0_Assignment_eAnnotations extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier())) { Solution s = new EAnnotationDecl_Group(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -6001,7 +6001,7 @@ protected class EParameterDecl_1_Assignment_eGenericType extends AssignmentToken if(value instanceof EObject) { // xtext::RuleCall IInstanceDescription param = getDescr((EObject)value); - if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) { + if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier())) { Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution(); while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s); if(s != null) { @@ -6066,7 +6066,7 @@ protected class MapEntrySuper_RuleCall_MapEntry extends RuleCallToken { @Override protected Solution createSolution() { if(checkForRecursion(MapEntry_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prMapEntry().getRule().getType().getType())) return null; + if(!current.isInstanceOf(grammarAccess.prMapEntry().getRule().getType().getClassifier())) return null; return new MapEntry_Group(current, this).firstSolution(); } } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g index c78dbc2..7da224b 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g @@ -89,7 +89,7 @@ ruleEcoreDsl returns [EObject current=null] lv_imports_0=ruleImportStatementDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -110,7 +110,7 @@ ruleEcoreDsl returns [EObject current=null] lv_package_1=ruleEPackageDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -156,7 +156,7 @@ ruleImportStatementDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -180,7 +180,7 @@ ruleImportStatementDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -225,7 +225,7 @@ ruleEPackageDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -250,7 +250,7 @@ ruleEPackageDecl returns [EObject current=null] lv_name_2=ruleQID { if ($current==null) { - $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -279,7 +279,7 @@ ruleEPackageDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -307,7 +307,7 @@ ruleEPackageDecl returns [EObject current=null] lv_nsPrefix_8=ruleQID { if ($current==null) { - $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -332,7 +332,7 @@ ruleEPackageDecl returns [EObject current=null] lv_eSubpackages_10=ruleSubEPackageDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -354,7 +354,7 @@ ruleEPackageDecl returns [EObject current=null] lv_eClassifiers_11=ruleEClassifierDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -400,7 +400,7 @@ ruleSubEPackageDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -425,7 +425,7 @@ ruleSubEPackageDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -449,7 +449,7 @@ ruleSubEPackageDecl returns [EObject current=null] lv_eSubpackages_4=ruleSubEPackageDecl { if ($current==null) { - $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -471,7 +471,7 @@ ruleSubEPackageDecl returns [EObject current=null] lv_eClassifiers_5=ruleEClassifierDecl { if ($current==null) { - $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -565,7 +565,7 @@ ruleEDataTypeDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -587,7 +587,7 @@ ruleEDataTypeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -611,7 +611,7 @@ ruleEDataTypeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -635,7 +635,7 @@ ruleEDataTypeDecl returns [EObject current=null] lv_instanceClassName_5=ruleSTRING_OR_QID { if ($current==null) { - $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -699,7 +699,7 @@ ruleEAnnotationDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -715,13 +715,13 @@ ruleEAnnotationDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEAnnotationDecl().ele20CrossReferenceEStringEModelElement(), "eModelElement"); + createLeafNode(grammarAccess.prEAnnotationDecl().ele20CrossReferenceIDEModelElement(), "eModelElement"); } // TODO assign feature to currentNode @@ -739,7 +739,7 @@ ruleEAnnotationDecl returns [EObject current=null] lv_contents_4=ruleMapEntrySuper { if ($current==null) { - $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -764,7 +764,7 @@ ruleEAnnotationDecl returns [EObject current=null] lv_contents_6=ruleMapEntrySuper { if ($current==null) { - $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -810,7 +810,7 @@ ruleEClassDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -832,7 +832,7 @@ ruleEClassDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -853,7 +853,7 @@ ruleEClassDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -878,7 +878,7 @@ ruleEClassDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -902,7 +902,7 @@ ruleEClassDecl returns [EObject current=null] lv_eTypeParameters_6=ruleETypeParameterDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -927,7 +927,7 @@ ruleEClassDecl returns [EObject current=null] lv_eTypeParameters_8=ruleETypeParameterDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -956,7 +956,7 @@ ruleEClassDecl returns [EObject current=null] lv_eGenericSuperTypes_11=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -981,7 +981,7 @@ ruleEClassDecl returns [EObject current=null] lv_eGenericSuperTypes_13=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1006,7 +1006,7 @@ ruleEClassDecl returns [EObject current=null] lv_instanceClassName_15=ruleSTRING_OR_QID { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1031,7 +1031,7 @@ ruleEClassDecl returns [EObject current=null] lv_eStructuralFeatures_17=ruleEStructuralFeatureDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1053,7 +1053,7 @@ ruleEClassDecl returns [EObject current=null] lv_eOperations_18=ruleEOperationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1147,7 +1147,7 @@ ruleEAttributeDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1169,7 +1169,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1191,7 +1191,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1213,7 +1213,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1235,7 +1235,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1257,7 +1257,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1279,7 +1279,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1301,7 +1301,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1323,7 +1323,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1347,7 +1347,7 @@ ruleEAttributeDecl returns [EObject current=null] lv_eGenericType_10=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1372,7 +1372,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1396,7 +1396,7 @@ ruleEAttributeDecl returns [EObject current=null] lv_upperBound_14=ruleSINT { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1421,7 +1421,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1445,7 +1445,7 @@ ruleEAttributeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1490,7 +1490,7 @@ ruleEReferenceDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1512,7 +1512,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1534,7 +1534,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1556,7 +1556,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1578,7 +1578,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1600,7 +1600,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1622,7 +1622,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1644,7 +1644,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1666,7 +1666,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1687,7 +1687,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1712,7 +1712,7 @@ ruleEReferenceDecl returns [EObject current=null] lv_eGenericType_11=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1737,7 +1737,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1761,7 +1761,7 @@ ruleEReferenceDecl returns [EObject current=null] lv_upperBound_15=ruleSINT { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1786,13 +1786,13 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEReferenceDecl().ele510CrossReferenceEStringEReference(), "eOpposite"); + createLeafNode(grammarAccess.prEReferenceDecl().ele510CrossReferenceIDEReference(), "eOpposite"); } // TODO assign feature to currentNode @@ -1806,7 +1806,7 @@ ruleEReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1851,7 +1851,7 @@ ruleEEnumDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1876,7 +1876,7 @@ ruleEEnumDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1900,7 +1900,7 @@ ruleEEnumDecl returns [EObject current=null] lv_eLiterals_4=ruleEEnumLiteralDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1946,7 +1946,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -1967,7 +1967,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -1991,7 +1991,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2011,7 +2011,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2056,7 +2056,7 @@ ruleETypeParameterDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2080,7 +2080,7 @@ ruleETypeParameterDecl returns [EObject current=null] lv_eBounds_2=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2118,13 +2118,13 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier(), "eClassifier"); + createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceIDEClassifier(), "eClassifier"); } // TODO assign feature to currentNode @@ -2142,7 +2142,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] lv_eTypeArguments_2=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2167,7 +2167,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] lv_eTypeArguments_4=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2193,13 +2193,13 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter(), "eTypeParameter"); + createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceIDETypeParameter(), "eTypeParameter"); } // TODO assign feature to currentNode @@ -2230,13 +2230,13 @@ ruleEGenericTypeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeDecl().ele000CrossReferenceEStringEClassifier(), "eClassifier"); + createLeafNode(grammarAccess.prEGenericTypeDecl().ele000CrossReferenceIDEClassifier(), "eClassifier"); } // TODO assign feature to currentNode @@ -2254,7 +2254,7 @@ ruleEGenericTypeDecl returns [EObject current=null] lv_eTypeArguments_2=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2279,7 +2279,7 @@ ruleEGenericTypeDecl returns [EObject current=null] lv_eTypeArguments_4=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2305,13 +2305,13 @@ ruleEGenericTypeDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } } RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeDecl().ele110CrossReferenceEStringETypeParameter(), "eTypeParameter"); + createLeafNode(grammarAccess.prEGenericTypeDecl().ele110CrossReferenceIDETypeParameter(), "eTypeParameter"); } // TODO assign feature to currentNode @@ -2334,7 +2334,7 @@ ruleEGenericTypeDecl returns [EObject current=null] lv_eUpperBound_10=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2360,7 +2360,7 @@ ruleEGenericTypeDecl returns [EObject current=null] lv_eLowerBound_12=ruleEGenericTypeDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2402,7 +2402,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2424,7 +2424,7 @@ ruleEOperationDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2446,7 +2446,7 @@ ruleEOperationDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2470,7 +2470,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eGenericType_4=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2496,7 +2496,7 @@ ruleEOperationDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2520,7 +2520,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eTypeParameters_8=ruleETypeParameterDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2545,7 +2545,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eTypeParameters_10=ruleETypeParameterDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2574,7 +2574,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eParameters_13=ruleEParameterDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2599,7 +2599,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eParameters_15=ruleEParameterDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2628,7 +2628,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eGenericExceptions_18=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2653,7 +2653,7 @@ ruleEOperationDecl returns [EObject current=null] lv_eGenericExceptions_20=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2699,7 +2699,7 @@ ruleEParameterDecl returns [EObject current=null] lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2720,7 +2720,7 @@ ruleEParameterDecl returns [EObject current=null] lv_eGenericType_1=ruleEGenericTypeReferenceDecl { if ($current==null) { - $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), $current); } @@ -2741,7 +2741,7 @@ ruleEParameterDecl returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType()); + $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2816,7 +2816,7 @@ ruleMapEntry returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prMapEntry().getRule().getType().getType()); + $current = factory.create(grammarAccess.prMapEntry().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } @@ -2840,7 +2840,7 @@ ruleMapEntry returns [EObject current=null] { if ($current==null) { - $current = factory.create(grammarAccess.prMapEntry().getRule().getType().getType()); + $current = factory.create(grammarAccess.prMapEntry().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, $current); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java index ba53d0e..0d971e6 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java @@ -142,7 +142,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -174,7 +174,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -287,7 +287,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -320,7 +320,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -444,7 +444,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -480,7 +480,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -512,7 +512,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -545,7 +545,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -584,7 +584,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -616,7 +616,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -746,7 +746,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -780,7 +780,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -818,7 +818,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -850,7 +850,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1105,7 +1105,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1143,7 +1143,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1176,7 +1176,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1205,7 +1205,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1343,7 +1343,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1369,13 +1369,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { { if (current==null) { - current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAnnotationDecl1485); - createLeafNode(grammarAccess.prEAnnotationDecl().ele20CrossReferenceEStringEModelElement(), "eModelElement"); + createLeafNode(grammarAccess.prEAnnotationDecl().ele20CrossReferenceIDEModelElement(), "eModelElement"); } @@ -1399,7 +1399,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1444,7 +1444,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1586,7 +1586,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1624,7 +1624,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1670,7 +1670,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1709,7 +1709,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -1749,7 +1749,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1794,7 +1794,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1854,7 +1854,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1899,7 +1899,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -1955,7 +1955,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2000,7 +2000,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2032,7 +2032,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2289,7 +2289,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2371,7 +2371,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2400,7 +2400,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2429,7 +2429,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2458,7 +2458,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2487,7 +2487,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2516,7 +2516,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2545,7 +2545,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2574,7 +2574,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2612,7 +2612,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2651,7 +2651,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2691,7 +2691,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -2731,7 +2731,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { if (current==null) { - current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType()); + current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getClassifier()); associateNodeWithAstElement(currentNode, current); } @@ -2769,7 +2769,7 @@ public class InternalEcoreDslParser exte |