| author | szarnekow | 2009-03-02 11:11:12 (EST) |
|---|---|---|
| committer | sefftinge | 2009-03-02 11:11:12 (EST) |
| commit | a4cd164d2490b21a2d7eadb1fc996826d5c51d37 (patch) (side-by-side diff) | |
| tree | 57daa31a6d0eeba1ab7992cf049e80336c82af7c | |
| parent | c334613af24403d989be74866901eb10a7fb0d8f (diff) | |
| download | org.eclipse.xtext-a4cd164d2490b21a2d7eadb1fc996826d5c51d37.zip org.eclipse.xtext-a4cd164d2490b21a2d7eadb1fc996826d5c51d37.tar.gz org.eclipse.xtext-a4cd164d2490b21a2d7eadb1fc996826d5c51d37.tar.bz2 | |
Renamed UpToToken to UntilToken (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266438)
146 files changed, 797 insertions, 785 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF_gen b/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF_gen index b35e1e2..486e37e 100644 --- a/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF_gen +++ b/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.reference.ui Bundle-SymbolicName: org.eclipse.xtext.reference.ui Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ui.core, org.eclipse.xtext.ui.common, diff --git a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF_gen b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF_gen index d4c634d..8ecbac0 100644 --- a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF_gen +++ b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.reference Bundle-SymbolicName: org.eclipse.xtext.reference Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.reference.referenceGrammar Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi index 173a445..d8e2537 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi @@ -366,7 +366,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF_gen b/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF_gen index 26ba3ed..e91c3ab 100644 --- a/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF_gen +++ b/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.example.domainmodel.ui Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel.ui Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ui.core, org.eclipse.xtext.ui.common, diff --git a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF_gen b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF_gen index 4e5b8be..3752b1a 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF_gen +++ b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.example.domainmodel Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.example.domainmodel Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi index 13d39bf..55d5af6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi @@ -415,7 +415,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF_gen b/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF_gen index 70a7fd0..e436d4c 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF_gen +++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.example.ecoredsl.ui Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl.ui Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ui.core, org.eclipse.xtext.ui.common, diff --git a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF_gen b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF_gen index 20859fc..1f76477 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF_gen +++ b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.example.ecoredsl Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.example.ecoredsl Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi index 8188d24..5de52ea 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi @@ -996,7 +996,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF_gen b/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF_gen index 3a3d03d..babc103 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF_gen +++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.example.fowlerdsl.ui Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ui.core, org.eclipse.xtext.ui.common, diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF_gen b/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF_gen index a767477..1f3de14 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF_gen +++ b/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.example.fowlerdsl Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.example.fowlerdsl Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi index 528c858..b16c8d1 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi @@ -273,7 +273,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF_gen b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF_gen index 2356b07..a09bf4d 100644 --- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF_gen +++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.generator.tests Bundle-SymbolicName: org.eclipse.xtext.generator.tests Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.xtextTest, org.eclipse.xtext.crossrefs.importedURI, org.eclipse.xtext.crossrefs.langATestLanguage, diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore index fccae78..bfd7e20 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore @@ -73,7 +73,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="terminal" eType="//AbstractElement" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NegatedToken" eSuperTypes="//AbstractNegatedToken"/> - <eClassifiers xsi:type="ecore:EClass" name="UpToToken" eSuperTypes="//AbstractNegatedToken"/> + <eClassifiers xsi:type="ecore:EClass" name="UntilToken" eSuperTypes="//AbstractNegatedToken"/> <eClassifiers xsi:type="ecore:EClass" name="Wildcard" eSuperTypes="//AbstractElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isWildcard"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel index d329719..76032a7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel @@ -114,7 +114,7 @@ <ecoreClass href="XtextGrammarTestLanguage.ecore#//NegatedToken"/> </genClasses> <genClasses> - <ecoreClass href="XtextGrammarTestLanguage.ecore#//UpToToken"/> + <ecoreClass href="XtextGrammarTestLanguage.ecore#//UntilToken"/> </genClasses> <genClasses> <ecoreClass href="XtextGrammarTestLanguage.ecore#//Wildcard"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi index 0d15e1a..650382e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi @@ -512,9 +512,9 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="UpToToken"> + <rules xsi:type="xtext:ParserRule" name="UntilToken"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UpToToken"/> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UntilToken"/> </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="->"/> @@ -769,7 +769,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi index 421803f..dcbe286 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi @@ -198,7 +198,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi index 8b71bf9..6584655 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi @@ -198,7 +198,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi index 125150b..169085b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi @@ -183,7 +183,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi index 3c829a5..5fdd626 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi @@ -159,7 +159,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi index 59194fd..f4ff702 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi @@ -283,7 +283,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi index e442da0..d611e95 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi @@ -162,7 +162,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi index 705e443..c5db00a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi @@ -431,7 +431,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi index 65b9492..1548248 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi @@ -200,7 +200,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi index 374d5c3..872f6eb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi @@ -187,7 +187,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi index e3e4457..2eb879c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi @@ -175,7 +175,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java index 3a15fea..0d24b65 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java @@ -42,7 +42,7 @@ public class XtextGrammarTestLanguageParsetreeConstructor extends AbstractParseT if(inst.isInstanceOf(grammarAccess.prTerminalTokenElement().getRule().getType().getType()) && (s = new TerminalTokenElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prAbstractNegatedToken().getRule().getType().getType()) && (s = new AbstractNegatedToken_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prNegatedToken().getRule().getType().getType()) && (s = new NegatedToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType()) && (s = new UpToToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType()) && (s = new UntilToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prWildcard().getRule().getType().getType()) && (s = new Wildcard_Assignment_isWildcard(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCharacterRange().getRule().getType().getType()) && (s = new CharacterRange_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCrossReference().getRule().getType().getType()) && (s = new CrossReference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; @@ -4356,7 +4356,7 @@ protected class AbstractNegatedToken_Alternatives extends AlternativesToken { @Override protected Solution createSolution() { - AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UpToToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); + AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UntilToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -4386,22 +4386,22 @@ protected class AbstractNegatedToken_0_RuleCall_NegatedToken extends RuleCallTok } // not supported -protected class AbstractNegatedToken_1_RuleCall_UpToToken extends RuleCallToken { +protected class AbstractNegatedToken_1_RuleCall_UntilToken extends RuleCallToken { - public AbstractNegatedToken_1_RuleCall_UpToToken(IInstanceDescription curr, AbstractToken pred) { + public AbstractNegatedToken_1_RuleCall_UntilToken(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public RuleCall getGrammarElement() { - return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(); + return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(); } @Override protected Solution createSolution() { - if(checkForRecursion(UpToToken_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType())) return null; - return new UpToToken_Group(current, this).firstSolution(); + if(checkForRecursion(UntilToken_Group.class, current)) return null; + if(!current.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType())) return null; + return new UntilToken_Group(current, this).firstSolution(); } } @@ -4495,7 +4495,7 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { /************ end Rule NegatedToken ****************/ -/************ begin Rule UpToToken **************** +/************ begin Rule UntilToken **************** * * not supported * @@ -4503,22 +4503,22 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { // not supported -protected class UpToToken_Group extends GroupToken { +protected class UntilToken_Group extends GroupToken { - public UpToToken_Group(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_Group(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Group getGrammarElement() { - return grammarAccess.prUpToToken().eleGroup(); + return grammarAccess.prUntilToken().eleGroup(); } @Override protected Solution createSolution() { - Solution s1 = new UpToToken_1_Assignment_terminal(current, this).firstSolution(); + Solution s1 = new UntilToken_1_Assignment_terminal(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new UpToToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new UntilToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 == null) { s1 = s1.getPredecessor().nextSolution(this,s1); if(s1 == null) return null; @@ -4533,27 +4533,27 @@ protected class UpToToken_Group extends GroupToken { } // not supported -protected class UpToToken_0_Keyword extends KeywordToken { +protected class UntilToken_0_Keyword extends KeywordToken { - public UpToToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public Keyword getGrammarElement() { - return grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(); + return grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(); } } // not supported -protected class UpToToken_1_Assignment_terminal extends AssignmentToken { +protected class UntilToken_1_Assignment_terminal extends AssignmentToken { - public UpToToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Assignment getGrammarElement() { - return grammarAccess.prUpToToken().ele1AssignmentTerminal(); + return grammarAccess.prUntilToken().ele1AssignmentTerminal(); } @Override @@ -4578,7 +4578,7 @@ protected class UpToToken_1_Assignment_terminal extends AssignmentToken { } -/************ end Rule UpToToken ****************/ +/************ end Rule UntilToken ****************/ /************ begin Rule Wildcard **************** diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g index 9ff392e..595034c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g @@ -1733,16 +1733,16 @@ ruleAbstractNegatedToken returns [EObject current=null] | { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); } - this_UpToToken_1=ruleUpToToken + this_UntilToken_1=ruleUntilToken { - $current = $this_UpToToken_1.current; + $current = $this_UntilToken_1.current; currentNode = currentNode.getParent(); } { - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } ); @@ -1796,16 +1796,16 @@ ruleNegatedToken returns [EObject current=null] -// Entry rule entryRuleUpToToken -entryRuleUpToToken returns [EObject current=null] : - { currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); } - iv_ruleUpToToken=ruleUpToToken - { $current=$iv_ruleUpToToken.current; } +// Entry rule entryRuleUntilToken +entryRuleUntilToken returns [EObject current=null] : + { currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); } + iv_ruleUntilToken=ruleUntilToken + { $current=$iv_ruleUntilToken.current; } EOF ; -// Rule UpToToken -ruleUpToToken returns [EObject current=null] +// Rule UntilToken +ruleUntilToken returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); @@ -1813,18 +1813,18 @@ ruleUpToToken returns [EObject current=null] }: ('->' { - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); } ( { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); } lv_terminal_1=ruleTerminalTokenElement { if ($current==null) { - $current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + $current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), $current); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index 314fcae..bc6027a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -4097,22 +4097,22 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleAbstractNegatedToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ; + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ; public final EObject ruleAbstractNegatedToken() throws RecognitionException { EObject current = null; EObject this_NegatedToken_0 = null; - EObject this_UpToToken_1 = null; + EObject this_UntilToken_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) int alt42=2; int LA42_0 = input.LA(1); @@ -4124,7 +4124,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } else { NoViableAltException nvae = - new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )", 42, 0, input); + new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken )", 42, 0, input); throw nvae; } @@ -4150,21 +4150,21 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UpToToken_1= ruleUpToToken + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UntilToken_1= ruleUntilToken { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899); - this_UpToToken_1=ruleUpToToken(); + pushFollow(FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899); + this_UntilToken_1=ruleUntilToken(); _fsp--; - current = this_UpToToken_1; + current = this_UntilToken_1; currentNode = currentNode.getParent(); - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } @@ -4295,25 +4295,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR end ruleNegatedToken - // $ANTLR start entryRuleUpToToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUpToToken returns [EObject current=null] : iv_ruleUpToToken= ruleUpToToken EOF ; - public final EObject entryRuleUpToToken() throws RecognitionException { + // $ANTLR start entryRuleUntilToken + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUntilToken returns [EObject current=null] : iv_ruleUntilToken= ruleUntilToken EOF ; + public final EObject entryRuleUntilToken() throws RecognitionException { EObject current = null; - EObject iv_ruleUpToToken = null; + EObject iv_ruleUntilToken = null; try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:51: (iv_ruleUpToToken= ruleUpToToken EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUpToToken= ruleUpToToken EOF + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:52: (iv_ruleUntilToken= ruleUntilToken EOF ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUntilToken= ruleUntilToken EOF { - currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053); - iv_ruleUpToToken=ruleUpToToken(); + currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); + pushFollow(FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053); + iv_ruleUntilToken=ruleUntilToken(); _fsp--; - current =iv_ruleUpToToken; - match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4063); + current =iv_ruleUntilToken; + match(input,EOF,FOLLOW_EOF_in_entryRuleUntilToken4063); } @@ -4327,12 +4327,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } return current; } - // $ANTLR end entryRuleUpToToken + // $ANTLR end entryRuleUntilToken - // $ANTLR start ruleUpToToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUpToToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; - public final EObject ruleUpToToken() throws RecognitionException { + // $ANTLR start ruleUntilToken + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUntilToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; + public final EObject ruleUntilToken() throws RecognitionException { EObject current = null; EObject lv_terminal_1 = null; @@ -4347,23 +4347,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:2: '->' (lv_terminal_1= ruleTerminalTokenElement ) { - match(input,37,FOLLOW_37_in_ruleUpToToken4097); + match(input,37,FOLLOW_37_in_ruleUntilToken4097); - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1818:1: (lv_terminal_1= ruleTerminalTokenElement ) // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1821:6: lv_terminal_1= ruleTerminalTokenElement { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); - pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131); + pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131); lv_terminal_1=ruleTerminalTokenElement(); _fsp--; if (current==null) { - current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -4396,7 +4396,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } return current; } - // $ANTLR end ruleUpToToken + // $ANTLR end ruleUntilToken // $ANTLR start entryRuleWildcard @@ -5324,15 +5324,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3808 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3818 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3865 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3938 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3948 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_36_in_ruleNegatedToken3982 = new BitSet(new long[]{0x0000003000028030L}); public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4016 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4063 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_37_in_ruleUpToToken4097 = new BitSet(new long[]{0x0000003000028030L}); - public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUntilToken4063 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_37_in_ruleUntilToken4097 = new BitSet(new long[]{0x0000003000028030L}); + public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4168 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4178 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_17_in_ruleWildcard4223 = new BitSet(new long[]{0x0000000000000002L}); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi index 9c08ab3..2a3270b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi @@ -260,7 +260,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi index c1a61d7..96d78c5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi @@ -960,7 +960,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi index ee7dc56..a9cde63 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi @@ -174,7 +174,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java index b6baeaf..10d4c4a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java @@ -30,7 +30,7 @@ import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstra import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageTerminalTokenElementConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstractNegatedTokenConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageNegatedTokenConsumer; -import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageUpToTokenConsumer; +import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageUntilTokenConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageWildcardConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageCharacterRangeConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageCrossReferenceConsumer; @@ -70,7 +70,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC private XtextGrammarTestLanguageTerminalTokenElementConsumer terminalTokenElementConsumer; private XtextGrammarTestLanguageAbstractNegatedTokenConsumer abstractNegatedTokenConsumer; private XtextGrammarTestLanguageNegatedTokenConsumer negatedTokenConsumer; - private XtextGrammarTestLanguageUpToTokenConsumer upToTokenConsumer; + private XtextGrammarTestLanguageUntilTokenConsumer untilTokenConsumer; private XtextGrammarTestLanguageWildcardConsumer wildcardConsumer; private XtextGrammarTestLanguageCharacterRangeConsumer characterRangeConsumer; private XtextGrammarTestLanguageCrossReferenceConsumer crossReferenceConsumer; @@ -156,7 +156,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC negatedTokenConsumer = new XtextGrammarTestLanguageNegatedTokenConsumer( this, null ); - upToTokenConsumer = new XtextGrammarTestLanguageUpToTokenConsumer( + untilTokenConsumer = new XtextGrammarTestLanguageUntilTokenConsumer( this, null ); wildcardConsumer = new XtextGrammarTestLanguageWildcardConsumer( @@ -210,7 +210,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getTerminalTokenElementConsumer().setRule(grammarAccess.prTerminalTokenElement()); getAbstractNegatedTokenConsumer().setRule(grammarAccess.prAbstractNegatedToken()); getNegatedTokenConsumer().setRule(grammarAccess.prNegatedToken()); - getUpToTokenConsumer().setRule(grammarAccess.prUpToToken()); + getUntilTokenConsumer().setRule(grammarAccess.prUntilToken()); getWildcardConsumer().setRule(grammarAccess.prWildcard()); getCharacterRangeConsumer().setRule(grammarAccess.prCharacterRange()); getCrossReferenceConsumer().setRule(grammarAccess.prCrossReference()); @@ -288,11 +288,11 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getTerminalTokenElementConsumer().setWildcardConsumer(getWildcardConsumer()); getAbstractNegatedTokenConsumer().setNegatedTokenConsumer(getNegatedTokenConsumer()); - getAbstractNegatedTokenConsumer().setUpToTokenConsumer(getUpToTokenConsumer()); + getAbstractNegatedTokenConsumer().setUntilTokenConsumer(getUntilTokenConsumer()); getNegatedTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); - getUpToTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); + getUntilTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); getCharacterRangeConsumer().setKeywordConsumer(getKeywordConsumer()); @@ -368,7 +368,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getActionConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getActionConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter); getNegatedTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); - getUpToTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); + getUntilTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getWildcardConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getCharacterRangeConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getCrossReferenceConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter); @@ -471,8 +471,8 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC return negatedTokenConsumer; } - public XtextGrammarTestLanguageUpToTokenConsumer getUpToTokenConsumer() { - return upToTokenConsumer; + public XtextGrammarTestLanguageUntilTokenConsumer getUntilTokenConsumer() { + return untilTokenConsumer; } public XtextGrammarTestLanguageWildcardConsumer getWildcardConsumer() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java index 633b406..f6b3975 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java @@ -23,7 +23,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends private INonTerminalConsumer negatedTokenConsumer; - private INonTerminalConsumer upToTokenConsumer; + private INonTerminalConsumer untilTokenConsumer; private IElementConsumer alternatives$1$Consumer; @@ -64,7 +64,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends @Override protected int doConsume(boolean optional) throws Exception { - return consumeNonTerminal(upToTokenConsumer, null, false, false, false, getElement(), optional); + return consumeNonTerminal(untilTokenConsumer, null, false, false, false, getElement(), optional); } } @@ -86,7 +86,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends alternatives$1$Consumer = new Alternatives$1$Consumer(rule.eleAlternatives()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallNegatedToken()); - ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUpToToken()); + ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUntilToken()); } @Override @@ -103,8 +103,8 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends this.negatedTokenConsumer = negatedTokenConsumer; } - public void setUpToTokenConsumer(INonTerminalConsumer upToTokenConsumer) { - this.upToTokenConsumer = upToTokenConsumer; + public void setUntilTokenConsumer(INonTerminalConsumer untilTokenConsumer) { + this.untilTokenConsumer = untilTokenConsumer; } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUntilTokenConsumer.java index bab1844..9164f7e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUntilTokenConsumer.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UpToTokenElements; +import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UntilTokenElements; -public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminalConsumer { +public final class XtextGrammarTestLanguageUntilTokenConsumer extends NonTerminalConsumer { - private UpToTokenElements rule; + private UntilTokenElements rule; private INonTerminalConsumer terminalTokenElementConsumer; @@ -85,7 +85,7 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal } } - public XtextGrammarTestLanguageUpToTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + public XtextGrammarTestLanguageUntilTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } @@ -95,11 +95,11 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal return group$1$Consumer.consume(); } - public UpToTokenElements getRule() { + public UntilTokenElements getRule() { return rule; } - public void setRule(UpToTokenElements rule) { + public void setRule(UntilTokenElements rule) { this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi index bfd9cf9..2b88d98 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi @@ -186,7 +186,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi index 12e3c36..8d27336 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi @@ -186,7 +186,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore index 933b629..39ffce8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore @@ -73,7 +73,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="terminal" eType="//AbstractElement" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NegatedToken" eSuperTypes="//AbstractNegatedToken"/> - <eClassifiers xsi:type="ecore:EClass" name="UpToToken" eSuperTypes="//AbstractNegatedToken"/> + <eClassifiers xsi:type="ecore:EClass" name="UntilToken" eSuperTypes="//AbstractNegatedToken"/> <eClassifiers xsi:type="ecore:EClass" name="Wildcard" eSuperTypes="//AbstractElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isWildcard"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel index f0159dd..d7549cd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel @@ -114,7 +114,7 @@ <ecoreClass href="XtextTerminalsTestLanguage.ecore#//NegatedToken"/> </genClasses> <genClasses> - <ecoreClass href="XtextTerminalsTestLanguage.ecore#//UpToToken"/> + <ecoreClass href="XtextTerminalsTestLanguage.ecore#//UntilToken"/> </genClasses> <genClasses> <ecoreClass href="XtextTerminalsTestLanguage.ecore#//Wildcard"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi index 9ec7236..0f5e270 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi @@ -511,9 +511,9 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="UpToToken"> + <rules xsi:type="xtext:ParserRule" name="UntilToken"> <type metamodel="//@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/XtextTerminalsTestLanguage#//UpToToken"/> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/XtextTerminalsTestLanguage#//UntilToken"/> </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="->"/> @@ -763,7 +763,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java index df82fee..972fba8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java @@ -42,7 +42,7 @@ public class XtextTerminalsTestLanguageParsetreeConstructor extends AbstractPars if(inst.isInstanceOf(grammarAccess.prTerminalTokenElement().getRule().getType().getType()) && (s = new TerminalTokenElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prAbstractNegatedToken().getRule().getType().getType()) && (s = new AbstractNegatedToken_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prNegatedToken().getRule().getType().getType()) && (s = new NegatedToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType()) && (s = new UpToToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType()) && (s = new UntilToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prWildcard().getRule().getType().getType()) && (s = new Wildcard_Assignment_isWildcard(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCharacterRange().getRule().getType().getType()) && (s = new CharacterRange_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCrossReference().getRule().getType().getType()) && (s = new CrossReference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; @@ -4356,7 +4356,7 @@ protected class AbstractNegatedToken_Alternatives extends AlternativesToken { @Override protected Solution createSolution() { - AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UpToToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); + AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UntilToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -4386,22 +4386,22 @@ protected class AbstractNegatedToken_0_RuleCall_NegatedToken extends RuleCallTok } // not supported -protected class AbstractNegatedToken_1_RuleCall_UpToToken extends RuleCallToken { +protected class AbstractNegatedToken_1_RuleCall_UntilToken extends RuleCallToken { - public AbstractNegatedToken_1_RuleCall_UpToToken(IInstanceDescription curr, AbstractToken pred) { + public AbstractNegatedToken_1_RuleCall_UntilToken(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public RuleCall getGrammarElement() { - return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(); + return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(); } @Override protected Solution createSolution() { - if(checkForRecursion(UpToToken_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType())) return null; - return new UpToToken_Group(current, this).firstSolution(); + if(checkForRecursion(UntilToken_Group.class, current)) return null; + if(!current.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType())) return null; + return new UntilToken_Group(current, this).firstSolution(); } } @@ -4495,7 +4495,7 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { /************ end Rule NegatedToken ****************/ -/************ begin Rule UpToToken **************** +/************ begin Rule UntilToken **************** * * not supported * @@ -4503,22 +4503,22 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { // not supported -protected class UpToToken_Group extends GroupToken { +protected class UntilToken_Group extends GroupToken { - public UpToToken_Group(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_Group(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Group getGrammarElement() { - return grammarAccess.prUpToToken().eleGroup(); + return grammarAccess.prUntilToken().eleGroup(); } @Override protected Solution createSolution() { - Solution s1 = new UpToToken_1_Assignment_terminal(current, this).firstSolution(); + Solution s1 = new UntilToken_1_Assignment_terminal(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new UpToToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new UntilToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 == null) { s1 = s1.getPredecessor().nextSolution(this,s1); if(s1 == null) return null; @@ -4533,27 +4533,27 @@ protected class UpToToken_Group extends GroupToken { } // not supported -protected class UpToToken_0_Keyword extends KeywordToken { +protected class UntilToken_0_Keyword extends KeywordToken { - public UpToToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public Keyword getGrammarElement() { - return grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(); + return grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(); } } // not supported -protected class UpToToken_1_Assignment_terminal extends AssignmentToken { +protected class UntilToken_1_Assignment_terminal extends AssignmentToken { - public UpToToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Assignment getGrammarElement() { - return grammarAccess.prUpToToken().ele1AssignmentTerminal(); + return grammarAccess.prUntilToken().ele1AssignmentTerminal(); } @Override @@ -4578,7 +4578,7 @@ protected class UpToToken_1_Assignment_terminal extends AssignmentToken { } -/************ end Rule UpToToken ****************/ +/************ end Rule UntilToken ****************/ /************ begin Rule Wildcard **************** diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g index 051f13b..dfa7789 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g @@ -1733,16 +1733,16 @@ ruleAbstractNegatedToken returns [EObject current=null] | { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); } - this_UpToToken_1=ruleUpToToken + this_UntilToken_1=ruleUntilToken { - $current = $this_UpToToken_1.current; + $current = $this_UntilToken_1.current; currentNode = currentNode.getParent(); } { - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } ); @@ -1796,16 +1796,16 @@ ruleNegatedToken returns [EObject current=null] -// Entry rule entryRuleUpToToken -entryRuleUpToToken returns [EObject current=null] : - { currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); } - iv_ruleUpToToken=ruleUpToToken - { $current=$iv_ruleUpToToken.current; } +// Entry rule entryRuleUntilToken +entryRuleUntilToken returns [EObject current=null] : + { currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); } + iv_ruleUntilToken=ruleUntilToken + { $current=$iv_ruleUntilToken.current; } EOF ; -// Rule UpToToken -ruleUpToToken returns [EObject current=null] +// Rule UntilToken +ruleUntilToken returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); @@ -1813,18 +1813,18 @@ ruleUpToToken returns [EObject current=null] }: ('->' { - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); } ( { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); } lv_terminal_1=ruleTerminalTokenElement { if ($current==null) { - $current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + $current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), $current); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java index bfff2cd..b80579e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java @@ -4097,22 +4097,22 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // $ANTLR start ruleAbstractNegatedToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ; + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ; public final EObject ruleAbstractNegatedToken() throws RecognitionException { EObject current = null; EObject this_NegatedToken_0 = null; - EObject this_UpToToken_1 = null; + EObject this_UntilToken_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) int alt42=2; int LA42_0 = input.LA(1); @@ -4124,7 +4124,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } else { NoViableAltException nvae = - new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )", 42, 0, input); + new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken )", 42, 0, input); throw nvae; } @@ -4150,21 +4150,21 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1735:5: this_UpToToken_1= ruleUpToToken + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1735:5: this_UntilToken_1= ruleUntilToken { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899); - this_UpToToken_1=ruleUpToToken(); + pushFollow(FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899); + this_UntilToken_1=ruleUntilToken(); _fsp--; - current = this_UpToToken_1; + current = this_UntilToken_1; currentNode = currentNode.getParent(); - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } @@ -4295,25 +4295,25 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // $ANTLR end ruleNegatedToken - // $ANTLR start entryRuleUpToToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1800:1: entryRuleUpToToken returns [EObject current=null] : iv_ruleUpToToken= ruleUpToToken EOF ; - public final EObject entryRuleUpToToken() throws RecognitionException { + // $ANTLR start entryRuleUntilToken + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1800:1: entryRuleUntilToken returns [EObject current=null] : iv_ruleUntilToken= ruleUntilToken EOF ; + public final EObject entryRuleUntilToken() throws RecognitionException { EObject current = null; - EObject iv_ruleUpToToken = null; + EObject iv_ruleUntilToken = null; try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1800:51: (iv_ruleUpToToken= ruleUpToToken EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1801:2: iv_ruleUpToToken= ruleUpToToken EOF + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1800:52: (iv_ruleUntilToken= ruleUntilToken EOF ) + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1801:2: iv_ruleUntilToken= ruleUntilToken EOF { - currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053); - iv_ruleUpToToken=ruleUpToToken(); + currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); + pushFollow(FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053); + iv_ruleUntilToken=ruleUntilToken(); _fsp--; - current =iv_ruleUpToToken; - match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4063); + current =iv_ruleUntilToken; + match(input,EOF,FOLLOW_EOF_in_entryRuleUntilToken4063); } @@ -4327,12 +4327,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } return current; } - // $ANTLR end entryRuleUpToToken + // $ANTLR end entryRuleUntilToken - // $ANTLR start ruleUpToToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1808:1: ruleUpToToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; - public final EObject ruleUpToToken() throws RecognitionException { + // $ANTLR start ruleUntilToken + // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1808:1: ruleUntilToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; + public final EObject ruleUntilToken() throws RecognitionException { EObject current = null; EObject lv_terminal_1 = null; @@ -4347,23 +4347,23 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1814:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1814:2: '->' (lv_terminal_1= ruleTerminalTokenElement ) { - match(input,37,FOLLOW_37_in_ruleUpToToken4097); + match(input,37,FOLLOW_37_in_ruleUntilToken4097); - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1818:1: (lv_terminal_1= ruleTerminalTokenElement ) // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1821:6: lv_terminal_1= ruleTerminalTokenElement { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); - pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131); + pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131); lv_terminal_1=ruleTerminalTokenElement(); _fsp--; if (current==null) { - current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -4396,7 +4396,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn } return current; } - // $ANTLR end ruleUpToToken + // $ANTLR end ruleUntilToken // $ANTLR start entryRuleWildcard @@ -5324,15 +5324,15 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3808 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3818 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3865 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3938 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3948 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_36_in_ruleNegatedToken3982 = new BitSet(new long[]{0x0000003000028030L}); public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4016 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4063 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_37_in_ruleUpToToken4097 = new BitSet(new long[]{0x0000003000028030L}); - public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUntilToken4063 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_37_in_ruleUntilToken4097 = new BitSet(new long[]{0x0000003000028030L}); + public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4168 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4178 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_17_in_ruleWildcard4223 = new BitSet(new long[]{0x0000000000000002L}); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java index 8450f68..73f659d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java @@ -29,7 +29,7 @@ import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerm import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageTerminalTokenElementConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageAbstractNegatedTokenConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageNegatedTokenConsumer; -import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageUpToTokenConsumer; +import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageUntilTokenConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageWildcardConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageCharacterRangeConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageCrossReferenceConsumer; @@ -68,7 +68,7 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse private XtextTerminalsTestLanguageTerminalTokenElementConsumer terminalTokenElementConsumer; private XtextTerminalsTestLanguageAbstractNegatedTokenConsumer abstractNegatedTokenConsumer; private XtextTerminalsTestLanguageNegatedTokenConsumer negatedTokenConsumer; - private XtextTerminalsTestLanguageUpToTokenConsumer upToTokenConsumer; + private XtextTerminalsTestLanguageUntilTokenConsumer untilTokenConsumer; private XtextTerminalsTestLanguageWildcardConsumer wildcardConsumer; private XtextTerminalsTestLanguageCharacterRangeConsumer characterRangeConsumer; private XtextTerminalsTestLanguageCrossReferenceConsumer crossReferenceConsumer; @@ -159,7 +159,7 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse negatedTokenConsumer = new XtextTerminalsTestLanguageNegatedTokenConsumer( this, null ); - upToTokenConsumer = new XtextTerminalsTestLanguageUpToTokenConsumer( + untilTokenConsumer = new XtextTerminalsTestLanguageUntilTokenConsumer( this, null ); wildcardConsumer = new XtextTerminalsTestLanguageWildcardConsumer( @@ -219,7 +219,7 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse getTerminalTokenElementConsumer().setRule(grammarAccess.prTerminalTokenElement()); getAbstractNegatedTokenConsumer().setRule(grammarAccess.prAbstractNegatedToken()); getNegatedTokenConsumer().setRule(grammarAccess.prNegatedToken()); - getUpToTokenConsumer().setRule(grammarAccess.prUpToToken()); + getUntilTokenConsumer().setRule(grammarAccess.prUntilToken()); getWildcardConsumer().setRule(grammarAccess.prWildcard()); getCharacterRangeConsumer().setRule(grammarAccess.prCharacterRange()); getCrossReferenceConsumer().setRule(grammarAccess.prCrossReference()); @@ -297,11 +297,11 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse getTerminalTokenElementConsumer().setWildcardConsumer(getWildcardConsumer()); getAbstractNegatedTokenConsumer().setNegatedTokenConsumer(getNegatedTokenConsumer()); - getAbstractNegatedTokenConsumer().setUpToTokenConsumer(getUpToTokenConsumer()); + getAbstractNegatedTokenConsumer().setUntilTokenConsumer(getUntilTokenConsumer()); getNegatedTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); - getUpToTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); + getUntilTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); getCharacterRangeConsumer().setKeywordConsumer(getKeywordConsumer()); @@ -377,7 +377,7 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse getActionConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.keyword$19$Delimiter); getActionConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.crossReference$31$Delimiter); getNegatedTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.keyword$19$Delimiter); - getUpToTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getUntilTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.keyword$19$Delimiter); getWildcardConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.keyword$19$Delimiter); getCharacterRangeConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.keyword$19$Delimiter); getCrossReferenceConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguageDelimiters.crossReference$31$Delimiter); @@ -476,8 +476,8 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse return negatedTokenConsumer; } - public XtextTerminalsTestLanguageUpToTokenConsumer getUpToTokenConsumer() { - return upToTokenConsumer; + public XtextTerminalsTestLanguageUntilTokenConsumer getUntilTokenConsumer() { + return untilTokenConsumer; } public XtextTerminalsTestLanguageWildcardConsumer getWildcardConsumer() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java index db90556..b9ac063 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java @@ -25,7 +25,7 @@ public final class HiddenTerminalsTestLanguageML_COMMENTConsumer extends Abstrac rollbackTo(marker); return false; } - if (!consumeUpToToken$3()) { + if (!consumeUntilToken$3()) { rollbackTo(marker); return false; } @@ -36,7 +36,7 @@ public final class HiddenTerminalsTestLanguageML_COMMENTConsumer extends Abstrac return readString("/*"); } - protected boolean consumeUpToToken$3() { + protected boolean consumeUntilToken$3() { final int marker = mark(); while(!eof()) { if(consumeKeyword$4()) diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java index 74db10f..bc83065 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java @@ -25,7 +25,7 @@ public final class TerminalRulesTestLanguageML_COMMENTConsumer extends AbstractR rollbackTo(marker); return false; } - if (!consumeUpToToken$3()) { + if (!consumeUntilToken$3()) { rollbackTo(marker); return false; } @@ -36,7 +36,7 @@ public final class TerminalRulesTestLanguageML_COMMENTConsumer extends AbstractR return readString("/*"); } - protected boolean consumeUpToToken$3() { + protected boolean consumeUntilToken$3() { final int marker = mark(); while(!eof()) { if(consumeKeyword$4()) diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java index 1c57194..7f51dbe 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java @@ -23,7 +23,7 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend private INonTerminalConsumer negatedTokenConsumer; - private INonTerminalConsumer upToTokenConsumer; + private INonTerminalConsumer untilTokenConsumer; private IElementConsumer alternatives$1$Consumer; @@ -64,7 +64,7 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend @Override protected int doConsume(boolean optional) throws Exception { - return consumeNonTerminal(upToTokenConsumer, null, false, false, false, getElement(), optional); + return consumeNonTerminal(untilTokenConsumer, null, false, false, false, getElement(), optional); } } @@ -86,7 +86,7 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend alternatives$1$Consumer = new Alternatives$1$Consumer(rule.eleAlternatives()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallNegatedToken()); - ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUpToToken()); + ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUntilToken()); } @Override @@ -103,8 +103,8 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend this.negatedTokenConsumer = negatedTokenConsumer; } - public void setUpToTokenConsumer(INonTerminalConsumer upToTokenConsumer) { - this.upToTokenConsumer = upToTokenConsumer; + public void setUntilTokenConsumer(INonTerminalConsumer untilTokenConsumer) { + this.untilTokenConsumer = untilTokenConsumer; } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java index 93486b0..24b6960 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java @@ -25,7 +25,7 @@ public final class XtextTerminalsTestLanguageML_COMMENTConsumer extends Abstract rollbackTo(marker); return false; } - if (!consumeUpToToken$3()) { + if (!consumeUntilToken$3()) { rollbackTo(marker); return false; } @@ -36,7 +36,7 @@ public final class XtextTerminalsTestLanguageML_COMMENTConsumer extends Abstract return readString("/*"); } - protected boolean consumeUpToToken$3() { + protected boolean consumeUntilToken$3() { final int marker = mark(); while(!eof()) { if(consumeKeyword$4()) diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUntilTokenConsumer.java index ddcbfca..49a6277 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUntilTokenConsumer.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.UpToTokenElements; +import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.UntilTokenElements; -public final class XtextTerminalsTestLanguageUpToTokenConsumer extends NonTerminalConsumer { +public final class XtextTerminalsTestLanguageUntilTokenConsumer extends NonTerminalConsumer { - private UpToTokenElements rule; + private UntilTokenElements rule; private INonTerminalConsumer terminalTokenElementConsumer; @@ -85,7 +85,7 @@ public final class XtextTerminalsTestLanguageUpToTokenConsumer extends NonTermin } } - public XtextTerminalsTestLanguageUpToTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + public XtextTerminalsTestLanguageUntilTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } @@ -95,11 +95,11 @@ public final class XtextTerminalsTestLanguageUpToTokenConsumer extends NonTermin return group$1$Consumer.consume(); } - public UpToTokenElements getRule() { + public UntilTokenElements getRule() { return rule; } - public void setRule(UpToTokenElements rule) { + public void setRule(UntilTokenElements rule) { this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java index b5b5b46..0ad21e1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java @@ -1021,7 +1021,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AbstractNegatedToken"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final RuleCall c0ParserRuleCallNegatedToken = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall c1ParserRuleCallUpToToken = (RuleCall)cAlternatives.eContents().get(1); + private final RuleCall c1ParserRuleCallUntilToken = (RuleCall)cAlternatives.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -1033,7 +1033,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele0ParserRuleCallNegatedToken() { return c0ParserRuleCallNegatedToken; } // not supported - public RuleCall ele1ParserRuleCallUpToToken() { return c1ParserRuleCallUpToToken; } + public RuleCall ele1ParserRuleCallUntilToken() { return c1ParserRuleCallUntilToken; } } public class NegatedTokenElements implements IParserRuleAccess { @@ -1059,8 +1059,8 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele10ParserRuleCallTerminalTokenElement() { return c10ParserRuleCallTerminalTokenElement; } } - public class UpToTokenElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UpToToken"); + public class UntilTokenElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UntilToken"); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordHyphenMinusGreaterThanSign = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentTerminal = (Assignment)cGroup.eContents().get(1); @@ -1292,7 +1292,7 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { private TerminalTokenElementElements pTerminalTokenElement; private AbstractNegatedTokenElements pAbstractNegatedToken; private NegatedTokenElements pNegatedToken; - private UpToTokenElements pUpToToken; + private UntilTokenElements pUntilToken; private WildcardElements pWildcard; private CharacterRangeElements pCharacterRange; private CrossReferenceElements pCrossReference; @@ -1427,8 +1427,8 @@ public class XtextTerminalsTestLanguageGrammarAccess implements IGrammarAccess { } // not supported - public UpToTokenElements prUpToToken() { - return (pUpToToken != null) ? pUpToToken : (pUpToToken = new UpToTokenElements()); + public UntilTokenElements prUntilToken() { + return (pUntilToken != null) ? pUntilToken : (pUntilToken = new UntilTokenElements()); } // not supported diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/UpToToken.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/UntilToken.java index 68793aa..23a8f6e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/UpToToken.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/UntilToken.java @@ -8,14 +8,14 @@ package org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage; /** * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Up To Token</b></em>'. + * A representation of the model object '<em><b>Until Token</b></em>'. * <!-- end-user-doc --> * * - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getUpToToken() + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getUntilToken() * @model * @generated */ -public interface UpToToken extends AbstractNegatedToken +public interface UntilToken extends AbstractNegatedToken { -} // UpToToken +} // UntilToken diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguageFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguageFactory.java index ad428b1..4d9df02 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguageFactory.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguageFactory.java @@ -143,13 +143,13 @@ public interface XtextTerminalsTestLanguageFactory extends EFactory NegatedToken createNegatedToken(); /** - * Returns a new object of class '<em>Up To Token</em>'. + * Returns a new object of class '<em>Until Token</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Up To Token</em>'. + * @return a new object of class '<em>Until Token</em>'. * @generated */ - UpToToken createUpToToken(); + UntilToken createUntilToken(); /** * Returns a new object of class '<em>Wildcard</em>'. diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguagePackage.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguagePackage.java index 439af4d..1e334fe 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguagePackage.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguagePackage.java @@ -658,14 +658,14 @@ public interface XtextTerminalsTestLanguagePackage extends EPackage int NEGATED_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object id for the '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UpToTokenImpl - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.XtextTerminalsTestLanguagePackageImpl#getUpToToken() + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UntilTokenImpl + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.XtextTerminalsTestLanguagePackageImpl#getUntilToken() * @generated */ - int UP_TO_TOKEN = 13; + int UNTIL_TOKEN = 13; /** * The feature id for the '<em><b>Cardinality</b></em>' attribute. @@ -674,7 +674,7 @@ public interface XtextTerminalsTestLanguagePackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; + int UNTIL_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; /** * The feature id for the '<em><b>Terminal</b></em>' containment reference. @@ -683,16 +683,16 @@ public interface XtextTerminalsTestLanguagePackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; + int UNTIL_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; /** - * The number of structural features of the '<em>Up To Token</em>' class. + * The number of structural features of the '<em>Until Token</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int UP_TO_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; + int UNTIL_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.WildcardImpl <em>Wildcard</em>}' class. @@ -1367,14 +1367,14 @@ public interface XtextTerminalsTestLanguagePackage extends EPackage EClass getNegatedToken(); /** - * Returns the meta object for class '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UpToToken <em>Up To Token</em>}'. + * Returns the meta object for class '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Up To Token</em>'. - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UpToToken + * @return the meta object for class '<em>Until Token</em>'. + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UntilToken * @generated */ - EClass getUpToToken(); + EClass getUntilToken(); /** * Returns the meta object for class '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.Wildcard <em>Wildcard</em>}'. @@ -1891,14 +1891,14 @@ public interface XtextTerminalsTestLanguagePackage extends EPackage EClass NEGATED_TOKEN = eINSTANCE.getNegatedToken(); /** - * The meta object literal for the '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object literal for the '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UpToTokenImpl - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.XtextTerminalsTestLanguagePackageImpl#getUpToToken() + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.UntilTokenImpl + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.XtextTerminalsTestLanguagePackageImpl#getUntilToken() * @generated */ - EClass UP_TO_TOKEN = eINSTANCE.getUpToToken(); + EClass UNTIL_TOKEN = eINSTANCE.getUntilToken(); /** * The meta object literal for the '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl.WildcardImpl <em>Wildcard</em>}' class. diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/UpToTokenImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/UntilTokenImpl.java index 3a091d1..c9a95f5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/UpToTokenImpl.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/UntilTokenImpl.java @@ -7,26 +7,26 @@ package org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl; import org.eclipse.emf.ecore.EClass; -import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UpToToken; +import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UntilToken; import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage; /** * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Up To Token</b></em>'. + * An implementation of the model object '<em><b>Until Token</b></em>'. * <!-- end-user-doc --> * <p> * </p> * * @generated */ -public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken +public class UntilTokenImpl extends AbstractNegatedTokenImpl implements UntilToken { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected UpToTokenImpl() + protected UntilTokenImpl() { super(); } @@ -39,7 +39,7 @@ public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken @Override protected EClass eStaticClass() { - return XtextTerminalsTestLanguagePackage.Literals.UP_TO_TOKEN; + return XtextTerminalsTestLanguagePackage.Literals.UNTIL_TOKEN; } -} //UpToTokenImpl +} //UntilTokenImpl diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java index 7352517..f5ce4f4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java @@ -80,7 +80,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen case XtextTerminalsTestLanguagePackage.ACTION: return createAction(); case XtextTerminalsTestLanguagePackage.ABSTRACT_NEGATED_TOKEN: return createAbstractNegatedToken(); case XtextTerminalsTestLanguagePackage.NEGATED_TOKEN: return createNegatedToken(); - case XtextTerminalsTestLanguagePackage.UP_TO_TOKEN: return createUpToToken(); + case XtextTerminalsTestLanguagePackage.UNTIL_TOKEN: return createUntilToken(); case XtextTerminalsTestLanguagePackage.WILDCARD: return createWildcard(); case XtextTerminalsTestLanguagePackage.CROSS_REFERENCE: return createCrossReference(); case XtextTerminalsTestLanguagePackage.KEYWORD: return createKeyword(); @@ -241,10 +241,10 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * <!-- end-user-doc --> * @generated */ - public UpToToken createUpToToken() + public UntilToken createUntilToken() { - UpToTokenImpl upToToken = new UpToTokenImpl(); - return upToToken; + UntilTokenImpl untilToken = new UntilTokenImpl(); + return untilToken; } /** diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java index 9a6d3e3..08fda5b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java @@ -31,7 +31,7 @@ import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.Referen import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.RuleCall; import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.TerminalRule; import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.TypeRef; -import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UpToToken; +import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UntilToken; import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.Wildcard; import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguageFactory; import org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage; @@ -140,7 +140,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * <!-- end-user-doc --> * @generated */ - private EClass upToTokenEClass = null; + private EClass untilTokenEClass = null; /** * <!-- begin-user-doc --> @@ -636,9 +636,9 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * <!-- end-user-doc --> * @generated */ - public EClass getUpToToken() + public EClass getUntilToken() { - return upToTokenEClass; + return untilTokenEClass; } /** @@ -881,7 +881,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen negatedTokenEClass = createEClass(NEGATED_TOKEN); - upToTokenEClass = createEClass(UP_TO_TOKEN); + untilTokenEClass = createEClass(UNTIL_TOKEN); wildcardEClass = createEClass(WILDCARD); createEAttribute(wildcardEClass, WILDCARD__IS_WILDCARD); @@ -944,7 +944,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen actionEClass.getESuperTypes().add(this.getAbstractElement()); abstractNegatedTokenEClass.getESuperTypes().add(this.getAbstractElement()); negatedTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); - upToTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); + untilTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); wildcardEClass.getESuperTypes().add(this.getAbstractElement()); crossReferenceEClass.getESuperTypes().add(this.getAbstractElement()); keywordEClass.getESuperTypes().add(this.getAbstractElement()); @@ -1004,7 +1004,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen initEClass(negatedTokenEClass, NegatedToken.class, "NegatedToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(upToTokenEClass, UpToToken.class, "UpToToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(untilTokenEClass, UntilToken.class, "UntilToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(wildcardEClass, Wildcard.class, "Wildcard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getWildcard_IsWildcard(), ecorePackage.getEBoolean(), "isWildcard", null, 0, 1, Wildcard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageAdapterFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageAdapterFactory.java index 319ba14..f121d9a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageAdapterFactory.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageAdapterFactory.java @@ -143,9 +143,9 @@ public class XtextTerminalsTestLanguageAdapterFactory extends AdapterFactoryImpl return createNegatedTokenAdapter(); } @Override - public Adapter caseUpToToken(UpToToken object) + public Adapter caseUntilToken(UntilToken object) { - return createUpToTokenAdapter(); + return createUntilTokenAdapter(); } @Override public Adapter caseWildcard(Wildcard object) @@ -400,16 +400,16 @@ public class XtextTerminalsTestLanguageAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UpToToken <em>Up To Token</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UpToToken + * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.UntilToken * @generated */ - public Adapter createUpToTokenAdapter() + public Adapter createUntilTokenAdapter() { return null; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageSwitch.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageSwitch.java index b452f7c..2eca7cf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageSwitch.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/util/XtextTerminalsTestLanguageSwitch.java @@ -195,12 +195,12 @@ public class XtextTerminalsTestLanguageSwitch<T> if (result == null) result = defaultCase(theEObject); return result; } - case XtextTerminalsTestLanguagePackage.UP_TO_TOKEN: + case XtextTerminalsTestLanguagePackage.UNTIL_TOKEN: { - UpToToken upToToken = (UpToToken)theEObject; - T result = caseUpToToken(upToToken); - if (result == null) result = caseAbstractNegatedToken(upToToken); - if (result == null) result = caseAbstractElement(upToToken); + UntilToken untilToken = (UntilToken)theEObject; + T result = caseUntilToken(untilToken); + if (result == null) result = caseAbstractNegatedToken(untilToken); + if (result == null) result = caseAbstractElement(untilToken); if (result == null) result = defaultCase(theEObject); return result; } @@ -473,17 +473,17 @@ public class XtextTerminalsTestLanguageSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * Returns the result of interpreting the object as an instance of '<em>Until Token</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * @return the result of interpreting the object as an instance of '<em>Until Token</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseUpToToken(UpToToken object) + public T caseUntilToken(UntilToken object) { return null; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi index 6df855d..71a1675 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi @@ -212,7 +212,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi index 250654b..6067f1a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi @@ -479,7 +479,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi index 884e5fe..0ac38f3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi @@ -336,7 +336,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi index de2b468..6790d16 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi @@ -212,7 +212,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi index 59def99..973427a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi @@ -159,7 +159,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index edafebd..a2d5c1f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -1022,7 +1022,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AbstractNegatedToken"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final RuleCall c0ParserRuleCallNegatedToken = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall c1ParserRuleCallUpToToken = (RuleCall)cAlternatives.eContents().get(1); + private final RuleCall c1ParserRuleCallUntilToken = (RuleCall)cAlternatives.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -1034,7 +1034,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele0ParserRuleCallNegatedToken() { return c0ParserRuleCallNegatedToken; } // not supported - public RuleCall ele1ParserRuleCallUpToToken() { return c1ParserRuleCallUpToToken; } + public RuleCall ele1ParserRuleCallUntilToken() { return c1ParserRuleCallUntilToken; } } public class NegatedTokenElements implements IParserRuleAccess { @@ -1060,8 +1060,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele10ParserRuleCallTerminalTokenElement() { return c10ParserRuleCallTerminalTokenElement; } } - public class UpToTokenElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UpToToken"); + public class UntilTokenElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UntilToken"); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordHyphenMinusGreaterThanSign = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentTerminal = (Assignment)cGroup.eContents().get(1); @@ -1293,7 +1293,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private TerminalTokenElementElements pTerminalTokenElement; private AbstractNegatedTokenElements pAbstractNegatedToken; private NegatedTokenElements pNegatedToken; - private UpToTokenElements pUpToToken; + private UntilTokenElements pUntilToken; private WildcardElements pWildcard; private CharacterRangeElements pCharacterRange; private CrossReferenceElements pCrossReference; @@ -1429,8 +1429,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { } // not supported - public UpToTokenElements prUpToToken() { - return (pUpToToken != null) ? pUpToToken : (pUpToToken = new UpToTokenElements()); + public UntilTokenElements prUntilToken() { + return (pUntilToken != null) ? pUntilToken : (pUntilToken = new UntilTokenElements()); } // not supported diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi index 92b530d..1373ad4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi @@ -192,7 +192,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi index 0125541..e4c6be0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi @@ -230,7 +230,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi index 84629e1..2966f2e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi @@ -273,7 +273,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi index f35d009..fff5e1f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi @@ -181,7 +181,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi index 1f81709..7934b78 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi @@ -251,7 +251,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi index 4acc444..7d87cf1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi @@ -170,7 +170,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi index 4436e5d..efe4c08 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi @@ -344,7 +344,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index 43af58e..be5fba5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -345,7 +345,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi index fb9865a..eac0ff9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi @@ -250,7 +250,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi index 124726c..333ba3f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi @@ -213,7 +213,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi index a6a10f9..e54cdc2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi @@ -189,7 +189,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi index e463e49..06fb050 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi @@ -318,7 +318,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java new file mode 100644 index 0000000..a987a84 --- a/dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java @@ -0,0 +1,21 @@ +/** + * <copyright> + * </copyright> + * + */ +package org.eclipse.xtext.xtextTest; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Until Token</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUntilToken() + * @model + * @generated + */ +public interface UntilToken extends AbstractNegatedToken +{ +} // UntilToken diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java deleted file mode 100644 index 5a6a55b..0000000 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java +++ b/dev/null @@ -1,21 +0,0 @@ -/** - * <copyright> - * </copyright> - * - */ -package org.eclipse.xtext.xtextTest; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Up To Token</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUpToToken() - * @model - * @generated - */ -public interface UpToToken extends AbstractNegatedToken -{ -} // UpToToken diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java index 9851590..3bf207c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java @@ -143,13 +143,13 @@ public interface XtextTestFactory extends EFactory NegatedToken createNegatedToken(); /** - * Returns a new object of class '<em>Up To Token</em>'. + * Returns a new object of class '<em>Until Token</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Up To Token</em>'. + * @return a new object of class '<em>Until Token</em>'. * @generated */ - UpToToken createUpToToken(); + UntilToken createUntilToken(); /** * Returns a new object of class '<em>Wildcard</em>'. diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java index ce7d723..f8a678e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java @@ -658,14 +658,14 @@ public interface XtextTestPackage extends EPackage int NEGATED_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.xtextTest.impl.UpToTokenImpl - * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUpToToken() + * @see org.eclipse.xtext.xtextTest.impl.UntilTokenImpl + * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUntilToken() * @generated */ - int UP_TO_TOKEN = 13; + int UNTIL_TOKEN = 13; /** * The feature id for the '<em><b>Cardinality</b></em>' attribute. @@ -674,7 +674,7 @@ public interface XtextTestPackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; + int UNTIL_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; /** * The feature id for the '<em><b>Terminal</b></em>' containment reference. @@ -683,16 +683,16 @@ public interface XtextTestPackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; + int UNTIL_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; /** - * The number of structural features of the '<em>Up To Token</em>' class. + * The number of structural features of the '<em>Until Token</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int UP_TO_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; + int UNTIL_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.WildcardImpl <em>Wildcard</em>}' class. @@ -1367,14 +1367,14 @@ public interface XtextTestPackage extends EPackage EClass getNegatedToken(); /** - * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.UpToToken <em>Up To Token</em>}'. + * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Up To Token</em>'. - * @see org.eclipse.xtext.xtextTest.UpToToken + * @return the meta object for class '<em>Until Token</em>'. + * @see org.eclipse.xtext.xtextTest.UntilToken * @generated */ - EClass getUpToToken(); + EClass getUntilToken(); /** * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.Wildcard <em>Wildcard</em>}'. @@ -1891,14 +1891,14 @@ public interface XtextTestPackage extends EPackage EClass NEGATED_TOKEN = eINSTANCE.getNegatedToken(); /** - * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.xtextTest.impl.UpToTokenImpl - * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUpToToken() + * @see org.eclipse.xtext.xtextTest.impl.UntilTokenImpl + * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUntilToken() * @generated */ - EClass UP_TO_TOKEN = eINSTANCE.getUpToToken(); + EClass UNTIL_TOKEN = eINSTANCE.getUntilToken(); /** * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.WildcardImpl <em>Wildcard</em>}' class. diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UpToTokenImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UntilTokenImpl.java index 7c0f7d3..4e92f0e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UpToTokenImpl.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UntilTokenImpl.java @@ -7,26 +7,26 @@ package org.eclipse.xtext.xtextTest.impl; import org.eclipse.emf.ecore.EClass; -import org.eclipse.xtext.xtextTest.UpToToken; +import org.eclipse.xtext.xtextTest.UntilToken; import org.eclipse.xtext.xtextTest.XtextTestPackage; /** * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Up To Token</b></em>'. + * An implementation of the model object '<em><b>Until Token</b></em>'. * <!-- end-user-doc --> * <p> * </p> * * @generated */ -public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken +public class UntilTokenImpl extends AbstractNegatedTokenImpl implements UntilToken { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected UpToTokenImpl() + protected UntilTokenImpl() { super(); } @@ -39,7 +39,7 @@ public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken @Override protected EClass eStaticClass() { - return XtextTestPackage.Literals.UP_TO_TOKEN; + return XtextTestPackage.Literals.UNTIL_TOKEN; } -} //UpToTokenImpl +} //UntilTokenImpl diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java index 7ac2d17..47c0c73 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java @@ -80,7 +80,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto case XtextTestPackage.ACTION: return createAction(); case XtextTestPackage.ABSTRACT_NEGATED_TOKEN: return createAbstractNegatedToken(); case XtextTestPackage.NEGATED_TOKEN: return createNegatedToken(); - case XtextTestPackage.UP_TO_TOKEN: return createUpToToken(); + case XtextTestPackage.UNTIL_TOKEN: return createUntilToken(); case XtextTestPackage.WILDCARD: return createWildcard(); case XtextTestPackage.CROSS_REFERENCE: return createCrossReference(); case XtextTestPackage.KEYWORD: return createKeyword(); @@ -241,10 +241,10 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * <!-- end-user-doc --> * @generated */ - public UpToToken createUpToToken() + public UntilToken createUntilToken() { - UpToTokenImpl upToToken = new UpToTokenImpl(); - return upToToken; + UntilTokenImpl untilToken = new UntilTokenImpl(); + return untilToken; } /** diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java index c492553..19085d2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java @@ -31,7 +31,7 @@ import org.eclipse.xtext.xtextTest.ReferencedMetamodel; import org.eclipse.xtext.xtextTest.RuleCall; import org.eclipse.xtext.xtextTest.TerminalRule; import org.eclipse.xtext.xtextTest.TypeRef; -import org.eclipse.xtext.xtextTest.UpToToken; +import org.eclipse.xtext.xtextTest.UntilToken; import org.eclipse.xtext.xtextTest.Wildcard; import org.eclipse.xtext.xtextTest.XtextTestFactory; import org.eclipse.xtext.xtextTest.XtextTestPackage; @@ -140,7 +140,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * <!-- end-user-doc --> * @generated */ - private EClass upToTokenEClass = null; + private EClass untilTokenEClass = null; /** * <!-- begin-user-doc --> @@ -636,9 +636,9 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * <!-- end-user-doc --> * @generated */ - public EClass getUpToToken() + public EClass getUntilToken() { - return upToTokenEClass; + return untilTokenEClass; } /** @@ -881,7 +881,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka negatedTokenEClass = createEClass(NEGATED_TOKEN); - upToTokenEClass = createEClass(UP_TO_TOKEN); + untilTokenEClass = createEClass(UNTIL_TOKEN); wildcardEClass = createEClass(WILDCARD); createEAttribute(wildcardEClass, WILDCARD__IS_WILDCARD); @@ -944,7 +944,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka actionEClass.getESuperTypes().add(this.getAbstractElement()); abstractNegatedTokenEClass.getESuperTypes().add(this.getAbstractElement()); negatedTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); - upToTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); + untilTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); wildcardEClass.getESuperTypes().add(this.getAbstractElement()); crossReferenceEClass.getESuperTypes().add(this.getAbstractElement()); keywordEClass.getESuperTypes().add(this.getAbstractElement()); @@ -1004,7 +1004,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka initEClass(negatedTokenEClass, NegatedToken.class, "NegatedToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(upToTokenEClass, UpToToken.class, "UpToToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(untilTokenEClass, UntilToken.class, "UntilToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(wildcardEClass, Wildcard.class, "Wildcard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getWildcard_IsWildcard(), ecorePackage.getEBoolean(), "isWildcard", null, 0, 1, Wildcard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java index b43d195..5bf51d0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java @@ -143,9 +143,9 @@ public class XtextTestAdapterFactory extends AdapterFactoryImpl return createNegatedTokenAdapter(); } @Override - public Adapter caseUpToToken(UpToToken object) + public Adapter caseUntilToken(UntilToken object) { - return createUpToTokenAdapter(); + return createUntilTokenAdapter(); } @Override public Adapter caseWildcard(Wildcard object) @@ -400,16 +400,16 @@ public class XtextTestAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtextTest.UpToToken <em>Up To Token</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtextTest.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.xtext.xtextTest.UpToToken + * @see org.eclipse.xtext.xtextTest.UntilToken * @generated */ - public Adapter createUpToTokenAdapter() + public Adapter createUntilTokenAdapter() { return null; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java index a3478ef..6296bed 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java @@ -195,12 +195,12 @@ public class XtextTestSwitch<T> if (result == null) result = defaultCase(theEObject); return result; } - case XtextTestPackage.UP_TO_TOKEN: + case XtextTestPackage.UNTIL_TOKEN: { - UpToToken upToToken = (UpToToken)theEObject; - T result = caseUpToToken(upToToken); - if (result == null) result = caseAbstractNegatedToken(upToToken); - if (result == null) result = caseAbstractElement(upToToken); + UntilToken untilToken = (UntilToken)theEObject; + T result = caseUntilToken(untilToken); + if (result == null) result = caseAbstractNegatedToken(untilToken); + if (result == null) result = caseAbstractElement(untilToken); if (result == null) result = defaultCase(theEObject); return result; } @@ -473,17 +473,17 @@ public class XtextTestSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * Returns the result of interpreting the object as an instance of '<em>Until Token</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * @return the result of interpreting the object as an instance of '<em>Until Token</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseUpToToken(UpToToken object) + public T caseUntilToken(UntilToken object) { return null; } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext index da294d8..6d06843 100755 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext @@ -92,14 +92,14 @@ TerminalTokenElement returns AbstractElement: ; AbstractNegatedToken: - NegatedToken | UpToToken + NegatedToken | UntilToken ; NegatedToken: '!' ^terminal=TerminalTokenElement ; -UpToToken: +UntilToken: '->' ^terminal=TerminalTokenElement ; diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext index 5fe188a..531290e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext @@ -92,14 +92,14 @@ TerminalTokenElement returns AbstractElement: ; AbstractNegatedToken: - NegatedToken | UpToToken + NegatedToken | UntilToken ; NegatedToken: '!' ^terminal=TerminalTokenElement ; -UpToToken: +UntilToken: '->' ^terminal=TerminalTokenElement ; diff --git a/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF_gen b/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF_gen index 3f71167..5836d92 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF_gen +++ b/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.ui.common.tests Bundle-SymbolicName: org.eclipse.xtext.ui.common.tests Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.xtextTest, org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts, org.eclipse.xtext.parser.keywords.keywordsTestLanguage, diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.java index 951ad71..8ce0d09 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.java @@ -339,9 +339,9 @@ public class GenXtextGrammarTestLanguageProposals extends AbstractJavaProposalPr return Collections.emptyList(); } - public List<? extends ICompletionProposal> completeUpToToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) { + public List<? extends ICompletionProposal> completeUntilToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) { if (logger.isDebugEnabled()) { - logger.debug("completeUpToToken_Terminal feature '" + assignment.getFeature() + "' terminal '" + logger.debug("completeUntilToken_Terminal feature '" + assignment.getFeature() + "' terminal '" + assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '" + contentAssistContext.getMatchString().trim() + "'"); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext index cb4b336..85f5f62 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext @@ -17,12 +17,6 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_metamodel(TypeRef this): - allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_metamodel(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - List[IScopedElement] scope_rule(CrossReference this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); @@ -35,16 +29,16 @@ List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): List[IScopedElement] scope_ePackage(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_type(TypeRef this): - allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_metamodel(TypeRef this): + allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_type(emf::EObject this) : +List[IScopedElement] scope_metamodel(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(RuleCall this): +List[IScopedElement] scope_hiddenTokens(ParserRule this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_hiddenTokens(Grammar this): @@ -53,15 +47,21 @@ List[IScopedElement] scope_hiddenTokens(Grammar this): List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(ParserRule this): +List[IScopedElement] scope_usedGrammars(Grammar this): + allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_usedGrammars(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_rule(RuleCall this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(Grammar this): - allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_type(TypeRef this): + allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(emf::EObject this) : +List[IScopedElement] scope_type(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore index fccae78..bfd7e20 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore @@ -73,7 +73,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="terminal" eType="//AbstractElement" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NegatedToken" eSuperTypes="//AbstractNegatedToken"/> - <eClassifiers xsi:type="ecore:EClass" name="UpToToken" eSuperTypes="//AbstractNegatedToken"/> + <eClassifiers xsi:type="ecore:EClass" name="UntilToken" eSuperTypes="//AbstractNegatedToken"/> <eClassifiers xsi:type="ecore:EClass" name="Wildcard" eSuperTypes="//AbstractElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isWildcard"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel index e1a82c9..7cf9bcd 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel @@ -114,7 +114,7 @@ <ecoreClass href="XtextGrammarTestLanguage.ecore#//NegatedToken"/> </genClasses> <genClasses> - <ecoreClass href="XtextGrammarTestLanguage.ecore#//UpToToken"/> + <ecoreClass href="XtextGrammarTestLanguage.ecore#//UntilToken"/> </genClasses> <genClasses> <ecoreClass href="XtextGrammarTestLanguage.ecore#//Wildcard"/> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi index 0d15e1a..650382e 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi @@ -512,9 +512,9 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="UpToToken"> + <rules xsi:type="xtext:ParserRule" name="UntilToken"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UpToToken"/> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UntilToken"/> </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="->"/> @@ -769,7 +769,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageUiModule.java index 5568998..bd0598d 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageUiModule.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageUiModule.java @@ -10,5 +10,5 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule; * Manual modifications go to {org.eclipse.xtext.grammarinheritance.AbstractTestLanguageUiModule} */ public abstract class AbstractAbstractTestLanguageUiModule extends DefaultUIModule { - + } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi index 59194fd..f4ff702 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi @@ -283,7 +283,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java index 3a15fea..0d24b65 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java @@ -42,7 +42,7 @@ public class XtextGrammarTestLanguageParsetreeConstructor extends AbstractParseT if(inst.isInstanceOf(grammarAccess.prTerminalTokenElement().getRule().getType().getType()) && (s = new TerminalTokenElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prAbstractNegatedToken().getRule().getType().getType()) && (s = new AbstractNegatedToken_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prNegatedToken().getRule().getType().getType()) && (s = new NegatedToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType()) && (s = new UpToToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType()) && (s = new UntilToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prWildcard().getRule().getType().getType()) && (s = new Wildcard_Assignment_isWildcard(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCharacterRange().getRule().getType().getType()) && (s = new CharacterRange_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCrossReference().getRule().getType().getType()) && (s = new CrossReference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; @@ -4356,7 +4356,7 @@ protected class AbstractNegatedToken_Alternatives extends AlternativesToken { @Override protected Solution createSolution() { - AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UpToToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); + AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UntilToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -4386,22 +4386,22 @@ protected class AbstractNegatedToken_0_RuleCall_NegatedToken extends RuleCallTok } // not supported -protected class AbstractNegatedToken_1_RuleCall_UpToToken extends RuleCallToken { +protected class AbstractNegatedToken_1_RuleCall_UntilToken extends RuleCallToken { - public AbstractNegatedToken_1_RuleCall_UpToToken(IInstanceDescription curr, AbstractToken pred) { + public AbstractNegatedToken_1_RuleCall_UntilToken(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public RuleCall getGrammarElement() { - return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(); + return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(); } @Override protected Solution createSolution() { - if(checkForRecursion(UpToToken_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType())) return null; - return new UpToToken_Group(current, this).firstSolution(); + if(checkForRecursion(UntilToken_Group.class, current)) return null; + if(!current.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType())) return null; + return new UntilToken_Group(current, this).firstSolution(); } } @@ -4495,7 +4495,7 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { /************ end Rule NegatedToken ****************/ -/************ begin Rule UpToToken **************** +/************ begin Rule UntilToken **************** * * not supported * @@ -4503,22 +4503,22 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { // not supported -protected class UpToToken_Group extends GroupToken { +protected class UntilToken_Group extends GroupToken { - public UpToToken_Group(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_Group(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Group getGrammarElement() { - return grammarAccess.prUpToToken().eleGroup(); + return grammarAccess.prUntilToken().eleGroup(); } @Override protected Solution createSolution() { - Solution s1 = new UpToToken_1_Assignment_terminal(current, this).firstSolution(); + Solution s1 = new UntilToken_1_Assignment_terminal(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new UpToToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new UntilToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 == null) { s1 = s1.getPredecessor().nextSolution(this,s1); if(s1 == null) return null; @@ -4533,27 +4533,27 @@ protected class UpToToken_Group extends GroupToken { } // not supported -protected class UpToToken_0_Keyword extends KeywordToken { +protected class UntilToken_0_Keyword extends KeywordToken { - public UpToToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public Keyword getGrammarElement() { - return grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(); + return grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(); } } // not supported -protected class UpToToken_1_Assignment_terminal extends AssignmentToken { +protected class UntilToken_1_Assignment_terminal extends AssignmentToken { - public UpToToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Assignment getGrammarElement() { - return grammarAccess.prUpToToken().ele1AssignmentTerminal(); + return grammarAccess.prUntilToken().ele1AssignmentTerminal(); } @Override @@ -4578,7 +4578,7 @@ protected class UpToToken_1_Assignment_terminal extends AssignmentToken { } -/************ end Rule UpToToken ****************/ +/************ end Rule UntilToken ****************/ /************ begin Rule Wildcard **************** diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g index 9ff392e..595034c 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g @@ -1733,16 +1733,16 @@ ruleAbstractNegatedToken returns [EObject current=null] | { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); } - this_UpToToken_1=ruleUpToToken + this_UntilToken_1=ruleUntilToken { - $current = $this_UpToToken_1.current; + $current = $this_UntilToken_1.current; currentNode = currentNode.getParent(); } { - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } ); @@ -1796,16 +1796,16 @@ ruleNegatedToken returns [EObject current=null] -// Entry rule entryRuleUpToToken -entryRuleUpToToken returns [EObject current=null] : - { currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); } - iv_ruleUpToToken=ruleUpToToken - { $current=$iv_ruleUpToToken.current; } +// Entry rule entryRuleUntilToken +entryRuleUntilToken returns [EObject current=null] : + { currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); } + iv_ruleUntilToken=ruleUntilToken + { $current=$iv_ruleUntilToken.current; } EOF ; -// Rule UpToToken -ruleUpToToken returns [EObject current=null] +// Rule UntilToken +ruleUntilToken returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); @@ -1813,18 +1813,18 @@ ruleUpToToken returns [EObject current=null] }: ('->' { - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); } ( { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); } lv_terminal_1=ruleTerminalTokenElement { if ($current==null) { - $current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + $current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), $current); } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index 3c9f46d..7ef9365 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -4097,22 +4097,22 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleAbstractNegatedToken - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ; + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ; public final EObject ruleAbstractNegatedToken() throws RecognitionException { EObject current = null; EObject this_NegatedToken_0 = null; - EObject this_UpToToken_1 = null; + EObject this_UntilToken_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ) - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) { - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) int alt42=2; int LA42_0 = input.LA(1); @@ -4124,7 +4124,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } else { NoViableAltException nvae = - new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )", 42, 0, input); + new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken )", 42, 0, input); throw nvae; } @@ -4150,21 +4150,21 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UpToToken_1= ruleUpToToken + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UntilToken_1= ruleUntilToken { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899); - this_UpToToken_1=ruleUpToToken(); + pushFollow(FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899); + this_UntilToken_1=ruleUntilToken(); _fsp--; - current = this_UpToToken_1; + current = this_UntilToken_1; currentNode = currentNode.getParent(); - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } @@ -4295,25 +4295,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR end ruleNegatedToken - // $ANTLR start entryRuleUpToToken - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUpToToken returns [EObject current=null] : iv_ruleUpToToken= ruleUpToToken EOF ; - public final EObject entryRuleUpToToken() throws RecognitionException { + // $ANTLR start entryRuleUntilToken + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUntilToken returns [EObject current=null] : iv_ruleUntilToken= ruleUntilToken EOF ; + public final EObject entryRuleUntilToken() throws RecognitionException { EObject current = null; - EObject iv_ruleUpToToken = null; + EObject iv_ruleUntilToken = null; try { - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:51: (iv_ruleUpToToken= ruleUpToToken EOF ) - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUpToToken= ruleUpToToken EOF + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:52: (iv_ruleUntilToken= ruleUntilToken EOF ) + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUntilToken= ruleUntilToken EOF { - currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053); - iv_ruleUpToToken=ruleUpToToken(); + currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); + pushFollow(FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053); + iv_ruleUntilToken=ruleUntilToken(); _fsp--; - current =iv_ruleUpToToken; - match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4063); + current =iv_ruleUntilToken; + match(input,EOF,FOLLOW_EOF_in_entryRuleUntilToken4063); } @@ -4327,12 +4327,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } return current; } - // $ANTLR end entryRuleUpToToken + // $ANTLR end entryRuleUntilToken - // $ANTLR start ruleUpToToken - // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUpToToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; - public final EObject ruleUpToToken() throws RecognitionException { + // $ANTLR start ruleUntilToken + // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUntilToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; + public final EObject ruleUntilToken() throws RecognitionException { EObject current = null; EObject lv_terminal_1 = null; @@ -4347,23 +4347,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:2: '->' (lv_terminal_1= ruleTerminalTokenElement ) { - match(input,37,FOLLOW_37_in_ruleUpToToken4097); + match(input,37,FOLLOW_37_in_ruleUntilToken4097); - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1818:1: (lv_terminal_1= ruleTerminalTokenElement ) // ../org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1821:6: lv_terminal_1= ruleTerminalTokenElement { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); - pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131); + pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131); lv_terminal_1=ruleTerminalTokenElement(); _fsp--; if (current==null) { - current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -4396,7 +4396,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } return current; } - // $ANTLR end ruleUpToToken + // $ANTLR end ruleUntilToken // $ANTLR start entryRuleWildcard @@ -5324,15 +5324,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3808 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3818 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3865 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3938 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3948 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_36_in_ruleNegatedToken3982 = new BitSet(new long[]{0x0000003000028030L}); public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4016 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4063 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_37_in_ruleUpToToken4097 = new BitSet(new long[]{0x0000003000028030L}); - public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUntilToken4063 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_37_in_ruleUntilToken4097 = new BitSet(new long[]{0x0000003000028030L}); + public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4168 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4178 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_17_in_ruleWildcard4223 = new BitSet(new long[]{0x0000000000000002L}); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi index ee7dc56..a9cde63 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi @@ -174,7 +174,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java index b6baeaf..10d4c4a 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java @@ -30,7 +30,7 @@ import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstra import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageTerminalTokenElementConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstractNegatedTokenConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageNegatedTokenConsumer; -import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageUpToTokenConsumer; +import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageUntilTokenConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageWildcardConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageCharacterRangeConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageCrossReferenceConsumer; @@ -70,7 +70,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC private XtextGrammarTestLanguageTerminalTokenElementConsumer terminalTokenElementConsumer; private XtextGrammarTestLanguageAbstractNegatedTokenConsumer abstractNegatedTokenConsumer; private XtextGrammarTestLanguageNegatedTokenConsumer negatedTokenConsumer; - private XtextGrammarTestLanguageUpToTokenConsumer upToTokenConsumer; + private XtextGrammarTestLanguageUntilTokenConsumer untilTokenConsumer; private XtextGrammarTestLanguageWildcardConsumer wildcardConsumer; private XtextGrammarTestLanguageCharacterRangeConsumer characterRangeConsumer; private XtextGrammarTestLanguageCrossReferenceConsumer crossReferenceConsumer; @@ -156,7 +156,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC negatedTokenConsumer = new XtextGrammarTestLanguageNegatedTokenConsumer( this, null ); - upToTokenConsumer = new XtextGrammarTestLanguageUpToTokenConsumer( + untilTokenConsumer = new XtextGrammarTestLanguageUntilTokenConsumer( this, null ); wildcardConsumer = new XtextGrammarTestLanguageWildcardConsumer( @@ -210,7 +210,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getTerminalTokenElementConsumer().setRule(grammarAccess.prTerminalTokenElement()); getAbstractNegatedTokenConsumer().setRule(grammarAccess.prAbstractNegatedToken()); getNegatedTokenConsumer().setRule(grammarAccess.prNegatedToken()); - getUpToTokenConsumer().setRule(grammarAccess.prUpToToken()); + getUntilTokenConsumer().setRule(grammarAccess.prUntilToken()); getWildcardConsumer().setRule(grammarAccess.prWildcard()); getCharacterRangeConsumer().setRule(grammarAccess.prCharacterRange()); getCrossReferenceConsumer().setRule(grammarAccess.prCrossReference()); @@ -288,11 +288,11 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getTerminalTokenElementConsumer().setWildcardConsumer(getWildcardConsumer()); getAbstractNegatedTokenConsumer().setNegatedTokenConsumer(getNegatedTokenConsumer()); - getAbstractNegatedTokenConsumer().setUpToTokenConsumer(getUpToTokenConsumer()); + getAbstractNegatedTokenConsumer().setUntilTokenConsumer(getUntilTokenConsumer()); getNegatedTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); - getUpToTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); + getUntilTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); getCharacterRangeConsumer().setKeywordConsumer(getKeywordConsumer()); @@ -368,7 +368,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getActionConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getActionConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter); getNegatedTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); - getUpToTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); + getUntilTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getWildcardConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getCharacterRangeConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getCrossReferenceConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter); @@ -471,8 +471,8 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC return negatedTokenConsumer; } - public XtextGrammarTestLanguageUpToTokenConsumer getUpToTokenConsumer() { - return upToTokenConsumer; + public XtextGrammarTestLanguageUntilTokenConsumer getUntilTokenConsumer() { + return untilTokenConsumer; } public XtextGrammarTestLanguageWildcardConsumer getWildcardConsumer() { diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java index 633b406..f6b3975 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java @@ -23,7 +23,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends private INonTerminalConsumer negatedTokenConsumer; - private INonTerminalConsumer upToTokenConsumer; + private INonTerminalConsumer untilTokenConsumer; private IElementConsumer alternatives$1$Consumer; @@ -64,7 +64,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends @Override protected int doConsume(boolean optional) throws Exception { - return consumeNonTerminal(upToTokenConsumer, null, false, false, false, getElement(), optional); + return consumeNonTerminal(untilTokenConsumer, null, false, false, false, getElement(), optional); } } @@ -86,7 +86,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends alternatives$1$Consumer = new Alternatives$1$Consumer(rule.eleAlternatives()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallNegatedToken()); - ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUpToToken()); + ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUntilToken()); } @Override @@ -103,8 +103,8 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends this.negatedTokenConsumer = negatedTokenConsumer; } - public void setUpToTokenConsumer(INonTerminalConsumer upToTokenConsumer) { - this.upToTokenConsumer = upToTokenConsumer; + public void setUntilTokenConsumer(INonTerminalConsumer untilTokenConsumer) { + this.untilTokenConsumer = untilTokenConsumer; } } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUntilTokenConsumer.java index bab1844..9164f7e 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUntilTokenConsumer.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UpToTokenElements; +import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UntilTokenElements; -public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminalConsumer { +public final class XtextGrammarTestLanguageUntilTokenConsumer extends NonTerminalConsumer { - private UpToTokenElements rule; + private UntilTokenElements rule; private INonTerminalConsumer terminalTokenElementConsumer; @@ -85,7 +85,7 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal } } - public XtextGrammarTestLanguageUpToTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + public XtextGrammarTestLanguageUntilTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } @@ -95,11 +95,11 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal return group$1$Consumer.consume(); } - public UpToTokenElements getRule() { + public UntilTokenElements getRule() { return rule; } - public void setRule(UpToTokenElements rule) { + public void setRule(UntilTokenElements rule) { this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index edafebd..a2d5c1f 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -1022,7 +1022,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AbstractNegatedToken"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final RuleCall c0ParserRuleCallNegatedToken = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall c1ParserRuleCallUpToToken = (RuleCall)cAlternatives.eContents().get(1); + private final RuleCall c1ParserRuleCallUntilToken = (RuleCall)cAlternatives.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -1034,7 +1034,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele0ParserRuleCallNegatedToken() { return c0ParserRuleCallNegatedToken; } // not supported - public RuleCall ele1ParserRuleCallUpToToken() { return c1ParserRuleCallUpToToken; } + public RuleCall ele1ParserRuleCallUntilToken() { return c1ParserRuleCallUntilToken; } } public class NegatedTokenElements implements IParserRuleAccess { @@ -1060,8 +1060,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele10ParserRuleCallTerminalTokenElement() { return c10ParserRuleCallTerminalTokenElement; } } - public class UpToTokenElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UpToToken"); + public class UntilTokenElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UntilToken"); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordHyphenMinusGreaterThanSign = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentTerminal = (Assignment)cGroup.eContents().get(1); @@ -1293,7 +1293,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private TerminalTokenElementElements pTerminalTokenElement; private AbstractNegatedTokenElements pAbstractNegatedToken; private NegatedTokenElements pNegatedToken; - private UpToTokenElements pUpToToken; + private UntilTokenElements pUntilToken; private WildcardElements pWildcard; private CharacterRangeElements pCharacterRange; private CrossReferenceElements pCrossReference; @@ -1429,8 +1429,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { } // not supported - public UpToTokenElements prUpToToken() { - return (pUpToToken != null) ? pUpToToken : (pUpToToken = new UpToTokenElements()); + public UntilTokenElements prUntilToken() { + return (pUntilToken != null) ? pUntilToken : (pUntilToken = new UntilTokenElements()); } // not supported diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi index 0125541..e4c6be0 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi @@ -230,7 +230,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext index ba1f41a..7948696 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext @@ -16,12 +16,6 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_vater(Familie this): - allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_vater(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - List[IScopedElement] scope_mutter(Familie this): allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); @@ -34,3 +28,9 @@ List[IScopedElement] scope_kinder(Familie this): List[IScopedElement] scope_kinder(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_vater(Familie this): + allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_vater(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index 43af58e..be5fba5 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -345,7 +345,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi index a6a10f9..e54cdc2 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi @@ -189,7 +189,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi index 90d402c..cf13b87 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi @@ -182,7 +182,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java new file mode 100644 index 0000000..a987a84 --- a/dev/null +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java @@ -0,0 +1,21 @@ +/** + * <copyright> + * </copyright> + * + */ +package org.eclipse.xtext.xtextTest; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Until Token</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUntilToken() + * @model + * @generated + */ +public interface UntilToken extends AbstractNegatedToken +{ +} // UntilToken diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java deleted file mode 100644 index 5a6a55b..0000000 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java +++ b/dev/null @@ -1,21 +0,0 @@ -/** - * <copyright> - * </copyright> - * - */ -package org.eclipse.xtext.xtextTest; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Up To Token</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUpToToken() - * @model - * @generated - */ -public interface UpToToken extends AbstractNegatedToken -{ -} // UpToToken diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java index 9851590..3bf207c 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java @@ -143,13 +143,13 @@ public interface XtextTestFactory extends EFactory NegatedToken createNegatedToken(); /** - * Returns a new object of class '<em>Up To Token</em>'. + * Returns a new object of class '<em>Until Token</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Up To Token</em>'. + * @return a new object of class '<em>Until Token</em>'. * @generated */ - UpToToken createUpToToken(); + UntilToken createUntilToken(); /** * Returns a new object of class '<em>Wildcard</em>'. diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java index ce7d723..f8a678e 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java @@ -658,14 +658,14 @@ public interface XtextTestPackage extends EPackage int NEGATED_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.xtextTest.impl.UpToTokenImpl - * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUpToToken() + * @see org.eclipse.xtext.xtextTest.impl.UntilTokenImpl + * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUntilToken() * @generated */ - int UP_TO_TOKEN = 13; + int UNTIL_TOKEN = 13; /** * The feature id for the '<em><b>Cardinality</b></em>' attribute. @@ -674,7 +674,7 @@ public interface XtextTestPackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; + int UNTIL_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; /** * The feature id for the '<em><b>Terminal</b></em>' containment reference. @@ -683,16 +683,16 @@ public interface XtextTestPackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; + int UNTIL_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; /** - * The number of structural features of the '<em>Up To Token</em>' class. + * The number of structural features of the '<em>Until Token</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int UP_TO_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; + int UNTIL_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.WildcardImpl <em>Wildcard</em>}' class. @@ -1367,14 +1367,14 @@ public interface XtextTestPackage extends EPackage EClass getNegatedToken(); /** - * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.UpToToken <em>Up To Token</em>}'. + * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Up To Token</em>'. - * @see org.eclipse.xtext.xtextTest.UpToToken + * @return the meta object for class '<em>Until Token</em>'. + * @see org.eclipse.xtext.xtextTest.UntilToken * @generated */ - EClass getUpToToken(); + EClass getUntilToken(); /** * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.Wildcard <em>Wildcard</em>}'. @@ -1891,14 +1891,14 @@ public interface XtextTestPackage extends EPackage EClass NEGATED_TOKEN = eINSTANCE.getNegatedToken(); /** - * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.xtextTest.impl.UpToTokenImpl - * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUpToToken() + * @see org.eclipse.xtext.xtextTest.impl.UntilTokenImpl + * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUntilToken() * @generated */ - EClass UP_TO_TOKEN = eINSTANCE.getUpToToken(); + EClass UNTIL_TOKEN = eINSTANCE.getUntilToken(); /** * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.WildcardImpl <em>Wildcard</em>}' class. diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UpToTokenImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UntilTokenImpl.java index 7c0f7d3..4e92f0e 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UpToTokenImpl.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UntilTokenImpl.java @@ -7,26 +7,26 @@ package org.eclipse.xtext.xtextTest.impl; import org.eclipse.emf.ecore.EClass; -import org.eclipse.xtext.xtextTest.UpToToken; +import org.eclipse.xtext.xtextTest.UntilToken; import org.eclipse.xtext.xtextTest.XtextTestPackage; /** * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Up To Token</b></em>'. + * An implementation of the model object '<em><b>Until Token</b></em>'. * <!-- end-user-doc --> * <p> * </p> * * @generated */ -public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken +public class UntilTokenImpl extends AbstractNegatedTokenImpl implements UntilToken { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected UpToTokenImpl() + protected UntilTokenImpl() { super(); } @@ -39,7 +39,7 @@ public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken @Override protected EClass eStaticClass() { - return XtextTestPackage.Literals.UP_TO_TOKEN; + return XtextTestPackage.Literals.UNTIL_TOKEN; } -} //UpToTokenImpl +} //UntilTokenImpl diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java index 7ac2d17..47c0c73 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java @@ -80,7 +80,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto case XtextTestPackage.ACTION: return createAction(); case XtextTestPackage.ABSTRACT_NEGATED_TOKEN: return createAbstractNegatedToken(); case XtextTestPackage.NEGATED_TOKEN: return createNegatedToken(); - case XtextTestPackage.UP_TO_TOKEN: return createUpToToken(); + case XtextTestPackage.UNTIL_TOKEN: return createUntilToken(); case XtextTestPackage.WILDCARD: return createWildcard(); case XtextTestPackage.CROSS_REFERENCE: return createCrossReference(); case XtextTestPackage.KEYWORD: return createKeyword(); @@ -241,10 +241,10 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * <!-- end-user-doc --> * @generated */ - public UpToToken createUpToToken() + public UntilToken createUntilToken() { - UpToTokenImpl upToToken = new UpToTokenImpl(); - return upToToken; + UntilTokenImpl untilToken = new UntilTokenImpl(); + return untilToken; } /** diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java index c492553..19085d2 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java @@ -31,7 +31,7 @@ import org.eclipse.xtext.xtextTest.ReferencedMetamodel; import org.eclipse.xtext.xtextTest.RuleCall; import org.eclipse.xtext.xtextTest.TerminalRule; import org.eclipse.xtext.xtextTest.TypeRef; -import org.eclipse.xtext.xtextTest.UpToToken; +import org.eclipse.xtext.xtextTest.UntilToken; import org.eclipse.xtext.xtextTest.Wildcard; import org.eclipse.xtext.xtextTest.XtextTestFactory; import org.eclipse.xtext.xtextTest.XtextTestPackage; @@ -140,7 +140,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * <!-- end-user-doc --> * @generated */ - private EClass upToTokenEClass = null; + private EClass untilTokenEClass = null; /** * <!-- begin-user-doc --> @@ -636,9 +636,9 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * <!-- end-user-doc --> * @generated */ - public EClass getUpToToken() + public EClass getUntilToken() { - return upToTokenEClass; + return untilTokenEClass; } /** @@ -881,7 +881,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka negatedTokenEClass = createEClass(NEGATED_TOKEN); - upToTokenEClass = createEClass(UP_TO_TOKEN); + untilTokenEClass = createEClass(UNTIL_TOKEN); wildcardEClass = createEClass(WILDCARD); createEAttribute(wildcardEClass, WILDCARD__IS_WILDCARD); @@ -944,7 +944,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka actionEClass.getESuperTypes().add(this.getAbstractElement()); abstractNegatedTokenEClass.getESuperTypes().add(this.getAbstractElement()); negatedTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); - upToTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); + untilTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); wildcardEClass.getESuperTypes().add(this.getAbstractElement()); crossReferenceEClass.getESuperTypes().add(this.getAbstractElement()); keywordEClass.getESuperTypes().add(this.getAbstractElement()); @@ -1004,7 +1004,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka initEClass(negatedTokenEClass, NegatedToken.class, "NegatedToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(upToTokenEClass, UpToToken.class, "UpToToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(untilTokenEClass, UntilToken.class, "UntilToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(wildcardEClass, Wildcard.class, "Wildcard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getWildcard_IsWildcard(), ecorePackage.getEBoolean(), "isWildcard", null, 0, 1, Wildcard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java index b43d195..5bf51d0 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java @@ -143,9 +143,9 @@ public class XtextTestAdapterFactory extends AdapterFactoryImpl return createNegatedTokenAdapter(); } @Override - public Adapter caseUpToToken(UpToToken object) + public Adapter caseUntilToken(UntilToken object) { - return createUpToTokenAdapter(); + return createUntilTokenAdapter(); } @Override public Adapter caseWildcard(Wildcard object) @@ -400,16 +400,16 @@ public class XtextTestAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtextTest.UpToToken <em>Up To Token</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtextTest.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.xtext.xtextTest.UpToToken + * @see org.eclipse.xtext.xtextTest.UntilToken * @generated */ - public Adapter createUpToTokenAdapter() + public Adapter createUntilTokenAdapter() { return null; } diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java index a3478ef..6296bed 100644 --- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java +++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java @@ -195,12 +195,12 @@ public class XtextTestSwitch<T> if (result == null) result = defaultCase(theEObject); return result; } - case XtextTestPackage.UP_TO_TOKEN: + case XtextTestPackage.UNTIL_TOKEN: { - UpToToken upToToken = (UpToToken)theEObject; - T result = caseUpToToken(upToToken); - if (result == null) result = caseAbstractNegatedToken(upToToken); - if (result == null) result = caseAbstractElement(upToToken); + UntilToken untilToken = (UntilToken)theEObject; + T result = caseUntilToken(untilToken); + if (result == null) result = caseAbstractNegatedToken(untilToken); + if (result == null) result = caseAbstractElement(untilToken); if (result == null) result = defaultCase(theEObject); return result; } @@ -473,17 +473,17 @@ public class XtextTestSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * Returns the result of interpreting the object as an instance of '<em>Until Token</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * @return the result of interpreting the object as an instance of '<em>Until Token</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseUpToToken(UpToToken object) + public T caseUntilToken(UntilToken object) { return null; } diff --git a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF_gen b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF_gen index 8a044e6..2209aec 100644 --- a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF_gen +++ b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.ui.integration.tests Bundle-SymbolicName: org.eclipse.xtext.ui.integration.tests Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.ui.integration.foo Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi index 202f862..12050a1 100644 --- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi @@ -170,7 +170,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF_gen b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF_gen index c491f5d..bdf171e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF_gen +++ b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF_gen @@ -4,6 +4,7 @@ Bundle-Name: org.eclipse.xtext.xtend.tests Bundle-SymbolicName: org.eclipse.xtext.xtend.tests Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.xtextTest, org.eclipse.xtext.parser.keywords.keywordsTestLanguage, org.eclipse.xtext.testlanguages.contentAssistTestLanguage, diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext index 1d1ae86..ccd89e3 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext @@ -229,8 +229,8 @@ List[ICompletionProposal] completeNegatedToken_Terminal(Assignment assignment, I + contentAssistContext.matchString.trim() + "'") -> {}; -List[ICompletionProposal] completeUpToToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) : - debug("completeUpToToken_Terminal feature '" + assignment.feature + "' terminal '" +List[ICompletionProposal] completeUntilToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) : + debug("completeUntilToken_Terminal feature '" + assignment.feature + "' terminal '" + assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '" + contentAssistContext.matchString.trim() + "'") -> {}; diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext index c4df9ec..bdbf5ce 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext @@ -17,16 +17,16 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_hiddenTokens(Grammar this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_usedGrammars(Grammar this): + allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_usedGrammars(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(RuleCall this): +List[IScopedElement] scope_hiddenTokens(ParserRule this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): @@ -35,22 +35,22 @@ List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): List[IScopedElement] scope_ePackage(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(ParserRule this): +List[IScopedElement] scope_rule(RuleCall this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(CrossReference this): +List[IScopedElement] scope_hiddenTokens(Grammar this): allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_rule(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(Grammar this): - allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_rule(CrossReference this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_usedGrammars(emf::EObject this) : +List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_type(TypeRef this): diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore index fccae78..bfd7e20 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore @@ -73,7 +73,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="terminal" eType="//AbstractElement" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NegatedToken" eSuperTypes="//AbstractNegatedToken"/> - <eClassifiers xsi:type="ecore:EClass" name="UpToToken" eSuperTypes="//AbstractNegatedToken"/> + <eClassifiers xsi:type="ecore:EClass" name="UntilToken" eSuperTypes="//AbstractNegatedToken"/> <eClassifiers xsi:type="ecore:EClass" name="Wildcard" eSuperTypes="//AbstractElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isWildcard"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel index 9171da5..4700f65 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel @@ -114,7 +114,7 @@ <ecoreClass href="XtextGrammarTestLanguage.ecore#//NegatedToken"/> </genClasses> <genClasses> - <ecoreClass href="XtextGrammarTestLanguage.ecore#//UpToToken"/> + <ecoreClass href="XtextGrammarTestLanguage.ecore#//UntilToken"/> </genClasses> <genClasses> <ecoreClass href="XtextGrammarTestLanguage.ecore#//Wildcard"/> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi index 0d15e1a..650382e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi @@ -512,9 +512,9 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="UpToToken"> + <rules xsi:type="xtext:ParserRule" name="UntilToken"> <type metamodel="/0/@metamodelDeclarations.0"> - <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UpToToken"/> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UntilToken"/> </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="->"/> @@ -769,7 +769,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java index 3a15fea..0d24b65 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java @@ -42,7 +42,7 @@ public class XtextGrammarTestLanguageParsetreeConstructor extends AbstractParseT if(inst.isInstanceOf(grammarAccess.prTerminalTokenElement().getRule().getType().getType()) && (s = new TerminalTokenElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prAbstractNegatedToken().getRule().getType().getType()) && (s = new AbstractNegatedToken_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prNegatedToken().getRule().getType().getType()) && (s = new NegatedToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; - if(inst.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType()) && (s = new UpToToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType()) && (s = new UntilToken_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prWildcard().getRule().getType().getType()) && (s = new Wildcard_Assignment_isWildcard(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCharacterRange().getRule().getType().getType()) && (s = new CharacterRange_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf(grammarAccess.prCrossReference().getRule().getType().getType()) && (s = new CrossReference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; @@ -4356,7 +4356,7 @@ protected class AbstractNegatedToken_Alternatives extends AlternativesToken { @Override protected Solution createSolution() { - AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UpToToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); + AbstractToken t = (first) ? new AbstractNegatedToken_1_RuleCall_UntilToken(current, this) : new AbstractNegatedToken_0_RuleCall_NegatedToken(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -4386,22 +4386,22 @@ protected class AbstractNegatedToken_0_RuleCall_NegatedToken extends RuleCallTok } // not supported -protected class AbstractNegatedToken_1_RuleCall_UpToToken extends RuleCallToken { +protected class AbstractNegatedToken_1_RuleCall_UntilToken extends RuleCallToken { - public AbstractNegatedToken_1_RuleCall_UpToToken(IInstanceDescription curr, AbstractToken pred) { + public AbstractNegatedToken_1_RuleCall_UntilToken(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public RuleCall getGrammarElement() { - return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(); + return grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(); } @Override protected Solution createSolution() { - if(checkForRecursion(UpToToken_Group.class, current)) return null; - if(!current.isInstanceOf(grammarAccess.prUpToToken().getRule().getType().getType())) return null; - return new UpToToken_Group(current, this).firstSolution(); + if(checkForRecursion(UntilToken_Group.class, current)) return null; + if(!current.isInstanceOf(grammarAccess.prUntilToken().getRule().getType().getType())) return null; + return new UntilToken_Group(current, this).firstSolution(); } } @@ -4495,7 +4495,7 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { /************ end Rule NegatedToken ****************/ -/************ begin Rule UpToToken **************** +/************ begin Rule UntilToken **************** * * not supported * @@ -4503,22 +4503,22 @@ protected class NegatedToken_1_Assignment_terminal extends AssignmentToken { // not supported -protected class UpToToken_Group extends GroupToken { +protected class UntilToken_Group extends GroupToken { - public UpToToken_Group(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_Group(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Group getGrammarElement() { - return grammarAccess.prUpToToken().eleGroup(); + return grammarAccess.prUntilToken().eleGroup(); } @Override protected Solution createSolution() { - Solution s1 = new UpToToken_1_Assignment_terminal(current, this).firstSolution(); + Solution s1 = new UntilToken_1_Assignment_terminal(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new UpToToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new UntilToken_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 == null) { s1 = s1.getPredecessor().nextSolution(this,s1); if(s1 == null) return null; @@ -4533,27 +4533,27 @@ protected class UpToToken_Group extends GroupToken { } // not supported -protected class UpToToken_0_Keyword extends KeywordToken { +protected class UntilToken_0_Keyword extends KeywordToken { - public UpToToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_0_Keyword(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public Keyword getGrammarElement() { - return grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(); + return grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(); } } // not supported -protected class UpToToken_1_Assignment_terminal extends AssignmentToken { +protected class UntilToken_1_Assignment_terminal extends AssignmentToken { - public UpToToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { + public UntilToken_1_Assignment_terminal(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } @Override public Assignment getGrammarElement() { - return grammarAccess.prUpToToken().ele1AssignmentTerminal(); + return grammarAccess.prUntilToken().ele1AssignmentTerminal(); } @Override @@ -4578,7 +4578,7 @@ protected class UpToToken_1_Assignment_terminal extends AssignmentToken { } -/************ end Rule UpToToken ****************/ +/************ end Rule UntilToken ****************/ /************ begin Rule Wildcard **************** diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g index 9ff392e..595034c 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g @@ -1733,16 +1733,16 @@ ruleAbstractNegatedToken returns [EObject current=null] | { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); } - this_UpToToken_1=ruleUpToToken + this_UntilToken_1=ruleUntilToken { - $current = $this_UpToToken_1.current; + $current = $this_UntilToken_1.current; currentNode = currentNode.getParent(); } { - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } ); @@ -1796,16 +1796,16 @@ ruleNegatedToken returns [EObject current=null] -// Entry rule entryRuleUpToToken -entryRuleUpToToken returns [EObject current=null] : - { currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); } - iv_ruleUpToToken=ruleUpToToken - { $current=$iv_ruleUpToToken.current; } +// Entry rule entryRuleUntilToken +entryRuleUntilToken returns [EObject current=null] : + { currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); } + iv_ruleUntilToken=ruleUntilToken + { $current=$iv_ruleUntilToken.current; } EOF ; -// Rule UpToToken -ruleUpToToken returns [EObject current=null] +// Rule UntilToken +ruleUntilToken returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); @@ -1813,18 +1813,18 @@ ruleUpToToken returns [EObject current=null] }: ('->' { - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); } ( { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); } lv_terminal_1=ruleTerminalTokenElement { if ($current==null) { - $current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + $current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), $current); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index 8ea1de9..c3301aa 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -4097,22 +4097,22 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleAbstractNegatedToken - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ; + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ; public final EObject ruleAbstractNegatedToken() throws RecognitionException { EObject current = null; EObject this_NegatedToken_0 = null; - EObject this_UpToToken_1 = null; + EObject this_UntilToken_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ) - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) { - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken ) int alt42=2; int LA42_0 = input.LA(1); @@ -4124,7 +4124,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } else { NoViableAltException nvae = - new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )", 42, 0, input); + new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UntilToken_1= ruleUntilToken )", 42, 0, input); throw nvae; } @@ -4150,21 +4150,21 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UpToToken_1= ruleUpToToken + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UntilToken_1= ruleUntilToken { - currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode); + currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899); - this_UpToToken_1=ruleUpToToken(); + pushFollow(FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899); + this_UntilToken_1=ruleUntilToken(); _fsp--; - current = this_UpToToken_1; + current = this_UntilToken_1; currentNode = currentNode.getParent(); - createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), null); + createLeafNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUntilToken(), null); } @@ -4295,25 +4295,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR end ruleNegatedToken - // $ANTLR start entryRuleUpToToken - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUpToToken returns [EObject current=null] : iv_ruleUpToToken= ruleUpToToken EOF ; - public final EObject entryRuleUpToToken() throws RecognitionException { + // $ANTLR start entryRuleUntilToken + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUntilToken returns [EObject current=null] : iv_ruleUntilToken= ruleUntilToken EOF ; + public final EObject entryRuleUntilToken() throws RecognitionException { EObject current = null; - EObject iv_ruleUpToToken = null; + EObject iv_ruleUntilToken = null; try { - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:51: (iv_ruleUpToToken= ruleUpToToken EOF ) - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUpToToken= ruleUpToToken EOF + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:52: (iv_ruleUntilToken= ruleUntilToken EOF ) + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUntilToken= ruleUntilToken EOF { - currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode); - pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053); - iv_ruleUpToToken=ruleUpToToken(); + currentNode = createCompositeNode(grammarAccess.prUntilToken().getRule(), currentNode); + pushFollow(FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053); + iv_ruleUntilToken=ruleUntilToken(); _fsp--; - current =iv_ruleUpToToken; - match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4063); + current =iv_ruleUntilToken; + match(input,EOF,FOLLOW_EOF_in_entryRuleUntilToken4063); } @@ -4327,12 +4327,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } return current; } - // $ANTLR end entryRuleUpToToken + // $ANTLR end entryRuleUntilToken - // $ANTLR start ruleUpToToken - // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUpToToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; - public final EObject ruleUpToToken() throws RecognitionException { + // $ANTLR start ruleUntilToken + // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUntilToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ; + public final EObject ruleUntilToken() throws RecognitionException { EObject current = null; EObject lv_terminal_1 = null; @@ -4347,23 +4347,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:2: '->' (lv_terminal_1= ruleTerminalTokenElement ) { - match(input,37,FOLLOW_37_in_ruleUpToToken4097); + match(input,37,FOLLOW_37_in_ruleUntilToken4097); - createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null); + createLeafNode(grammarAccess.prUntilToken().ele0KeywordHyphenMinusGreaterThanSign(), null); // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1818:1: (lv_terminal_1= ruleTerminalTokenElement ) // ../org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1821:6: lv_terminal_1= ruleTerminalTokenElement { - currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); + currentNode=createCompositeNode(grammarAccess.prUntilToken().ele10ParserRuleCallTerminalTokenElement(), currentNode); - pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131); + pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131); lv_terminal_1=ruleTerminalTokenElement(); _fsp--; if (current==null) { - current = factory.create(grammarAccess.prUpToToken().getRule().getType().getType()); + current = factory.create(grammarAccess.prUntilToken().getRule().getType().getType()); associateNodeWithAstElement(currentNode.getParent(), current); } @@ -4396,7 +4396,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } return current; } - // $ANTLR end ruleUpToToken + // $ANTLR end ruleUntilToken // $ANTLR start entryRuleWildcard @@ -5324,15 +5324,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3808 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3818 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3865 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3938 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3948 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_36_in_ruleNegatedToken3982 = new BitSet(new long[]{0x0000003000028030L}); public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4016 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4063 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_37_in_ruleUpToToken4097 = new BitSet(new long[]{0x0000003000028030L}); - public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUntilToken_in_entryRuleUntilToken4053 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUntilToken4063 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_37_in_ruleUntilToken4097 = new BitSet(new long[]{0x0000003000028030L}); + public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUntilToken4131 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4168 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4178 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_17_in_ruleWildcard4223 = new BitSet(new long[]{0x0000000000000002L}); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi index ee7dc56..a9cde63 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi @@ -174,7 +174,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java index b6baeaf..10d4c4a 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java @@ -30,7 +30,7 @@ import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstra import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageTerminalTokenElementConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstractNegatedTokenConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageNegatedTokenConsumer; -import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageUpToTokenConsumer; +import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageUntilTokenConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageWildcardConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageCharacterRangeConsumer; import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageCrossReferenceConsumer; @@ -70,7 +70,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC private XtextGrammarTestLanguageTerminalTokenElementConsumer terminalTokenElementConsumer; private XtextGrammarTestLanguageAbstractNegatedTokenConsumer abstractNegatedTokenConsumer; private XtextGrammarTestLanguageNegatedTokenConsumer negatedTokenConsumer; - private XtextGrammarTestLanguageUpToTokenConsumer upToTokenConsumer; + private XtextGrammarTestLanguageUntilTokenConsumer untilTokenConsumer; private XtextGrammarTestLanguageWildcardConsumer wildcardConsumer; private XtextGrammarTestLanguageCharacterRangeConsumer characterRangeConsumer; private XtextGrammarTestLanguageCrossReferenceConsumer crossReferenceConsumer; @@ -156,7 +156,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC negatedTokenConsumer = new XtextGrammarTestLanguageNegatedTokenConsumer( this, null ); - upToTokenConsumer = new XtextGrammarTestLanguageUpToTokenConsumer( + untilTokenConsumer = new XtextGrammarTestLanguageUntilTokenConsumer( this, null ); wildcardConsumer = new XtextGrammarTestLanguageWildcardConsumer( @@ -210,7 +210,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getTerminalTokenElementConsumer().setRule(grammarAccess.prTerminalTokenElement()); getAbstractNegatedTokenConsumer().setRule(grammarAccess.prAbstractNegatedToken()); getNegatedTokenConsumer().setRule(grammarAccess.prNegatedToken()); - getUpToTokenConsumer().setRule(grammarAccess.prUpToToken()); + getUntilTokenConsumer().setRule(grammarAccess.prUntilToken()); getWildcardConsumer().setRule(grammarAccess.prWildcard()); getCharacterRangeConsumer().setRule(grammarAccess.prCharacterRange()); getCrossReferenceConsumer().setRule(grammarAccess.prCrossReference()); @@ -288,11 +288,11 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getTerminalTokenElementConsumer().setWildcardConsumer(getWildcardConsumer()); getAbstractNegatedTokenConsumer().setNegatedTokenConsumer(getNegatedTokenConsumer()); - getAbstractNegatedTokenConsumer().setUpToTokenConsumer(getUpToTokenConsumer()); + getAbstractNegatedTokenConsumer().setUntilTokenConsumer(getUntilTokenConsumer()); getNegatedTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); - getUpToTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); + getUntilTokenConsumer().setTerminalTokenElementConsumer(getTerminalTokenElementConsumer()); getCharacterRangeConsumer().setKeywordConsumer(getKeywordConsumer()); @@ -368,7 +368,7 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC getActionConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getActionConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter); getNegatedTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); - getUpToTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); + getUntilTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getWildcardConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getCharacterRangeConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter); getCrossReferenceConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter); @@ -471,8 +471,8 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC return negatedTokenConsumer; } - public XtextGrammarTestLanguageUpToTokenConsumer getUpToTokenConsumer() { - return upToTokenConsumer; + public XtextGrammarTestLanguageUntilTokenConsumer getUntilTokenConsumer() { + return untilTokenConsumer; } public XtextGrammarTestLanguageWildcardConsumer getWildcardConsumer() { diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java index 633b406..f6b3975 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java @@ -23,7 +23,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends private INonTerminalConsumer negatedTokenConsumer; - private INonTerminalConsumer upToTokenConsumer; + private INonTerminalConsumer untilTokenConsumer; private IElementConsumer alternatives$1$Consumer; @@ -64,7 +64,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends @Override protected int doConsume(boolean optional) throws Exception { - return consumeNonTerminal(upToTokenConsumer, null, false, false, false, getElement(), optional); + return consumeNonTerminal(untilTokenConsumer, null, false, false, false, getElement(), optional); } } @@ -86,7 +86,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends alternatives$1$Consumer = new Alternatives$1$Consumer(rule.eleAlternatives()); ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallNegatedToken()); - ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUpToToken()); + ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallUntilToken()); } @Override @@ -103,8 +103,8 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends this.negatedTokenConsumer = negatedTokenConsumer; } - public void setUpToTokenConsumer(INonTerminalConsumer upToTokenConsumer) { - this.upToTokenConsumer = upToTokenConsumer; + public void setUntilTokenConsumer(INonTerminalConsumer untilTokenConsumer) { + this.untilTokenConsumer = untilTokenConsumer; } } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUntilTokenConsumer.java index bab1844..9164f7e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUntilTokenConsumer.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UpToTokenElements; +import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UntilTokenElements; -public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminalConsumer { +public final class XtextGrammarTestLanguageUntilTokenConsumer extends NonTerminalConsumer { - private UpToTokenElements rule; + private UntilTokenElements rule; private INonTerminalConsumer terminalTokenElementConsumer; @@ -85,7 +85,7 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal } } - public XtextGrammarTestLanguageUpToTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + public XtextGrammarTestLanguageUntilTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } @@ -95,11 +95,11 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal return group$1$Consumer.consume(); } - public UpToTokenElements getRule() { + public UntilTokenElements getRule() { return rule; } - public void setRule(UpToTokenElements rule) { + public void setRule(UntilTokenElements rule) { this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index edafebd..a2d5c1f 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -1022,7 +1022,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AbstractNegatedToken"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final RuleCall c0ParserRuleCallNegatedToken = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall c1ParserRuleCallUpToToken = (RuleCall)cAlternatives.eContents().get(1); + private final RuleCall c1ParserRuleCallUntilToken = (RuleCall)cAlternatives.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -1034,7 +1034,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele0ParserRuleCallNegatedToken() { return c0ParserRuleCallNegatedToken; } // not supported - public RuleCall ele1ParserRuleCallUpToToken() { return c1ParserRuleCallUpToToken; } + public RuleCall ele1ParserRuleCallUntilToken() { return c1ParserRuleCallUntilToken; } } public class NegatedTokenElements implements IParserRuleAccess { @@ -1060,8 +1060,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { public RuleCall ele10ParserRuleCallTerminalTokenElement() { return c10ParserRuleCallTerminalTokenElement; } } - public class UpToTokenElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UpToToken"); + public class UntilTokenElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UntilToken"); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordHyphenMinusGreaterThanSign = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentTerminal = (Assignment)cGroup.eContents().get(1); @@ -1293,7 +1293,7 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { private TerminalTokenElementElements pTerminalTokenElement; private AbstractNegatedTokenElements pAbstractNegatedToken; private NegatedTokenElements pNegatedToken; - private UpToTokenElements pUpToToken; + private UntilTokenElements pUntilToken; private WildcardElements pWildcard; private CharacterRangeElements pCharacterRange; private CrossReferenceElements pCrossReference; @@ -1429,8 +1429,8 @@ public class XtextGrammarTestLanguageGrammarAccess implements IGrammarAccess { } // not supported - public UpToTokenElements prUpToToken() { - return (pUpToToken != null) ? pUpToToken : (pUpToToken = new UpToTokenElements()); + public UntilTokenElements prUntilToken() { + return (pUntilToken != null) ? pUntilToken : (pUntilToken = new UntilTokenElements()); } // not supported diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi index 0125541..e4c6be0 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi @@ -230,7 +230,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext index efbcf20..ba1f41a 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext @@ -16,12 +16,6 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_kinder(Familie this): - allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_kinder(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - List[IScopedElement] scope_vater(Familie this): allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); @@ -34,3 +28,9 @@ List[IScopedElement] scope_mutter(Familie this): List[IScopedElement] scope_mutter(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_kinder(Familie this): + allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_kinder(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index 43af58e..be5fba5 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -345,7 +345,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi index a6a10f9..e54cdc2 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi @@ -189,7 +189,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="/*"/> - <abstractTokens xsi:type="xtext:UpToToken"> + <abstractTokens xsi:type="xtext:UntilToken"> <terminal xsi:type="xtext:Keyword" value="*/"/> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java new file mode 100644 index 0000000..a987a84 --- a/dev/null +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/UntilToken.java @@ -0,0 +1,21 @@ +/** + * <copyright> + * </copyright> + * + */ +package org.eclipse.xtext.xtextTest; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Until Token</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUntilToken() + * @model + * @generated + */ +public interface UntilToken extends AbstractNegatedToken +{ +} // UntilToken diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java deleted file mode 100644 index 5a6a55b..0000000 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/UpToToken.java +++ b/dev/null @@ -1,21 +0,0 @@ -/** - * <copyright> - * </copyright> - * - */ -package org.eclipse.xtext.xtextTest; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Up To Token</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUpToToken() - * @model - * @generated - */ -public interface UpToToken extends AbstractNegatedToken -{ -} // UpToToken diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java index 9851590..3bf207c 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestFactory.java @@ -143,13 +143,13 @@ public interface XtextTestFactory extends EFactory NegatedToken createNegatedToken(); /** - * Returns a new object of class '<em>Up To Token</em>'. + * Returns a new object of class '<em>Until Token</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Up To Token</em>'. + * @return a new object of class '<em>Until Token</em>'. * @generated */ - UpToToken createUpToToken(); + UntilToken createUntilToken(); /** * Returns a new object of class '<em>Wildcard</em>'. diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java index ce7d723..f8a678e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java @@ -658,14 +658,14 @@ public interface XtextTestPackage extends EPackage int NEGATED_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.xtextTest.impl.UpToTokenImpl - * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUpToToken() + * @see org.eclipse.xtext.xtextTest.impl.UntilTokenImpl + * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUntilToken() * @generated */ - int UP_TO_TOKEN = 13; + int UNTIL_TOKEN = 13; /** * The feature id for the '<em><b>Cardinality</b></em>' attribute. @@ -674,7 +674,7 @@ public interface XtextTestPackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; + int UNTIL_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY; /** * The feature id for the '<em><b>Terminal</b></em>' containment reference. @@ -683,16 +683,16 @@ public interface XtextTestPackage extends EPackage * @generated * @ordered */ - int UP_TO_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; + int UNTIL_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL; /** - * The number of structural features of the '<em>Up To Token</em>' class. + * The number of structural features of the '<em>Until Token</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int UP_TO_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; + int UNTIL_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.xtext.xtextTest.impl.WildcardImpl <em>Wildcard</em>}' class. @@ -1367,14 +1367,14 @@ public interface XtextTestPackage extends EPackage EClass getNegatedToken(); /** - * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.UpToToken <em>Up To Token</em>}'. + * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Up To Token</em>'. - * @see org.eclipse.xtext.xtextTest.UpToToken + * @return the meta object for class '<em>Until Token</em>'. + * @see org.eclipse.xtext.xtextTest.UntilToken * @generated */ - EClass getUpToToken(); + EClass getUntilToken(); /** * Returns the meta object for class '{@link org.eclipse.xtext.xtextTest.Wildcard <em>Wildcard</em>}'. @@ -1891,14 +1891,14 @@ public interface XtextTestPackage extends EPackage EClass NEGATED_TOKEN = eINSTANCE.getNegatedToken(); /** - * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class. + * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.UntilTokenImpl <em>Until Token</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xtext.xtextTest.impl.UpToTokenImpl - * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUpToToken() + * @see org.eclipse.xtext.xtextTest.impl.UntilTokenImpl + * @see org.eclipse.xtext.xtextTest.impl.XtextTestPackageImpl#getUntilToken() * @generated */ - EClass UP_TO_TOKEN = eINSTANCE.getUpToToken(); + EClass UNTIL_TOKEN = eINSTANCE.getUntilToken(); /** * The meta object literal for the '{@link org.eclipse.xtext.xtextTest.impl.WildcardImpl <em>Wildcard</em>}' class. diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UpToTokenImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UntilTokenImpl.java index 7c0f7d3..4e92f0e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UpToTokenImpl.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UntilTokenImpl.java @@ -7,26 +7,26 @@ package org.eclipse.xtext.xtextTest.impl; import org.eclipse.emf.ecore.EClass; -import org.eclipse.xtext.xtextTest.UpToToken; +import org.eclipse.xtext.xtextTest.UntilToken; import org.eclipse.xtext.xtextTest.XtextTestPackage; /** * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Up To Token</b></em>'. + * An implementation of the model object '<em><b>Until Token</b></em>'. * <!-- end-user-doc --> * <p> * </p> * * @generated */ -public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken +public class UntilTokenImpl extends AbstractNegatedTokenImpl implements UntilToken { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected UpToTokenImpl() + protected UntilTokenImpl() { super(); } @@ -39,7 +39,7 @@ public class UpToTokenImpl extends AbstractNegatedTokenImpl implements UpToToken @Override protected EClass eStaticClass() { - return XtextTestPackage.Literals.UP_TO_TOKEN; + return XtextTestPackage.Literals.UNTIL_TOKEN; } -} //UpToTokenImpl +} //UntilTokenImpl diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java index 7ac2d17..47c0c73 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java @@ -80,7 +80,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto case XtextTestPackage.ACTION: return createAction(); case XtextTestPackage.ABSTRACT_NEGATED_TOKEN: return createAbstractNegatedToken(); case XtextTestPackage.NEGATED_TOKEN: return createNegatedToken(); - case XtextTestPackage.UP_TO_TOKEN: return createUpToToken(); + case XtextTestPackage.UNTIL_TOKEN: return createUntilToken(); case XtextTestPackage.WILDCARD: return createWildcard(); case XtextTestPackage.CROSS_REFERENCE: return createCrossReference(); case XtextTestPackage.KEYWORD: return createKeyword(); @@ -241,10 +241,10 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * <!-- end-user-doc --> * @generated */ - public UpToToken createUpToToken() + public UntilToken createUntilToken() { - UpToTokenImpl upToToken = new UpToTokenImpl(); - return upToToken; + UntilTokenImpl untilToken = new UntilTokenImpl(); + return untilToken; } /** diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java index c492553..19085d2 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java @@ -31,7 +31,7 @@ import org.eclipse.xtext.xtextTest.ReferencedMetamodel; import org.eclipse.xtext.xtextTest.RuleCall; import org.eclipse.xtext.xtextTest.TerminalRule; import org.eclipse.xtext.xtextTest.TypeRef; -import org.eclipse.xtext.xtextTest.UpToToken; +import org.eclipse.xtext.xtextTest.UntilToken; import org.eclipse.xtext.xtextTest.Wildcard; import org.eclipse.xtext.xtextTest.XtextTestFactory; import org.eclipse.xtext.xtextTest.XtextTestPackage; @@ -140,7 +140,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * <!-- end-user-doc --> * @generated */ - private EClass upToTokenEClass = null; + private EClass untilTokenEClass = null; /** * <!-- begin-user-doc --> @@ -636,9 +636,9 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * <!-- end-user-doc --> * @generated */ - public EClass getUpToToken() + public EClass getUntilToken() { - return upToTokenEClass; + return untilTokenEClass; } /** @@ -881,7 +881,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka negatedTokenEClass = createEClass(NEGATED_TOKEN); - upToTokenEClass = createEClass(UP_TO_TOKEN); + untilTokenEClass = createEClass(UNTIL_TOKEN); wildcardEClass = createEClass(WILDCARD); createEAttribute(wildcardEClass, WILDCARD__IS_WILDCARD); @@ -944,7 +944,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka actionEClass.getESuperTypes().add(this.getAbstractElement()); abstractNegatedTokenEClass.getESuperTypes().add(this.getAbstractElement()); negatedTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); - upToTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); + untilTokenEClass.getESuperTypes().add(this.getAbstractNegatedToken()); wildcardEClass.getESuperTypes().add(this.getAbstractElement()); crossReferenceEClass.getESuperTypes().add(this.getAbstractElement()); keywordEClass.getESuperTypes().add(this.getAbstractElement()); @@ -1004,7 +1004,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka initEClass(negatedTokenEClass, NegatedToken.class, "NegatedToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(upToTokenEClass, UpToToken.class, "UpToToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(untilTokenEClass, UntilToken.class, "UntilToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(wildcardEClass, Wildcard.class, "Wildcard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getWildcard_IsWildcard(), ecorePackage.getEBoolean(), "isWildcard", null, 0, 1, Wildcard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java index b43d195..5bf51d0 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestAdapterFactory.java @@ -143,9 +143,9 @@ public class XtextTestAdapterFactory extends AdapterFactoryImpl return createNegatedTokenAdapter(); } @Override - public Adapter caseUpToToken(UpToToken object) + public Adapter caseUntilToken(UntilToken object) { - return createUpToTokenAdapter(); + return createUntilTokenAdapter(); } @Override public Adapter caseWildcard(Wildcard object) @@ -400,16 +400,16 @@ public class XtextTestAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtextTest.UpToToken <em>Up To Token</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtextTest.UntilToken <em>Until Token</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.xtext.xtextTest.UpToToken + * @see org.eclipse.xtext.xtextTest.UntilToken * @generated */ - public Adapter createUpToTokenAdapter() + public Adapter createUntilTokenAdapter() { return null; } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java index a3478ef..6296bed 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/util/XtextTestSwitch.java @@ -195,12 +195,12 @@ public class XtextTestSwitch<T> if (result == null) result = defaultCase(theEObject); return result; } - case XtextTestPackage.UP_TO_TOKEN: + case XtextTestPackage.UNTIL_TOKEN: { - UpToToken upToToken = (UpToToken)theEObject; - T result = caseUpToToken(upToToken); - if (result == null) result = caseAbstractNegatedToken(upToToken); - if (result == null) result = caseAbstractElement(upToToken); + UntilToken untilToken = (UntilToken)theEObject; + T result = caseUntilToken(untilToken); + if (result == null) result = caseAbstractNegatedToken(untilToken); + if (result == null) result = caseAbstractElement(untilToken); if (result == null) result = defaultCase(theEObject); return result; } @@ -473,17 +473,17 @@ public class XtextTestSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * Returns the result of interpreting the object as an instance of '<em>Until Token</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Up To Token</em>'. + * @return the result of interpreting the object as an instance of '<em>Until Token</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseUpToToken(UpToToken object) + public T caseUntilToken(UntilToken object) { return null; } |