aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2008-12-03 04:58:24 (EST)
committersefftinge2008-12-03 04:58:24 (EST)
commit52b4798d5666d774fa774a8023bf1f721f1b3ca4 (patch)
treead7ceb1335e6267642df522af05c08e0167f961b
parentec710d33630e3b85fe931fc24218c6946158fbed (diff)
downloadorg.eclipse.xtext-52b4798d5666d774fa774a8023bf1f721f1b3ca4.zip
org.eclipse.xtext-52b4798d5666d774fa774a8023bf1f721f1b3ca4.tar.gz
org.eclipse.xtext-52b4798d5666d774fa774a8023bf1f721f1b3ca4.tar.bz2
updated XtextGrammar in XtextGrammarTest
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTest.xmi10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore6
-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/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/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/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/parser/internal/InternalXtextGrammarTest.g39
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLexer.java74
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestParser.java173
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestParseTreeConstructor.java51
-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/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/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/XtextGrammarTest.xtext6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java12
47 files changed, 229 insertions, 232 deletions
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 ff61a0a..38fbb1f 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
@@ -336,7 +336,9 @@
<abstractTokens xsi:type="xtext:Group" cardinality="?">
<abstractTokens xsi:type="xtext:Keyword" value="|"/>
<abstractTokens xsi:type="xtext:Assignment" feature="rule" operator="=">
- <terminal xsi:type="xtext:RuleCall" rule="//@rules.17"/>
+ <terminal xsi:type="xtext:CrossReference">
+ <type name="LexerRule"/>
+ </terminal>
</abstractTokens>
</abstractTokens>
</abstractTokens>
@@ -361,9 +363,9 @@
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="RuleCall">
- <alternatives xsi:type="xtext:Assignment" feature="name" operator="=">
- <terminal xsi:type="xtext:RuleCall">
- <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/>
+ <alternatives xsi:type="xtext:Assignment" feature="rule" operator="=">
+ <terminal xsi:type="xtext:CrossReference">
+ <type name="AbstractRule"/>
</terminal>
</alternatives>
</rules>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 3611c14..50079e4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -88,12 +88,10 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RuleCall" eSuperTypes="//AbstractElement">
- <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:EReference" name="rule" eType="//AbstractRule"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CrossReference" eSuperTypes="//AbstractElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="rule" eType="//RuleCall" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rule" eType="//LexerRule"/>
</eClassifiers>
</ecore:EPackage>
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 5d0d200..1ec5628 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-02 18:42:26
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-03 10:05:39
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 987894c..89a9924 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-02 18:42:26
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-03 10:05:39
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 43ff4ae..987168b 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-02 18:42:16
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangA.g 2008-12-03 10:05:27
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 e303ccd..a7299e2 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-02 18:42:16
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangA.g 2008-12-03 10:05:26
package org.eclipse.xtext.crossrefs.parser.internal;
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 abd619d..430262a 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-02 18:42:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguage.g 2008-12-03 10:05:31
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 1ef4993..4ced9d0 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-02 18:42:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyLanguage.g 2008-12-03 10:05:31
package org.eclipse.xtext.dummy.parser.internal;
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 af6a169..6149c81 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-02 18:42:17
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-03 10:05:28
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 a5752bf..ac28371 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-02 18:42:17
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-03 10:05:28
package org.eclipse.xtext.grammarinheritance.parser.internal;
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 95dd401..eccd5b9 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-02 18:42:19
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTest.g 2008-12-03 10:05:30
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 2c250c2..2f36831 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-02 18:42:19
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTest.g 2008-12-03 10:05:30
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g
index 1ee5b04..ed4500d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g
@@ -1065,20 +1065,18 @@ ruleCrossReference returns [EObject current=null]
}
(
-
- {
- currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- }
- lv_rule=ruleRuleCall
- {
- currentNode = currentNode.getParent();
- if ($current==null) {
+
+ {
+ if ($current==null) {
$current = factory.create("CrossReference");
associateNodeWithAstElement(currentNode, $current);
}
-
- factory.set($current, "rule", lv_rule,null);
- }
+ }
+(
+ RULE_ID {
+ createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "rule");
+ }
+)
))?)']'
{
@@ -1167,19 +1165,18 @@ ruleRuleCall returns [EObject current=null]
@after { resetLookahead(); }:
(
- lv_name=RULE_ID
- {
- createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17/@alternatives/@terminal" /* xtext::RuleCall */, "name");
- }
-
- {
- if ($current==null) {
+
+ {
+ if ($current==null) {
$current = factory.create("RuleCall");
associateNodeWithAstElement(currentNode, $current);
}
-
- factory.set($current, "name", lv_name,"ID");
- }
+ }
+(
+ RULE_ID {
+ createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17/@alternatives/@terminal" /* xtext::CrossReference */, "rule");
+ }
+)
);
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 dd3c8e9..587728b 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 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-02 18:42:18
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-03 10:05:29
package org.eclipse.xtext.parser.internal;
@@ -558,10 +558,10 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1189:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1189:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1186:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1186:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1189:11: ( '^' )?
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1186:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -570,7 +570,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1189:12: '^'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1186:12: '^'
{
match('^');
@@ -589,7 +589,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
recover(mse); throw mse;
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1189:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1186:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -637,10 +637,10 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1191:10: ( ( '0' .. '9' )+ )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1191:12: ( '0' .. '9' )+
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1188:10: ( ( '0' .. '9' )+ )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1188:12: ( '0' .. '9' )+
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1191:12: ( '0' .. '9' )+
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1188:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -654,7 +654,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1191:13: '0' .. '9'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1188:13: '0' .. '9'
{
matchRange('0','9');
@@ -684,7 +684,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -696,16 +696,16 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("1193:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input);
+ new NoViableAltException("1190:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
{
match('\"');
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
loop4:
do {
int alt4=3;
@@ -721,7 +721,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -738,7 +738,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:65: ~ ( '\\\\' | '\"' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:65: ~ ( '\\\\' | '\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -764,10 +764,10 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
loop5:
do {
int alt5=3;
@@ -783,7 +783,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -800,7 +800,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1193:152: ~ ( '\\\\' | '\\'' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1190:152: ~ ( '\\\\' | '\\'' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -838,12 +838,12 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1195:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1195:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1192:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1192:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1195:24: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1192:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -868,7 +868,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1195:52: .
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1192:52: .
{
matchAny();
@@ -897,12 +897,12 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:24: (~ ( '\\n' | '\\r' ) )*
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:24: (~ ( '\\n' | '\\r' ) )*
loop8:
do {
int alt8=2;
@@ -915,7 +915,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:24: ~ ( '\\n' | '\\r' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:24: ~ ( '\\n' | '\\r' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -936,7 +936,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:38: ( ( '\\r' )? '\\n' )?
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:38: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -945,9 +945,9 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:39: ( '\\r' )? '\\n'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:39: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:39: ( '\\r' )?
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:39: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -956,7 +956,7 @@ public class InternalXtextGrammarTestLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1197:39: '\\r'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1194:39: '\\r'
{
match('\r');
@@ -987,10 +987,10 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1199:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1199:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1196:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1196:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1199:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1196:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -1044,8 +1044,8 @@ public class InternalXtextGrammarTestLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1201:16: ( . )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1201:18: .
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1198:16: ( . )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1198:18: .
{
matchAny();
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 afcc496..82d8bb0 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 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-02 18:42:18
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g 2008-12-03 10:05:29
package org.eclipse.xtext.parser.internal;
@@ -2855,25 +2855,23 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start ruleCrossReference
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1038:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )? ) ']' ) ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1038:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ;
public final EObject ruleCrossReference() throws RecognitionException {
EObject current = null;
EObject lv_type = null;
- EObject lv_rule = null;
-
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1040:33: ( ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )? ) ']' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )? ) ']' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1040:33: ( ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )? ) ']' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )? ) ']'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:3: ( '[' (lv_type= ruleTypeRef ) ) ( '|' (lv_rule= ruleRuleCall ) )?
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:3: ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )?
{
// ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:3: ( '[' (lv_type= ruleTypeRef ) )
// ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1041:4: '[' (lv_type= ruleTypeRef )
@@ -2907,7 +2905,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1062:3: ( '|' (lv_rule= ruleRuleCall ) )?
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1062:3: ( '|' ( ( RULE_ID ) ) )?
int alt29=2;
int LA29_0 = input.LA(1);
@@ -2916,31 +2914,31 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
}
switch (alt29) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1062:4: '|' (lv_rule= ruleRuleCall )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1062:4: '|' ( ( RULE_ID ) )
{
match(input,24,FOLLOW_24_in_ruleCrossReference2871);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1066:1: (lv_rule= ruleRuleCall )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1069:6: lv_rule= ruleRuleCall
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1066:1: ( ( RULE_ID ) )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1069:3: ( RULE_ID )
{
-
- currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
-
- pushFollow(FOLLOW_ruleRuleCall_in_ruleCrossReference2905);
- lv_rule=ruleRuleCall();
- _fsp--;
-
- currentNode = currentNode.getParent();
- if (current==null) {
+ if (current==null) {
current = factory.create("CrossReference");
associateNodeWithAstElement(currentNode, current);
}
-
- factory.set(current, "rule", lv_rule,null);
-
+
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1075:1: ( RULE_ID )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1076:2: RULE_ID
+ {
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference2895);
+
+ createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "rule");
+
+
+ }
+
}
@@ -2953,7 +2951,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
}
- match(input,35,FOLLOW_35_in_ruleCrossReference2921);
+ match(input,35,FOLLOW_35_in_ruleCrossReference2911);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -2978,7 +2976,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start entryRuleParenthesizedElement
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1092:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1090:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ;
public final EObject entryRuleParenthesizedElement() throws RecognitionException {
EObject current = null;
@@ -2986,16 +2984,16 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1092:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1093:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1090:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1091:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.15" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement2956);
+ pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement2946);
iv_ruleParenthesizedElement=ruleParenthesizedElement();
_fsp--;
current =iv_ruleParenthesizedElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedElement2966);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedElement2956);
}
@@ -3013,7 +3011,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start ruleParenthesizedElement
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1100:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1098:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ;
public final EObject ruleParenthesizedElement() throws RecognitionException {
EObject current = null;
@@ -3022,23 +3020,23 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1102:33: ( ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1103:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1100:33: ( ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1101:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1103:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1103:2: ( '(' this_Alternatives= ruleAlternatives ) ')'
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1101:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1101:2: ( '(' this_Alternatives= ruleAlternatives ) ')'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1103:2: ( '(' this_Alternatives= ruleAlternatives )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1103:3: '(' this_Alternatives= ruleAlternatives
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1101:2: ( '(' this_Alternatives= ruleAlternatives )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1101:3: '(' this_Alternatives= ruleAlternatives
{
- match(input,36,FOLLOW_36_in_ruleParenthesizedElement3001);
+ match(input,36,FOLLOW_36_in_ruleParenthesizedElement2991);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.15/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.15/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_ruleParenthesizedElement3023);
+ pushFollow(FOLLOW_ruleAlternatives_in_ruleParenthesizedElement3013);
this_Alternatives=ruleAlternatives();
_fsp--;
@@ -3049,7 +3047,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
}
- match(input,37,FOLLOW_37_in_ruleParenthesizedElement3032);
+ match(input,37,FOLLOW_37_in_ruleParenthesizedElement3022);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.15/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -3074,7 +3072,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start entryRuleKeyword
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1125:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1123:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
public final EObject entryRuleKeyword() throws RecognitionException {
EObject current = null;
@@ -3082,16 +3080,16 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1125:49: (iv_ruleKeyword= ruleKeyword EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1126:2: iv_ruleKeyword= ruleKeyword EOF
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1123:49: (iv_ruleKeyword= ruleKeyword EOF )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1124:2: iv_ruleKeyword= ruleKeyword EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.16" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword3067);
+ pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword3057);
iv_ruleKeyword=ruleKeyword();
_fsp--;
current =iv_ruleKeyword;
- match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword3077);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword3067);
}
@@ -3109,7 +3107,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start ruleKeyword
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1133:1: ruleKeyword returns [EObject current=null] : (lv_value= RULE_STRING ) ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1131:1: ruleKeyword returns [EObject current=null] : (lv_value= RULE_STRING ) ;
public final EObject ruleKeyword() throws RecognitionException {
EObject current = null;
@@ -3117,14 +3115,14 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1135:33: ( (lv_value= RULE_STRING ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1136:1: (lv_value= RULE_STRING )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1133:33: ( (lv_value= RULE_STRING ) )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1134:1: (lv_value= RULE_STRING )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1136:1: (lv_value= RULE_STRING )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1138:6: lv_value= RULE_STRING
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1134:1: (lv_value= RULE_STRING )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1136:6: lv_value= RULE_STRING
{
lv_value=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword3122);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword3112);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.16/@alternatives/@terminal" /* xtext::RuleCall */, "value");
@@ -3157,7 +3155,7 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start entryRuleRuleCall
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1157:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1155:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ;
public final EObject entryRuleRuleCall() throws RecognitionException {
EObject current = null;
@@ -3165,16 +3163,16 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1157:50: (iv_ruleRuleCall= ruleRuleCall EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1158:2: iv_ruleRuleCall= ruleRuleCall EOF
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1155:50: (iv_ruleRuleCall= ruleRuleCall EOF )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1156:2: iv_ruleRuleCall= ruleRuleCall EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall3167);
+ pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall3157);
iv_ruleRuleCall=ruleRuleCall();
_fsp--;
current =iv_ruleRuleCall;
- match(input,EOF,FOLLOW_EOF_in_entryRuleRuleCall3177);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleRuleCall3167);
}
@@ -3192,33 +3190,34 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
// $ANTLR start ruleRuleCall
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1165:1: ruleRuleCall returns [EObject current=null] : (lv_name= RULE_ID ) ;
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1163:1: ruleRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ;
public final EObject ruleRuleCall() throws RecognitionException {
EObject current = null;
- Token lv_name=null;
-
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1167:33: ( (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1168:1: (lv_name= RULE_ID )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1165:33: ( ( ( RULE_ID ) ) )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1166:1: ( ( RULE_ID ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1168:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1170:6: lv_name= RULE_ID
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1166:1: ( ( RULE_ID ) )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1169:3: ( RULE_ID )
{
- lv_name=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall3222);
-
- createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17/@alternatives/@terminal" /* xtext::RuleCall */, "name");
-
- if (current==null) {
+ if (current==null) {
current = factory.create("RuleCall");
associateNodeWithAstElement(currentNode, current);
}
-
- factory.set(current, "name", lv_name,"ID");
-
+
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1175:1: ( RULE_ID )
+ // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g:1176:2: RULE_ID
+ {
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall3215);
+
+ createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17/@alternatives/@terminal" /* xtext::CrossReference */, "rule");
+
+
+ }
+
}
@@ -3345,18 +3344,18 @@ public class InternalXtextGrammarTestParser extends AbstractAntlrParser {
public static final BitSet FOLLOW_34_in_ruleCrossReference2822 = new BitSet(new long[]{0x0000000000000010L});
public static final BitSet FOLLOW_ruleTypeRef_in_ruleCrossReference2856 = new BitSet(new long[]{0x0000000801000000L});
public static final BitSet FOLLOW_24_in_ruleCrossReference2871 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleRuleCall_in_ruleCrossReference2905 = new BitSet(new long[]{0x0000000800000000L});
- public static final BitSet FOLLOW_35_in_ruleCrossReference2921 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement2956 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedElement2966 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_36_in_ruleParenthesizedElement3001 = new BitSet(new long[]{0x0000001480000030L});
- public static final BitSet FOLLOW_ruleAlternatives_in_ruleParenthesizedElement3023 = new BitSet(new long[]{0x0000002000000000L});
- public static final BitSet FOLLOW_37_in_ruleParenthesizedElement3032 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword3067 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleKeyword3077 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword3122 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_entryRuleRuleCall3167 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleRuleCall3177 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleRuleCall3222 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleCrossReference2895 = new BitSet(new long[]{0x0000000800000000L});
+ public static final BitSet FOLLOW_35_in_ruleCrossReference2911 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement2946 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedElement2956 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_36_in_ruleParenthesizedElement2991 = new BitSet(new long[]{0x0000001480000030L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_ruleParenthesizedElement3013 = new BitSet(new long[]{0x0000002000000000L});
+ public static final BitSet FOLLOW_37_in_ruleParenthesizedElement3022 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword3057 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleKeyword3067 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword3112 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_entryRuleRuleCall3157 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleRuleCall3167 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleRuleCall3215 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest__.g
index bc936da..1e4fefd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest__.g
@@ -35,25 +35,25 @@ T35 : ']' ;
T36 : '(' ;
T37 : ')' ;
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1189
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1186
RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1191
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1188
RULE_INT : ('0'..'9')+;
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1193
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1190
RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1195
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1192
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1197
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1194
RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1199
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1196
RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1201
+// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTest.g" 1198
RULE_ANY_OTHER : .;
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 9ee71ac..373a6ef 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
@@ -39,7 +39,7 @@ public class XtextGrammarTestParseTreeConstructor extends AbstractParseTreeConst
if(inst.isInstanceOf("CrossReference") && (s = new CrossReference_Group(inst, null).firstSolution()) != null) return s;
if(inst.isInstanceOf("AbstractElement") && (s = new ParenthesizedElement_Group(inst, null).firstSolution()) != null) return s;
if(inst.isInstanceOf("Keyword") && (s = new Keyword_Assignment_value(inst, null).firstSolution()) != null) return s;
- if(inst.isInstanceOf("RuleCall") && (s = new RuleCall_Assignment_name(inst, null).firstSolution()) != null) return s;
+ if(inst.isInstanceOf("RuleCall") && (s = new RuleCall_Assignment_rule(inst, null).firstSolution()) != null) return s;
return null;
}
@@ -2924,9 +2924,9 @@ protected class AbstractTerminal_0_0_1_RuleCall_RuleCall extends RuleCallToken {
}
protected Solution createSolution() {
- if(checkForRecursion(RuleCall_Assignment_name.class, current)) return null;
+ if(checkForRecursion(RuleCall_Assignment_rule.class, current)) return null;
if(!current.isInstanceOf("RuleCall")) return null;
- return new RuleCall_Assignment_name(current, this).firstSolution();
+ return new RuleCall_Assignment_rule(current, this).firstSolution();
}
}
@@ -2973,12 +2973,12 @@ protected class AbstractTerminal_1_RuleCall_CrossReference extends RuleCallToken
/************ begin Rule CrossReference ****************
*
- * CrossReference : '[' type = TypeRef ( '|' rule = RuleCall ) ? ']' ;
+ * CrossReference : '[' type = TypeRef ( '|' rule = [ LexerRule ] ) ? ']' ;
*
**/
-// '[' type = TypeRef ( '|' rule = RuleCall ) ? ']'
+// '[' type = TypeRef ( '|' rule = [ 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 = RuleCall ) ?
+// '[' type = TypeRef ( '|' rule = [ 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 = RuleCall ) ?
+// ( '|' rule = [ 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 = RuleCall
+// rule = [ LexerRule ]
protected class CrossReference_0_1_1_Assignment_rule extends AssignmentToken {
public CrossReference_0_1_1_Assignment_rule(IInstanceDescription curr, AbstractToken pred) {
@@ -3157,14 +3157,12 @@ protected class CrossReference_0_1_1_Assignment_rule extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("rule",required)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("rule");
- if(value instanceof EObject) { // xtext::RuleCall
+ if(value instanceof EObject) { // xtext::CrossReference
IInstanceDescription param = getDescr((EObject)value);
- if(param.isInstanceOf("RuleCall")) {
- Solution s = new RuleCall_Assignment_name(param, this).firstSolution();
- if(s != null) {
- type = AssignmentType.PRC;
- return new Solution(obj,s.getPredecessor());
- }
+ if(param.isInstanceOf("LexerRule")) {
+ type = AssignmentType.CR;
+ element = (AbstractElement)getGrammarEle("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal");
+ return new Solution(obj);
}
}
return null;
@@ -3331,15 +3329,15 @@ protected class Keyword_Assignment_value extends AssignmentToken {
/************ begin Rule RuleCall ****************
*
- * RuleCall : name = ID ;
+ * RuleCall : rule = [ AbstractRule ] ;
*
**/
-// name = ID
-protected class RuleCall_Assignment_name extends AssignmentToken {
+// rule = [ AbstractRule ]
+protected class RuleCall_Assignment_rule extends AssignmentToken {
- public RuleCall_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
+ public RuleCall_Assignment_rule(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
@@ -3348,12 +3346,15 @@ protected class RuleCall_Assignment_name extends AssignmentToken {
}
protected Solution createSolution() {
- if((value = current.getConsumable("name",required)) == null) return null;
- IInstanceDescription obj = current.cloneAndConsume("name");
- if(true) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = (AbstractElement)getGrammarEle("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17/@alternatives/@terminal");
- return new Solution(obj);
+ if((value = current.getConsumable("rule",required)) == null) return null;
+ IInstanceDescription obj = current.cloneAndConsume("rule");
+ if(value instanceof EObject) { // xtext::CrossReference
+ IInstanceDescription param = getDescr((EObject)value);
+ if(param.isInstanceOf("AbstractRule")) {
+ type = AssignmentType.CR;
+ element = (AbstractElement)getGrammarEle("classpath:/org/eclipse/xtext/XtextGrammarTest.xmi#//@rules.17/@alternatives/@terminal");
+ return new Solution(obj);
+ }
}
return null;
}
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 9da629a..c2e82af 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-02 18:42:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTest.g 2008-12-03 10:05:33
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 4f6dddf..e79cfa4 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-02 18:42:21
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTest.g 2008-12-03 10:05:33
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 753b693..756677b 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-02 18:42:21
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTest.g 2008-12-03 10:05:33
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 078e0ad..2458c5a 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-02 18:42:21
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTest.g 2008-12-03 10:05:32
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
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 368cbee..abbc4c5 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-02 18:42:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-03 10:05:35
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 99689be..e8cbc31 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-02 18:42:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-03 10:05:35
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 eedfda7..b2079f1 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 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-02 18:42:28
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-03 10:05: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/InternalContentAssistTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
index 2c9676a..6fd1ee1 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 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-02 18:42:28
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-03 10:05: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/InternalFowlerDslTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
index bb90d4d..d75405c 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-02 18:42:26
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-03 10:05:38
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 d0966e9..c3dc142 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-02 18:42:25
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-03 10:05:38
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 b436c7f..8003f3d 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-02 18:42:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguage.g 2008-12-03 10:05:34
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 f6ae473..7c277e5 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-02 18:42:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerLanguage.g 2008-12-03 10:05:34
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 192fe09..7e06dc9 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-02 18:42:25
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguage.g 2008-12-03 10:05:37
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 9270375..fc8bbdb 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-02 18:42:24
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadLanguage.g 2008-12-03 10:05:37
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 227ce64..5145f78 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-02 18:42:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguage.g 2008-12-03 10:05:36
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 6e6d4aa..1fd4391 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-02 18:42:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyLanguage.g 2008-12-03 10:05:36
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 871dc21..def8c2f 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-02 18:42:27
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-03 10:05: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/InternalPartialParserTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
index 5103f86..8d5c607 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-02 18:42:27
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-03 10:05: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/InternalReferenceGrammarLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarLexer.java
index 2ef3a2c..0d00be8 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 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-02 18:42:24
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-03 10:05:36
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 92bfb84..cc2b338 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 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-02 18:42:24
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammar.g 2008-12-03 10:05:36
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 305f084..aea1b92 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-02 18:42:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressions.g 2008-12-03 10:05:35
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 7ab287d..3239bfa 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-02 18:42:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressions.g 2008-12-03 10:05:35
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 fbeebcb..eaae5d5 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-02 18:42:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-03 10:05:32
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 7052785..535c32d 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-02 18:42:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-03 10:05:32
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 da5dfe9..f67e5bd 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 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-02 18:42:26
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-03 10:05:39
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 7469681..647461b 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 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-02 18:42:26
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-03 10:05:38
package org.eclipse.xtext.testlanguages.parser.internal;
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 a1436f3..a55a0da 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-02 18:42:25
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g 2008-12-03 10:05:38
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 be2c2af..04b31bc 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-02 18:42:25
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g 2008-12-03 10:05:37
package org.eclipse.xtext.valueconverter.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTest.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTest.xtext
index be32609..47d0806 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTest.xtext
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTest.xtext
@@ -10,7 +10,7 @@ language org.eclipse.xtext.XtextGrammarTest
generate XtextTest "http://www.eclipse.org/2008/Test/XtextTest"
-Grammar :
+Grammar :
(abstract?='abstract language' | 'language') idElements+=ID ('.' idElements+=ID)* ('extends' superGrammarIdElements+=ID ('.' superGrammarIdElements+=ID)*)?
metamodelDeclarations+=AbstractMetamodelDeclaration*
(rules+=AbstractRule)+
@@ -66,7 +66,7 @@ AbstractTerminal returns AbstractElement:
;
CrossReference :
- '[' type=TypeRef ('|' rule=RuleCall)? ']'
+ '[' type=TypeRef ('|' rule=[LexerRule])? ']'
;
ParenthesizedElement returns AbstractElement:
@@ -78,5 +78,5 @@ Keyword :
;
RuleCall :
- name=ID ;
+ rule=[AbstractRule];
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java
index a5297b2..83462d3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java
@@ -51,19 +51,19 @@ public class ParseErrorHandlingTest extends AbstractGeneratorTest {
}
public void testParseError2() throws Exception {
- Object object = getModel("language a import 'holla' foo returns y::Z : name=ID #;");
- assertWithXtend("'ID'", "rules.first().eAllContents.typeSelect(XtextTest::RuleCall).first().name", object);
+ Object object = getModel("language a import 'holla' foo returns y::Z : name=foo #;");
+ assertWithXtend("'foo'", "rules.first().eAllContents.typeSelect(XtextTest::RuleCall).first().rule.name", object);
}
public void testParseError3() throws Exception {
- Object object = getModel("language a import 'holla' foo returns y::Z : name=ID #############");
- assertWithXtend("'ID'", "rules.first().eAllContents.typeSelect(XtextTest::RuleCall).first().name", object);
+ Object object = getModel("language a import 'holla' foo returns y::Z : name=foo #############");
+ assertWithXtend("'foo'", "rules.first().eAllContents.typeSelect(XtextTest::RuleCall).first().rule.name", object);
}
public void testParseError4() throws Exception {
- Object object = getModel("language a import 'holla' foo returns y::Z : name=ID # 'foo'; bar : 'stuff'");
+ Object object = getModel("language a import 'holla' foo returns y::Z : name=foo # 'foo'; bar : 'stuff'");
//logger.debug(errors);
- assertWithXtend("'ID'", "rules.first().eAllContents.typeSelect(XtextTest::RuleCall).first().name", object);
+ assertWithXtend("'foo'", "rules.first().eAllContents.typeSelect(XtextTest::RuleCall).first().rule.name", object);
assertWithXtend("null", "rules.first().eAllContents.typeSelect(XtextTest::Keyword).first().name", object);
assertWithXtend("'stuff'", "rules.get(1).eAllContents.typeSelect(XtextTest::Keyword).first().value", object);
}