aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-03-10 11:33:55 (EDT)
committersefftinge2009-03-10 11:33:55 (EDT)
commit20f132bfd2b5e063eadeb77e81666bb0b8f8b7db (patch)
treec274fe6b8daef38bbb8c0c0f9594c4d91a31674a
parentb2ed7a29b7f1f455acb93c3b7bb640578a9a4111 (diff)
downloadorg.eclipse.xtext-20f132bfd2b5e063eadeb77e81666bb0b8f8b7db.zip
org.eclipse.xtext-20f132bfd2b5e063eadeb77e81666bb0b8f8b7db.tar.gz
org.eclipse.xtext-20f132bfd2b5e063eadeb77e81666bb0b8f8b7db.tar.bz2
MergableManifest: Don't create lines that exceed 512bytes, because java.util.Manifest will throw an exception, some cosmetics
-rw-r--r--devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF1
-rw-r--r--devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF63
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java8
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF57
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java8
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens80
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java442
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java16
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF35
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF286
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java68
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext30
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext8
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF79
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF99
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext30
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext8
21 files changed, 680 insertions, 642 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF b/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF
index a4b89a3..ebcaa3b 100644
--- a/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF
+++ b/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.xtext.reference.ui.Activator
+
diff --git a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
index ef87432..a8d7160 100644
--- a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
+++ b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
@@ -1,32 +1,31 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Reference (Incubation)
-Bundle-SymbolicName: org.eclipse.xtext.reference;singleton:=true
-Bundle-Vendor: Eclipse.org
-Bundle-Version: 0.7.0.qualifier
-Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: ReferenceModel,
- ReferenceModel.util,
- org.eclipse.xtext.reference,
- org.eclipse.xtext.reference.parseTreeConstruction,
- org.eclipse.xtext.reference.parser.packrat,
- org.eclipse.xtext.reference.parser.packrat.consumers,
- org.eclipse.xtext.reference.referenceGrammar,
- org.eclipse.xtext.reference.referenceGrammar.util,
- org.eclipse.xtext.reference.services,
- org.eclipse.xtext.reference.parser.antlr
-Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",
- org.eclipse.xtext,
- org.eclipse.xtext.generator,
- de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.emf.mwe.core;bundle-version="0.7.0",
- org.eclipse.xtext.ui.generator,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.xtend,
- org.eclipse.xtend.typesystem.emf,
- org.antlr.runtime
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Reference (Incubation)
+Bundle-SymbolicName: org.eclipse.xtext.reference;singleton:=true
+Bundle-Vendor: Eclipse.org
+Bundle-Version: 0.7.0.qualifier
+Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: ReferenceModel,
+ ReferenceModel.util,
+ org.eclipse.xtext.reference,
+ org.eclipse.xtext.reference.parseTreeConstruction,
+ org.eclipse.xtext.reference.parser.packrat,
+ org.eclipse.xtext.reference.parser.packrat.consumers,
+ org.eclipse.xtext.reference.referenceGrammar,
+ org.eclipse.xtext.reference.referenceGrammar.util,
+ org.eclipse.xtext.reference.services,
+ org.eclipse.xtext.reference.parser.antlr
+Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ org.eclipse.xtext,
+ org.eclipse.xtext.generator,
+ de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF
index da4e7dd..9e4ffef 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF
@@ -15,4 +15,3 @@ Require-Bundle: org.eclipse.xtext.example.domainmodel,
org.eclipse.ui
Export-Package: org.eclipse.xtext.example
Bundle-Activator: org.eclipse.xtext.example.ui.internal.DomainmodelActivator
-
diff --git a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
index 1ef69d3..d9a7c4b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -31,4 +31,3 @@ Export-Package: org.eclipse.xtext.example,
org.eclipse.xtext.example.parser.packrat.consumers,
org.eclipse.xtext.example.services,
xtext.example
-
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF
index df19bb6..96033df 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Bundle-Vendor: mycompany.com
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.xtext.example.EcoreDslActivator
+
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
index 2a870f7..b7adfe3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule;
public abstract class AbstractEcoreDslUiModule extends DefaultUIModule {
- public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
- return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
- }
-
public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
}
+ public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
+ return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
+ }
+
public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
return org.eclipse.xtext.example.EcoreDslProposals.class;
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
index 1c5151f..08da1c8 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
@@ -1,29 +1,28 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Ecore DSL Example (Incubation)
-Bundle-Vendor: Eclipse.org
-Bundle-Version: 0.7.0.qualifier
-Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl;singleton:=true
-Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator,
- org.eclipse.xtext.log4j;bundle-version="1.2.15",
- de.itemis.xtext.antlr;resolution:=optional,
- org.eclipse.emf.mwe.core;bundle-version="0.7.0",
- org.eclipse.xtend;bundle-version="0.7.0",
- org.eclipse.xtext.ui.generator,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.xtend.typesystem.emf,
- org.antlr.runtime
-Export-Package: org.eclipse.xtext.example,
- org.eclipse.xtext.example.ecoredsl,
- org.eclipse.xtext.example.parseTreeConstruction,
- org.eclipse.xtext.example.parser.antlr,
- org.eclipse.xtext.example.parser.packrat,
- org.eclipse.xtext.example.services,
- org.eclipse.xtext.example.parser.packrat.consumers
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Ecore DSL Example (Incubation)
+Bundle-Vendor: Eclipse.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl;singleton:=true
+Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ de.itemis.xtext.antlr;resolution:=optional,
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtend;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime
+Export-Package: org.eclipse.xtext.example,
+ org.eclipse.xtext.example.ecoredsl,
+ org.eclipse.xtext.example.parseTreeConstruction,
+ org.eclipse.xtext.example.parser.antlr,
+ org.eclipse.xtext.example.parser.packrat,
+ org.eclipse.xtext.example.services,
+ org.eclipse.xtext.example.parser.packrat.consumers
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java
index 9e4bf5f..b4dff54 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java
@@ -38,16 +38,16 @@ public abstract class AbstractEcoreDslRuntimeModule extends DefaultRuntimeModule
return org.eclipse.xtext.example.parser.antlr.internal.InternalEcoreDslLexer.class;
}
- public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
- return org.eclipse.xtext.example.parser.antlr.EcoreDslAntlrTokenFileProvider.class;
+ public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
+ return org.eclipse.xtext.example.parser.antlr.EcoreDslParser.class;
}
public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
}
- public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
- return org.eclipse.xtext.example.parser.antlr.EcoreDslParser.class;
+ public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
+ return org.eclipse.xtext.example.parser.antlr.EcoreDslAntlrTokenFileProvider.class;
}
public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens
index 859c0ae..c9bf247 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens
@@ -1,55 +1,55 @@
-RULE_BAG=7
+RULE_ML_COMMENT=12
RULE_ID=4
-RULE_STRING=5
-RULE_SERIALIZABLE=6
-RULE_RANDOM=8
-RULE_ANY_OTHER=15
-RULE_INT=10
RULE_WS=14
-RULE_SL_COMMENT=13
+RULE_INT=10
RULE_LOCAL=11
-RULE_ML_COMMENT=12
+RULE_STRING=5
+RULE_ANY_OTHER=15
+RULE_RANDOM=8
+RULE_SERIALIZABLE=6
+RULE_BAG=7
RULE_READONLY=9
-'enum'=48
+RULE_SL_COMMENT=13
+'<'=33
'..'=43
-'nsURI'=20
-'transient'=38
-'#'=47
-'class'=32
-'val'=45
-'throws'=53
+'interface'=31
'>'=34
-'datatype'=24
-'nsPrefix'=21
+'$'=55
+'val'=45
+'package'=19
+'-'=56
';'=18
-'volatile'=37
+'?'=49
+']'=44
+','=28
+'nsURI'=20
+'op'=51
+'ID'=36
+'ref'=46
'='=17
-'@'=26
+'['=42
+'volatile'=37
+'derived'=40
+'enum'=48
'unsettable'=39
-'.'=54
')'=29
+'random'=8
'super'=50
-'import'=16
-'$'=55
-'}'=23
-'op'=51
-'abstract'=30
-'extends'=35
+'datatype'=24
+'@'=26
'{'=22
-'bag'=7
-'package'=19
+'import'=16
'void'=52
-'?'=49
-'attr'=41
-'<'=33
-'ref'=46
'('=27
+'throws'=53
+'nsPrefix'=21
+'transient'=38
':'=25
-'-'=56
-'['=42
-'derived'=40
-','=28
-'random'=8
-']'=44
-'ID'=36
-'interface'=31
+'#'=47
+'attr'=41
+'.'=54
+'bag'=7
+'extends'=35
+'class'=32
+'}'=23
+'abstract'=30
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
index 64ad050..f4fe276 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
@@ -11,61 +11,61 @@ import java.util.List;
import java.util.ArrayList;
public class InternalEcoreDslLexer extends Lexer {
- public static final int RULE_ID=4;
- public static final int RULE_ANY_OTHER=15;
public static final int T29=29;
- public static final int T28=28;
- public static final int T27=27;
- public static final int T26=26;
- public static final int T25=25;
- public static final int EOF=-1;
- public static final int T24=24;
- public static final int T23=23;
- public static final int T22=22;
- public static final int T21=21;
- public static final int T20=20;
- public static final int RULE_INT=10;
- public static final int T38=38;
- public static final int T37=37;
- public static final int T39=39;
- public static final int T34=34;
- public static final int T33=33;
public static final int T36=36;
+ public static final int RULE_STRING=5;
public static final int T35=35;
- public static final int T30=30;
- public static final int RULE_LOCAL=11;
+ public static final int RULE_READONLY=9;
+ public static final int T45=45;
+ public static final int T20=20;
+ public static final int T34=34;
+ public static final int T25=25;
+ public static final int T18=18;
+ public static final int T37=37;
+ public static final int T26=26;
+ public static final int RULE_INT=10;
public static final int T32=32;
- public static final int T31=31;
+ public static final int T17=17;
+ public static final int T51=51;
public static final int RULE_SERIALIZABLE=6;
public static final int RULE_RANDOM=8;
- public static final int T49=49;
- public static final int T48=48;
- public static final int T43=43;
- public static final int Tokens=57;
- public static final int RULE_SL_COMMENT=13;
- public static final int T42=42;
- public static final int T41=41;
- public static final int T40=40;
- public static final int T47=47;
public static final int T46=46;
- public static final int T45=45;
- public static final int RULE_ML_COMMENT=12;
+ public static final int T16=16;
+ public static final int T38=38;
+ public static final int T41=41;
+ public static final int T24=24;
+ public static final int T19=19;
+ public static final int T39=39;
+ public static final int T21=21;
public static final int T44=44;
- public static final int RULE_READONLY=9;
- public static final int RULE_BAG=7;
- public static final int RULE_STRING=5;
+ public static final int T55=55;
+ public static final int RULE_ML_COMMENT=12;
+ public static final int RULE_ID=4;
+ public static final int T33=33;
+ public static final int T22=22;
public static final int T50=50;
- public static final int T52=52;
+ public static final int T43=43;
+ public static final int T23=23;
+ public static final int T28=28;
+ public static final int RULE_BAG=7;
+ public static final int T42=42;
+ public static final int T40=40;
+ public static final int T56=56;
public static final int RULE_WS=14;
- public static final int T51=51;
- public static final int T16=16;
+ public static final int T48=48;
public static final int T54=54;
- public static final int T17=17;
+ public static final int EOF=-1;
+ public static final int T47=47;
+ public static final int RULE_LOCAL=11;
+ public static final int Tokens=57;
public static final int T53=53;
- public static final int T18=18;
- public static final int T56=56;
- public static final int T19=19;
- public static final int T55=55;
+ public static final int RULE_ANY_OTHER=15;
+ public static final int T31=31;
+ public static final int T49=49;
+ public static final int RULE_SL_COMMENT=13;
+ public static final int T27=27;
+ public static final int T52=52;
+ public static final int T30=30;
public InternalEcoreDslLexer() {;}
public InternalEcoreDslLexer(CharStream input) {
super(input);
@@ -1443,27 +1443,45 @@ public class InternalEcoreDslLexer extends Lexer {
if ( (LA12_0=='i') ) {
switch ( input.LA(2) ) {
- case 'm':
+ case 'n':
{
int LA12_44 = input.LA(3);
- if ( (LA12_44=='p') ) {
+ if ( (LA12_44=='t') ) {
int LA12_93 = input.LA(4);
- if ( (LA12_93=='o') ) {
+ if ( (LA12_93=='e') ) {
int LA12_119 = input.LA(5);
if ( (LA12_119=='r') ) {
int LA12_143 = input.LA(6);
- if ( (LA12_143=='t') ) {
+ if ( (LA12_143=='f') ) {
int LA12_164 = input.LA(7);
- if ( ((LA12_164>='0' && LA12_164<='9')||(LA12_164>='A' && LA12_164<='Z')||LA12_164=='_'||(LA12_164>='a' && LA12_164<='z')) ) {
- alt12=47;
+ if ( (LA12_164=='a') ) {
+ int LA12_182 = input.LA(8);
+
+ if ( (LA12_182=='c') ) {
+ int LA12_196 = input.LA(9);
+
+ if ( (LA12_196=='e') ) {
+ int LA12_207 = input.LA(10);
+
+ if ( ((LA12_207>='0' && LA12_207<='9')||(LA12_207>='A' && LA12_207<='Z')||LA12_207=='_'||(LA12_207>='a' && LA12_207<='z')) ) {
+ alt12=47;
+ }
+ else {
+ alt12=16;}
+ }
+ else {
+ alt12=47;}
+ }
+ else {
+ alt12=47;}
}
else {
- alt12=1;}
+ alt12=47;}
}
else {
alt12=47;}
@@ -1478,45 +1496,27 @@ public class InternalEcoreDslLexer extends Lexer {
alt12=47;}
}
break;
- case 'n':
+ case 'm':
{
int LA12_45 = input.LA(3);
- if ( (LA12_45=='t') ) {
+ if ( (LA12_45=='p') ) {
int LA12_94 = input.LA(4);
- if ( (LA12_94=='e') ) {
+ if ( (LA12_94=='o') ) {
int LA12_120 = input.LA(5);
if ( (LA12_120=='r') ) {
int LA12_144 = input.LA(6);
- if ( (LA12_144=='f') ) {
+ if ( (LA12_144=='t') ) {
int LA12_165 = input.LA(7);
- if ( (LA12_165=='a') ) {
- int LA12_183 = input.LA(8);
-
- if ( (LA12_183=='c') ) {
- int LA12_196 = input.LA(9);
-
- if ( (LA12_196=='e') ) {
- int LA12_207 = input.LA(10);
-
- if ( ((LA12_207>='0' && LA12_207<='9')||(LA12_207>='A' && LA12_207<='Z')||LA12_207=='_'||(LA12_207>='a' && LA12_207<='z')) ) {
- alt12=47;
- }
- else {
- alt12=16;}
- }
- else {
- alt12=47;}
- }
- else {
- alt12=47;}
+ if ( ((LA12_165>='0' && LA12_165<='9')||(LA12_165>='A' && LA12_165<='Z')||LA12_165=='_'||(LA12_165>='a' && LA12_165<='z')) ) {
+ alt12=47;
}
else {
- alt12=47;}
+ alt12=1;}
}
else {
alt12=47;}
@@ -1591,20 +1591,43 @@ public class InternalEcoreDslLexer extends Lexer {
if ( (LA12_5=='s') ) {
switch ( input.LA(3) ) {
- case 'P':
+ case 'U':
{
int LA12_96 = input.LA(4);
- if ( (LA12_96=='r') ) {
+ if ( (LA12_96=='R') ) {
int LA12_122 = input.LA(5);
- if ( (LA12_122=='e') ) {
+ if ( (LA12_122=='I') ) {
int LA12_146 = input.LA(6);
- if ( (LA12_146=='f') ) {
- int LA12_167 = input.LA(7);
+ if ( ((LA12_146>='0' && LA12_146<='9')||(LA12_146>='A' && LA12_146<='Z')||LA12_146=='_'||(LA12_146>='a' && LA12_146<='z')) ) {
+ alt12=47;
+ }
+ else {
+ alt12=5;}
+ }
+ else {
+ alt12=47;}
+ }
+ else {
+ alt12=47;}
+ }
+ break;
+ case 'P':
+ {
+ int LA12_97 = input.LA(4);
- if ( (LA12_167=='i') ) {
+ if ( (LA12_97=='r') ) {
+ int LA12_123 = input.LA(5);
+
+ if ( (LA12_123=='e') ) {
+ int LA12_147 = input.LA(6);
+
+ if ( (LA12_147=='f') ) {
+ int LA12_168 = input.LA(7);
+
+ if ( (LA12_168=='i') ) {
int LA12_185 = input.LA(8);
if ( (LA12_185=='x') ) {
@@ -1632,29 +1655,6 @@ public class InternalEcoreDslLexer extends Lexer {
alt12=47;}
}
break;
- case 'U':
- {
- int LA12_97 = input.LA(4);
-
- if ( (LA12_97=='R') ) {
- int LA12_123 = input.LA(5);
-
- if ( (LA12_123=='I') ) {
- int LA12_147 = input.LA(6);
-
- if ( ((LA12_147>='0' && LA12_147<='9')||(LA12_147>='A' && LA12_147<='Z')||LA12_147=='_'||(LA12_147>='a' && LA12_147<='z')) ) {
- alt12=47;
- }
- else {
- alt12=5;}
- }
- else {
- alt12=47;}
- }
- else {
- alt12=47;}
- }
- break;
default:
alt12=47;}
@@ -1670,36 +1670,30 @@ public class InternalEcoreDslLexer extends Lexer {
}
else if ( (LA12_0=='d') ) {
switch ( input.LA(2) ) {
- case 'a':
+ case 'e':
{
int LA12_53 = input.LA(3);
- if ( (LA12_53=='t') ) {
+ if ( (LA12_53=='r') ) {
int LA12_98 = input.LA(4);
- if ( (LA12_98=='a') ) {
+ if ( (LA12_98=='i') ) {
int LA12_124 = input.LA(5);
- if ( (LA12_124=='t') ) {
+ if ( (LA12_124=='v') ) {
int LA12_148 = input.LA(6);
- if ( (LA12_148=='y') ) {
+ if ( (LA12_148=='e') ) {
int LA12_169 = input.LA(7);
- if ( (LA12_169=='p') ) {
+ if ( (LA12_169=='d') ) {
int LA12_186 = input.LA(8);
- if ( (LA12_186=='e') ) {
- int LA12_199 = input.LA(9);
-
- if ( ((LA12_199>='0' && LA12_199<='9')||(LA12_199>='A' && LA12_199<='Z')||LA12_199=='_'||(LA12_199>='a' && LA12_199<='z')) ) {
- alt12=47;
- }
- else {
- alt12=9;}
+ if ( ((LA12_186>='0' && LA12_186<='9')||(LA12_186>='A' && LA12_186<='Z')||LA12_186=='_'||(LA12_186>='a' && LA12_186<='z')) ) {
+ alt12=47;
}
else {
- alt12=47;}
+ alt12=25;}
}
else {
alt12=47;}
@@ -1717,30 +1711,36 @@ public class InternalEcoreDslLexer extends Lexer {
alt12=47;}
}
break;
- case 'e':
+ case 'a':
{
int LA12_54 = input.LA(3);
- if ( (LA12_54=='r') ) {
+ if ( (LA12_54=='t') ) {
int LA12_99 = input.LA(4);
- if ( (LA12_99=='i') ) {
+ if ( (LA12_99=='a') ) {
int LA12_125 = input.LA(5);
- if ( (LA12_125=='v') ) {
+ if ( (LA12_125=='t') ) {
int LA12_149 = input.LA(6);
- if ( (LA12_149=='e') ) {
+ if ( (LA12_149=='y') ) {
int LA12_170 = input.LA(7);
- if ( (LA12_170=='d') ) {
+ if ( (LA12_170=='p') ) {
int LA12_187 = input.LA(8);
- if ( ((LA12_187>='0' && LA12_187<='9')||(LA12_187>='A' && LA12_187<='Z')||LA12_187=='_'||(LA12_187>='a' && LA12_187<='z')) ) {
- alt12=47;
+ if ( (LA12_187=='e') ) {
+ int LA12_200 = input.LA(9);
+
+ if ( ((LA12_200>='0' && LA12_200<='9')||(LA12_200>='A' && LA12_200<='Z')||LA12_200=='_'||(LA12_200>='a' && LA12_200<='z')) ) {
+ alt12=47;
+ }
+ else {
+ alt12=9;}
}
else {
- alt12=25;}
+ alt12=47;}
}
else {
alt12=47;}
@@ -1894,20 +1894,43 @@ public class InternalEcoreDslLexer extends Lexer {
}
else if ( (LA12_0=='e') ) {
switch ( input.LA(2) ) {
- case 'x':
+ case 'n':
{
int LA12_65 = input.LA(3);
- if ( (LA12_65=='t') ) {
+ if ( (LA12_65=='u') ) {
int LA12_103 = input.LA(4);
- if ( (LA12_103=='e') ) {
+ if ( (LA12_103=='m') ) {
int LA12_129 = input.LA(5);
- if ( (LA12_129=='n') ) {
- int LA12_153 = input.LA(6);
+ if ( ((LA12_129>='0' && LA12_129<='9')||(LA12_129>='A' && LA12_129<='Z')||LA12_129=='_'||(LA12_129>='a' && LA12_129<='z')) ) {
+ alt12=47;
+ }
+ else {
+ alt12=33;}
+ }
+ else {
+ alt12=47;}
+ }
+ else {
+ alt12=47;}
+ }
+ break;
+ case 'x':
+ {
+ int LA12_66 = input.LA(3);
+
+ if ( (LA12_66=='t') ) {
+ int LA12_104 = input.LA(4);
+
+ if ( (LA12_104=='e') ) {
+ int LA12_130 = input.LA(5);
+
+ if ( (LA12_130=='n') ) {
+ int LA12_154 = input.LA(6);
- if ( (LA12_153=='d') ) {
+ if ( (LA12_154=='d') ) {
int LA12_173 = input.LA(7);
if ( (LA12_173=='s') ) {
@@ -1935,29 +1958,6 @@ public class InternalEcoreDslLexer extends Lexer {
alt12=47;}
}
break;
- case 'n':
- {
- int LA12_66 = input.LA(3);
-
- if ( (LA12_66=='u') ) {
- int LA12_104 = input.LA(4);
-
- if ( (LA12_104=='m') ) {
- int LA12_130 = input.LA(5);
-
- if ( ((LA12_130>='0' && LA12_130<='9')||(LA12_130>='A' && LA12_130<='Z')||LA12_130=='_'||(LA12_130>='a' && LA12_130<='z')) ) {
- alt12=47;
- }
- else {
- alt12=33;}
- }
- else {
- alt12=47;}
- }
- else {
- alt12=47;}
- }
- break;
default:
alt12=47;}
@@ -1982,34 +1982,17 @@ public class InternalEcoreDslLexer extends Lexer {
case 'o':
{
switch ( input.LA(3) ) {
- case 'i':
+ case 'l':
{
int LA12_106 = input.LA(4);
- if ( (LA12_106=='d') ) {
+ if ( (LA12_106=='a') ) {
int LA12_131 = input.LA(5);
- if ( ((LA12_131>='0' && LA12_131<='9')||(LA12_131>='A' && LA12_131<='Z')||LA12_131=='_'||(LA12_131>='a' && LA12_131<='z')) ) {
- alt12=47;
- }
- else {
- alt12=37;}
- }
- else {
- alt12=47;}
- }
- break;
- case 'l':
- {
- int LA12_107 = input.LA(4);
-
- if ( (LA12_107=='a') ) {
- int LA12_132 = input.LA(5);
-
- if ( (LA12_132=='t') ) {
- int LA12_156 = input.LA(6);
+ if ( (LA12_131=='t') ) {
+ int LA12_155 = input.LA(6);
- if ( (LA12_156=='i') ) {
+ if ( (LA12_155=='i') ) {
int LA12_174 = input.LA(7);
if ( (LA12_174=='l') ) {
@@ -2040,6 +2023,23 @@ public class InternalEcoreDslLexer extends Lexer {
alt12=47;}
}
break;
+ case 'i':
+ {
+ int LA12_107 = input.LA(4);
+
+ if ( (LA12_107=='d') ) {
+ int LA12_132 = input.LA(5);
+
+ if ( ((LA12_132>='0' && LA12_132<='9')||(LA12_132>='A' && LA12_132<='Z')||LA12_132=='_'||(LA12_132>='a' && LA12_132<='z')) ) {
+ alt12=47;
+ }
+ else {
+ alt12=37;}
+ }
+ else {
+ alt12=47;}
+ }
+ break;
default:
alt12=47;}
@@ -2240,11 +2240,11 @@ public class InternalEcoreDslLexer extends Lexer {
}
else if ( (LA12_0=='r') ) {
switch ( input.LA(2) ) {
- case 'e':
+ case 'a':
{
- switch ( input.LA(3) ) {
- case 'a':
- {
+ int LA12_77 = input.LA(3);
+
+ if ( (LA12_77=='n') ) {
int LA12_112 = input.LA(4);
if ( (LA12_112=='d') ) {
@@ -2253,26 +2253,14 @@ public class InternalEcoreDslLexer extends Lexer {
if ( (LA12_137=='o') ) {
int LA12_160 = input.LA(6);
- if ( (LA12_160=='n') ) {
+ if ( (LA12_160=='m') ) {
int LA12_178 = input.LA(7);
- if ( (LA12_178=='l') ) {
- int LA12_194 = input.LA(8);
-
- if ( (LA12_194=='y') ) {
- int LA12_206 = input.LA(9);
-
- if ( ((LA12_206>='0' && LA12_206<='9')||(LA12_206>='A' && LA12_206<='Z')||LA12_206=='_'||(LA12_206>='a' && LA12_206<='z')) ) {
- alt12=47;
- }
- else {
- alt12=44;}
- }
- else {
- alt12=47;}
+ if ( ((LA12_178>='0' && LA12_178<='9')||(LA12_178>='A' && LA12_178<='Z')||LA12_178=='_'||(LA12_178>='a' && LA12_178<='z')) ) {
+ alt12=47;
}
else {
- alt12=47;}
+ alt12=43;}
}
else {
alt12=47;}
@@ -2282,8 +2270,14 @@ public class InternalEcoreDslLexer extends Lexer {
}
else {
alt12=47;}
- }
- break;
+ }
+ else {
+ alt12=47;}
+ }
+ break;
+ case 'e':
+ {
+ switch ( input.LA(3) ) {
case 'f':
{
int LA12_113 = input.LA(4);
@@ -2295,16 +2289,8 @@ public class InternalEcoreDslLexer extends Lexer {
alt12=31;}
}
break;
- default:
- alt12=47;}
-
- }
- break;
- case 'a':
- {
- int LA12_78 = input.LA(3);
-
- if ( (LA12_78=='n') ) {
+ case 'a':
+ {
int LA12_114 = input.LA(4);
if ( (LA12_114=='d') ) {
@@ -2313,14 +2299,26 @@ public class InternalEcoreDslLexer extends Lexer {
if ( (LA12_139=='o') ) {
int LA12_161 = input.LA(6);
- if ( (LA12_161=='m') ) {
+ if ( (LA12_161=='n') ) {
int LA12_179 = input.LA(7);
- if ( ((LA12_179>='0' && LA12_179<='9')||(LA12_179>='A' && LA12_179<='Z')||LA12_179=='_'||(LA12_179>='a' && LA12_179<='z')) ) {
- alt12=47;
+ if ( (LA12_179=='l') ) {
+ int LA12_195 = input.LA(8);
+
+ if ( (LA12_195=='y') ) {
+ int LA12_206 = input.LA(9);
+
+ if ( ((LA12_206>='0' && LA12_206<='9')||(LA12_206>='A' && LA12_206<='Z')||LA12_206=='_'||(LA12_206>='a' && LA12_206<='z')) ) {
+ alt12=47;
+ }
+ else {
+ alt12=44;}
+ }
+ else {
+ alt12=47;}
}
else {
- alt12=43;}
+ alt12=47;}
}
else {
alt12=47;}
@@ -2330,9 +2328,11 @@ public class InternalEcoreDslLexer extends Lexer {
}
else {
alt12=47;}
- }
- else {
+ }
+ break;
+ default:
alt12=47;}
+
}
break;
default:
@@ -2497,14 +2497,14 @@ public class InternalEcoreDslLexer extends Lexer {
}
else if ( (LA12_0=='/') ) {
switch ( input.LA(2) ) {
- case '*':
+ case '/':
{
- alt12=50;
+ alt12=51;
}
break;
- case '/':
+ case '*':
{
- alt12=51;
+ alt12=50;
}
break;
default:
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
index 15176c3..10a8d03 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
@@ -25,19 +25,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_SERIALIZABLE", "RULE_BAG", "RULE_RANDOM", "RULE_READONLY", "RULE_INT", "RULE_LOCAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "'='", "';'", "'package'", "'nsURI'", "'nsPrefix'", "'{'", "'}'", "'datatype'", "':'", "'@'", "'('", "','", "')'", "'abstract'", "'interface'", "'class'", "'<'", "'>'", "'extends'", "'ID'", "'volatile'", "'transient'", "'unsettable'", "'derived'", "'attr'", "'['", "'..'", "']'", "'val'", "'ref'", "'#'", "'enum'", "'?'", "'super'", "'op'", "'void'", "'throws'", "'.'", "'$'", "'-'"
};
- public static final int RULE_BAG=7;
+ public static final int RULE_ML_COMMENT=12;
public static final int RULE_ID=4;
- public static final int RULE_STRING=5;
- public static final int RULE_SERIALIZABLE=6;
- public static final int RULE_RANDOM=8;
- public static final int RULE_ANY_OTHER=15;
- public static final int RULE_INT=10;
public static final int RULE_WS=14;
- public static final int RULE_SL_COMMENT=13;
+ public static final int RULE_INT=10;
public static final int EOF=-1;
public static final int RULE_LOCAL=11;
- public static final int RULE_ML_COMMENT=12;
+ public static final int RULE_STRING=5;
+ public static final int RULE_ANY_OTHER=15;
+ public static final int RULE_RANDOM=8;
+ public static final int RULE_SERIALIZABLE=6;
+ public static final int RULE_BAG=7;
public static final int RULE_READONLY=9;
+ public static final int RULE_SL_COMMENT=13;
public InternalEcoreDslParser(TokenStream input) {
super(input);
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
index f113ce7..70b687c 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
@@ -1,18 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext DSL Example UI (Incubation)
-Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui;singleton:=true
-Bundle-Vendor: Eclipse.org
-Bundle-Version: 0.7.0.qualifier
-Eclipse-RegisterBuddy: org.eclipse.xtext.log4j,org.eclipse.xtext.service.ui,org.eclipse.xtext.service
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.xtext.example
-Require-Bundle: org.eclipse.xtext.example.fowlerdsl,
- org.eclipse.xtext.ui.core,
- org.eclipse.xtext.ui.common,
- org.eclipse.xtext.xtend;bundle-version="0.7.0";resolution:=optional,
- org.eclipse.ui.editors,
- org.eclipse.ui
-Bundle-Activator: org.eclipse.xtext.example.FowlerDslActivator
-Bundle-ActivationPolicy: lazy
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext DSL Example UI (Incubation)
+Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui;singleton:=true
+Bundle-Vendor: Eclipse.org
+Bundle-Version: 0.7.0.qualifier
+Eclipse-RegisterBuddy: org.eclipse.xtext.log4j,org.eclipse.xtext.service.ui,org.eclipse.xtext.service
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.xtext.example
+Require-Bundle: org.eclipse.xtext.example.fowlerdsl,
+ org.eclipse.xtext.ui.core,
+ org.eclipse.xtext.ui.common,
+ org.eclipse.xtext.xtend;bundle-version="0.7.0";resolution:=optional,
+ org.eclipse.ui.editors,
+ org.eclipse.ui
+Bundle-Activator: org.eclipse.xtext.example.FowlerDslActivator
+Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
index 4b731c7..231c32e 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
@@ -29,4 +29,3 @@ Export-Package: org.eclipse.xtext.example,
org.eclipse.xtext.example.parser.packrat,
org.eclipse.xtext.example.parser.packrat.consumers,
org.eclipse.xtext.example.services
-
diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
index c792ac6..1b67afc 100644
--- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
@@ -1,143 +1,143 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Generator Tests (Incubation)
-Bundle-SymbolicName: org.eclipse.xtext.generator.tests;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator,
- org.junit,
- org.eclipse.emf.compare,
- org.eclipse.emf.compare.diff,
- org.eclipse.emf.compare.match,
- org.eclipse.xtext.log4j;bundle-version="1.2.15",
- org.eclipse.xtend,
- org.eclipse.xtend.typesystem.emf,
- org.eclipse.xtend.util.stdlib,
- de.itemis.xtext.antlr;resolution:=optional,
- org.easymock;bundle-version="2.3.0",
- org.eclipse.xtext.junit;bundle-version="0.7.0",
- org.eclipse.emf.mwe.utils;bundle-version="0.7.0",
- org.eclipse.emf.index;bundle-version="1.0.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime
-Bundle-ClassPath: lib/simple.jar,.
-Export-Package: org.eclipse.xtext,
- org.eclipse.xtext.grammarinheritance,
- org.eclipse.xtext.grammarinheritance.ametamodel,
- org.eclipse.xtext.parser.keywords,
- org.eclipse.xtext.testlanguages,
- org.eclipse.xtext.xtextTest,
- org.eclipse.xtext.parser.packrat,
- org.eclipse.xtext.parser.packrat.consumers,
- org.eclipse.xtext.parseTreeConstruction,
- org.eclipse.xtext.parser.antlr,
- org.eclipse.xtext.crossrefs,
- org.eclipse.xtext.crossrefs.importedURI,
- org.eclipse.xtext.crossrefs.parser.packrat,
- org.eclipse.xtext.crossrefs.parser.packrat.consumers,
- org.eclipse.xtext.crossrefs.parseTreeConstruction,
- org.eclipse.xtext.crossrefs.parser.antlr,
- org.eclipse.xtext.crossrefs.langATestLanguage,
- org.eclipse.xtext.dummy,
- org.eclipse.xtext.dummy.dummyLang,
- org.eclipse.xtext.dummy.parser.packrat,
- org.eclipse.xtext.dummy.parser.packrat.consumers,
- org.eclipse.xtext.dummy.parseTreeConstruction,
- org.eclipse.xtext.dummy.parser.antlr,
- org.eclipse.xtext.generator,
- org.eclipse.xtext.generator.lowerCaseNamedTestLanguage,
- org.eclipse.xtext.generator.parser.packrat,
- org.eclipse.xtext.generator.parser.packrat.consumers,
- org.eclipse.xtext.generator.parseTreeConstruction,
- org.eclipse.xtext.generator.parser.antlr,
- org.eclipse.xtext.grammarinheritance.parser.packrat,
- org.eclipse.xtext.grammarinheritance.parser.packrat.consumers,
- org.eclipse.xtext.grammarinheritance.parseTreeConstruction,
- org.eclipse.xtext.grammarinheritance.baseInheritanceTest,
- org.eclipse.xtext.grammarinheritance.parser.antlr,
- org.eclipse.xtext.grammarinheritance.foo,
- org.eclipse.xtext.grammarinheritance.inheritanceTest,
- org.eclipse.xtext.metamodelreferencing.tests,
- org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest,
- org.eclipse.xtext.metamodelreferencing.tests.parser.packrat,
- org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers,
- org.eclipse.xtext.metamodelreferencing.tests.parseTreeConstruction,
- org.eclipse.xtext.metamodelreferencing.tests.parser.antlr,
- org.eclipse.xtext.metamodelreferencing.tests.simpleTest,
- org.eclipse.xtext.metamodelreferencing.tests.otherTest,
- org.eclipse.xtext.parser.datatyperules,
- org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage,
- org.eclipse.xtext.parser.datatyperules.parser.packrat,
- org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers,
- org.eclipse.xtext.parser.datatyperules.parseTreeConstruction,
- org.eclipse.xtext.parser.datatyperules.parser.antlr,
- org.eclipse.xtext.parser.epatch,
- org.eclipse.xtext.parser.epatch.epatchTestLanguage,
- org.eclipse.xtext.parser.epatch.parser.packrat,
- org.eclipse.xtext.parser.epatch.parser.packrat.consumers,
- org.eclipse.xtext.parser.epatch.parseTreeConstruction,
- org.eclipse.xtext.parser.epatch.parser.antlr,
- org.eclipse.xtext.parser.keywords.keywordsTestLanguage,
- org.eclipse.xtext.parser.keywords.parser.packrat,
- org.eclipse.xtext.parser.keywords.parser.packrat.consumers,
- org.eclipse.xtext.parser.keywords.parseTreeConstruction,
- org.eclipse.xtext.parser.keywords.parser.antlr,
- org.eclipse.xtext.parser.terminalrules,
- org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage,
- org.eclipse.xtext.parser.terminalrules.parser.packrat,
- org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers,
- org.eclipse.xtext.parser.terminalrules.parseTreeConstruction,
- org.eclipse.xtext.parser.terminalrules.parser.antlr,
- org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage,
- org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage,
- org.eclipse.xtext.parsetree.formatter,
- org.eclipse.xtext.parsetree.formatter.formattertestlanguage,
- org.eclipse.xtext.parsetree.formatter.parser.packrat,
- org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers,
- org.eclipse.xtext.parsetree.formatter.parseTreeConstruction,
- org.eclipse.xtext.parsetree.formatter.parser.antlr,
- org.eclipse.xtext.parsetree.reconstr,
- org.eclipse.xtext.parsetree.reconstr.complexrewritetest,
- org.eclipse.xtext.parsetree.reconstr.parser.packrat,
- org.eclipse.xtext.parsetree.reconstr.parser.packrat.consumers,
- org.eclipse.xtext.parsetree.reconstr.parseTreeConstruction,
- org.eclipse.xtext.parsetree.reconstr.parser.antlr,
- org.eclipse.xtext.parsetree.reconstr.simplerewritetest,
- org.eclipse.xtext.parsetree.transientvalues,
- org.eclipse.xtext.parsetree.transientvalues.transientvaluestest,
- org.eclipse.xtext.parsetree.transientvalues.parser.packrat,
- org.eclipse.xtext.parsetree.transientvalues.parser.packrat.consumers,
- org.eclipse.xtext.parsetree.transientvalues.parseTreeConstruction,
- org.eclipse.xtext.parsetree.transientvalues.parser.antlr,
- org.eclipse.xtext.resource.metamodel,
- org.eclipse.xtext.resource.metamodel.multiValueFeatureTestLanguage,
- org.eclipse.xtext.resource.metamodel.parser.packrat,
- org.eclipse.xtext.resource.metamodel.parser.packrat.consumers,
- org.eclipse.xtext.resource.metamodel.parseTreeConstruction,
- org.eclipse.xtext.resource.metamodel.parser.antlr,
- org.eclipse.xtext.testlanguages.actionLang,
- org.eclipse.xtext.testlanguages.parser.packrat,
- org.eclipse.xtext.testlanguages.parser.packrat.consumers,
- org.eclipse.xtext.testlanguages.parseTreeConstruction,
- org.eclipse.xtext.testlanguages.parser.antlr,
- org.eclipse.xtext.testlanguages.contentAssistTestLanguage,
- org.eclipse.xtext.testlanguages.fowlerdsl,
- org.eclipse.xtext.testlanguages.lexerLang,
- org.eclipse.xtext.testlanguages.lookaheadLang,
- org.eclipse.xtext.testlanguages.optionalEmpty,
- org.eclipse.xtext.testlanguages.partialParserTestLanguage,
- org.eclipse.xtext.testlanguages.referenceGrammar,
- org.eclipse.xtext.testlanguages.simpleExpressions,
- org.eclipse.xtext.testlanguages.testLang,
- org.eclipse.xtext.testlanguages.treeTestLanguage,
- org.eclipse.xtext.valueconverter,
- org.eclipse.xtext.valueconverter.bug250313,
- org.eclipse.xtext.valueconverter.parser.packrat,
- org.eclipse.xtext.valueconverter.parser.packrat.consumers,
- org.eclipse.xtext.valueconverter.parseTreeConstruction,
- org.eclipse.xtext.valueconverter.parser.antlr
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Generator Tests (Incubation)
+Bundle-SymbolicName: org.eclipse.xtext.generator.tests;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: Eclipse.org
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.generator,
+ org.junit,
+ org.eclipse.emf.compare,
+ org.eclipse.emf.compare.diff,
+ org.eclipse.emf.compare.match,
+ org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.eclipse.xtend.util.stdlib,
+ de.itemis.xtext.antlr;resolution:=optional,
+ org.easymock;bundle-version="2.3.0",
+ org.eclipse.xtext.junit;bundle-version="0.7.0",
+ org.eclipse.emf.mwe.utils;bundle-version="0.7.0",
+ org.eclipse.emf.index;bundle-version="1.0.0",
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.antlr.runtime
+Bundle-ClassPath: lib/simple.jar,.
+Export-Package: org.eclipse.xtext,
+ org.eclipse.xtext.grammarinheritance,
+ org.eclipse.xtext.grammarinheritance.ametamodel,
+ org.eclipse.xtext.parser.keywords,
+ org.eclipse.xtext.testlanguages,
+ org.eclipse.xtext.xtextTest,
+ org.eclipse.xtext.parser.packrat,
+ org.eclipse.xtext.parser.packrat.consumers,
+ org.eclipse.xtext.parseTreeConstruction,
+ org.eclipse.xtext.parser.antlr,
+ org.eclipse.xtext.crossrefs,
+ org.eclipse.xtext.crossrefs.importedURI,
+ org.eclipse.xtext.crossrefs.parser.packrat,
+ org.eclipse.xtext.crossrefs.parser.packrat.consumers,
+ org.eclipse.xtext.crossrefs.parseTreeConstruction,
+ org.eclipse.xtext.crossrefs.parser.antlr,
+ org.eclipse.xtext.crossrefs.langATestLanguage,
+ org.eclipse.xtext.dummy,
+ org.eclipse.xtext.dummy.dummyLang,
+ org.eclipse.xtext.dummy.parser.packrat,
+ org.eclipse.xtext.dummy.parser.packrat.consumers,
+ org.eclipse.xtext.dummy.parseTreeConstruction,
+ org.eclipse.xtext.dummy.parser.antlr,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.generator.lowerCaseNamedTestLanguage,
+ org.eclipse.xtext.generator.parser.packrat,
+ org.eclipse.xtext.generator.parser.packrat.consumers,
+ org.eclipse.xtext.generator.parseTreeConstruction,
+ org.eclipse.xtext.generator.parser.antlr,
+ org.eclipse.xtext.grammarinheritance.parser.packrat,
+ org.eclipse.xtext.grammarinheritance.parser.packrat.consumers,
+ org.eclipse.xtext.grammarinheritance.parseTreeConstruction,
+ org.eclipse.xtext.grammarinheritance.baseInheritanceTest,
+ org.eclipse.xtext.grammarinheritance.parser.antlr,
+ org.eclipse.xtext.grammarinheritance.foo,
+ org.eclipse.xtext.grammarinheritance.inheritanceTest,
+ org.eclipse.xtext.metamodelreferencing.tests,
+ org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.packrat,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers,
+ org.eclipse.xtext.metamodelreferencing.tests.parseTreeConstruction,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.antlr,
+ org.eclipse.xtext.metamodelreferencing.tests.simpleTest,
+ org.eclipse.xtext.metamodelreferencing.tests.otherTest,
+ org.eclipse.xtext.parser.datatyperules,
+ org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage,
+ org.eclipse.xtext.parser.datatyperules.parser.packrat,
+ org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers,
+ org.eclipse.xtext.parser.datatyperules.parseTreeConstruction,
+ org.eclipse.xtext.parser.datatyperules.parser.antlr,
+ org.eclipse.xtext.parser.epatch,
+ org.eclipse.xtext.parser.epatch.epatchTestLanguage,
+ org.eclipse.xtext.parser.epatch.parser.packrat,
+ org.eclipse.xtext.parser.epatch.parser.packrat.consumers,
+ org.eclipse.xtext.parser.epatch.parseTreeConstruction,
+ org.eclipse.xtext.parser.epatch.parser.antlr,
+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage,
+ org.eclipse.xtext.parser.keywords.parser.packrat,
+ org.eclipse.xtext.parser.keywords.parser.packrat.consumers,
+ org.eclipse.xtext.parser.keywords.parseTreeConstruction,
+ org.eclipse.xtext.parser.keywords.parser.antlr,
+ org.eclipse.xtext.parser.terminalrules,
+ org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage,
+ org.eclipse.xtext.parser.terminalrules.parser.packrat,
+ org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers,
+ org.eclipse.xtext.parser.terminalrules.parseTreeConstruction,
+ org.eclipse.xtext.parser.terminalrules.parser.antlr,
+ org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage,
+ org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage,
+ org.eclipse.xtext.parsetree.formatter,
+ org.eclipse.xtext.parsetree.formatter.formattertestlanguage,
+ org.eclipse.xtext.parsetree.formatter.parser.packrat,
+ org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers,
+ org.eclipse.xtext.parsetree.formatter.parseTreeConstruction,
+ org.eclipse.xtext.parsetree.formatter.parser.antlr,
+ org.eclipse.xtext.parsetree.reconstr,
+ org.eclipse.xtext.parsetree.reconstr.complexrewritetest,
+ org.eclipse.xtext.parsetree.reconstr.parser.packrat,
+ org.eclipse.xtext.parsetree.reconstr.parser.packrat.consumers,
+ org.eclipse.xtext.parsetree.reconstr.parseTreeConstruction,
+ org.eclipse.xtext.parsetree.reconstr.parser.antlr,
+ org.eclipse.xtext.parsetree.reconstr.simplerewritetest,
+ org.eclipse.xtext.parsetree.transientvalues,
+ org.eclipse.xtext.parsetree.transientvalues.transientvaluestest,
+ org.eclipse.xtext.parsetree.transientvalues.parser.packrat,
+ org.eclipse.xtext.parsetree.transientvalues.parser.packrat.consumers,
+ org.eclipse.xtext.parsetree.transientvalues.parseTreeConstruction,
+ org.eclipse.xtext.parsetree.transientvalues.parser.antlr,
+ org.eclipse.xtext.resource.metamodel,
+ org.eclipse.xtext.resource.metamodel.multiValueFeatureTestLanguage,
+ org.eclipse.xtext.resource.metamodel.parser.packrat,
+ org.eclipse.xtext.resource.metamodel.parser.packrat.consumers,
+ org.eclipse.xtext.resource.metamodel.parseTreeConstruction,
+ org.eclipse.xtext.resource.metamodel.parser.antlr,
+ org.eclipse.xtext.testlanguages.actionLang,
+ org.eclipse.xtext.testlanguages.parser.packrat,
+ org.eclipse.xtext.testlanguages.parser.packrat.consumers,
+ org.eclipse.xtext.testlanguages.parseTreeConstruction,
+ org.eclipse.xtext.testlanguages.parser.antlr,
+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage,
+ org.eclipse.xtext.testlanguages.fowlerdsl,
+ org.eclipse.xtext.testlanguages.lexerLang,
+ org.eclipse.xtext.testlanguages.lookaheadLang,
+ org.eclipse.xtext.testlanguages.optionalEmpty,
+ org.eclipse.xtext.testlanguages.partialParserTestLanguage,
+ org.eclipse.xtext.testlanguages.referenceGrammar,
+ org.eclipse.xtext.testlanguages.simpleExpressions,
+ org.eclipse.xtext.testlanguages.testLang,
+ org.eclipse.xtext.testlanguages.treeTestLanguage,
+ org.eclipse.xtext.valueconverter,
+ org.eclipse.xtext.valueconverter.bug250313,
+ org.eclipse.xtext.valueconverter.parser.packrat,
+ org.eclipse.xtext.valueconverter.parser.packrat.consumers,
+ org.eclipse.xtext.valueconverter.parseTreeConstruction,
+ org.eclipse.xtext.valueconverter.parser.antlr
+
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java
index 58c2a95..dc202e1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java
@@ -8,16 +8,22 @@
*******************************************************************************/
package org.eclipse.xtext.generator;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.eclipse.xtext.util.StringInputStream;
+import org.eclipse.xtext.util.Wrapper;
import junit.framework.TestCase;
/**
* @author Sven Efftinge - Initial contribution and API
- *
+ *
*/
public class ManifestMergerTest extends TestCase {
@@ -26,7 +32,7 @@ public class ManifestMergerTest extends TestCase {
InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF");
MergeableManifest manifest = new MergeableManifest(resourceAsStream);
Attributes attrs = manifest.getMainAttributes();
- String before = (String) attrs.get(MergeableManifest.REQUIRE_BUNDLE);
+ String before = ((String) attrs.get(MergeableManifest.REQUIRE_BUNDLE)).replaceAll("\\s","");
manifest.addRequiredBundles(Collections.singleton("foo.bar.baz"));
String after = (String) attrs.get(MergeableManifest.REQUIRE_BUNDLE);
assertEquals(before + ",foo.bar.baz", after.replaceAll("\\s",""));
@@ -39,17 +45,53 @@ public class ManifestMergerTest extends TestCase {
manifest.addExportedPackages(Collections.singleton("org.eclipse.xtext"));
assertFalse(manifest.isModified());
-
+
manifest.addRequiredBundles(Collections.singleton("org.eclipse.xtext.log4j"));
assertFalse(manifest.isModified());
}
-
+
+ public void testNoLongLine() throws Exception {
+ String packageName = getClass().getPackage().getName().replace('.', '/');
+ InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF");
+ MergeableManifest manifest = new MergeableManifest(resourceAsStream);
+ manifest.addExportedPackages(Collections.singleton("foobar"));
+ assertTrue(manifest.isModified());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ manifest.write(out);
+ String result = out.toString();
+ String lookup = "Require-Bundle: org.eclipse.xtext,";
+ int idx = result.indexOf(lookup);
+ assertTrue(idx != -1);
+ idx += lookup.length();
+ assertEquals(result, '\r', result.charAt(idx));
+ assertEquals(result, '\n', result.charAt(idx + 1));
+ assertEquals(result, ' ', result.charAt(idx + 2));
+ }
+
+ public void testSplit512Length() throws Exception {
+ String packageName = getClass().getPackage().getName().replace('.', '/');
+ InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF");
+ MergeableManifest manifest = new MergeableManifest(resourceAsStream);
+ char[] buff = new char[712];
+ Arrays.fill(buff, 'c');
+ manifest.addExportedPackages(Collections.singleton(new String(buff)));
+ assertTrue(manifest.isModified());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ manifest.write(out);
+ String result = out.toString();
+ try {
+ new Manifest(new StringInputStream(result));
+ } catch(Exception e) {
+ fail("long line has not been splitted into chunks");
+ }
+ }
+
public void testNoChanges() throws Exception {
String packageName = getClass().getPackage().getName().replace('.', '/');
InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF");
MergeableManifest manifest = new MergeableManifest(resourceAsStream);
Attributes attrs = manifest.getMainAttributes();
- String before = (String) attrs.get(MergeableManifest.EXPORT_PACKAGE);
+ String before = ((String) attrs.get(MergeableManifest.EXPORT_PACKAGE)).replaceAll("\\s","");
manifest.addExportedPackages(Collections.singleton("foo.bar.baz"));
String after = (String) attrs.get(MergeableManifest.EXPORT_PACKAGE);
assertEquals(before + ",foo.bar.baz", after.replaceAll("\\s",""));
@@ -61,11 +103,11 @@ public class ManifestMergerTest extends TestCase {
toMerge.add("bar");
toMerge.add("baz");
- assertEquals("bar,foo,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("bar", toMerge)));
- assertEquals("bar,x,foo,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("bar , x", toMerge)));
- assertEquals("baz,bar,foo", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("baz,bar,foo", toMerge)));
- assertEquals("foo,bar,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("", toMerge)));
- assertEquals("foo,bar,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList(null, toMerge)));
+ assertEquals("bar,foo,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("bar", toMerge, Wrapper.wrap(false))));
+ assertEquals("bar,x,foo,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("bar , x", toMerge, Wrapper.wrap(false))));
+ assertEquals("baz,bar,foo", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("baz,bar,foo", toMerge, Wrapper.wrap(false))));
+ assertEquals("foo,bar,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList("", toMerge, Wrapper.wrap(false))));
+ assertEquals("foo,bar,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList(null, toMerge, Wrapper.wrap(false))));
}
/**
@@ -83,9 +125,9 @@ public class ManifestMergerTest extends TestCase {
toMerge.add("baz");
assertEquals("bar;version=\"0.7.0\",foo,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList(
- "bar;version=\"0.7.0\"", toMerge)));
+ "bar;version=\"0.7.0\"", toMerge, Wrapper.wrap(false))));
assertEquals("bar;special=foo,x,foo,baz", removeWS(MergeableManifest.mergeIntoCommaSeparatedList(
- "bar;special=foo , x", toMerge)));
+ "bar;special=foo , x", toMerge, Wrapper.wrap(false))));
}
public void testMergeIntoCommaSeparatedListInvalidParam() throws Exception {
@@ -95,7 +137,7 @@ public class ManifestMergerTest extends TestCase {
toMerge.add("baz");
try {
assertEquals("bar;version=\"0.7.0\",foo,baz", MergeableManifest.mergeIntoCommaSeparatedList(
- "bar;version=\"0.7.0\"", toMerge));
+ "bar;version=\"0.7.0\"", toMerge, Wrapper.wrap(false)));
fail("Exception expected");
} catch (IllegalArgumentException e) {
// expected
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 6898be3..a935caf 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,10 +17,10 @@ extension org::eclipse::xtend::util::stdlib::io;
*/
-List[IScopedElement] scope_rule(RuleCall 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_rule(emf::EObject this) :
+List[IScopedElement] scope_usedGrammars(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
List[IScopedElement] scope_hiddenTokens(ParserRule this):
@@ -29,10 +29,10 @@ List[IScopedElement] scope_hiddenTokens(ParserRule this):
List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_hiddenTokens(Grammar this):
- allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
+ allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
+List[IScopedElement] scope_ePackage(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
List[IScopedElement] scope_classifier(TypeRef this):
@@ -41,21 +41,21 @@ List[IScopedElement] scope_classifier(TypeRef this):
List[IScopedElement] scope_classifier(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_metamodel(TypeRef this):
- allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_hiddenTokens(Grammar this):
+ allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_metamodel(emf::EObject this) :
+List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
- allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_metamodel(TypeRef this):
+ allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_ePackage(emf::EObject this) :
+List[IScopedElement] scope_metamodel(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(RuleCall 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));
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..485886c 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,16 +16,16 @@ extension org::eclipse::xtend::util::stdlib::io;
*/
-List[IScopedElement] scope_vater(Familie this):
+List[IScopedElement] scope_mutter(Familie this):
allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_vater(emf::EObject this) :
+List[IScopedElement] scope_mutter(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_mutter(Familie this):
+List[IScopedElement] scope_vater(Familie this):
allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_mutter(emf::EObject this) :
+List[IScopedElement] scope_vater(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
List[IScopedElement] scope_kinder(Familie this):
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
index 02fa5ba..1415b1e 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
@@ -1,40 +1,39 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Integration Tests Plug-in
-Bundle-SymbolicName: org.eclipse.xtext.ui.integration.tests;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.xtext.ui.core.util,
- org.eclipse.xtext.ui.integration,
- org.eclipse.xtext.ui.integration.editor,
- org.eclipse.xtext.ui.integration.workbench,
- org.eclipse.xtext.ui.integration.foo,
- org.eclipse.xtext.ui.integration.parser.packrat,
- org.eclipse.xtext.ui.integration.parser.packrat.consumers,
- org.eclipse.xtext.ui.integration.parseTreeConstruction,
- org.eclipse.xtext.ui.integration.parser.antlr
-Require-Bundle: org.eclipse.xtext.generator;bundle-version="0.7.0",
- org.eclipse.xtext.log4j;bundle-version="1.2.15",
- org.eclipse.xtext;bundle-version="0.7.0",
- org.eclipse.xtext.ui.common;bundle-version="0.7.0",
- org.eclipse.xtext.ui.core;bundle-version="0.7.0",
- org.eclipse.ui.ide;bundle-version="3.4.0",
- org.junit;bundle-version="3.8.2",
- org.eclipse.jdt.core;bundle-version="3.4.0",
- org.eclipse.jdt.launching;bundle-version="3.4.0",
- de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.xtext.reference.ui;bundle-version="0.7.0",
- org.eclipse.xtext.generator.tests;bundle-version="0.7.0",
- org.eclipse.xtext.ui.generator;bundle-version="0.7.0",
- org.eclipse.emf.mwe.core;bundle-version="0.7.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.xtend,
- org.eclipse.xtend.typesystem.emf,
- org.antlr.runtime,
- org.eclipse.ui.editors,
- org.eclipse.ui
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.xtext.ui.integration.XtextUIIntegrationTestsPlugin
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Integration Tests Plug-in
+Bundle-SymbolicName: org.eclipse.xtext.ui.integration.tests;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.xtext.ui.core.util,
+ org.eclipse.xtext.ui.integration,
+ org.eclipse.xtext.ui.integration.editor,
+ org.eclipse.xtext.ui.integration.workbench,
+ org.eclipse.xtext.ui.integration.foo,
+ org.eclipse.xtext.ui.integration.parser.packrat,
+ org.eclipse.xtext.ui.integration.parser.packrat.consumers,
+ org.eclipse.xtext.ui.integration.parseTreeConstruction,
+ org.eclipse.xtext.ui.integration.parser.antlr
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="0.7.0",
+ org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ org.eclipse.xtext;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.common;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.core;bundle-version="0.7.0",
+ org.eclipse.ui.ide;bundle-version="3.4.0",
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.jdt.core;bundle-version="3.4.0",
+ org.eclipse.jdt.launching;bundle-version="3.4.0",
+ de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.xtext.reference.ui;bundle-version="0.7.0",
+ org.eclipse.xtext.generator.tests;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator;bundle-version="0.7.0",
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime,
+ org.eclipse.ui.editors,
+ org.eclipse.ui
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.xtext.ui.integration.XtextUIIntegrationTestsPlugin
diff --git a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
index 900ca31..78cccfe 100644
--- a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
@@ -1,49 +1,50 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtend API Tests Plug-in
-Bundle-SymbolicName: org.eclipse.xtext.xtend.tests;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Vendor: Eclipse Modeling
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.xtext;bundle-version="0.7.0",
- org.eclipse.xtext.ui.common;bundle-version="0.7.0",
- org.eclipse.xtext.ui.common.tests;bundle-version="0.7.0",
- org.eclipse.xtext.ui.core;bundle-version="0.7.0",
- org.eclipse.xtext.xtend;bundle-version="0.7.0",
- org.junit,
- org.eclipse.xtext.junit;bundle-version="0.7.0",
- org.eclipse.xtext.reference;bundle-version="0.7.0",
- org.eclipse.xtext.generator.tests;bundle-version="0.7.0",
- org.eclipse.xtext.ui.generator;bundle-version="0.7.0",
- org.eclipse.emf.mwe.core;bundle-version="0.7.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.xtend,
- org.eclipse.xtend.typesystem.emf,
- org.antlr.runtime,
- org.eclipse.ui.editors,
- org.eclipse.ui,
- org.eclipse.xpand
-Export-Package: org.eclipse.xtext,
- org.eclipse.xtext.xtend.crossref,
- org.eclipse.xtext.xtend.tests,
- org.eclipse.xtext.xtextTest,
- org.eclipse.xtext.parser.packrat,
- org.eclipse.xtext.parser.packrat.consumers,
- org.eclipse.xtext.parseTreeConstruction,
- org.eclipse.xtext.parser.antlr,
- org.eclipse.xtext.parser.keywords.keywordsTestLanguage,
- org.eclipse.xtext.parser.keywords,
- org.eclipse.xtext.parser.keywords.parser.packrat,
- org.eclipse.xtext.parser.keywords.parser.packrat.consumers,
- org.eclipse.xtext.parser.keywords.parseTreeConstruction,
- org.eclipse.xtext.parser.keywords.parser.antlr,
- org.eclipse.xtext.testlanguages.contentAssistTestLanguage,
- org.eclipse.xtext.testlanguages,
- org.eclipse.xtext.testlanguages.parser.packrat,
- org.eclipse.xtext.testlanguages.parser.packrat.consumers,
- org.eclipse.xtext.testlanguages.parseTreeConstruction,
- org.eclipse.xtext.testlanguages.parser.antlr,
- org.eclipse.xtext.testlanguages.referenceGrammar,
- org.eclipse.xtext.testlanguages.treeTestLanguage
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtend API Tests Plug-in
+Bundle-SymbolicName: org.eclipse.xtext.xtend.tests;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: Eclipse Modeling
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.xtext;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.common;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.common.tests;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.core;bundle-version="0.7.0",
+ org.eclipse.xtext.xtend;bundle-version="0.7.0",
+ org.junit,
+ org.eclipse.xtext.junit;bundle-version="0.7.0",
+ org.eclipse.xtext.reference;bundle-version="0.7.0",
+ org.eclipse.xtext.generator.tests;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator;bundle-version="0.7.0",
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.xpand
+Export-Package: org.eclipse.xtext,
+ org.eclipse.xtext.xtend.crossref,
+ org.eclipse.xtext.xtend.tests,
+ org.eclipse.xtext.xtextTest,
+ org.eclipse.xtext.parser.packrat,
+ org.eclipse.xtext.parser.packrat.consumers,
+ org.eclipse.xtext.parseTreeConstruction,
+ org.eclipse.xtext.parser.antlr,
+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage,
+ org.eclipse.xtext.parser.keywords,
+ org.eclipse.xtext.parser.keywords.parser.packrat,
+ org.eclipse.xtext.parser.keywords.parser.packrat.consumers,
+ org.eclipse.xtext.parser.keywords.parseTreeConstruction,
+ org.eclipse.xtext.parser.keywords.parser.antlr,
+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage,
+ org.eclipse.xtext.testlanguages,
+ org.eclipse.xtext.testlanguages.parser.packrat,
+ org.eclipse.xtext.testlanguages.parser.packrat.consumers,
+ org.eclipse.xtext.testlanguages.parseTreeConstruction,
+ org.eclipse.xtext.testlanguages.parser.antlr,
+ org.eclipse.xtext.testlanguages.referenceGrammar,
+ org.eclipse.xtext.testlanguages.treeTestLanguage
+
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 c38564c..5dae269 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,22 +17,22 @@ extension org::eclipse::xtend::util::stdlib::io;
*/
-List[IScopedElement] scope_classifier(TypeRef this):
- allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_rule(RuleCall this):
+ allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_classifier(emf::EObject this) :
+List[IScopedElement] scope_rule(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
- allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_usedGrammars(Grammar this):
+ allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_ePackage(emf::EObject this) :
+List[IScopedElement] scope_usedGrammars(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_hiddenTokens(Grammar this):
- allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
+ allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
+List[IScopedElement] scope_ePackage(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
List[IScopedElement] scope_hiddenTokens(ParserRule this):
@@ -47,15 +47,15 @@ List[IScopedElement] scope_metamodel(TypeRef this):
List[IScopedElement] scope_metamodel(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_hiddenTokens(Grammar this):
+ allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_usedGrammars(emf::EObject this) :
+List[IScopedElement] scope_hiddenTokens(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_classifier(TypeRef this):
+ allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_rule(emf::EObject this) :
+List[IScopedElement] scope_classifier(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/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
index 30e5c87..7948696 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,10 +16,10 @@ extension org::eclipse::xtend::util::stdlib::io;
*/
-List[IScopedElement] scope_vater(Familie this):
+List[IScopedElement] scope_mutter(Familie this):
allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_vater(emf::EObject this) :
+List[IScopedElement] scope_mutter(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));
List[IScopedElement] scope_kinder(Familie this):
@@ -28,9 +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_mutter(Familie this):
+List[IScopedElement] scope_vater(Familie this):
allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_mutter(emf::EObject this) :
+List[IScopedElement] scope_vater(emf::EObject this) :
allElements().collect(x | createScopedElement(x.referenceName(), x));