Upgrade to XText 1.0. Everything *seems* to be working except for content assist on apar.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/.project b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/.project
index 490638a..9537ff9 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/.project
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/.project
@@ -25,10 +25,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.xtext.ui.core.xtextNature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF
index 1aa26c9..af6b500 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@
org.antlr.runtime,
org.eclipse.core.resources,
org.eclipse.core.runtime,
- org.eclipse.emf.mwe.utils
+ org.eclipse.emf.mwe.utils,
+ org.eclipse.emf.mwe2.launch;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.amp.amf.abase,
org.eclipse.amp.amf.abase.aBase,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/plugin.xml_gen b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/plugin.xml_gen
index 2e92903..54bbb8b 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/plugin.xml_gen
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/plugin.xml_gen
@@ -14,4 +14,5 @@
+
</plugin>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xmi b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xmi
index af3ee57..1b00dff 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xmi
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xmi
@@ -12,10 +12,10 @@
<classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/amp/amf/abase/ABase#//Value"/>
</type>
<alternatives xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
- <groups xsi:type="xtext:RuleCall" rule="/0/@rules.3"/>
- <groups xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
- <groups xsi:type="xtext:RuleCall" rule="/0/@rules.4"/>
+ <elements xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
+ <elements xsi:type="xtext:RuleCall" rule="/0/@rules.3"/>
+ <elements xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
+ <elements xsi:type="xtext:RuleCall" rule="/0/@rules.4"/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="IntValue">
@@ -55,14 +55,14 @@
<classifier xsi:type="ecore:EEnum" href="http://www.eclipse.org/amp/amf/abase/ABase#//BOOLEAN"/>
</type>
<alternatives xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:EnumLiteralDeclaration">
+ <elements xsi:type="xtext:EnumLiteralDeclaration">
<enumLiteral href="http://www.eclipse.org/amp/amf/abase/ABase#//BOOLEAN/TRUE"/>
<literal value="true"/>
- </groups>
- <groups xsi:type="xtext:EnumLiteralDeclaration">
+ </elements>
+ <elements xsi:type="xtext:EnumLiteralDeclaration">
<enumLiteral href="http://www.eclipse.org/amp/amf/abase/ABase#//BOOLEAN/FALSE"/>
<literal value="false"/>
- </groups>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="INTEGER">
@@ -70,11 +70,11 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" cardinality="?" value="-"/>
- <tokens xsi:type="xtext:CharacterRange" cardinality="+">
+ <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>
+ <elements xsi:type="xtext:CharacterRange" cardinality="+">
<left value="0"/>
<right value="9"/>
- </tokens>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="REAL">
@@ -82,16 +82,16 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" cardinality="?" value="-"/>
- <tokens xsi:type="xtext:CharacterRange" cardinality="*">
+ <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>
+ <elements xsi:type="xtext:CharacterRange" cardinality="*">
<left value="0"/>
<right value="9"/>
- </tokens>
- <tokens xsi:type="xtext:Keyword" value="."/>
- <tokens xsi:type="xtext:CharacterRange" cardinality="*">
+ </elements>
+ <elements xsi:type="xtext:Keyword" value="."/>
+ <elements xsi:type="xtext:CharacterRange" cardinality="*">
<left value="0"/>
<right value="9"/>
- </tokens>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="DESC_STRING">
@@ -99,30 +99,30 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="«"/>
- <tokens xsi:type="xtext:Alternatives" cardinality="*">
- <groups xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="\"/>
- <tokens xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="b"/>
- <groups xsi:type="xtext:Keyword" value="t"/>
- <groups xsi:type="xtext:Keyword" value="n"/>
- <groups xsi:type="xtext:Keyword" value="f"/>
- <groups xsi:type="xtext:Keyword" value="r"/>
- <groups xsi:type="xtext:Keyword" value="«"/>
- <groups xsi:type="xtext:Keyword" value="»"/>
- <groups xsi:type="xtext:Keyword" value="\"/>
- </tokens>
- </groups>
- <groups xsi:type="xtext:NegatedToken">
+ <elements xsi:type="xtext:Keyword" value="«"/>
+ <elements xsi:type="xtext:Alternatives" cardinality="*">
+ <elements xsi:type="xtext:Group">
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ <elements xsi:type="xtext:Alternatives">
+ <elements xsi:type="xtext:Keyword" value="b"/>
+ <elements xsi:type="xtext:Keyword" value="t"/>
+ <elements xsi:type="xtext:Keyword" value="n"/>
+ <elements xsi:type="xtext:Keyword" value="f"/>
+ <elements xsi:type="xtext:Keyword" value="r"/>
+ <elements xsi:type="xtext:Keyword" value="«"/>
+ <elements xsi:type="xtext:Keyword" value="»"/>
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ </elements>
+ </elements>
+ <elements xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\"/>
- <groups xsi:type="xtext:Keyword" value="«"/>
- <groups xsi:type="xtext:Keyword" value="»"/>
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ <elements xsi:type="xtext:Keyword" value="«"/>
+ <elements xsi:type="xtext:Keyword" value="»"/>
</terminal>
- </groups>
- </tokens>
- <tokens xsi:type="xtext:Keyword" value="»"/>
+ </elements>
+ </elements>
+ <elements xsi:type="xtext:Keyword" value="»"/>
</alternatives>
</rules>
</xtext:Grammar>
@@ -135,33 +135,33 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" cardinality="?" value="^"/>
- <tokens xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:CharacterRange">
+ <elements xsi:type="xtext:Keyword" cardinality="?" value="^"/>
+ <elements xsi:type="xtext:Alternatives">
+ <elements xsi:type="xtext:CharacterRange">
<left value="a"/>
<right value="z"/>
- </groups>
- <groups xsi:type="xtext:CharacterRange">
+ </elements>
+ <elements xsi:type="xtext:CharacterRange">
<left value="A"/>
<right value="Z"/>
- </groups>
- <groups xsi:type="xtext:Keyword" value="_"/>
- </tokens>
- <tokens xsi:type="xtext:Alternatives" cardinality="*">
- <groups xsi:type="xtext:CharacterRange">
+ </elements>
+ <elements xsi:type="xtext:Keyword" value="_"/>
+ </elements>
+ <elements xsi:type="xtext:Alternatives" cardinality="*">
+ <elements xsi:type="xtext:CharacterRange">
<left value="a"/>
<right value="z"/>
- </groups>
- <groups xsi:type="xtext:CharacterRange">
+ </elements>
+ <elements xsi:type="xtext:CharacterRange">
<left value="A"/>
<right value="Z"/>
- </groups>
- <groups xsi:type="xtext:Keyword" value="_"/>
- <groups xsi:type="xtext:CharacterRange">
+ </elements>
+ <elements xsi:type="xtext:Keyword" value="_"/>
+ <elements xsi:type="xtext:CharacterRange">
<left value="0"/>
<right value="9"/>
- </groups>
- </tokens>
+ </elements>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="INT">
@@ -178,56 +178,56 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="""/>
- <tokens xsi:type="xtext:Alternatives" cardinality="*">
- <groups xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="\"/>
- <tokens xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="b"/>
- <groups xsi:type="xtext:Keyword" value="t"/>
- <groups xsi:type="xtext:Keyword" value="n"/>
- <groups xsi:type="xtext:Keyword" value="f"/>
- <groups xsi:type="xtext:Keyword" value="r"/>
- <groups xsi:type="xtext:Keyword" value="""/>
- <groups xsi:type="xtext:Keyword" value="'"/>
- <groups xsi:type="xtext:Keyword" value="\"/>
- </tokens>
- </groups>
- <groups xsi:type="xtext:NegatedToken">
+ <elements xsi:type="xtext:Group">
+ <elements xsi:type="xtext:Keyword" value="""/>
+ <elements xsi:type="xtext:Alternatives" cardinality="*">
+ <elements xsi:type="xtext:Group">
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ <elements xsi:type="xtext:Alternatives">
+ <elements xsi:type="xtext:Keyword" value="b"/>
+ <elements xsi:type="xtext:Keyword" value="t"/>
+ <elements xsi:type="xtext:Keyword" value="n"/>
+ <elements xsi:type="xtext:Keyword" value="f"/>
+ <elements xsi:type="xtext:Keyword" value="r"/>
+ <elements xsi:type="xtext:Keyword" value="""/>
+ <elements xsi:type="xtext:Keyword" value="'"/>
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ </elements>
+ </elements>
+ <elements xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\"/>
- <groups xsi:type="xtext:Keyword" value="""/>
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ <elements xsi:type="xtext:Keyword" value="""/>
</terminal>
- </groups>
- </tokens>
- <tokens xsi:type="xtext:Keyword" value="""/>
- </groups>
- <groups xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="'"/>
- <tokens xsi:type="xtext:Alternatives" cardinality="*">
- <groups xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="\"/>
- <tokens xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="b"/>
- <groups xsi:type="xtext:Keyword" value="t"/>
- <groups xsi:type="xtext:Keyword" value="n"/>
- <groups xsi:type="xtext:Keyword" value="f"/>
- <groups xsi:type="xtext:Keyword" value="r"/>
- <groups xsi:type="xtext:Keyword" value="""/>
- <groups xsi:type="xtext:Keyword" value="'"/>
- <groups xsi:type="xtext:Keyword" value="\"/>
- </tokens>
- </groups>
- <groups xsi:type="xtext:NegatedToken">
+ </elements>
+ </elements>
+ <elements xsi:type="xtext:Keyword" value="""/>
+ </elements>
+ <elements xsi:type="xtext:Group">
+ <elements xsi:type="xtext:Keyword" value="'"/>
+ <elements xsi:type="xtext:Alternatives" cardinality="*">
+ <elements xsi:type="xtext:Group">
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ <elements xsi:type="xtext:Alternatives">
+ <elements xsi:type="xtext:Keyword" value="b"/>
+ <elements xsi:type="xtext:Keyword" value="t"/>
+ <elements xsi:type="xtext:Keyword" value="n"/>
+ <elements xsi:type="xtext:Keyword" value="f"/>
+ <elements xsi:type="xtext:Keyword" value="r"/>
+ <elements xsi:type="xtext:Keyword" value="""/>
+ <elements xsi:type="xtext:Keyword" value="'"/>
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ </elements>
+ </elements>
+ <elements xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\"/>
- <groups xsi:type="xtext:Keyword" value="'"/>
+ <elements xsi:type="xtext:Keyword" value="\"/>
+ <elements xsi:type="xtext:Keyword" value="'"/>
</terminal>
- </groups>
- </tokens>
- <tokens xsi:type="xtext:Keyword" value="'"/>
- </groups>
+ </elements>
+ </elements>
+ <elements xsi:type="xtext:Keyword" value="'"/>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="ML_COMMENT">
@@ -235,10 +235,10 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="/*"/>
- <tokens xsi:type="xtext:UntilToken">
+ <elements xsi:type="xtext:Keyword" value="/*"/>
+ <elements xsi:type="xtext:UntilToken">
<terminal xsi:type="xtext:Keyword" value="*/"/>
- </tokens>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="SL_COMMENT">
@@ -246,17 +246,17 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Keyword" value="//"/>
- <tokens xsi:type="xtext:NegatedToken" cardinality="*">
+ <elements xsi:type="xtext:Keyword" value="//"/>
+ <elements xsi:type="xtext:NegatedToken" cardinality="*">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="
"/>
- <groups xsi:type="xtext:Keyword" value="
"/>
+ <elements xsi:type="xtext:Keyword" value="
"/>
+ <elements xsi:type="xtext:Keyword" value="
"/>
</terminal>
- </tokens>
- <tokens xsi:type="xtext:Group" cardinality="?">
- <tokens xsi:type="xtext:Keyword" cardinality="?" value="
"/>
- <tokens xsi:type="xtext:Keyword" value="
"/>
- </tokens>
+ </elements>
+ <elements xsi:type="xtext:Group" cardinality="?">
+ <elements xsi:type="xtext:Keyword" cardinality="?" value="
"/>
+ <elements xsi:type="xtext:Keyword" value="
"/>
+ </elements>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="WS">
@@ -264,10 +264,10 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Alternatives" cardinality="+">
- <groups xsi:type="xtext:Keyword" value=" "/>
- <groups xsi:type="xtext:Keyword" value="	"/>
- <groups xsi:type="xtext:Keyword" value="
"/>
- <groups xsi:type="xtext:Keyword" value="
"/>
+ <elements xsi:type="xtext:Keyword" value=" "/>
+ <elements xsi:type="xtext:Keyword" value="	"/>
+ <elements xsi:type="xtext:Keyword" value="
"/>
+ <elements xsi:type="xtext:Keyword" value="
"/>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="ANY_OTHER">
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xsd b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xsd
deleted file mode 100644
index 582413a..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:aBase="http://www.eclipse.org/amp/amf/abase/ABase" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ecore:nsPrefix="aBase" ecore:package="org.eclipse.amp.amf.abase.aBase" targetNamespace="http://www.eclipse.org/amp/amf/abase/ABase">
- <xsd:import namespace="http://www.eclipse.org/emf/2002/Ecore" schemaLocation="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.xsd"/>
- <xsd:element ecore:ignore="true" name="Value" type="aBase:Value"/>
- <xsd:element ecore:ignore="true" name="IntValue" type="aBase:IntValue"/>
- <xsd:element ecore:ignore="true" name="RealValue" type="aBase:RealValue"/>
- <xsd:element ecore:ignore="true" name="StringValue" type="aBase:StringValue"/>
- <xsd:element ecore:ignore="true" name="BooleanValue" type="aBase:BooleanValue"/>
- <xsd:complexType name="Value"/>
- <xsd:complexType name="IntValue">
- <xsd:complexContent>
- <xsd:extension base="aBase:Value">
- <xsd:attribute name="value" type="ecore:EString"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="RealValue">
- <xsd:complexContent>
- <xsd:extension base="aBase:Value">
- <xsd:attribute name="value" type="ecore:EString"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="StringValue">
- <xsd:complexContent>
- <xsd:extension base="aBase:Value">
- <xsd:attribute name="value" type="ecore:EString"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="BooleanValue">
- <xsd:complexContent>
- <xsd:extension base="aBase:Value">
- <xsd:attribute ecore:unsettable="false" name="value" type="aBase:BOOLEAN"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:simpleType name="BOOLEAN">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration ecore:name="TRUE" value="true"/>
- <xsd:enumeration ecore:name="FALSE" value="false"/>
- </xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABaseStandaloneSetup.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABaseStandaloneSetup.java
index 368247c..3b4ead9 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABaseStandaloneSetup.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABaseStandaloneSetup.java
@@ -34,10 +34,13 @@
}
org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
+ org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("abase", resourceFactory);
+ org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("abase", serviceProvider);
+
}
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/AbstractABaseRuntimeModule.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/AbstractABaseRuntimeModule.java
index 0873e79..dc3ce1a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/AbstractABaseRuntimeModule.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/AbstractABaseRuntimeModule.java
@@ -20,6 +20,11 @@
super.configure(binder);
binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance(
"org.eclipse.amp.amf.abase.ABase");
+ bindProperties(binder);
+ }
+
+ protected void bindProperties(Binder binder) {
+ bindProperties(binder, "org/eclipse/amp/amf/abase/ABase.properties");
}
@@ -54,6 +59,16 @@
}
// contributed by de.itemis.xtext.antlr.XtextAntlrGeneratorFragment
+ public com.google.inject.Provider<org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseLexer> provideInternalABaseLexer() {
+ return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseLexer.class);
+ }
+
+ // contributed by de.itemis.xtext.antlr.XtextAntlrGeneratorFragment
+ public void configureRuntimeLexer(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseLexer.class);
+ }
+
+ // contributed by de.itemis.xtext.antlr.XtextAntlrGeneratorFragment
public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
}
@@ -63,14 +78,49 @@
return org.eclipse.amp.amf.abase.validation.ABaseJavaValidator.class;
}
- // contributed by org.eclipse.xtext.generator.scoping.JavaScopingFragment
+ // contributed by org.eclipse.xtext.generator.scoping.ImportURIScopingFragment
public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {
return org.eclipse.amp.amf.abase.scoping.ABaseScopeProvider.class;
}
+ // contributed by org.eclipse.xtext.generator.scoping.ImportURIScopingFragment
+ public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
+ }
+
+ // contributed by org.eclipse.xtext.generator.scoping.ImportURIScopingFragment
+ public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
+ return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
+ public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
+ return org.eclipse.xtext.naming.SimpleNameProvider.class;
+ }
+
// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
return org.eclipse.amp.amf.abase.formatting.ABaseFormatter.class;
}
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {
+ return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {
+ return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public void configureIResourceDescriptions(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+ }
+
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+ }
+
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/BooleanValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/BooleanValueImpl.java
index 145ff10..49a6529 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/BooleanValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/BooleanValueImpl.java
@@ -8,8 +8,11 @@
import org.eclipse.amp.amf.abase.aBase.ABasePackage;
import org.eclipse.amp.amf.abase.aBase.BOOLEAN;
import org.eclipse.amp.amf.abase.aBase.BooleanValue;
+
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
@@ -27,142 +30,151 @@
*/
public class BooleanValueImpl extends ValueImpl implements BooleanValue
{
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final BOOLEAN VALUE_EDEFAULT = BOOLEAN.TRUE;
+ /**
+ * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected static final BOOLEAN VALUE_EDEFAULT = BOOLEAN.TRUE;
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected BOOLEAN value = VALUE_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected BOOLEAN value = VALUE_EDEFAULT;
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected BooleanValueImpl()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected BooleanValueImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return ABasePackage.Literals.BOOLEAN_VALUE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public BOOLEAN getValue()
+ {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setValue(BOOLEAN newValue)
+ {
+ BOOLEAN oldValue = value;
+ value = newValue == null ? VALUE_EDEFAULT : newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.BOOLEAN_VALUE__VALUE, oldValue, value));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
{
- super();
+ case ABasePackage.BOOLEAN_VALUE__VALUE:
+ return getValue();
}
+ return super.eGet(featureID, resolve, coreType);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
{
- return ABasePackage.Literals.BOOLEAN_VALUE;
+ case ABasePackage.BOOLEAN_VALUE__VALUE:
+ setValue((BOOLEAN)newValue);
+ return;
}
+ super.eSet(featureID, newValue);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public BOOLEAN getValue()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
{
- return value;
+ case ABasePackage.BOOLEAN_VALUE__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
}
+ super.eUnset(featureID);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(BOOLEAN newValue)
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
{
- BOOLEAN oldValue = value;
- value = newValue == null ? VALUE_EDEFAULT : newValue;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.BOOLEAN_VALUE__VALUE, oldValue, value));
- }
+ case ABasePackage.BOOLEAN_VALUE__VALUE:
+ return value != VALUE_EDEFAULT;
}
+ return super.eIsSet(featureID);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID) {
- case ABasePackage.BOOLEAN_VALUE__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
- }
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID) {
- case ABasePackage.BOOLEAN_VALUE__VALUE:
- setValue((BOOLEAN)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID) {
- case ABasePackage.BOOLEAN_VALUE__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID) {
- case ABasePackage.BOOLEAN_VALUE__VALUE:
- return value != VALUE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- @Override
- public String toString()
- {
- return value == BOOLEAN.TRUE? "true" : "false";
- }
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (value: ");
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
} //BooleanValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/IntValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/IntValueImpl.java
index f1f0833..39d209f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/IntValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/IntValueImpl.java
@@ -30,140 +30,150 @@
public class IntValueImpl extends ValueImpl implements IntValue
{
/**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
+ * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
protected static final String VALUE_EDEFAULT = null;
/**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
+ * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
protected String value = VALUE_EDEFAULT;
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected IntValueImpl()
{
- super();
- }
+ super();
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
protected EClass eStaticClass()
{
- return ABasePackage.Literals.INT_VALUE;
- }
+ return ABasePackage.Literals.INT_VALUE;
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public String getValue()
{
- return value;
- }
+ return value;
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void setValue(String newValue)
{
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.INT_VALUE__VALUE, oldValue, value));
- }
+ String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.INT_VALUE__VALUE, oldValue, value));
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType)
{
- switch (featureID) {
- case ABasePackage.INT_VALUE__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
+ switch (featureID)
+ {
+ case ABasePackage.INT_VALUE__VALUE:
+ return getValue();
}
+ return super.eGet(featureID, resolve, coreType);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public void eSet(int featureID, Object newValue)
{
- switch (featureID) {
- case ABasePackage.INT_VALUE__VALUE:
- setValue((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
+ switch (featureID)
+ {
+ case ABasePackage.INT_VALUE__VALUE:
+ setValue((String)newValue);
+ return;
}
+ super.eSet(featureID, newValue);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public void eUnset(int featureID)
{
- switch (featureID) {
- case ABasePackage.INT_VALUE__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
+ switch (featureID)
+ {
+ case ABasePackage.INT_VALUE__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
}
+ super.eUnset(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public boolean eIsSet(int featureID)
{
- switch (featureID) {
- case ABasePackage.INT_VALUE__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return super.eIsSet(featureID);
+ switch (featureID)
+ {
+ case ABasePackage.INT_VALUE__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
}
+ return super.eIsSet(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated NOT
- */
+ * @generated
+ */
@Override
public String toString()
{
- return value;
- }
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (value: ");
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
} //IntValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/RealValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/RealValueImpl.java
index c24e9e2..2d01245 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/RealValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/RealValueImpl.java
@@ -7,8 +7,11 @@
import org.eclipse.amp.amf.abase.aBase.ABasePackage;
import org.eclipse.amp.amf.abase.aBase.RealValue;
+
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
@@ -26,142 +29,151 @@
*/
public class RealValueImpl extends ValueImpl implements RealValue
{
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
+ /**
+ * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected static final String VALUE_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected String value = VALUE_EDEFAULT;
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected RealValueImpl()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected RealValueImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return ABasePackage.Literals.REAL_VALUE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getValue()
+ {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setValue(String newValue)
+ {
+ String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.REAL_VALUE__VALUE, oldValue, value));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
{
- super();
+ case ABasePackage.REAL_VALUE__VALUE:
+ return getValue();
}
+ return super.eGet(featureID, resolve, coreType);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
{
- return ABasePackage.Literals.REAL_VALUE;
+ case ABasePackage.REAL_VALUE__VALUE:
+ setValue((String)newValue);
+ return;
}
+ super.eSet(featureID, newValue);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValue()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
{
- return value;
+ case ABasePackage.REAL_VALUE__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
}
+ super.eUnset(featureID);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(String newValue)
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
{
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.REAL_VALUE__VALUE, oldValue, value));
- }
+ case ABasePackage.REAL_VALUE__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
}
+ return super.eIsSet(featureID);
+ }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID) {
- case ABasePackage.REAL_VALUE__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
- }
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID) {
- case ABasePackage.REAL_VALUE__VALUE:
- setValue((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID) {
- case ABasePackage.REAL_VALUE__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID) {
- case ABasePackage.REAL_VALUE__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- @Override
- public String toString()
- {
- return value;
- }
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (value: ");
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
} //RealValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/StringValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/StringValueImpl.java
index f080639..745fb7f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/StringValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/aBase/impl/StringValueImpl.java
@@ -30,140 +30,150 @@
public class StringValueImpl extends ValueImpl implements StringValue
{
/**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
+ * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
protected static final String VALUE_EDEFAULT = null;
/**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
+ * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
protected String value = VALUE_EDEFAULT;
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected StringValueImpl()
{
- super();
- }
+ super();
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
protected EClass eStaticClass()
{
- return ABasePackage.Literals.STRING_VALUE;
- }
+ return ABasePackage.Literals.STRING_VALUE;
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public String getValue()
{
- return value;
- }
+ return value;
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void setValue(String newValue)
{
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.STRING_VALUE__VALUE, oldValue, value));
- }
+ String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ABasePackage.STRING_VALUE__VALUE, oldValue, value));
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType)
{
- switch (featureID) {
- case ABasePackage.STRING_VALUE__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
+ switch (featureID)
+ {
+ case ABasePackage.STRING_VALUE__VALUE:
+ return getValue();
}
+ return super.eGet(featureID, resolve, coreType);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public void eSet(int featureID, Object newValue)
{
- switch (featureID) {
- case ABasePackage.STRING_VALUE__VALUE:
- setValue((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
+ switch (featureID)
+ {
+ case ABasePackage.STRING_VALUE__VALUE:
+ setValue((String)newValue);
+ return;
}
+ super.eSet(featureID, newValue);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public void eUnset(int featureID)
{
- switch (featureID) {
- case ABasePackage.STRING_VALUE__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
+ switch (featureID)
+ {
+ case ABasePackage.STRING_VALUE__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
}
+ super.eUnset(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
@Override
public boolean eIsSet(int featureID)
{
- switch (featureID) {
- case ABasePackage.STRING_VALUE__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return super.eIsSet(featureID);
+ switch (featureID)
+ {
+ case ABasePackage.STRING_VALUE__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
}
+ return super.eIsSet(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated NOT
- */
+ * @generated
+ */
@Override
public String toString()
{
- return value;
- }
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (value: ");
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
} //StringValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parseTreeConstruction/ABaseParsetreeConstructor.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parseTreeConstruction/ABaseParsetreeConstructor.java
index 5199355..2c42c0a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parseTreeConstruction/ABaseParsetreeConstructor.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parseTreeConstruction/ABaseParsetreeConstructor.java
@@ -16,11 +16,13 @@
@Inject
private ABaseGrammarAccess grammarAccess;
-
+
+ @Override
public ABaseGrammarAccess getGrammarAccess() {
return grammarAccess;
}
+ @Override
protected AbstractToken getRootToken(IInstanceDescription inst) {
return new ThisRootNode(inst);
}
@@ -30,6 +32,7 @@
super(inst);
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Value_Alternatives(this, this, 0, inst);
@@ -57,10 +60,12 @@
super(parent, next, no, current);
}
+ @Override
public Alternatives getGrammarElement() {
return grammarAccess.getValueAccess().getAlternatives();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Value_IntValueParserRuleCall_0(parent, this, 0, inst);
@@ -71,6 +76,7 @@
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getValueRule().getType().getClassifier())) return null;
return tryConsumeVal();
@@ -84,10 +90,12 @@
super(parent, next, no, current);
}
+ @Override
public RuleCall getGrammarElement() {
return grammarAccess.getValueAccess().getIntValueParserRuleCall_0();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new IntValue_ValueAssignment(this, this, 0, inst);
@@ -95,12 +103,14 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if(checkForRecursion(IntValue_ValueAssignment.class, current)) return null;
if(!current.isInstanceOf(grammarAccess.getIntValueRule().getType().getClassifier())) return null;
return current;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(next, actIndex , index, inst);
@@ -115,10 +125,12 @@
super(parent, next, no, current);
}
+ @Override
public RuleCall getGrammarElement() {
return grammarAccess.getValueAccess().getStringValueParserRuleCall_1();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new StringValue_ValueAssignment(this, this, 0, inst);
@@ -126,12 +138,14 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if(checkForRecursion(StringValue_ValueAssignment.class, current)) return null;
if(!current.isInstanceOf(grammarAccess.getStringValueRule().getType().getClassifier())) return null;
return current;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(next, actIndex , index, inst);
@@ -146,10 +160,12 @@
super(parent, next, no, current);
}
+ @Override
public RuleCall getGrammarElement() {
return grammarAccess.getValueAccess().getRealValueParserRuleCall_2();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new RealValue_ValueAssignment(this, this, 0, inst);
@@ -157,12 +173,14 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if(checkForRecursion(RealValue_ValueAssignment.class, current)) return null;
if(!current.isInstanceOf(grammarAccess.getRealValueRule().getType().getClassifier())) return null;
return current;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(next, actIndex , index, inst);
@@ -177,10 +195,12 @@
super(parent, next, no, current);
}
+ @Override
public RuleCall getGrammarElement() {
return grammarAccess.getValueAccess().getBooleanValueParserRuleCall_3();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new BooleanValue_ValueAssignment(this, this, 0, inst);
@@ -188,12 +208,14 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if(checkForRecursion(BooleanValue_ValueAssignment.class, current)) return null;
if(!current.isInstanceOf(grammarAccess.getBooleanValueRule().getType().getClassifier())) return null;
return current;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(next, actIndex , index, inst);
@@ -219,24 +241,28 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getIntValueAccess().getValueAssignment();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getIntValueRule().getType().getClassifier())) return null;
return tryConsumeVal();
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("value",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("value");
- if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for lexer rule
+ if(Boolean.TRUE.booleanValue()) {
type = AssignmentType.LRC;
element = grammarAccess.getIntValueAccess().getValueINTEGERTerminalRuleCall_0();
return obj;
@@ -263,24 +289,28 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getRealValueAccess().getValueAssignment();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getRealValueRule().getType().getClassifier())) return null;
return tryConsumeVal();
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("value",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("value");
- if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for lexer rule
+ if(Boolean.TRUE.booleanValue()) {
type = AssignmentType.LRC;
element = grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0();
return obj;
@@ -307,24 +337,28 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getStringValueAccess().getValueAssignment();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getStringValueRule().getType().getClassifier())) return null;
return tryConsumeVal();
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("value",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("value");
- if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for lexer rule
+ if(Boolean.TRUE.booleanValue()) {
type = AssignmentType.LRC;
element = grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0();
return obj;
@@ -351,24 +385,28 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getBooleanValueAccess().getValueAssignment();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getBooleanValueRule().getType().getClassifier())) return null;
return tryConsumeVal();
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("value",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("value");
- if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for datatype rule
+ if(Boolean.TRUE.booleanValue()) {
type = AssignmentType.ERC;
element = grammarAccess.getBooleanValueAccess().getValueBOOLEANEnumRuleCall_0();
return obj;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/ABaseParser.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/ABaseParser.java
index 90e235d..680a9a9 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/ABaseParser.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/ABaseParser.java
@@ -4,7 +4,7 @@
package org.eclipse.amp.amf.abase.parser.antlr;
import org.antlr.runtime.ANTLRInputStream;
-import org.eclipse.xtext.parser.antlr.ITokenDefProvider;
+import org.antlr.runtime.TokenSource;
import org.eclipse.xtext.parser.IParseResult;
import org.eclipse.xtext.parser.ParseException;
import org.eclipse.xtext.parser.antlr.XtextTokenStream;
@@ -15,20 +15,18 @@
public class ABaseParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
- @Inject
- protected ITokenDefProvider antlrTokenDefProvider;
-
@Inject
private ABaseGrammarAccess grammarAccess;
@Override
protected IParseResult parse(String ruleName, ANTLRInputStream in) {
- org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseLexer lexer = new org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseLexer(in);
- XtextTokenStream stream = new XtextTokenStream(lexer, antlrTokenDefProvider);
- stream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
- org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseParser parser = new org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseParser(
- stream, getElementFactory(), grammarAccess);
- parser.setTokenTypeMap(antlrTokenDefProvider.getTokenDefMap());
+ TokenSource tokenSource = createLexer(in);
+ XtextTokenStream tokenStream = createTokenStream(tokenSource);
+ tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
+ org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseParser parser = createParser(tokenStream);
+ parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
+ parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
+ parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
try {
if(ruleName != null)
return parser.parse(ruleName);
@@ -38,6 +36,10 @@
}
}
+ protected org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseParser createParser(XtextTokenStream stream) {
+ return new org.eclipse.amp.amf.abase.parser.antlr.internal.InternalABaseParser(stream, getElementFactory(), getGrammarAccess());
+ }
+
@Override
protected String getDefaultRuleName() {
return "Value";
@@ -50,4 +52,5 @@
public void setGrammarAccess(ABaseGrammarAccess grammarAccess) {
this.grammarAccess = grammarAccess;
}
+
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g
index 429c250..9fac225 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g
@@ -37,7 +37,7 @@
}
@parser::members {
-
+
private ABaseGrammarAccess grammarAccess;
public InternalABaseParser(TokenStream input, IAstFactory factory, ABaseGrammarAccess grammarAccess) {
@@ -56,7 +56,12 @@
@Override
protected String getFirstRuleName() {
return "Value";
- }
+ }
+
+ @Override
+ protected ABaseGrammarAccess getGrammarAccess() {
+ return grammarAccess;
+ }
}
@rulecatch {
@@ -70,7 +75,8 @@
// Entry rule entryRuleValue
-entryRuleValue returns [EObject current=null] :
+entryRuleValue returns [EObject current=null]
+ :
{ currentNode = createCompositeNode(grammarAccess.getValueRule(), currentNode); }
iv_ruleValue=ruleValue
{ $current=$iv_ruleValue.current; }
@@ -79,7 +85,7 @@
// Rule Value
ruleValue returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
@@ -123,14 +129,16 @@
$current = $this_BooleanValue_3.current;
currentNode = currentNode.getParent();
}
-);
+)
+;
// Entry rule entryRuleIntValue
-entryRuleIntValue returns [EObject current=null] :
+entryRuleIntValue returns [EObject current=null]
+ :
{ currentNode = createCompositeNode(grammarAccess.getIntValueRule(), currentNode); }
iv_ruleIntValue=ruleIntValue
{ $current=$iv_ruleIntValue.current; }
@@ -139,39 +147,45 @@
// Rule IntValue
ruleIntValue returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
}:
-(
-
- lv_value_0= RULE_INTEGER
- {
- createLeafNode(grammarAccess.getIntValueAccess().getValueINTEGERTerminalRuleCall_0(), "value");
- }
-
- {
+(
+(
+ lv_value_0_0=RULE_INTEGER
+ {
+ createLeafNode(grammarAccess.getIntValueAccess().getValueINTEGERTerminalRuleCall_0(), "value");
+ }
+ {
if ($current==null) {
$current = factory.create(grammarAccess.getIntValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
try {
- set($current, "value", lv_value_0, "INTEGER", lastConsumedNode);
+ set(
+ $current,
+ "value",
+ lv_value_0_0,
+ "INTEGER",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
-
-);
+
+)
+)
+;
// Entry rule entryRuleRealValue
-entryRuleRealValue returns [EObject current=null] :
+entryRuleRealValue returns [EObject current=null]
+ :
{ currentNode = createCompositeNode(grammarAccess.getRealValueRule(), currentNode); }
iv_ruleRealValue=ruleRealValue
{ $current=$iv_ruleRealValue.current; }
@@ -180,39 +194,45 @@
// Rule RealValue
ruleRealValue returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
}:
-(
-
- lv_value_0= RULE_REAL
- {
- createLeafNode(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0(), "value");
- }
-
- {
+(
+(
+ lv_value_0_0=RULE_REAL
+ {
+ createLeafNode(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0(), "value");
+ }
+ {
if ($current==null) {
$current = factory.create(grammarAccess.getRealValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
try {
- set($current, "value", lv_value_0, "REAL", lastConsumedNode);
+ set(
+ $current,
+ "value",
+ lv_value_0_0,
+ "REAL",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
-
-);
+
+)
+)
+;
// Entry rule entryRuleStringValue
-entryRuleStringValue returns [EObject current=null] :
+entryRuleStringValue returns [EObject current=null]
+ :
{ currentNode = createCompositeNode(grammarAccess.getStringValueRule(), currentNode); }
iv_ruleStringValue=ruleStringValue
{ $current=$iv_ruleStringValue.current; }
@@ -221,39 +241,45 @@
// Rule StringValue
ruleStringValue returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
}:
-(
-
- lv_value_0= RULE_STRING
- {
- createLeafNode(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0(), "value");
- }
-
- {
+(
+(
+ lv_value_0_0=RULE_STRING
+ {
+ createLeafNode(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0(), "value");
+ }
+ {
if ($current==null) {
$current = factory.create(grammarAccess.getStringValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
try {
- set($current, "value", lv_value_0, "STRING", lastConsumedNode);
+ set(
+ $current,
+ "value",
+ lv_value_0_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
-
-);
+
+)
+)
+;
// Entry rule entryRuleBooleanValue
-entryRuleBooleanValue returns [EObject current=null] :
+entryRuleBooleanValue returns [EObject current=null]
+ :
{ currentNode = createCompositeNode(grammarAccess.getBooleanValueRule(), currentNode); }
iv_ruleBooleanValue=ruleBooleanValue
{ $current=$iv_ruleBooleanValue.current; }
@@ -262,33 +288,37 @@
// Rule BooleanValue
ruleBooleanValue returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
}:
-(
-
-
- {
+(
+(
+ {
currentNode=createCompositeNode(grammarAccess.getBooleanValueAccess().getValueBOOLEANEnumRuleCall_0(), currentNode);
}
- lv_value_0=ruleBOOLEAN
- {
+ lv_value_0_0=ruleBOOLEAN {
if ($current==null) {
$current = factory.create(grammarAccess.getBooleanValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), $current);
}
-
try {
- set($current, "value", lv_value_0, "BOOLEAN", lastConsumedNode);
+ set(
+ $current,
+ "value",
+ lv_value_0_0,
+ "BOOLEAN",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
currentNode = currentNode.getParent();
}
-
-);
+
+)
+)
+;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseLexer.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseLexer.java
index 0049cb9..a3c8a34 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseLexer.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseLexer.java
@@ -73,10 +73,10 @@
public final void mRULE_INTEGER() throws RecognitionException {
try {
int _type = RULE_INTEGER;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:318:14: ( ( '-' )? ( '0' .. '9' )+ )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:318:16: ( '-' )? ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:348:14: ( ( '-' )? ( '0' .. '9' )+ )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:348:16: ( '-' )? ( '0' .. '9' )+
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:318:16: ( '-' )?
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:348:16: ( '-' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -85,7 +85,7 @@
}
switch (alt1) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:318:16: '-'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:348:16: '-'
{
match('-');
@@ -94,7 +94,7 @@
}
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:318:21: ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:348:21: ( '0' .. '9' )+
int cnt2=0;
loop2:
do {
@@ -108,7 +108,7 @@
switch (alt2) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:318:22: '0' .. '9'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:348:22: '0' .. '9'
{
matchRange('0','9');
@@ -138,10 +138,10 @@
public final void mRULE_REAL() throws RecognitionException {
try {
int _type = RULE_REAL;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:11: ( ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )* )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:13: ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:11: ( ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:13: ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )*
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:13: ( '-' )?
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:13: ( '-' )?
int alt3=2;
int LA3_0 = input.LA(1);
@@ -150,7 +150,7 @@
}
switch (alt3) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:13: '-'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:13: '-'
{
match('-');
@@ -159,7 +159,7 @@
}
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:18: ( '0' .. '9' )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:18: ( '0' .. '9' )*
loop4:
do {
int alt4=2;
@@ -172,7 +172,7 @@
switch (alt4) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:19: '0' .. '9'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:19: '0' .. '9'
{
matchRange('0','9');
@@ -185,7 +185,7 @@
} while (true);
match('.');
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:34: ( '0' .. '9' )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:34: ( '0' .. '9' )*
loop5:
do {
int alt5=2;
@@ -198,7 +198,7 @@
switch (alt5) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:320:35: '0' .. '9'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:350:35: '0' .. '9'
{
matchRange('0','9');
@@ -224,11 +224,11 @@
public final void mRULE_DESC_STRING() throws RecognitionException {
try {
int _type = RULE_DESC_STRING;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:322:18: ( '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB' )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:322:20: '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:352:18: ( '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:352:20: '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB'
{
match('\u00AB');
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:322:29: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:352:29: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )*
loop6:
do {
int alt6=3;
@@ -244,7 +244,7 @@
switch (alt6) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:322:30: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:352:30: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t'||input.LA(1)=='\u00AB'||input.LA(1)=='\u00BB' ) {
@@ -261,7 +261,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:322:80: ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:352:80: ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\u00BA')||(input.LA(1)>='\u00BC' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -297,10 +297,10 @@
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:324:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:324:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:354:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:354:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:324:11: ( '^' )?
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:354:11: ( '^' )?
int alt7=2;
int LA7_0 = input.LA(1);
@@ -309,7 +309,7 @@
}
switch (alt7) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:324:11: '^'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:354:11: '^'
{
match('^');
@@ -328,7 +328,7 @@
recover(mse); throw mse;
}
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:324:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:354:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop8:
do {
int alt8=2;
@@ -376,10 +376,10 @@
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:326:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:326:12: ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:356:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:356:12: ( '0' .. '9' )+
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:326:12: ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:356:12: ( '0' .. '9' )+
int cnt9=0;
loop9:
do {
@@ -393,7 +393,7 @@
switch (alt9) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:326:13: '0' .. '9'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:356:13: '0' .. '9'
{
matchRange('0','9');
@@ -423,10 +423,10 @@
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt12=2;
int LA12_0 = input.LA(1);
@@ -438,16 +438,16 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("328:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 12, 0, input);
+ new NoViableAltException("358:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 12, 0, input);
throw nvae;
}
switch (alt12) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
loop10:
do {
int alt10=3;
@@ -463,7 +463,7 @@
switch (alt10) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -480,7 +480,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:62: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:62: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -506,10 +506,10 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop11:
do {
int alt11=3;
@@ -525,7 +525,7 @@
switch (alt11) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -542,7 +542,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:129: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:358:129: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -584,12 +584,12 @@
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:330:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:330:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:360:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:360:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:330:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:360:24: ( options {greedy=false; } : . )*
loop13:
do {
int alt13=2;
@@ -614,7 +614,7 @@
switch (alt13) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:330:52: .
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:360:52: .
{
matchAny();
@@ -642,12 +642,12 @@
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop14:
do {
int alt14=2;
@@ -660,7 +660,7 @@
switch (alt14) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -681,7 +681,7 @@
}
} while (true);
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:40: ( ( '\\r' )? '\\n' )?
int alt16=2;
int LA16_0 = input.LA(1);
@@ -690,9 +690,9 @@
}
switch (alt16) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:41: ( '\\r' )?
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:41: ( '\\r' )?
int alt15=2;
int LA15_0 = input.LA(1);
@@ -701,7 +701,7 @@
}
switch (alt15) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:41: '\\r'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:362:41: '\\r'
{
match('\r');
@@ -731,10 +731,10 @@
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:334:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:334:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:364:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:364:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:334:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:364:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt17=0;
loop17:
do {
@@ -787,8 +787,8 @@
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:336:16: ( . )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:336:18: .
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:366:16: ( . )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:366:18: .
{
matchAny();
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseParser.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseParser.java
index edf5052..314db64 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseParser.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABaseParser.java
@@ -47,7 +47,7 @@
public String getGrammarFileName() { return "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g"; }
-
+
private ABaseGrammarAccess grammarAccess;
public InternalABaseParser(TokenStream input, IAstFactory factory, ABaseGrammarAccess grammarAccess) {
@@ -66,12 +66,17 @@
@Override
protected String getFirstRuleName() {
return "Value";
- }
+ }
+
+ @Override
+ protected ABaseGrammarAccess getGrammarAccess() {
+ return grammarAccess;
+ }
// $ANTLR start entryRuleValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:73:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:78:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
public final EObject entryRuleValue() throws RecognitionException {
EObject current = null;
@@ -79,16 +84,16 @@
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:73:47: (iv_ruleValue= ruleValue EOF )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:74:2: iv_ruleValue= ruleValue EOF
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:79:2: (iv_ruleValue= ruleValue EOF )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:80:2: iv_ruleValue= ruleValue EOF
{
currentNode = createCompositeNode(grammarAccess.getValueRule(), currentNode);
- pushFollow(FOLLOW_ruleValue_in_entryRuleValue73);
+ pushFollow(FOLLOW_ruleValue_in_entryRuleValue75);
iv_ruleValue=ruleValue();
_fsp--;
current =iv_ruleValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleValue83);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleValue85);
}
@@ -106,7 +111,7 @@
// $ANTLR start ruleValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:81:1: ruleValue returns [EObject current=null] : (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue ) ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:87:1: ruleValue returns [EObject current=null] : (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue ) ;
public final EObject ruleValue() throws RecognitionException {
EObject current = null;
@@ -119,13 +124,13 @@
EObject this_BooleanValue_3 = null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:86:6: ( (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:87:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:92:6: ( (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:93:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:87:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:93:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
int alt1=4;
switch ( input.LA(1) ) {
case RULE_INTEGER:
@@ -151,19 +156,19 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("87:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )", 1, 0, input);
+ new NoViableAltException("93:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )", 1, 0, input);
throw nvae;
}
switch (alt1) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:88:5: this_IntValue_0= ruleIntValue
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:94:5: this_IntValue_0= ruleIntValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getIntValueParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleIntValue_in_ruleValue130);
+ pushFollow(FOLLOW_ruleIntValue_in_ruleValue132);
this_IntValue_0=ruleIntValue();
_fsp--;
@@ -175,12 +180,12 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:98:5: this_StringValue_1= ruleStringValue
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:104:5: this_StringValue_1= ruleStringValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getStringValueParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleStringValue_in_ruleValue157);
+ pushFollow(FOLLOW_ruleStringValue_in_ruleValue159);
this_StringValue_1=ruleStringValue();
_fsp--;
@@ -192,12 +197,12 @@
}
break;
case 3 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:108:5: this_RealValue_2= ruleRealValue
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:114:5: this_RealValue_2= ruleRealValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getRealValueParserRuleCall_2(), currentNode);
- pushFollow(FOLLOW_ruleRealValue_in_ruleValue184);
+ pushFollow(FOLLOW_ruleRealValue_in_ruleValue186);
this_RealValue_2=ruleRealValue();
_fsp--;
@@ -209,12 +214,12 @@
}
break;
case 4 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:118:5: this_BooleanValue_3= ruleBooleanValue
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:124:5: this_BooleanValue_3= ruleBooleanValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getBooleanValueParserRuleCall_3(), currentNode);
- pushFollow(FOLLOW_ruleBooleanValue_in_ruleValue211);
+ pushFollow(FOLLOW_ruleBooleanValue_in_ruleValue213);
this_BooleanValue_3=ruleBooleanValue();
_fsp--;
@@ -248,7 +253,7 @@
// $ANTLR start entryRuleIntValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:133:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:140:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
public final EObject entryRuleIntValue() throws RecognitionException {
EObject current = null;
@@ -256,16 +261,16 @@
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:133:50: (iv_ruleIntValue= ruleIntValue EOF )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:134:2: iv_ruleIntValue= ruleIntValue EOF
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:141:2: (iv_ruleIntValue= ruleIntValue EOF )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:142:2: iv_ruleIntValue= ruleIntValue EOF
{
currentNode = createCompositeNode(grammarAccess.getIntValueRule(), currentNode);
- pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue243);
+ pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue248);
iv_ruleIntValue=ruleIntValue();
_fsp--;
current =iv_ruleIntValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue253);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue258);
}
@@ -283,34 +288,41 @@
// $ANTLR start ruleIntValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:141:1: ruleIntValue returns [EObject current=null] : (lv_value_0= RULE_INTEGER ) ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:149:1: ruleIntValue returns [EObject current=null] : ( (lv_value_0_0= RULE_INTEGER ) ) ;
public final EObject ruleIntValue() throws RecognitionException {
EObject current = null;
- Token lv_value_0=null;
+ Token lv_value_0_0=null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:146:6: ( (lv_value_0= RULE_INTEGER ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:147:1: (lv_value_0= RULE_INTEGER )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:154:6: ( ( (lv_value_0_0= RULE_INTEGER ) ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:155:1: ( (lv_value_0_0= RULE_INTEGER ) )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:147:1: (lv_value_0= RULE_INTEGER )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:149:6: lv_value_0= RULE_INTEGER
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:155:1: ( (lv_value_0_0= RULE_INTEGER ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:156:1: (lv_value_0_0= RULE_INTEGER )
{
- lv_value_0=(Token)input.LT(1);
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:156:1: (lv_value_0_0= RULE_INTEGER )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:157:3: lv_value_0_0= RULE_INTEGER
+ {
+ lv_value_0_0=(Token)input.LT(1);
match(input,RULE_INTEGER,FOLLOW_RULE_INTEGER_in_ruleIntValue299);
- createLeafNode(grammarAccess.getIntValueAccess().getValueINTEGERTerminalRuleCall_0(), "value");
-
+ createLeafNode(grammarAccess.getIntValueAccess().getValueINTEGERTerminalRuleCall_0(), "value");
+
if (current==null) {
current = factory.create(grammarAccess.getIntValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
try {
- set(current, "value", lv_value_0, "INTEGER", lastConsumedNode);
+ set(
+ current,
+ "value",
+ lv_value_0_0,
+ "INTEGER",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -321,6 +333,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -338,7 +353,7 @@
// $ANTLR start entryRuleRealValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:174:1: entryRuleRealValue returns [EObject current=null] : iv_ruleRealValue= ruleRealValue EOF ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:187:1: entryRuleRealValue returns [EObject current=null] : iv_ruleRealValue= ruleRealValue EOF ;
public final EObject entryRuleRealValue() throws RecognitionException {
EObject current = null;
@@ -346,8 +361,8 @@
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:174:51: (iv_ruleRealValue= ruleRealValue EOF )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:175:2: iv_ruleRealValue= ruleRealValue EOF
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:188:2: (iv_ruleRealValue= ruleRealValue EOF )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:189:2: iv_ruleRealValue= ruleRealValue EOF
{
currentNode = createCompositeNode(grammarAccess.getRealValueRule(), currentNode);
pushFollow(FOLLOW_ruleRealValue_in_entryRuleRealValue339);
@@ -373,34 +388,41 @@
// $ANTLR start ruleRealValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:182:1: ruleRealValue returns [EObject current=null] : (lv_value_0= RULE_REAL ) ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:196:1: ruleRealValue returns [EObject current=null] : ( (lv_value_0_0= RULE_REAL ) ) ;
public final EObject ruleRealValue() throws RecognitionException {
EObject current = null;
- Token lv_value_0=null;
+ Token lv_value_0_0=null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:187:6: ( (lv_value_0= RULE_REAL ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:188:1: (lv_value_0= RULE_REAL )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:201:6: ( ( (lv_value_0_0= RULE_REAL ) ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:202:1: ( (lv_value_0_0= RULE_REAL ) )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:188:1: (lv_value_0= RULE_REAL )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:190:6: lv_value_0= RULE_REAL
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:202:1: ( (lv_value_0_0= RULE_REAL ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:203:1: (lv_value_0_0= RULE_REAL )
{
- lv_value_0=(Token)input.LT(1);
- match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealValue395);
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:203:1: (lv_value_0_0= RULE_REAL )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:204:3: lv_value_0_0= RULE_REAL
+ {
+ lv_value_0_0=(Token)input.LT(1);
+ match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealValue390);
- createLeafNode(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0(), "value");
-
+ createLeafNode(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0(), "value");
+
if (current==null) {
current = factory.create(grammarAccess.getRealValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
try {
- set(current, "value", lv_value_0, "REAL", lastConsumedNode);
+ set(
+ current,
+ "value",
+ lv_value_0_0,
+ "REAL",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -411,6 +433,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -428,7 +453,7 @@
// $ANTLR start entryRuleStringValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:215:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:234:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
public final EObject entryRuleStringValue() throws RecognitionException {
EObject current = null;
@@ -436,16 +461,16 @@
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:215:53: (iv_ruleStringValue= ruleStringValue EOF )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:216:2: iv_ruleStringValue= ruleStringValue EOF
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:235:2: (iv_ruleStringValue= ruleStringValue EOF )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:236:2: iv_ruleStringValue= ruleStringValue EOF
{
currentNode = createCompositeNode(grammarAccess.getStringValueRule(), currentNode);
- pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue435);
+ pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue430);
iv_ruleStringValue=ruleStringValue();
_fsp--;
current =iv_ruleStringValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue445);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue440);
}
@@ -463,34 +488,41 @@
// $ANTLR start ruleStringValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:223:1: ruleStringValue returns [EObject current=null] : (lv_value_0= RULE_STRING ) ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:243:1: ruleStringValue returns [EObject current=null] : ( (lv_value_0_0= RULE_STRING ) ) ;
public final EObject ruleStringValue() throws RecognitionException {
EObject current = null;
- Token lv_value_0=null;
+ Token lv_value_0_0=null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:228:6: ( (lv_value_0= RULE_STRING ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:229:1: (lv_value_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:248:6: ( ( (lv_value_0_0= RULE_STRING ) ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:249:1: ( (lv_value_0_0= RULE_STRING ) )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:229:1: (lv_value_0= RULE_STRING )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:231:6: lv_value_0= RULE_STRING
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:249:1: ( (lv_value_0_0= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:250:1: (lv_value_0_0= RULE_STRING )
{
- lv_value_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue491);
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:250:1: (lv_value_0_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:251:3: lv_value_0_0= RULE_STRING
+ {
+ lv_value_0_0=(Token)input.LT(1);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue481);
- createLeafNode(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0(), "value");
-
+ createLeafNode(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0(), "value");
+
if (current==null) {
current = factory.create(grammarAccess.getStringValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
try {
- set(current, "value", lv_value_0, "STRING", lastConsumedNode);
+ set(
+ current,
+ "value",
+ lv_value_0_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -501,6 +533,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -518,7 +553,7 @@
// $ANTLR start entryRuleBooleanValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:256:1: entryRuleBooleanValue returns [EObject current=null] : iv_ruleBooleanValue= ruleBooleanValue EOF ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:281:1: entryRuleBooleanValue returns [EObject current=null] : iv_ruleBooleanValue= ruleBooleanValue EOF ;
public final EObject entryRuleBooleanValue() throws RecognitionException {
EObject current = null;
@@ -526,16 +561,16 @@
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:256:54: (iv_ruleBooleanValue= ruleBooleanValue EOF )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:257:2: iv_ruleBooleanValue= ruleBooleanValue EOF
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:282:2: (iv_ruleBooleanValue= ruleBooleanValue EOF )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:283:2: iv_ruleBooleanValue= ruleBooleanValue EOF
{
currentNode = createCompositeNode(grammarAccess.getBooleanValueRule(), currentNode);
- pushFollow(FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue531);
+ pushFollow(FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue521);
iv_ruleBooleanValue=ruleBooleanValue();
_fsp--;
current =iv_ruleBooleanValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanValue541);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanValue531);
}
@@ -553,27 +588,30 @@
// $ANTLR start ruleBooleanValue
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:264:1: ruleBooleanValue returns [EObject current=null] : (lv_value_0= ruleBOOLEAN ) ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:290:1: ruleBooleanValue returns [EObject current=null] : ( (lv_value_0_0= ruleBOOLEAN ) ) ;
public final EObject ruleBooleanValue() throws RecognitionException {
EObject current = null;
- Enumerator lv_value_0 = null;
+ Enumerator lv_value_0_0 = null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:269:6: ( (lv_value_0= ruleBOOLEAN ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:270:1: (lv_value_0= ruleBOOLEAN )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:295:6: ( ( (lv_value_0_0= ruleBOOLEAN ) ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:296:1: ( (lv_value_0_0= ruleBOOLEAN ) )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:270:1: (lv_value_0= ruleBOOLEAN )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:273:6: lv_value_0= ruleBOOLEAN
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:296:1: ( (lv_value_0_0= ruleBOOLEAN ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:297:1: (lv_value_0_0= ruleBOOLEAN )
+ {
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:297:1: (lv_value_0_0= ruleBOOLEAN )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:298:3: lv_value_0_0= ruleBOOLEAN
{
currentNode=createCompositeNode(grammarAccess.getBooleanValueAccess().getValueBOOLEANEnumRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleBOOLEAN_in_ruleBooleanValue599);
- lv_value_0=ruleBOOLEAN();
+ pushFollow(FOLLOW_ruleBOOLEAN_in_ruleBooleanValue576);
+ lv_value_0_0=ruleBOOLEAN();
_fsp--;
@@ -581,9 +619,13 @@
current = factory.create(grammarAccess.getBooleanValueRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), current);
}
-
try {
- set(current, "value", lv_value_0, "BOOLEAN", lastConsumedNode);
+ set(
+ current,
+ "value",
+ lv_value_0_0,
+ "BOOLEAN",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -595,6 +637,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -612,16 +657,16 @@
// $ANTLR start ruleBOOLEAN
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:298:1: ruleBOOLEAN returns [Enumerator current=null] : ( ( 'true' ) | ( 'false' ) ) ;
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:328:1: ruleBOOLEAN returns [Enumerator current=null] : ( ( 'true' ) | ( 'false' ) ) ;
public final Enumerator ruleBOOLEAN() throws RecognitionException {
Enumerator current = null;
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:302:6: ( ( ( 'true' ) | ( 'false' ) ) )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:303:1: ( ( 'true' ) | ( 'false' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:332:6: ( ( ( 'true' ) | ( 'false' ) ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:333:1: ( ( 'true' ) | ( 'false' ) )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:303:1: ( ( 'true' ) | ( 'false' ) )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:333:1: ( ( 'true' ) | ( 'false' ) )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -633,18 +678,18 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("303:1: ( ( 'true' ) | ( 'false' ) )", 2, 0, input);
+ new NoViableAltException("333:1: ( ( 'true' ) | ( 'false' ) )", 2, 0, input);
throw nvae;
}
switch (alt2) {
case 1 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:303:2: ( 'true' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:333:2: ( 'true' )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:303:2: ( 'true' )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:303:4: 'true'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:333:2: ( 'true' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:333:4: 'true'
{
- match(input,14,FOLLOW_14_in_ruleBOOLEAN649);
+ match(input,14,FOLLOW_14_in_ruleBOOLEAN623);
current = grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_0(), null);
@@ -656,12 +701,12 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:309:6: ( 'false' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:339:6: ( 'false' )
{
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:309:6: ( 'false' )
- // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:309:8: 'false'
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:339:6: ( 'false' )
+ // ../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g:339:8: 'false'
{
- match(input,15,FOLLOW_15_in_ruleBOOLEAN664);
+ match(input,15,FOLLOW_15_in_ruleBOOLEAN638);
current = grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_1(), null);
@@ -696,25 +741,25 @@
- public static final BitSet FOLLOW_ruleValue_in_entryRuleValue73 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValue83 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntValue_in_ruleValue130 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringValue_in_ruleValue157 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRealValue_in_ruleValue184 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanValue_in_ruleValue211 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue243 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleIntValue253 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleValue_in_entryRuleValue75 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleValue85 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntValue_in_ruleValue132 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringValue_in_ruleValue159 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRealValue_in_ruleValue186 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanValue_in_ruleValue213 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue248 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleIntValue258 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_INTEGER_in_ruleIntValue299 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleRealValue_in_entryRuleRealValue339 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleRealValue349 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_REAL_in_ruleRealValue395 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue435 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleStringValue445 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue491 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue531 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleBooleanValue541 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBOOLEAN_in_ruleBooleanValue599 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleBOOLEAN649 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_15_in_ruleBOOLEAN664 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_REAL_in_ruleRealValue390 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue430 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleStringValue440 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue481 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue521 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleBooleanValue531 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBOOLEAN_in_ruleBooleanValue576 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_14_in_ruleBOOLEAN623 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleBOOLEAN638 = new BitSet(new long[]{0x0000000000000002L});
}
\ No newline at end of file
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase__.g b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase__.g
index e14b569..19f14ea 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase__.g
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase__.g
@@ -10,34 +10,34 @@
T14 : 'true' ;
T15 : 'false' ;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 318
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 348
RULE_INTEGER : '-'? ('0'..'9')+;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 320
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 350
RULE_REAL : '-'? ('0'..'9')* '.' ('0'..'9')*;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 322
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 352
RULE_DESC_STRING : '\u00AB' ('\\' ('b'|'t'|'n'|'f'|'r'|'\u00AB'|'\u00BB'|'\\')|~(('\\'|'\u00AB'|'\u00BB')))* '\u00BB';
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 324
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 354
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 326
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 356
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 328
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 358
RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 330
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 360
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 332
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 362
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 334
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 364
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 336
+// $ANTLR src "../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/parser/antlr/internal/InternalABase.g" 366
RULE_ANY_OTHER : .;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/services/ABaseGrammarAccess.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/services/ABaseGrammarAccess.java
index 5b32494..f1a9e0c 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/services/ABaseGrammarAccess.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/services/ABaseGrammarAccess.java
@@ -8,16 +8,16 @@
import com.google.inject.Inject;
import org.eclipse.xtext.*;
-
import org.eclipse.xtext.service.GrammarProvider;
+import org.eclipse.xtext.service.AbstractElementFinder.*;
import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
@Singleton
-public class ABaseGrammarAccess implements IGrammarAccess {
+public class ABaseGrammarAccess extends AbstractGrammarElementFinder {
- public class ValueElements implements IParserRuleAccess {
+ public class ValueElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Value");
private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
private final RuleCall cIntValueParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
@@ -45,7 +45,7 @@
public RuleCall getBooleanValueParserRuleCall_3() { return cBooleanValueParserRuleCall_3; }
}
- public class IntValueElements implements IParserRuleAccess {
+ public class IntValueElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntValue");
private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
private final RuleCall cValueINTEGERTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
@@ -61,7 +61,7 @@
public RuleCall getValueINTEGERTerminalRuleCall_0() { return cValueINTEGERTerminalRuleCall_0; }
}
- public class RealValueElements implements IParserRuleAccess {
+ public class RealValueElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RealValue");
private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
private final RuleCall cValueREALTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
@@ -77,7 +77,7 @@
public RuleCall getValueREALTerminalRuleCall_0() { return cValueREALTerminalRuleCall_0; }
}
- public class StringValueElements implements IParserRuleAccess {
+ public class StringValueElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringValue");
private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
private final RuleCall cValueSTRINGTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
@@ -93,7 +93,7 @@
public RuleCall getValueSTRINGTerminalRuleCall_0() { return cValueSTRINGTerminalRuleCall_0; }
}
- public class BooleanValueElements implements IParserRuleAccess {
+ public class BooleanValueElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BooleanValue");
private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
private final RuleCall cValueBOOLEANEnumRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
@@ -110,7 +110,7 @@
}
- public class BOOLEANElements implements IEnumRuleAccess {
+ public class BOOLEANElements extends AbstractEnumRuleElementFinder {
private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "BOOLEAN");
private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
private final EnumLiteralDeclaration cTRUEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
@@ -242,8 +242,7 @@
}
//terminal DESC_STRING:
- // "\u00AB" ("\\" ("b" | "t" | "n" | "f" | "r" | "\u00AB" | "\u00BB" | "\\") | !("\\" | "\u00AB" |
- // "\u00BB"))* "\u00BB";
+ // "«" ("\\" ("b" | "t" | "n" | "f" | "r" | "«" | "»" | "\\") | !("\\" | "«" | "»"))* "»";
public TerminalRule getDESC_STRINGRule() {
return (tDESC_STRING != null) ? tDESC_STRING : (tDESC_STRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DESC_STRING"));
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/validation/AbstractABaseJavaValidator.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/validation/AbstractABaseJavaValidator.java
index e1c4edf..7cc3356 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/validation/AbstractABaseJavaValidator.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/validation/AbstractABaseJavaValidator.java
@@ -7,11 +7,11 @@
import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
import org.eclipse.xtext.validation.ComposedChecks;
-@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class})
+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
public class AbstractABaseJavaValidator extends AbstractDeclarativeValidator {
@Override
- protected List<? extends EPackage> getEPackages() {
+ protected List<EPackage> getEPackages() {
List<EPackage> result = new ArrayList<EPackage>();
result.add(org.eclipse.amp.amf.abase.aBase.ABasePackage.eINSTANCE);
return result;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/ABaseRuntimeModule.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/ABaseRuntimeModule.java
index d225516..a7c7606 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/ABaseRuntimeModule.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/ABaseRuntimeModule.java
@@ -4,6 +4,8 @@
package org.eclipse.amp.amf.abase;
import org.eclipse.xtext.conversion.IValueConverterService;
+import org.eclipse.xtext.linking.ILinker;
+import org.eclipse.xtext.linking.impl.Linker;
/**
* Use this class to register components to be used within the IDE.
@@ -17,4 +19,13 @@
public Class<? extends IValueConverterService> bindIValueConverterService() {
return AMPTerminalConverters.class;
}
+
+ @Override
+ /**
+ * @return
+ * @see org.eclipse.xtext.service.DefaultRuntimeModule#bindILinker()
+ */
+ public Class<? extends ILinker> bindILinker() {
+ return Linker.class;
+ }
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/GenerateABase.mwe2 b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/GenerateABase.mwe2
new file mode 100644
index 0000000..ed32c5f
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/src/org/eclipse/amp/amf/abase/GenerateABase.mwe2
@@ -0,0 +1,114 @@
+module org.eclipse.amp.amf.abase.ABase
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.generator.*
+import org.eclipse.xtext.ui.generator.*
+
+var grammarURI = "classpath:/org/eclipse/amp/amf/abase/ABase.xtext"
+var file.extensions = "abase"
+var projectName = "org.eclipse.amp.amf.abase"
+var runtimeProject = "../${projectName}"
+
+Workflow {
+ bean = StandaloneSetup {
+ platformUri = "${runtimeProject}/.."
+ }
+
+ component = DirectoryCleaner {
+ directory = "${runtimeProject}/src-gen"
+ }
+
+ component = DirectoryCleaner {
+ directory = "${runtimeProject}.ui/src-gen"
+ }
+
+ component = Generator {
+ pathRtProject = runtimeProject
+ pathUiProject = "${runtimeProject}.ui"
+ projectNameRt = projectName
+ projectNameUi = "${projectName}.ui"
+
+ language = {
+ uri = grammarURI
+ fileExtensions = file.extensions
+
+ // Java API to access grammar elements (required by several other fragments)
+ fragment = grammarAccess.GrammarAccessFragment {}
+
+ // generates Java API for the generated EPackages
+ fragment = ecore.EcoreGeneratorFragment {
+ // referencedGenModels = "uri to genmodel, uri to next genmodel"
+ }
+
+ // the serialization component
+ fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
+
+ // a custom ResourceFactory for use with EMF
+ fragment = resourceFactory.ResourceFactoryFragment {
+ fileExtensions = file.extensions
+ }
+
+ // the following fragment tries to use the Antlr Generator fragment which can be installed via update manager from http://download.itemis.com/updates/
+ fragment = AntlrDelegatingFragment {}
+
+ /*
+ If you don't want to use the Antlr fragment for some reason, remove the antlr fragment and uncomment the packrat parser fragment below.
+ fragment = parser.PackratParserFragment {}
+ */
+
+ // check-based API for validation
+ /*
+ fragment = validation.CheckFragment {}
+ */
+
+ // java-based API for validation
+ fragment = validation.JavaValidatorFragment {
+ composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
+ composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
+ }
+
+ // scoping and exporting API
+ fragment = scoping.ImportURIScopingFragment {}
+ fragment = exporting.SimpleNamesFragment {}
+
+ // scoping and exporting API
+ //fragment = scoping.ImportNamespacesScopingFragment {}
+ //fragment = exporting.QualifiedNamesFragment {}
+
+ // formatter API
+ fragment = formatting.FormatterFragment {}
+
+ // labeling API
+ fragment = labeling.LabelProviderFragment {}
+
+ // outline API
+ fragment = outline.TransformerFragment {}
+ fragment = outline.OutlineNodeAdapterFactoryFragment {}
+ fragment = outline.QuickOutlineFragment {}
+
+ // java-based API for content assistance
+ fragment = contentAssist.JavaBasedContentAssistFragment {}
+
+ // the following fragment tries to use the Antlr based content assist
+ // fragment which can be downloaded from http://www.itemis.com
+ // and will be ignored if it's not available.
+ fragment = DelegatingGeneratorFragment {
+ delegate = "de.itemis.xtext.antlr.XtextAntlrUiGeneratorFragment"
+ message="You are generating without ANTLR. It is highly recommended to download and use the plugin \'de.itemis.xtext.antlr\' \n\t using the update site http:\//download.itemis.com/updates/."
+ }
+
+ fragment = builder.BuilderIntegrationFragment {}
+
+ // project wizard (optional)
+ /*
+ fragment = projectWizard.SimpleProjectWizardFragment {
+ generatorProjectName = "${projectName}.generator"
+ modelFileExtension = file.extensions
+ }
+ */
+
+ // quickfix API
+ fragment = quickfix.QuickfixProviderFragment {}
+ }
+ }
+}