summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2008-12-03 15:56:26 (EST)
committer sefftinge2008-12-03 15:56:26 (EST)
commit42c53d34c3d54a355bdfb30adad1d70b6efe6d8b (patch)
tree1be24642eb36d06c634671da24aefd6dea1e7436
parent13150032e23ab93b11bc5c27f2c63c04acfa0174 (diff)
downloadorg.eclipse.xtext-42c53d34c3d54a355bdfb30adad1d70b6efe6d8b.zip
org.eclipse.xtext-42c53d34c3d54a355bdfb30adad1d70b6efe6d8b.tar.gz
org.eclipse.xtext-42c53d34c3d54a355bdfb30adad1d70b6efe6d8b.tar.bz2
CrossRefs for Metamodel-Aliases in xtext grammar (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=257255)
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore6
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi10
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java24
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi6
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java24
-rw-r--r--plugins/org.eclipse.xtext.service/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.xtext.service/build.properties1
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ProposalProviderInvokerSwitch.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTest.xmi22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangA.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangALexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangAParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangAParseTreeConstructor.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.xmi6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parsetree/reconstr/MetamodelRefTestParseTreeConstructor.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xmi24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.xmi10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestParseTreeConstructor.java42
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestParseTreeConstructor.java60
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestParseTreeConstructor.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.xmi8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressions.xmi14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ActionTestLanguageParseTreeConstructor.java14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsParseTreeConstructor.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TestLanguageParseTreeConstructor.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Lexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Parser.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTests.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/TypeHierarchyHelperTests.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTests.java9
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src/org/eclipse/xtext/ui/core/editor/AbstractEditorTest.java1
87 files changed, 293 insertions, 289 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
index b9d52de..5e4cd5b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
@@ -16,12 +16,12 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Person">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
<eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
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 795e89e..fa318d4 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
@@ -155,19 +155,19 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="mutter" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Erwachsener"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Erwachsener"/>
</terminal>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="vater" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Erwachsener"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Erwachsener"/>
</terminal>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="kinder" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Kind"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Kind"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -175,7 +175,7 @@
<abstractTokens xsi:type="xtext:Keyword" value=","/>
<abstractTokens xsi:type="xtext:Assignment" feature="kinder" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Kind"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Kind"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -198,7 +198,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="CustomTypeParserRule">
- <type alias="ReferenceModel" name="CustomType"/>
+ <type metamodel="//@metamodelDeclarations.1" name="CustomType"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Keyword" value="type"/>
<abstractTokens xsi:type="xtext:Assignment" feature="name" operator="=">
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
index 101d798..e52eb08 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-02 18:50:55
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-03 21:42:29
package org.eclipse.xtext.reference.parser.internal;
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
index 69a1422..e26fa2f 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-02 18:50:54
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-03 21:42:29
package org.eclipse.xtext.reference.parser.internal;
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
index be33728..d594c32 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
@@ -1192,12 +1192,12 @@ protected class Spielzeug_1_Keyword extends KeywordToken {
/************ begin Rule Familie ****************
*
- * Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')' ;
+ * Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ] ( ',' kinder += [ ReferenceGrammar :: Kind ] ) * ')' ;
*
**/
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')'
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ] ( ',' kinder += [ ReferenceGrammar :: Kind ] ) * ')'
protected class Familie_Group extends GroupToken {
public Familie_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1225,7 +1225,7 @@ protected class Familie_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) *
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ] ( ',' kinder += [ ReferenceGrammar :: Kind ] ) *
protected class Familie_0_Group extends GroupToken {
public Familie_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1253,7 +1253,7 @@ protected class Familie_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ]
protected class Familie_0_0_Group extends GroupToken {
public Familie_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1281,7 +1281,7 @@ protected class Familie_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_Group extends GroupToken {
public Familie_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1309,7 +1309,7 @@ protected class Familie_0_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ]
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_0_Group extends GroupToken {
public Familie_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1452,7 +1452,7 @@ protected class Familie_0_0_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// mutter = [ Erwachsener ]
+// mutter = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_0_1_Assignment_mutter extends AssignmentToken {
public Familie_0_0_0_0_1_Assignment_mutter(IInstanceDescription curr, AbstractToken pred) {
@@ -1479,7 +1479,7 @@ protected class Familie_0_0_0_0_1_Assignment_mutter extends AssignmentToken {
}
-// vater = [ Erwachsener ]
+// vater = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_1_Assignment_vater extends AssignmentToken {
public Familie_0_0_0_1_Assignment_vater(IInstanceDescription curr, AbstractToken pred) {
@@ -1506,7 +1506,7 @@ protected class Familie_0_0_0_1_Assignment_vater extends AssignmentToken {
}
-// kinder += [ Kind ]
+// kinder += [ ReferenceGrammar :: Kind ]
protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken {
public Familie_0_0_1_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
@@ -1533,7 +1533,7 @@ protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken {
}
-// ( ',' kinder += [ Kind ] ) *
+// ( ',' kinder += [ ReferenceGrammar :: Kind ] ) *
protected class Familie_0_1_Group extends GroupToken {
public Familie_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1573,7 +1573,7 @@ protected class Familie_0_1_0_Keyword extends KeywordToken {
}
}
-// kinder += [ Kind ]
+// kinder += [ ReferenceGrammar :: Kind ]
protected class Familie_0_1_1_Assignment_kinder extends AssignmentToken {
public Familie_0_1_1_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
@@ -1665,7 +1665,7 @@ protected class Farbe_Assignment_wert extends AssignmentToken {
/************ begin Rule CustomTypeParserRule ****************
*
- * CustomTypeParserRule returns ReferenceModel :: CustomType : 'type' name = ID ;
+ * (error)
*
**/
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi
index 3259aa9..1632167 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi
@@ -86,7 +86,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" cardinality="+" feature="actions" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Command"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Command"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -105,14 +105,14 @@
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Assignment" feature="event" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Event"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Event"/>
</terminal>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="=>"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="state" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="State"/>
+ <type metamodel="//@metamodelDeclarations.0" name="State"/>
</terminal>
</abstractTokens>
</alternatives>
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
index 71ee948..ff59e53 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-02 18:52:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-03 21:42:10
package org.eclipse.xtext.example.parser.internal;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
index a9c6ab0..e5d996f 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-02 18:52:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-03 21:42:09
package org.eclipse.xtext.example.parser.internal;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
index 6fdc62e..628620e 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
@@ -567,12 +567,12 @@ protected class Command_1_Assignment_code extends AssignmentToken {
/************ begin Rule State ****************
*
- * State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
+ * State : 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
*
**/
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
+// 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
protected class State_Group extends GroupToken {
public State_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -600,7 +600,7 @@ protected class State_Group extends GroupToken {
}
}
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) *
+// 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ? ( transitions += Transition ) *
protected class State_0_Group extends GroupToken {
public State_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -628,7 +628,7 @@ protected class State_0_Group extends GroupToken {
}
}
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+// 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ?
protected class State_0_0_Group extends GroupToken {
public State_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -720,7 +720,7 @@ protected class State_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+// ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ?
protected class State_0_0_1_Group extends GroupToken {
public State_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -748,7 +748,7 @@ protected class State_0_0_1_Group extends GroupToken {
}
}
-// 'actions' '{' ( actions += [ Command ] ) +
+// 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) +
protected class State_0_0_1_0_Group extends GroupToken {
public State_0_0_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -829,7 +829,7 @@ protected class State_0_0_1_0_0_1_Keyword extends KeywordToken {
}
-// ( actions += [ Command ] ) +
+// ( actions += [ fowlerdsl :: Command ] ) +
protected class State_0_0_1_0_1_Assignment_actions extends AssignmentToken {
public State_0_0_1_0_1_Assignment_actions(IInstanceDescription curr, AbstractToken pred) {
@@ -916,12 +916,12 @@ protected class State_1_Keyword_end extends KeywordToken {
/************ begin Rule Transition ****************
*
- * Transition : event = [ Event ] '=>' state = [ State ] ;
+ * Transition : event = [ fowlerdsl :: Event ] '=>' state = [ fowlerdsl :: State ] ;
*
**/
-// event = [ Event ] '=>' state = [ State ]
+// event = [ fowlerdsl :: Event ] '=>' state = [ fowlerdsl :: State ]
protected class Transition_Group extends GroupToken {
public Transition_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -949,7 +949,7 @@ protected class Transition_Group extends GroupToken {
}
}
-// event = [ Event ] '=>'
+// event = [ fowlerdsl :: Event ] '=>'
protected class Transition_0_Group extends GroupToken {
public Transition_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -977,7 +977,7 @@ protected class Transition_0_Group extends GroupToken {
}
}
-// event = [ Event ]
+// event = [ fowlerdsl :: Event ]
protected class Transition_0_0_Assignment_event extends AssignmentToken {
public Transition_0_0_Assignment_event(IInstanceDescription curr, AbstractToken pred) {
@@ -1016,7 +1016,7 @@ protected class Transition_0_1_Keyword extends KeywordToken {
}
-// state = [ State ]
+// state = [ fowlerdsl :: State ]
protected class Transition_1_Assignment_state extends AssignmentToken {
public Transition_1_Assignment_state(IInstanceDescription curr, AbstractToken pred) {
diff --git a/plugins/org.eclipse.xtext.service/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.service/META-INF/MANIFEST.MF
index 6d19b5d..6a3c470 100644
--- a/plugins/org.eclipse.xtext.service/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext.service/META-INF/MANIFEST.MF
@@ -12,5 +12,4 @@ Require-Bundle: org.eclipse.xtext.util,
Export-Package: org.eclipse.xtext.service,
org.eclipse.xtext.service.internal;x-friends:="org.eclipse.xtext.service.tests"
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: lib/picocontainer-2.5.jar,
- .
+Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.xtext.service/build.properties b/plugins/org.eclipse.xtext.service/build.properties
index 9648b78..aa1a008 100644
--- a/plugins/org.eclipse.xtext.service/build.properties
+++ b/plugins/org.eclipse.xtext.service/build.properties
@@ -2,5 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/picocontainer-2.5.jar,\
plugin.properties
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ProposalProviderInvokerSwitch.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ProposalProviderInvokerSwitch.java
index 7d99355..924aba2 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ProposalProviderInvokerSwitch.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ProposalProviderInvokerSwitch.java
@@ -147,7 +147,7 @@ public class ProposalProviderInvokerSwitch extends XtextSwitch<List<ICompletionP
TypeRef typeRef = calledRule.getType();
Method method = findMethod(proposalProvider.getClass(), "complete"
- + firstLetterCapitalized(typeRef.getAlias()) + firstLetterCapitalized(typeRef.getName()),
+ + firstLetterCapitalized(typeRef.getMetamodel().getAlias()) + firstLetterCapitalized(typeRef.getName()),
RuleCall.class, model==null? EObject.class : model.getClass(), String.class, document.getClass(), int.class);
Collection<? extends ICompletionProposal> proposalList = null == method ? null : invokeMethod(method,
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTest.xmi
index 38fbb1f..1bc5121 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTest.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTest.xmi
@@ -197,13 +197,13 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Alternatives">
- <type name="AbstractElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractElement"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.9"/>
<abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="groups" operator="+=">
- <typeName name="Alternatives"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Alternatives"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="|"/>
</abstractTokens>
@@ -214,12 +214,12 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Group">
- <type name="AbstractElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractElement"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.10"/>
<abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Action" feature="abstractTokens" operator="+=">
- <typeName name="Group"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Group"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="abstractTokens" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/>
@@ -228,7 +228,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="AbstractToken">
- <type name="AbstractElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractElement"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -249,7 +249,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Assignment">
- <type name="Assignment"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Assignment"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="=">
@@ -273,7 +273,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Action">
- <type name="Action"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Action"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
@@ -312,7 +312,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="AbstractTerminal">
- <type name="AbstractElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractElement"/>
<alternatives xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -337,7 +337,7 @@
<abstractTokens xsi:type="xtext:Keyword" value="|"/>
<abstractTokens xsi:type="xtext:Assignment" feature="rule" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="LexerRule"/>
+ <type metamodel="//@metamodelDeclarations.0" name="LexerRule"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -346,7 +346,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="ParenthesizedElement">
- <type name="AbstractElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractElement"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Keyword" value="("/>
@@ -365,7 +365,7 @@
<rules xsi:type="xtext:ParserRule" name="RuleCall">
<alternatives xsi:type="xtext:Assignment" feature="rule" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="AbstractRule"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractRule"/>
</terminal>
</alternatives>
</rules>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi
index 633b210..35ce9a2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi
@@ -41,7 +41,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="extends" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Type"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Type"/>
</terminal>
</abstractTokens>
</alternatives>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangA.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangA.xmi
index d2d1ff9..8c2e479 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangA.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangA.xmi
@@ -41,7 +41,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="extends" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Type"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Type"/>
</terminal>
</abstractTokens>
</alternatives>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
index ddae88a..9439a16 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-03 11:36:03
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-03 21:38:46
package org.eclipse.xtext.crossrefs.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
index 64f775f..e013f91 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-03 11:36:03
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-03 21:38:46
package org.eclipse.xtext.crossrefs.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangALexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangALexer.java
index 85a7681..8973ab9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangALexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangALexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangA.g 2008-12-03 11:35:51
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangA.g 2008-12-03 21:38:36
package org.eclipse.xtext.crossrefs.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangAParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangAParser.java
index cbf9a8e..a82569c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangAParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangAParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangA.g 2008-12-03 11:35:51
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangA.g 2008-12-03 21:38:36
package org.eclipse.xtext.crossrefs.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java
index 0ca07b8..d69ad52 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java
@@ -197,12 +197,12 @@ protected class Import_1_Assignment_importURI extends AssignmentToken {
/************ begin Rule Type ****************
*
- * Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ * Type : 'type' name = ID 'extends' ^extends = [ importedURI :: Type ] ;
*
**/
-// 'type' name = ID 'extends' ^extends = [ Type ]
+// 'type' name = ID 'extends' ^extends = [ importedURI :: Type ]
protected class Type_Group extends GroupToken {
public Type_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -335,7 +335,7 @@ protected class Type_0_1_Keyword_extends extends KeywordToken {
}
-// ^extends = [ Type ]
+// ^extends = [ importedURI :: Type ]
protected class Type_1_Assignment_extends extends AssignmentToken {
public Type_1_Assignment_extends(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangAParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangAParseTreeConstructor.java
index 936b92f..cc4c63a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangAParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangAParseTreeConstructor.java
@@ -197,12 +197,12 @@ protected class Import_1_Assignment_uri extends AssignmentToken {
/************ begin Rule Type ****************
*
- * Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ * Type : 'type' name = ID 'extends' ^extends = [ langA :: Type ] ;
*
**/
-// 'type' name = ID 'extends' ^extends = [ Type ]
+// 'type' name = ID 'extends' ^extends = [ langA :: Type ]
protected class Type_Group extends GroupToken {
public Type_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -335,7 +335,7 @@ protected class Type_0_1_Keyword_extends extends KeywordToken {
}
-// ^extends = [ Type ]
+// ^extends = [ langA :: Type ]
protected class Type_1_Assignment_extends extends AssignmentToken {
public Type_1_Assignment_extends(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageLexer.java
index 63729b6..8b02bd6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguage.g 2008-12-03 11:35:55
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguage.g 2008-12-03 21:38:40
package org.eclipse.xtext.dummy.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageParser.java
index b5d9a05..fed630e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguage.g 2008-12-03 11:35:55
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguage.g 2008-12-03 21:38:39
package org.eclipse.xtext.dummy.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi
index 9d7a006..89f1a7a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi
@@ -6,8 +6,9 @@
<idElements>grammarinheritance</idElements>
<idElements>AbstractTestLanguage</idElements>
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="mm" uri="classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore"/>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore" uri="http://www.eclipse.org/emf/2002/Ecore"/>
<rules xsi:type="xtext:ParserRule" name="InheritedParserRule">
- <type alias="mm" name="AType"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AType"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Keyword" value="element"/>
<abstractTokens xsi:type="xtext:Assignment" feature="name" operator="=">
@@ -16,7 +17,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:LexerRule" name="REAL" body="RULE_INT '.' RULE_INT">
- <type alias="ecore" name="EDouble"/>
+ <type metamodel="//@metamodelDeclarations.1" name="EDouble"/>
</rules>
<rules xsi:type="xtext:LexerRule" name="ID" body="('^')?('a'..'z'|'A'..'Z'|'&#xf6;'|'&#xe4;'|'&#xfc;'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*"/>
</xtext:Grammar>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
index 4d89050..bab847f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-03 11:35:52
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-03 21:38:37
package org.eclipse.xtext.grammarinheritance.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
index 28536fd..e28be6b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-03 11:35:52
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-03 21:38:37
package org.eclipse.xtext.grammarinheritance.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
index 7dac423..0b12f60 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
@@ -200,7 +200,7 @@ protected class ConcreteParserRule_1_Assignment_elements extends AssignmentToken
/************ begin Rule InheritedParserRule ****************
*
- * InheritedParserRule returns mm :: AType : 'element' name = ID ;
+ * (error)
*
**/
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java
index 21841e0..9493fa0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java
@@ -24,6 +24,8 @@ public class AbstractTestLanguageMetamodelAccess extends BaseEPackageAccess impl
private EPackage[] referenced = new EPackage[] {
BaseEPackageAccess.getEPackageFromRegistry("classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore")
+ ,
+ BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
};
public EPackage[] getReferencedEPackages() {
@@ -31,7 +33,7 @@ public class AbstractTestLanguageMetamodelAccess extends BaseEPackageAccess impl
}
private EPackage[] all = new EPackage[] {
- BaseEPackageAccess.getEPackageFromRegistry("classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore")
+ BaseEPackageAccess.getEPackageFromRegistry("classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore"),BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
};
public EPackage[] getAllEPackages() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.xmi
index f92c1b6..af8c1e7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.xmi
@@ -21,15 +21,15 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="NameRef">
- <type alias="xtext" name="RuleCall"/>
+ <type metamodel="//@metamodelDeclarations.0" name="RuleCall"/>
<alternatives xsi:type="xtext:Assignment" feature="rule" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="MyRule"/>
+ <type metamodel="//@metamodelDeclarations.1" name="MyRule"/>
</terminal>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="MyRule">
- <type alias="xtext" name="ParserRule"/>
+ <type metamodel="//@metamodelDeclarations.0" name="ParserRule"/>
<alternatives xsi:type="xtext:Assignment" feature="name" operator="=">
<terminal xsi:type="xtext:RuleCall">
<rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLexer.java
index 14568de..ba8fa7c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTest.g 2008-12-03 11:35:55
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTest.g 2008-12-03 21:38:39
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestParser.java
index de56392..ae7534e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTest.g 2008-12-03 11:35:55
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTest.g 2008-12-03 21:38:39
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parsetree/reconstr/MetamodelRefTestParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parsetree/reconstr/MetamodelRefTestParseTreeConstructor.java
index 0e9a73b..acfa776 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parsetree/reconstr/MetamodelRefTestParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parsetree/reconstr/MetamodelRefTestParseTreeConstructor.java
@@ -119,12 +119,12 @@ protected class Foo_1_Assignment_nameRefs extends AssignmentToken {
/************ begin Rule NameRef ****************
*
- * NameRef returns xtext :: RuleCall : rule = [ MyRule ] ;
+ * (error)
*
**/
-// rule = [ MyRule ]
+// rule = [ SimpleTest :: MyRule ]
protected class NameRef_Assignment_rule extends AssignmentToken {
public NameRef_Assignment_rule(IInstanceDescription curr, AbstractToken pred) {
@@ -154,7 +154,7 @@ protected class NameRef_Assignment_rule extends AssignmentToken {
/************ begin Rule MyRule ****************
*
- * MyRule returns xtext :: ParserRule : name = ID ;
+ * (error)
*
**/
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLexer.java
index b97f59e..5060311 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-03 11:41:04
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-03 21:43:18
package org.eclipse.xtext.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestParser.java
index 8cccc56..38b1e12 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-03 11:41:04
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-03 21:43:18
package org.eclipse.xtext.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xmi
index 3a470eb..b22bafa 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xmi
@@ -8,14 +8,14 @@
<idElements>ComplexReconstrTest</idElements>
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="complexrewritetest" nsURI="http://complex/rewrite/test"/>
<rules xsi:type="xtext:ParserRule" name="Op">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.1"/>
<abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
<groups xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="addOperands" operator="+=">
- <typeName name="Add"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Add"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="+"/>
</abstractTokens>
@@ -26,7 +26,7 @@
<groups xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="minusOperands" operator="+=">
- <typeName name="Minus"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Minus"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="-"/>
</abstractTokens>
@@ -38,7 +38,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Term">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:RuleCall" rule="//@rules.2"/>
<groups xsi:type="xtext:RuleCall" rule="//@rules.3"/>
@@ -52,7 +52,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Parens">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
@@ -67,7 +67,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="TrickyA">
- <type name="TypeA1"/>
+ <type metamodel="//@metamodelDeclarations.0" name="TypeA1"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
@@ -84,13 +84,13 @@
<abstractTokens xsi:type="xtext:Alternatives" cardinality="?">
<groups xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="x" operator="=">
- <typeName name="TypeB"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="TypeB"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="x"/>
</groups>
<groups xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="x" operator="=">
- <typeName name="TypeC"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="TypeC"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="y"/>
</groups>
@@ -104,7 +104,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="TrickyA1">
- <type name="TypeD"/>
+ <type metamodel="//@metamodelDeclarations.0" name="TypeD"/>
<alternatives xsi:type="xtext:Assignment" feature="name" operator="+=">
<terminal xsi:type="xtext:RuleCall">
<rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/>
@@ -149,21 +149,21 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
<abstractTokens xsi:type="xtext:Action" feature="x" operator="=">
- <typeName name="C1"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="C1"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="x"/>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
<abstractTokens xsi:type="xtext:Action" feature="y" operator="=">
- <typeName name="C2"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="C2"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="y"/>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
<abstractTokens xsi:type="xtext:Action" feature="z" operator="=">
- <typeName name="C3"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="C3"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="z"/>
</abstractTokens>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.xmi
index 67a74a6..53428d9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.xmi
@@ -8,12 +8,12 @@
<idElements>SimpleReconstrTest</idElements>
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simplerewritetest" nsURI="http://simple/rewrite/test"/>
<rules xsi:type="xtext:ParserRule" name="Op">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.1"/>
<abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Action" feature="values" operator="+=">
- <typeName name="Op"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Op"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="values" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.1"/>
@@ -22,7 +22,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Term">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -51,7 +51,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Parens">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
@@ -121,7 +121,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="extends" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Type"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Type"/>
</terminal>
</abstractTokens>
</alternatives>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestParseTreeConstructor.java
index 373a6ef..138d9af 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestParseTreeConstructor.java
@@ -1807,12 +1807,12 @@ protected class TypeRef_1_Assignment_name extends AssignmentToken {
/************ begin Rule Alternatives ****************
*
- * Alternatives returns AbstractElement : Group ( { current = Alternatives . groups += current } '|' groups += Group ) * ;
+ * Alternatives returns XtextTest :: AbstractElement : Group ( { current = XtextTest :: Alternatives . groups += current } '|' groups += Group ) * ;
*
**/
-// Group ( { current = Alternatives . groups += current } '|' groups += Group ) *
+// Group ( { current = XtextTest :: Alternatives . groups += current } '|' groups += Group ) *
protected class Alternatives_Group extends GroupToken {
public Alternatives_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1858,7 +1858,7 @@ protected class Alternatives_0_RuleCall_Group extends RuleCallToken {
}
}
-// ( { current = Alternatives . groups += current } '|' groups += Group ) *
+// ( { current = XtextTest :: Alternatives . groups += current } '|' groups += Group ) *
protected class Alternatives_1_Group extends GroupToken {
public Alternatives_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1886,7 +1886,7 @@ protected class Alternatives_1_Group extends GroupToken {
}
}
-// { current = Alternatives . groups += current } '|'
+// { current = XtextTest :: Alternatives . groups += current } '|'
protected class Alternatives_1_0_Group extends GroupToken {
public Alternatives_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1914,7 +1914,7 @@ protected class Alternatives_1_0_Group extends GroupToken {
}
}
-// { current = Alternatives . groups += current }
+// { current = XtextTest :: Alternatives . groups += current }
protected class Alternatives_1_0_0_Action_Alternatives_groups extends ActionToken {
public Alternatives_1_0_0_Action_Alternatives_groups(IInstanceDescription curr, AbstractToken pred) {
@@ -1981,12 +1981,12 @@ protected class Alternatives_1_1_Assignment_groups extends AssignmentToken {
/************ begin Rule Group ****************
*
- * Group returns AbstractElement : AbstractToken ( { current = Group . abstractTokens += current } abstractTokens += AbstractToken ) * ;
+ * Group returns XtextTest :: AbstractElement : AbstractToken ( { current = XtextTest :: Group . abstractTokens += current } abstractTokens += AbstractToken ) * ;
*
**/
-// AbstractToken ( { current = Group . abstractTokens += current } abstractTokens += AbstractToken ) *
+// AbstractToken ( { current = XtextTest :: Group . abstractTokens += current } abstractTokens += AbstractToken ) *
protected class Group_Group extends GroupToken {
public Group_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -2032,7 +2032,7 @@ protected class Group_0_RuleCall_AbstractToken extends RuleCallToken {
}
}
-// ( { current = Group . abstractTokens += current } abstractTokens += AbstractToken ) *
+// ( { current = XtextTest :: Group . abstractTokens += current } abstractTokens += AbstractToken ) *
protected class Group_1_Group extends GroupToken {
public Group_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -2060,7 +2060,7 @@ protected class Group_1_Group extends GroupToken {
}
}
-// { current = Group . abstractTokens += current }
+// { current = XtextTest :: Group . abstractTokens += current }
protected class Group_1_0_Action_Group_abstractTokens extends ActionToken {
public Group_1_0_Action_Group_abstractTokens(IInstanceDescription curr, AbstractToken pred) {
@@ -2114,7 +2114,7 @@ protected class Group_1_1_Assignment_abstractTokens extends AssignmentToken {
/************ begin Rule AbstractToken ****************
*
- * AbstractToken returns AbstractElement : ( Assignment | Action | AbstractTerminal ) ( cardinality = ( '?' | '*' | '+' ) ) ? ;
+ * AbstractToken returns XtextTest :: AbstractElement : ( Assignment | Action | AbstractTerminal ) ( cardinality = ( '?' | '*' | '+' ) ) ? ;
*
**/
@@ -2283,7 +2283,7 @@ protected class AbstractToken_1_Assignment_cardinality extends AssignmentToken
/************ begin Rule Assignment ****************
*
- * Assignment returns Assignment : feature = ID operator = ( '+=' | '=' | '?=' ) terminal = AbstractTerminal ;
+ * Assignment returns XtextTest :: Assignment : feature = ID operator = ( '+=' | '=' | '?=' ) terminal = AbstractTerminal ;
*
**/
@@ -2434,7 +2434,7 @@ protected class Assignment_1_Assignment_terminal extends AssignmentToken {
/************ begin Rule Action ****************
*
- * Action returns Action : '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID operator = ( '=' | '+=' ) 'current' '}' ;
+ * Action returns XtextTest :: Action : '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID operator = ( '=' | '+=' ) 'current' '}' ;
*
**/
@@ -2826,7 +2826,7 @@ protected class Action_1_Keyword extends KeywordToken {
/************ begin Rule AbstractTerminal ****************
*
- * AbstractTerminal returns AbstractElement : Keyword | RuleCall | ParenthesizedElement | CrossReference ;
+ * AbstractTerminal returns XtextTest :: AbstractElement : Keyword | RuleCall | ParenthesizedElement | CrossReference ;
*
**/
@@ -2973,12 +2973,12 @@ protected class AbstractTerminal_1_RuleCall_CrossReference extends RuleCallToken
/************ begin Rule CrossReference ****************
*
- * CrossReference : '[' type = TypeRef ( '|' rule = [ LexerRule ] ) ? ']' ;
+ * CrossReference : '[' type = TypeRef ( '|' rule = [ XtextTest :: LexerRule ] ) ? ']' ;
*
**/
-// '[' type = TypeRef ( '|' rule = [ LexerRule ] ) ? ']'
+// '[' type = TypeRef ( '|' rule = [ XtextTest :: LexerRule ] ) ? ']'
protected class CrossReference_Group extends GroupToken {
public CrossReference_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -3006,7 +3006,7 @@ protected class CrossReference_Group extends GroupToken {
}
}
-// '[' type = TypeRef ( '|' rule = [ LexerRule ] ) ?
+// '[' type = TypeRef ( '|' rule = [ XtextTest :: LexerRule ] ) ?
protected class CrossReference_0_Group extends GroupToken {
public CrossReference_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -3103,7 +3103,7 @@ protected class CrossReference_0_0_1_Assignment_type extends AssignmentToken {
}
-// ( '|' rule = [ LexerRule ] ) ?
+// ( '|' rule = [ XtextTest :: LexerRule ] ) ?
protected class CrossReference_0_1_Group extends GroupToken {
public CrossReference_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -3143,7 +3143,7 @@ protected class CrossReference_0_1_0_Keyword extends KeywordToken {
}
}
-// rule = [ LexerRule ]
+// rule = [ XtextTest :: LexerRule ]
protected class CrossReference_0_1_1_Assignment_rule extends AssignmentToken {
public CrossReference_0_1_1_Assignment_rule(IInstanceDescription curr, AbstractToken pred) {
@@ -3188,7 +3188,7 @@ protected class CrossReference_1_Keyword extends KeywordToken {
/************ begin Rule ParenthesizedElement ****************
*
- * ParenthesizedElement returns AbstractElement : '(' Alternatives ')' ;
+ * ParenthesizedElement returns XtextTest :: AbstractElement : '(' Alternatives ')' ;
*
**/
@@ -3329,12 +3329,12 @@ protected class Keyword_Assignment_value extends AssignmentToken {
/************ begin Rule RuleCall ****************
*
- * RuleCall : rule = [ AbstractRule ] ;
+ * RuleCall : rule = [ XtextTest :: AbstractRule ] ;
*
**/
-// rule = [ AbstractRule ]
+// rule = [ XtextTest :: AbstractRule ]
protected class RuleCall_Assignment_rule extends AssignmentToken {
public RuleCall_Assignment_rule(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLexer.java
index 2d50b4f..90690e8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTest.g 2008-12-03 11:35:57
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTest.g 2008-12-03 21:38:41
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestParser.java
index 8e53d28..d91252a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTest.g 2008-12-03 11:35:57
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTest.g 2008-12-03 21:38:41
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLexer.java
index f055b54..0f8ac94 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTest.g 2008-12-03 11:35:56
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTest.g 2008-12-03 21:38:41
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestParser.java
index 788e616..3bd1875 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTest.g 2008-12-03 11:35:56
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTest.g 2008-12-03 21:38:41
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestParseTreeConstructor.java
index 32ca042..13ebd99 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestParseTreeConstructor.java
@@ -38,12 +38,12 @@ public class ComplexReconstrTestParseTreeConstructor extends AbstractParseTreeCo
/************ begin Rule Op ****************
*
- * Op returns Expression : Term ( { current = Add . addOperands += current } '+' addOperands += Term | { current = Minus . minusOperands += current } '-' minusOperands += Term ) * ;
+ * Op returns complexrewritetest :: Expression : Term ( { current = complexrewritetest :: Add . addOperands += current } '+' addOperands += Term | { current = complexrewritetest :: Minus . minusOperands += current } '-' minusOperands += Term ) * ;
*
**/
-// Term ( { current = Add . addOperands += current } '+' addOperands += Term | { current = Minus . minusOperands += current } '-' minusOperands += Term ) *
+// Term ( { current = complexrewritetest :: Add . addOperands += current } '+' addOperands += Term | { current = complexrewritetest :: Minus . minusOperands += current } '-' minusOperands += Term ) *
protected class Op_Group extends GroupToken {
public Op_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -89,7 +89,7 @@ protected class Op_0_RuleCall_Term extends RuleCallToken {
}
}
-// ( { current = Add . addOperands += current } '+' addOperands += Term | { current = Minus . minusOperands += current } '-' minusOperands += Term ) *
+// ( { current = complexrewritetest :: Add . addOperands += current } '+' addOperands += Term | { current = complexrewritetest :: Minus . minusOperands += current } '-' minusOperands += Term ) *
protected class Op_1_Alternatives extends AlternativesToken {
public Op_1_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -110,7 +110,7 @@ protected class Op_1_Alternatives extends AlternativesToken {
}
}
-// { current = Add . addOperands += current } '+' addOperands += Term
+// { current = complexrewritetest :: Add . addOperands += current } '+' addOperands += Term
protected class Op_1_0_Group extends GroupToken {
public Op_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -138,7 +138,7 @@ protected class Op_1_0_Group extends GroupToken {
}
}
-// { current = Add . addOperands += current } '+'
+// { current = complexrewritetest :: Add . addOperands += current } '+'
protected class Op_1_0_0_Group extends GroupToken {
public Op_1_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -166,7 +166,7 @@ protected class Op_1_0_0_Group extends GroupToken {
}
}
-// { current = Add . addOperands += current }
+// { current = complexrewritetest :: Add . addOperands += current }
protected class Op_1_0_0_0_Action_Add_addOperands extends ActionToken {
public Op_1_0_0_0_Action_Add_addOperands(IInstanceDescription curr, AbstractToken pred) {
@@ -228,7 +228,7 @@ protected class Op_1_0_1_Assignment_addOperands extends AssignmentToken {
}
-// { current = Minus . minusOperands += current } '-' minusOperands += Term
+// { current = complexrewritetest :: Minus . minusOperands += current } '-' minusOperands += Term
protected class Op_1_1_Group extends GroupToken {
public Op_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -256,7 +256,7 @@ protected class Op_1_1_Group extends GroupToken {
}
}
-// { current = Minus . minusOperands += current } '-'
+// { current = complexrewritetest :: Minus . minusOperands += current } '-'
protected class Op_1_1_0_Group extends GroupToken {
public Op_1_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -284,7 +284,7 @@ protected class Op_1_1_0_Group extends GroupToken {
}
}
-// { current = Minus . minusOperands += current }
+// { current = complexrewritetest :: Minus . minusOperands += current }
protected class Op_1_1_0_0_Action_Minus_minusOperands extends ActionToken {
public Op_1_1_0_0_Action_Minus_minusOperands(IInstanceDescription curr, AbstractToken pred) {
@@ -352,7 +352,7 @@ protected class Op_1_1_1_Assignment_minusOperands extends AssignmentToken {
/************ begin Rule Term ****************
*
- * Term returns Expression : Atom | Parens ;
+ * Term returns complexrewritetest :: Expression : Atom | Parens ;
*
**/
@@ -451,7 +451,7 @@ protected class Atom_Assignment_name extends AssignmentToken {
/************ begin Rule Parens ****************
*
- * Parens returns Expression : '(' Op ')' ( em = '!' ) ? ;
+ * Parens returns complexrewritetest :: Expression : '(' Op ')' ( em = '!' ) ? ;
*
**/
@@ -612,12 +612,12 @@ protected class Parens_1_Assignment_em extends AssignmentToken {
/************ begin Rule TrickyA ****************
*
- * TrickyA returns TypeA1 : 'TA' TrickyA1 ( name += ID ) * ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ? name += STRING ;
+ * TrickyA returns complexrewritetest :: TypeA1 : 'TA' TrickyA1 ( name += ID ) * ( { current = complexrewritetest :: TypeB . x = current } 'x' | { current = complexrewritetest :: TypeC . x = current } 'y' ) ? name += STRING ;
*
**/
-// 'TA' TrickyA1 ( name += ID ) * ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ? name += STRING
+// 'TA' TrickyA1 ( name += ID ) * ( { current = complexrewritetest :: TypeB . x = current } 'x' | { current = complexrewritetest :: TypeC . x = current } 'y' ) ? name += STRING
protected class TrickyA_Group extends GroupToken {
public TrickyA_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -645,7 +645,7 @@ protected class TrickyA_Group extends GroupToken {
}
}
-// 'TA' TrickyA1 ( name += ID ) * ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ?
+// 'TA' TrickyA1 ( name += ID ) * ( { current = complexrewritetest :: TypeB . x = current } 'x' | { current = complexrewritetest :: TypeC . x = current } 'y' ) ?
protected class TrickyA_0_Group extends GroupToken {
public TrickyA_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -784,7 +784,7 @@ protected class TrickyA_0_0_1_Assignment_name extends AssignmentToken {
}
-// ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ?
+// ( { current = complexrewritetest :: TypeB . x = current } 'x' | { current = complexrewritetest :: TypeC . x = current } 'y' ) ?
protected class TrickyA_0_1_Alternatives extends AlternativesToken {
public TrickyA_0_1_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -805,7 +805,7 @@ protected class TrickyA_0_1_Alternatives extends AlternativesToken {
}
}
-// { current = TypeB . x = current } 'x'
+// { current = complexrewritetest :: TypeB . x = current } 'x'
protected class TrickyA_0_1_0_Group extends GroupToken {
public TrickyA_0_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -833,7 +833,7 @@ protected class TrickyA_0_1_0_Group extends GroupToken {
}
}
-// { current = TypeB . x = current }
+// { current = complexrewritetest :: TypeB . x = current }
protected class TrickyA_0_1_0_0_Action_TypeB_x extends ActionToken {
public TrickyA_0_1_0_0_Action_TypeB_x(IInstanceDescription curr, AbstractToken pred) {
@@ -866,7 +866,7 @@ protected class TrickyA_0_1_0_1_Keyword_x extends KeywordToken {
}
-// { current = TypeC . x = current } 'y'
+// { current = complexrewritetest :: TypeC . x = current } 'y'
protected class TrickyA_0_1_1_Group extends GroupToken {
public TrickyA_0_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -894,7 +894,7 @@ protected class TrickyA_0_1_1_Group extends GroupToken {
}
}
-// { current = TypeC . x = current }
+// { current = complexrewritetest :: TypeC . x = current }
protected class TrickyA_0_1_1_0_Action_TypeC_x extends ActionToken {
public TrickyA_0_1_1_0_Action_TypeC_x(IInstanceDescription curr, AbstractToken pred) {
@@ -957,7 +957,7 @@ protected class TrickyA_1_Assignment_name extends AssignmentToken {
/************ begin Rule TrickyA1 ****************
*
- * TrickyA1 returns TypeD : name += ID ;
+ * TrickyA1 returns complexrewritetest :: TypeD : name += ID ;
*
**/
@@ -1166,12 +1166,12 @@ protected class TrickyB_1_Assignment_type extends AssignmentToken {
/************ begin Rule TrickyC ****************
*
- * TrickyC : 'TC' name = ID ( { current = C1 . x = current } 'x' ) ? ( { current = C2 . y = current } 'y' ) ? ( { current = C3 . z = current } 'z' ) ? ;
+ * TrickyC : 'TC' name = ID ( { current = complexrewritetest :: C1 . x = current } 'x' ) ? ( { current = complexrewritetest :: C2 . y = current } 'y' ) ? ( { current = complexrewritetest :: C3 . z = current } 'z' ) ? ;
*
**/
-// 'TC' name = ID ( { current = C1 . x = current } 'x' ) ? ( { current = C2 . y = current } 'y' ) ? ( { current = C3 . z = current } 'z' ) ?
+// 'TC' name = ID ( { current = complexrewritetest :: C1 . x = current } 'x' ) ? ( { current = complexrewritetest :: C2 . y = current } 'y' ) ? ( { current = complexrewritetest :: C3 . z = current } 'z' ) ?
protected class TrickyC_Group extends GroupToken {
public TrickyC_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1199,7 +1199,7 @@ protected class TrickyC_Group extends GroupToken {
}
}
-// 'TC' name = ID ( { current = C1 . x = current } 'x' ) ? ( { current = C2 . y = current } 'y' ) ?
+// 'TC' name = ID ( { current = complexrewritetest :: C1 . x = current } 'x' ) ? ( { current = complexrewritetest :: C2 . y = current } 'y' ) ?
protected class TrickyC_0_Group extends GroupToken {
public TrickyC_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1227,7 +1227,7 @@ protected class TrickyC_0_Group extends GroupToken {
}
}
-// 'TC' name = ID ( { current = C1 . x = current } 'x' ) ?
+// 'TC' name = ID ( { current = complexrewritetest :: C1 . x = current } 'x' ) ?
protected class TrickyC_0_0_Group extends GroupToken {
public TrickyC_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1319,7 +1319,7 @@ protected class TrickyC_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// ( { current = C1 . x = current } 'x' ) ?
+// ( { current = complexrewritetest :: C1 . x = current } 'x' ) ?
protected class TrickyC_0_0_1_Group extends GroupToken {
public TrickyC_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1347,7 +1347,7 @@ protected class TrickyC_0_0_1_Group extends GroupToken {
}
}
-// { current = C1 . x = current }
+// { current = complexrewritetest :: C1 . x = current }
protected class TrickyC_0_0_1_0_Action_C1_x extends ActionToken {
public TrickyC_0_0_1_0_Action_C1_x(IInstanceDescription curr, AbstractToken pred) {
@@ -1381,7 +1381,7 @@ protected class TrickyC_0_0_1_1_Keyword_x extends KeywordToken {
-// ( { current = C2 . y = current } 'y' ) ?
+// ( { current = complexrewritetest :: C2 . y = current } 'y' ) ?
protected class TrickyC_0_1_Group extends GroupToken {
public TrickyC_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1409,7 +1409,7 @@ protected class TrickyC_0_1_Group extends GroupToken {
}
}
-// { current = C2 . y = current }
+// { current = complexrewritetest :: C2 . y = current }
protected class TrickyC_0_1_0_Action_C2_y extends ActionToken {
public TrickyC_0_1_0_Action_C2_y(IInstanceDescription curr, AbstractToken pred) {
@@ -1443,7 +1443,7 @@ protected class TrickyC_0_1_1_Keyword_y extends KeywordToken {
-// ( { current = C3 . z = current } 'z' ) ?
+// ( { current = complexrewritetest :: C3 . z = current } 'z' ) ?
protected class TrickyC_1_Group extends GroupToken {
public TrickyC_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1471,7 +1471,7 @@ protected class TrickyC_1_Group extends GroupToken {
}
}
-// { current = C3 . z = current }
+// { current = complexrewritetest :: C3 . z = current }
protected class TrickyC_1_0_Action_C3_z extends ActionToken {
public TrickyC_1_0_Action_C3_z(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestParseTreeConstructor.java
index aab2795..755bd47 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestParseTreeConstructor.java
@@ -36,12 +36,12 @@ public class SimpleReconstrTestParseTreeConstructor extends AbstractParseTreeCon
/************ begin Rule Op ****************
*
- * Op returns Expression : Term ( { current = Op . values += current } values += Term ) * ;
+ * Op returns simplerewritetest :: Expression : Term ( { current = simplerewritetest :: Op . values += current } values += Term ) * ;
*
**/
-// Term ( { current = Op . values += current } values += Term ) *
+// Term ( { current = simplerewritetest :: Op . values += current } values += Term ) *
protected class Op_Group extends GroupToken {
public Op_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -87,7 +87,7 @@ protected class Op_0_RuleCall_Term extends RuleCallToken {
}
}
-// ( { current = Op . values += current } values += Term ) *
+// ( { current = simplerewritetest :: Op . values += current } values += Term ) *
protected class Op_1_Group extends GroupToken {
public Op_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -115,7 +115,7 @@ protected class Op_1_Group extends GroupToken {
}
}
-// { current = Op . values += current }
+// { current = simplerewritetest :: Op . values += current }
protected class Op_1_0_Action_Op_values extends ActionToken {
public Op_1_0_Action_Op_values(IInstanceDescription curr, AbstractToken pred) {
@@ -169,7 +169,7 @@ protected class Op_1_1_Assignment_values extends AssignmentToken {
/************ begin Rule Term ****************
*
- * Term returns Expression : Atom | TwoNumbers | ManyStrings | Parens | Type | Ref2 | Spare ;
+ * Term returns simplerewritetest :: Expression : Atom | TwoNumbers | ManyStrings | Parens | Type | Ref2 | Spare ;
*
**/
@@ -468,7 +468,7 @@ protected class Atom_Assignment_name extends AssignmentToken {
/************ begin Rule Parens ****************
*
- * Parens returns Expression : '(' Op ')' ( em = '!' ) ? ;
+ * Parens returns simplerewritetest :: Expression : '(' Op ')' ( em = '!' ) ? ;
*
**/
@@ -931,12 +931,12 @@ protected class ManyStrings_1_Assignment_str2 extends AssignmentToken {
/************ begin Rule Type ****************
*
- * Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ * Type : 'type' name = ID 'extends' ^extends = [ simplerewritetest :: Type ] ;
*
**/
-// 'type' name = ID 'extends' ^extends = [ Type ]
+// 'type' name = ID 'extends' ^extends = [ simplerewritetest :: Type ]
protected class Type_Group extends GroupToken {
public Type_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1069,7 +1069,7 @@ protected class Type_0_1_Keyword_extends extends KeywordToken {
}
-// ^extends = [ Type ]
+// ^extends = [ simplerewritetest :: Type ]
protected class Type_1_Assignment_extends extends AssignmentToken {
public Type_1_Assignment_extends(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi
index 5174fe7..5b6acd7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi
@@ -12,12 +12,12 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Element">
- <type name="Type"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Type"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.2"/>
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="items" operator="+=">
- <typeName name="Item"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Item"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="items" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.2"/>
@@ -26,10 +26,10 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Item">
- <type name="Type"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Type"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="content" operator="=">
- <typeName name="Thing"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Thing"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="name" operator="=">
<terminal xsi:type="xtext:RuleCall">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi
index 50f5b60..8a6b90a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi
@@ -68,7 +68,7 @@
<rules xsi:type="xtext:ParserRule" name="AbstractRuleCall">
<alternatives xsi:type="xtext:Assignment" feature="rule" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="AbstractRule"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractRule"/>
</terminal>
</alternatives>
</rules>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi
index 71080ef..cca0de6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi
@@ -86,7 +86,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" cardinality="+" feature="actions" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Command"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Command"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -105,14 +105,14 @@
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Assignment" feature="event" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Event"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Event"/>
</terminal>
</abstractTokens>
<abstractTokens xsi:type="xtext:Keyword" value="=>"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="state" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="State"/>
+ <type metamodel="//@metamodelDeclarations.0" name="State"/>
</terminal>
</abstractTokens>
</alternatives>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi
index d438d64..631fd3e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi
@@ -128,7 +128,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="referencedContainer" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Container"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Container"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -155,7 +155,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="referencedChildren" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Child"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Child"/>
</terminal>
</abstractTokens>
</abstractTokens>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
index e06ff31..d5d6059 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
@@ -13,12 +13,12 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="familie" upperBound="-1" eType="//Familie" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Person">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
<eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.xmi
index cf85712..ef40fc2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.xmi
@@ -161,19 +161,19 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="mutter" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Erwachsener"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Erwachsener"/>
</terminal>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="vater" operator="=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Erwachsener"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Erwachsener"/>
</terminal>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="kinder" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Kind"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Kind"/>
</terminal>
</abstractTokens>
</abstractTokens>
@@ -181,7 +181,7 @@
<abstractTokens xsi:type="xtext:Keyword" value=","/>
<abstractTokens xsi:type="xtext:Assignment" feature="kinder" operator="+=">
<terminal xsi:type="xtext:CrossReference">
- <type name="Kind"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Kind"/>
</terminal>
</abstractTokens>
</abstractTokens>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressions.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressions.xmi
index 61bd249..e0b5530 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressions.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressions.xmi
@@ -11,7 +11,7 @@
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.1"/>
<abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Action" feature="expressions" operator="+=">
- <typeName name="Sequence"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Sequence"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="expressions" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.1"/>
@@ -20,13 +20,13 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Addition">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.2"/>
<abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="values" operator="+=">
- <typeName name="Op"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Op"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="operator" operator="=">
<terminal xsi:type="xtext:Alternatives">
@@ -42,13 +42,13 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Multiplication">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.3"/>
<abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Action" feature="values" operator="+=">
- <typeName name="Op"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="Op"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="operator" operator="=">
<terminal xsi:type="xtext:Alternatives">
@@ -64,7 +64,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Term">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:RuleCall" rule="//@rules.4"/>
<groups xsi:type="xtext:RuleCall" rule="//@rules.5"/>
@@ -78,7 +78,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="Parens">
- <type name="Expression"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Expression"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Keyword" value="("/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi
index 28ac9c0..4a94c9f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi
@@ -7,20 +7,20 @@
<idElements>TestLanguage</idElements>
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TestLang" nsURI="http://www.eclipse.org/2008/xtext/TestLang"/>
<rules xsi:type="xtext:ParserRule" name="EntryRule">
- <type name="Model"/>
+ <type metamodel="//@metamodelDeclarations.0" name="Model"/>
<alternatives xsi:type="xtext:Assignment" cardinality="*" feature="multiFeature" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.1"/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="AbstractRule">
- <type name="AbstractElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="AbstractElement"/>
<alternatives xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:RuleCall" rule="//@rules.2"/>
<groups xsi:type="xtext:RuleCall" rule="//@rules.3"/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="ChoiceRule">
- <type name="ChoiceElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="ChoiceElement"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Keyword" value="choice"/>
@@ -36,7 +36,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="ReducibleRule">
- <type name="ReducibleElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="ReducibleElement"/>
<alternatives xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Group">
<abstractTokens xsi:type="xtext:Keyword" value="reducible"/>
@@ -44,7 +44,7 @@
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
<abstractTokens xsi:type="xtext:Action" feature="actionFeature" operator="+=">
- <typeName name="ReducibleComposite"/>
+ <typeName metamodel="//@metamodelDeclarations.0" name="ReducibleComposite"/>
</abstractTokens>
<abstractTokens xsi:type="xtext:Assignment" feature="actionFeature" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.4"/>
@@ -53,7 +53,7 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="TerminalRule">
- <type name="TerminalElement"/>
+ <type metamodel="//@metamodelDeclarations.0" name="TerminalElement"/>
<alternatives xsi:type="xtext:Assignment" feature="stringFeature" operator="=">
<terminal xsi:type="xtext:RuleCall">
<rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
index 43da2d0..341ae17 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-03 11:35:59
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-03 21:38:43
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
index c0f076a..add34a3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-03 11:35:59
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-03 21:38:43
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
index 57a7f13..98cc524 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-03 11:41:05
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-03 21:43:19
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
index 72895f6..eaebb9c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-03 11:41:05
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-03 21:43:19
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
index 2080ba1..acf9de1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-03 11:36:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-03 21:38:45
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
index 42c0676..9e509f1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-03 11:36:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-03 21:38:45
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageLexer.java
index 62aa62b..5a91944 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguage.g 2008-12-03 11:35:58
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguage.g 2008-12-03 21:38:42
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageParser.java
index c065065..3f53a79 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguage.g 2008-12-03 11:35:58
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguage.g 2008-12-03 21:38:42
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageLexer.java
index 6f2327d..b6d87f3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguage.g 2008-12-03 11:36:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguage.g 2008-12-03 21:38:44
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageParser.java
index 11f26b6..8e6bd88 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguage.g 2008-12-03 11:36:00
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguage.g 2008-12-03 21:38:44
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageLexer.java
index 2a9352a..0c17703 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguage.g 2008-12-03 11:35:59
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguage.g 2008-12-03 21:38:43
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageParser.java
index e3ae092..6d8760d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguage.g 2008-12-03 11:35:59
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguage.g 2008-12-03 21:38:43
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
index ef32a9e..4329119 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-03 11:36:03
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-03 21:38:47
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
index d24985a..46b4182 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-03 11:36:03
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-03 21:38:47
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarLexer.java
index 9d562da..2fbab18 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-03 11:41:01
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-03 21:43:16
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarParser.java
index 2a3b4ca..7656143 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-03 11:41:01
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-03 21:43:15
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsLexer.java
index 4aa09ef..17eb08b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressions.g 2008-12-03 11:35:58
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressions.g 2008-12-03 21:38:42
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsParser.java
index 77ae51d..3f4ddce 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressions.g 2008-12-03 11:35:58
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressions.g 2008-12-03 21:38:42
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java
index 5c2427e..d8a317e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-03 11:35:56
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-03 21:38:40
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java
index 6611132..dae9932 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-03 11:35:56
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-03 21:38:40
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java
index 0aecd2b..55e7c00 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-03 11:41:03
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-03 21:43:17
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java
index 5b47629..9d9adc0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-03 11:41:02
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-03 21:43:16
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ActionTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ActionTestLanguageParseTreeConstructor.java
index 98f75da..8d98c18 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ActionTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ActionTestLanguageParseTreeConstructor.java
@@ -67,12 +67,12 @@ protected class Model_Assignment_children extends AssignmentToken {
/************ begin Rule Element ****************
*
- * Element returns Type : Item ( { current = Item . items += current } items += Item ) ;
+ * Element returns ActionLang :: Type : Item ( { current = ActionLang :: Item . items += current } items += Item ) ;
*
**/
-// Item ( { current = Item . items += current } items += Item )
+// Item ( { current = ActionLang :: Item . items += current } items += Item )
protected class Element_Group extends GroupToken {
public Element_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -118,7 +118,7 @@ protected class Element_0_RuleCall_Item extends RuleCallToken {
}
}
-// { current = Item . items += current } items += Item
+// { current = ActionLang :: Item . items += current } items += Item
protected class Element_1_Group extends GroupToken {
public Element_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -146,7 +146,7 @@ protected class Element_1_Group extends GroupToken {
}
}
-// { current = Item . items += current }
+// { current = ActionLang :: Item . items += current }
protected class Element_1_0_Action_Item_items extends ActionToken {
public Element_1_0_Action_Item_items(IInstanceDescription curr, AbstractToken pred) {
@@ -200,12 +200,12 @@ protected class Element_1_1_Assignment_items extends AssignmentToken {
/************ begin Rule Item ****************
*
- * Item returns Type : { current = Thing . content = current } name = ID ;
+ * Item returns ActionLang :: Type : { current = ActionLang :: Thing . content = current } name = ID ;
*
**/
-// { current = Thing . content = current } name = ID
+// { current = ActionLang :: Thing . content = current } name = ID
protected class Item_Group extends GroupToken {
public Item_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -233,7 +233,7 @@ protected class Item_Group extends GroupToken {
}
}
-// { current = Thing . content = current }
+// { current = ActionLang :: Thing . content = current }
protected class Item_0_Action_Thing_content extends ActionToken {
public Item_0_Action_Thing_content(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java
index 6ef2aff..c956214 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java
@@ -642,12 +642,12 @@ protected class SecondAbstractRuleChild_1_Keyword extends KeywordToken {
/************ begin Rule AbstractRuleCall ****************
*
- * AbstractRuleCall : rule = [ AbstractRule ] ;
+ * AbstractRuleCall : rule = [ contentAssistTestLanguage :: AbstractRule ] ;
*
**/
-// rule = [ AbstractRule ]
+// rule = [ contentAssistTestLanguage :: AbstractRule ]
protected class AbstractRuleCall_Assignment_rule extends AssignmentToken {
public AbstractRuleCall_Assignment_rule(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java
index 088e602..88aad0d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java
@@ -567,12 +567,12 @@ protected class Command_1_Assignment_code extends AssignmentToken {
/************ begin Rule State ****************
*
- * State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
+ * State : 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
*
**/
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
+// 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
protected class State_Group extends GroupToken {
public State_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -600,7 +600,7 @@ protected class State_Group extends GroupToken {
}
}
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) *
+// 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ? ( transitions += Transition ) *
protected class State_0_Group extends GroupToken {
public State_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -628,7 +628,7 @@ protected class State_0_Group extends GroupToken {
}
}
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+// 'state' name = ID ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ?
protected class State_0_0_Group extends GroupToken {
public State_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -720,7 +720,7 @@ protected class State_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+// ( 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) + '}' ) ?
protected class State_0_0_1_Group extends GroupToken {
public State_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -748,7 +748,7 @@ protected class State_0_0_1_Group extends GroupToken {
}
}
-// 'actions' '{' ( actions += [ Command ] ) +
+// 'actions' '{' ( actions += [ fowlerdsl :: Command ] ) +
protected class State_0_0_1_0_Group extends GroupToken {
public State_0_0_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -829,7 +829,7 @@ protected class State_0_0_1_0_0_1_Keyword extends KeywordToken {
}
-// ( actions += [ Command ] ) +
+// ( actions += [ fowlerdsl :: Command ] ) +
protected class State_0_0_1_0_1_Assignment_actions extends AssignmentToken {
public State_0_0_1_0_1_Assignment_actions(IInstanceDescription curr, AbstractToken pred) {
@@ -916,12 +916,12 @@ protected class State_1_Keyword_end extends KeywordToken {
/************ begin Rule Transition ****************
*
- * Transition : event = [ Event ] '=>' state = [ State ] ;
+ * Transition : event = [ fowlerdsl :: Event ] '=>' state = [ fowlerdsl :: State ] ;
*
**/
-// event = [ Event ] '=>' state = [ State ]
+// event = [ fowlerdsl :: Event ] '=>' state = [ fowlerdsl :: State ]
protected class Transition_Group extends GroupToken {
public Transition_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -949,7 +949,7 @@ protected class Transition_Group extends GroupToken {
}
}
-// event = [ Event ] '=>'
+// event = [ fowlerdsl :: Event ] '=>'
protected class Transition_0_Group extends GroupToken {
public Transition_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -977,7 +977,7 @@ protected class Transition_0_Group extends GroupToken {
}
}
-// event = [ Event ]
+// event = [ fowlerdsl :: Event ]
protected class Transition_0_0_Assignment_event extends AssignmentToken {
public Transition_0_0_Assignment_event(IInstanceDescription curr, AbstractToken pred) {
@@ -1016,7 +1016,7 @@ protected class Transition_0_1_Keyword extends KeywordToken {
}
-// state = [ State ]
+// state = [ fowlerdsl :: State ]
protected class Transition_1_Assignment_state extends AssignmentToken {
public Transition_1_Assignment_state(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java
index 0f0ea95..0a08348 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java
@@ -1212,12 +1212,12 @@ protected class AbstractChild_1_RuleCall_SecondConcrete extends RuleCallToken {
/************ begin Rule FirstConcrete ****************
*
- * FirstConcrete : '->' 'F' '(' value = Named ( referencedContainer = [ Container ] ) ? ')' ;
+ * FirstConcrete : '->' 'F' '(' value = Named ( referencedContainer = [ partialParserTestLanguage :: Container ] ) ? ')' ;
*
**/
-// '->' 'F' '(' value = Named ( referencedContainer = [ Container ] ) ? ')'
+// '->' 'F' '(' value = Named ( referencedContainer = [ partialParserTestLanguage :: Container ] ) ? ')'
protected class FirstConcrete_Group extends GroupToken {
public FirstConcrete_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1245,7 +1245,7 @@ protected class FirstConcrete_Group extends GroupToken {
}
}
-// '->' 'F' '(' value = Named ( referencedContainer = [ Container ] ) ?
+// '->' 'F' '(' value = Named ( referencedContainer = [ partialParserTestLanguage :: Container ] ) ?
protected class FirstConcrete_0_Group extends GroupToken {
public FirstConcrete_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1424,7 +1424,7 @@ protected class FirstConcrete_0_0_1_Assignment_value extends AssignmentToken {
}
-// ( referencedContainer = [ Container ] ) ?
+// ( referencedContainer = [ partialParserTestLanguage :: Container ] ) ?
protected class FirstConcrete_0_1_Assignment_referencedContainer extends AssignmentToken {
public FirstConcrete_0_1_Assignment_referencedContainer(IInstanceDescription curr, AbstractToken pred) {
@@ -1468,12 +1468,12 @@ protected class FirstConcrete_1_Keyword extends KeywordToken {
/************ begin Rule SecondConcrete ****************
*
- * SecondConcrete : '->' 'F' 'S' '(' value = Named ( referencedChildren += [ Child ] ) ? ')' ;
+ * SecondConcrete : '->' 'F' 'S' '(' value = Named ( referencedChildren += [ partialParserTestLanguage :: Child ] ) ? ')' ;
*
**/
-// '->' 'F' 'S' '(' value = Named ( referencedChildren += [ Child ] ) ? ')'
+// '->' 'F' 'S' '(' value = Named ( referencedChildren += [ partialParserTestLanguage :: Child ] ) ? ')'
protected class SecondConcrete_Group extends GroupToken {
public SecondConcrete_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1501,7 +1501,7 @@ protected class SecondConcrete_Group extends GroupToken {
}
}
-// '->' 'F' 'S' '(' value = Named ( referencedChildren += [ Child ] ) ?
+// '->' 'F' 'S' '(' value = Named ( referencedChildren += [ partialParserTestLanguage :: Child ] ) ?
protected class SecondConcrete_0_Group extends GroupToken {
public SecondConcrete_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1721,7 +1721,7 @@ protected class SecondConcrete_0_0_1_Assignment_value extends AssignmentToken {
}
-// ( referencedChildren += [ Child ] ) ?
+// ( referencedChildren += [ partialParserTestLanguage :: Child ] ) ?
protected class SecondConcrete_0_1_Assignment_referencedChildren extends AssignmentToken {
public SecondConcrete_0_1_Assignment_referencedChildren(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
index e489109..6268cf6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
@@ -1264,12 +1264,12 @@ protected class Farbe_1_Keyword_GRN extends KeywordToken {
/************ begin Rule Familie ****************
*
- * Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')' ;
+ * Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ] ( ',' kinder += [ ReferenceGrammar :: Kind ] ) * ')' ;
*
**/
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')'
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ] ( ',' kinder += [ ReferenceGrammar :: Kind ] ) * ')'
protected class Familie_Group extends GroupToken {
public Familie_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1297,7 +1297,7 @@ protected class Familie_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) *
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ] ( ',' kinder += [ ReferenceGrammar :: Kind ] ) *
protected class Familie_0_Group extends GroupToken {
public Familie_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1325,7 +1325,7 @@ protected class Familie_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ] kinder += [ ReferenceGrammar :: Kind ]
protected class Familie_0_0_Group extends GroupToken {
public Familie_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1353,7 +1353,7 @@ protected class Familie_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ] vater = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_Group extends GroupToken {
public Familie_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1381,7 +1381,7 @@ protected class Familie_0_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ]
+// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_0_Group extends GroupToken {
public Familie_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1524,7 +1524,7 @@ protected class Familie_0_0_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// mutter = [ Erwachsener ]
+// mutter = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_0_1_Assignment_mutter extends AssignmentToken {
public Familie_0_0_0_0_1_Assignment_mutter(IInstanceDescription curr, AbstractToken pred) {
@@ -1551,7 +1551,7 @@ protected class Familie_0_0_0_0_1_Assignment_mutter extends AssignmentToken {
}
-// vater = [ Erwachsener ]
+// vater = [ ReferenceGrammar :: Erwachsener ]
protected class Familie_0_0_0_1_Assignment_vater extends AssignmentToken {
public Familie_0_0_0_1_Assignment_vater(IInstanceDescription curr, AbstractToken pred) {
@@ -1578,7 +1578,7 @@ protected class Familie_0_0_0_1_Assignment_vater extends AssignmentToken {
}
-// kinder += [ Kind ]
+// kinder += [ ReferenceGrammar :: Kind ]
protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken {
public Familie_0_0_1_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
@@ -1605,7 +1605,7 @@ protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken {
}
-// ( ',' kinder += [ Kind ] ) *
+// ( ',' kinder += [ ReferenceGrammar :: Kind ] ) *
protected class Familie_0_1_Group extends GroupToken {
public Familie_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1645,7 +1645,7 @@ protected class Familie_0_1_0_Keyword extends KeywordToken {
}
}
-// kinder += [ Kind ]
+// kinder += [ ReferenceGrammar :: Kind ]
protected class Familie_0_1_1_Assignment_kinder extends AssignmentToken {
public Familie_0_1_1_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsParseTreeConstructor.java
index 4dc6b4e..a85597c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsParseTreeConstructor.java
@@ -33,12 +33,12 @@ public class SimpleExpressionsParseTreeConstructor extends AbstractParseTreeCons
/************ begin Rule Sequence ****************
*
- * Sequence : Addition ( { current = Sequence . expressions += current } expressions += Addition ) * ;
+ * Sequence : Addition ( { current = simpleExpressions :: Sequence . expressions += current } expressions += Addition ) * ;
*
**/
-// Addition ( { current = Sequence . expressions += current } expressions += Addition ) *
+// Addition ( { current = simpleExpressions :: Sequence . expressions += current } expressions += Addition ) *
protected class Sequence_Group extends GroupToken {
public Sequence_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -84,7 +84,7 @@ protected class Sequence_0_RuleCall_Addition extends RuleCallToken {
}
}
-// ( { current = Sequence . expressions += current } expressions += Addition ) *
+// ( { current = simpleExpressions :: Sequence . expressions += current } expressions += Addition ) *
protected class Sequence_1_Group extends GroupToken {
public Sequence_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -112,7 +112,7 @@ protected class Sequence_1_Group extends GroupToken {
}
}
-// { current = Sequence . expressions += current }
+// { current = simpleExpressions :: Sequence . expressions += current }
protected class Sequence_1_0_Action_Sequence_expressions extends ActionToken {
public Sequence_1_0_Action_Sequence_expressions(IInstanceDescription curr, AbstractToken pred) {
@@ -166,12 +166,12 @@ protected class Sequence_1_1_Assignment_expressions extends AssignmentToken {
/************ begin Rule Addition ****************
*
- * Addition returns Expression : Multiplication ( { current = Op . values += current } operator = ( '+' | '-' ) values += Multiplication ) * ;
+ * Addition returns simpleExpressions :: Expression : Multiplication ( { current = simpleExpressions :: Op . values += current } operator = ( '+' | '-' ) values += Multiplication ) * ;
*
**/
-// Multiplication ( { current = Op . values += current } operator = ( '+' | '-' ) values += Multiplication ) *
+// Multiplication ( { current = simpleExpressions :: Op . values += current } operator = ( '+' | '-' ) values += Multiplication ) *
protected class Addition_Group extends GroupToken {
public Addition_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -217,7 +217,7 @@ protected class Addition_0_RuleCall_Multiplication extends RuleCallToken {
}
}
-// ( { current = Op . values += current } operator = ( '+' | '-' ) values += Multiplication ) *
+// ( { current = simpleExpressions :: Op . values += current } operator = ( '+' | '-' ) values += Multiplication ) *
protected class Addition_1_Group extends GroupToken {
public Addition_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -245,7 +245,7 @@ protected class Addition_1_Group extends GroupToken {
}
}
-// { current = Op . values += current } operator = ( '+' | '-' )
+// { current = simpleExpressions :: Op . values += current } operator = ( '+' | '-' )
protected class Addition_1_0_Group extends GroupToken {
public Addition_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -273,7 +273,7 @@ protected class Addition_1_0_Group extends GroupToken {
}
}
-// { current = Op . values += current }
+// { current = simpleExpressions :: Op . values += current }
protected class Addition_1_0_0_Action_Op_values extends ActionToken {
public Addition_1_0_0_Action_Op_values(IInstanceDescription curr, AbstractToken pred) {
@@ -356,12 +356,12 @@ protected class Addition_1_1_Assignment_values extends AssignmentToken {
/************ begin Rule Multiplication ****************
*
- * Multiplication returns Expression : Term ( { current = Op . values += current } operator = ( '*' | '/' ) values += Term ) * ;
+ * Multiplication returns simpleExpressions :: Expression : Term ( { current = simpleExpressions :: Op . values += current } operator = ( '*' | '/' ) values += Term ) * ;
*
**/
-// Term ( { current = Op . values += current } operator = ( '*' | '/' ) values += Term ) *
+// Term ( { current = simpleExpressions :: Op . values += current } operator = ( '*' | '/' ) values += Term ) *
protected class Multiplication_Group extends GroupToken {
public Multiplication_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -407,7 +407,7 @@ protected class Multiplication_0_RuleCall_Term extends RuleCallToken {
}
}
-// ( { current = Op . values += current } operator = ( '*' | '/' ) values += Term ) *
+// ( { current = simpleExpressions :: Op . values += current } operator = ( '*' | '/' ) values += Term ) *
protected class Multiplication_1_Group extends GroupToken {
public Multiplication_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -435,7 +435,7 @@ protected class Multiplication_1_Group extends GroupToken {
}
}
-// { current = Op . values += current } operator = ( '*' | '/' )
+// { current = simpleExpressions :: Op . values += current } operator = ( '*' | '/' )
protected class Multiplication_1_0_Group extends GroupToken {
public Multiplication_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -463,7 +463,7 @@ protected class Multiplication_1_0_Group extends GroupToken {
}
}
-// { current = Op . values += current }
+// { current = simpleExpressions :: Op . values += current }
protected class Multiplication_1_0_0_Action_Op_values extends ActionToken {
public Multiplication_1_0_0_Action_Op_values(IInstanceDescription curr, AbstractToken pred) {
@@ -546,7 +546,7 @@ protected class Multiplication_1_1_Assignment_values extends AssignmentToken {
/************ begin Rule Term ****************
*
- * Term returns Expression : Atom | Parens ;
+ * Term returns simpleExpressions :: Expression : Atom | Parens ;
*
**/
@@ -645,7 +645,7 @@ protected class Atom_Assignment_name extends AssignmentToken {
/************ begin Rule Parens ****************
*
- * Parens returns Expression : '(' Addition ')' ;
+ * Parens returns simpleExpressions :: Expression : '(' Addition ')' ;
*
**/
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TestLanguageParseTreeConstructor.java
index 86f5a47..f0092c6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TestLanguageParseTreeConstructor.java
@@ -32,7 +32,7 @@ public class TestLanguageParseTreeConstructor extends AbstractParseTreeConstruct
/************ begin Rule EntryRule ****************
*
- * EntryRule returns Model : ( multiFeature += AbstractRule ) * ;
+ * EntryRule returns TestLang :: Model : ( multiFeature += AbstractRule ) * ;
*
**/
@@ -69,7 +69,7 @@ protected class EntryRule_Assignment_multiFeature extends AssignmentToken {
/************ begin Rule AbstractRule ****************
*
- * AbstractRule returns AbstractElement : ChoiceRule | ReducibleRule ;
+ * AbstractRule returns TestLang :: AbstractElement : ChoiceRule | ReducibleRule ;
*
**/
@@ -136,7 +136,7 @@ protected class AbstractRule_1_RuleCall_ReducibleRule extends RuleCallToken {
/************ begin Rule ChoiceRule ****************
*
- * ChoiceRule returns ChoiceElement : 'choice' ( optionalKeyword ?= 'optional' ) ? name = ID ;
+ * ChoiceRule returns TestLang :: ChoiceElement : 'choice' ( optionalKeyword ?= 'optional' ) ? name = ID ;
*
**/
@@ -261,12 +261,12 @@ protected class ChoiceRule_1_Assignment_name extends AssignmentToken {
/************ begin Rule ReducibleRule ****************
*
- * ReducibleRule returns ReducibleElement : 'reducible' TerminalRule ( { current = ReducibleComposite . actionFeature += current } actionFeature += TerminalRule ) ? ;
+ * ReducibleRule returns TestLang :: ReducibleElement : 'reducible' TerminalRule ( { current = TestLang :: ReducibleComposite . actionFeature += current } actionFeature += TerminalRule ) ? ;
*
**/
-// 'reducible' TerminalRule ( { current = ReducibleComposite . actionFeature += current } actionFeature += TerminalRule ) ?
+// 'reducible' TerminalRule ( { current = TestLang :: ReducibleComposite . actionFeature += current } actionFeature += TerminalRule ) ?
protected class ReducibleRule_Group extends GroupToken {
public ReducibleRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -353,7 +353,7 @@ protected class ReducibleRule_0_1_RuleCall_TerminalRule extends RuleCallToken {
}
-// ( { current = ReducibleComposite . actionFeature += current } actionFeature += TerminalRule ) ?
+// ( { current = TestLang :: ReducibleComposite . actionFeature += current } actionFeature += TerminalRule ) ?
protected class ReducibleRule_1_Group extends GroupToken {
public ReducibleRule_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -381,7 +381,7 @@ protected class ReducibleRule_1_Group extends GroupToken {
}
}
-// { current = ReducibleComposite . actionFeature += current }
+// { current = TestLang :: ReducibleComposite . actionFeature += current }
protected class ReducibleRule_1_0_Action_ReducibleComposite_actionFeature extends ActionToken {
public ReducibleRule_1_0_Action_ReducibleComposite_actionFeature(IInstanceDescription curr, AbstractToken pred) {
@@ -435,7 +435,7 @@ protected class ReducibleRule_1_1_Assignment_actionFeature extends AssignmentTok
/************ begin Rule TerminalRule ****************
*
- * TerminalRule returns TerminalElement : stringFeature = STRING ;
+ * TerminalRule returns TestLang :: TerminalElement : stringFeature = STRING ;
*
**/
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Lexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Lexer.java
index de37c91..af91353 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Lexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Lexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g 2008-12-03 11:36:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g 2008-12-03 21:38:45
package org.eclipse.xtext.valueconverter.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Parser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Parser.java
index 9986aa8..0942bb5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Parser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Parser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g 2008-12-03 11:36:01
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g 2008-12-03 21:38:45
package org.eclipse.xtext.valueconverter.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTests.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTests.java
index fa2147f..3bbd6e5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTests.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTests.java
@@ -64,7 +64,6 @@ public class GrammarUtilTests extends AbstractGeneratorTest {
Assignment asExtends = (Assignment)((Group)prType.getAlternatives()).getAbstractTokens().get(1);
CrossReference xref = (CrossReference) asExtends.getTerminal();
-
EClass referencedEClass = GrammarUtil.getReferencedEClass(resource, xref);
assertNotNull(referencedEClass);
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext
index 3e7f6b7..7a0c328 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext
@@ -2,6 +2,8 @@ abstract language org.eclipse.xtext.grammarinheritance.AbstractTestLanguage
import "classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore" as mm
+import "http://www.eclipse.org/emf/2002/Ecore" as ecore
+
InheritedParserRule returns mm::AType :
'element' name=ID;
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/TypeHierarchyHelperTests.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/TypeHierarchyHelperTests.java
index 66616e2..d42c700 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/TypeHierarchyHelperTests.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/TypeHierarchyHelperTests.java
@@ -56,7 +56,7 @@ public class TypeHierarchyHelperTests extends TestCase {
EClass eClass = EcoreFactory.eINSTANCE.createEClass();
eClass.setName(name);
EClassInfo info = (EClassInfo) EClassifierInfo.createEClassInfo(eClass, isGenerated);
- infos.addInfo("", name, info);
+ infos.addInfo(null, name, info);
return info;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTests.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTests.java
index 2c4c74d..0bb71a0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTests.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTests.java
@@ -502,17 +502,18 @@ public class Xtext2EcoreTransformerTests extends AbstractGeneratorTest {
errorAcceptorMock.acceptError(same(ErrorCode.AliasForMetamodelAlreadyExists), (String) anyObject(),
(EObject) anyObject());
- errorAcceptorMock.acceptError(same(ErrorCode.CannotCreateTypeInSealedMetamodel), (String) anyObject(),
+ errorAcceptorMock.acceptError(same(ErrorCode.UnknownMetaModelAlias), (String) anyObject(),
+ (EObject) anyObject());
+ errorAcceptorMock.acceptError(same(ErrorCode.UnknownMetaModelAlias), (String) anyObject(),
(EObject) anyObject());
errorAcceptorMock.acceptError(same(ErrorCode.NoSuchTypeAvailable), (String) anyObject(), (EObject) anyObject());
+ errorAcceptorMock.acceptError(same(ErrorCode.NoSuchTypeAvailable), (String) anyObject(), (EObject) anyObject());
List<EPackage> ePackages = getEPackagesFromGrammar(grammar);
assertEquals(1, ePackages.size());
EPackage t1 = ePackages.get(0);
assertEquals("t1", t1.getName());
- assertEquals(1, t1.getEClassifiers().size());
- EClassifier ruleA = t1.getEClassifier("TypeB");
- assertNotNull(ruleA);
+ assertTrue(t1.getEClassifiers().isEmpty());
}
public void testModifyingSealedModel() throws Exception {
diff --git a/tests/org.eclipse.xtext.ui.core.tests/src/org/eclipse/xtext/ui/core/editor/AbstractEditorTest.java b/tests/org.eclipse.xtext.ui.core.tests/src/org/eclipse/xtext/ui/core/editor/AbstractEditorTest.java
index 425f2a1..adb8825 100644
--- a/tests/org.eclipse.xtext.ui.core.tests/src/org/eclipse/xtext/ui/core/editor/AbstractEditorTest.java
+++ b/tests/org.eclipse.xtext.ui.core.tests/src/org/eclipse/xtext/ui/core/editor/AbstractEditorTest.java
@@ -42,6 +42,7 @@ public abstract class AbstractEditorTest extends AbstractWorkbenchTest {
return (XtextEditor) openEditor;
}
else if (openEditor instanceof org.eclipse.ui.internal.ErrorEditorPart) {
+ sleep(25000);
fail("Could not open XtextEditor. Editor produced errors during initialization.");
}
else {