Changes for XText 0.8.0. Doesn't build locally because of codegen issue but perhaps it will on build server..
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/.project b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/.project
index d71e446..1604f18 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/.project
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.core.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>
</natures>
</projectDescription>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF
index 2abe6fb..eeb8848 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF
@@ -2,30 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
-Bundle-Version: 0.2.0.qualifier
+Bundle-Version: 0.5.0.qualifier
Bundle-SymbolicName: org.eclipse.amp.amf.parameters;singleton:=true
Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.generator;resolution:=optional,
de.itemis.xtext.antlr;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.xtext.log4j;resolution:=optional,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe.core;resolution:=optional,
+ com.ibm.icu;resolution:=optional,
org.eclipse.xtext.xtend;resolution:=optional,
- org.eclipse.xtext.util,
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.amp.amf.acore,
+ org.eclipse.amp.amf.abase,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime,
- org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.core.resources;bundle-version="3.5.0",
- org.eclipse.amp.amf.acore,
- org.eclipse.amp.amf.abase
+ org.eclipse.xtext.util
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
-Import-Package: org.apache.commons.collections,org.apache.commons.lang
+Import-Package: org.apache.commons.collections,org.apache.commons.lang,org.apache.log4j
Export-Package: org.eclipse.amp.amf.parameters,
org.eclipse.amp.amf.parameters.aPar,
org.eclipse.amp.amf.parameters.aPar.impl,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.xmi b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.xmi
index eabb568..7fe799a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.xmi
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.xmi
@@ -168,6 +168,37 @@
</tokens>
</alternatives>
</rules>
+ <rules xsi:type="xtext:TerminalRule" name="DESC_STRING">
+ <type metamodel="/1/@metamodelDeclarations.1">
+ <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">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="«"/>
+ <groups xsi:type="xtext:Keyword" value="»"/>
+ </terminal>
+ </groups>
+ </tokens>
+ <tokens xsi:type="xtext:Keyword" value="»"/>
+ </alternatives>
+ </rules>
</xtext:Grammar>
<xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/2/@rules.5 /2/@rules.3 /2/@rules.4">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/AbstractAParRuntimeModule.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/AbstractAParRuntimeModule.java
index 840e5d5..66ef8d7 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/AbstractAParRuntimeModule.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/AbstractAParRuntimeModule.java
@@ -20,6 +20,11 @@
super.configure(binder);
binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance(
"org.eclipse.amp.amf.parameters.APar");
+ bindProperties(binder);
+ }
+
+ protected void bindProperties(Binder binder) {
+ bindProperties(binder, "/org/eclipse/amp/amf/parameters/APar.properties");
}
@@ -49,8 +54,8 @@
}
// contributed by de.itemis.xtext.antlr.XtextAntlrGeneratorFragment
- public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
- return org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer.class;
+ public com.google.inject.Provider<org.eclipse.xtext.parser.antlr.Lexer> provideLexer() {
+ return new org.eclipse.xtext.parser.antlr.LexerProvider(org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer.class);
}
// contributed by de.itemis.xtext.antlr.XtextAntlrGeneratorFragment
@@ -68,6 +73,11 @@
return org.eclipse.amp.amf.parameters.scoping.AParScopeProvider.class;
}
+ // contributed by org.eclipse.xtext.generator.scoping.JavaScopingFragment
+ 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.IScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleNameScopeProvider.class);
+ }
+
// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
return org.eclipse.amp.amf.parameters.formatting.AParFormatter.class;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/BOOLEAN.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/BOOLEAN.java
deleted file mode 100644
index ab30657..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/BOOLEAN.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- */
-package org.eclipse.amp.amf.parameters.aPar;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>BOOLEAN</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getBOOLEAN()
- * @model
- * @generated
- */
-public enum BOOLEAN implements Enumerator
-{
- /**
- * The '<em><b>TRUE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #TRUE_VALUE
- * @generated
- * @ordered
- */
- TRUE(0, "TRUE", "true"),
-
- /**
- * The '<em><b>FALSE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #FALSE_VALUE
- * @generated
- * @ordered
- */
- FALSE(1, "FALSE", "false");
-
- /**
- * The '<em><b>TRUE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>TRUE</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #TRUE
- * @model literal="true"
- * @generated
- * @ordered
- */
- public static final int TRUE_VALUE = 0;
-
- /**
- * The '<em><b>FALSE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>FALSE</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #FALSE
- * @model literal="false"
- * @generated
- * @ordered
- */
- public static final int FALSE_VALUE = 1;
-
- /**
- * An array of all the '<em><b>BOOLEAN</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final BOOLEAN[] VALUES_ARRAY =
- new BOOLEAN[]
- {
- TRUE,
- FALSE,
- };
-
- /**
- * A public read-only list of all the '<em><b>BOOLEAN</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<BOOLEAN> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>BOOLEAN</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static BOOLEAN get(String literal)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- BOOLEAN result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>BOOLEAN</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static BOOLEAN getByName(String name)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- BOOLEAN result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>BOOLEAN</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static BOOLEAN get(int value)
- {
- switch (value)
- {
- case TRUE_VALUE: return TRUE;
- case FALSE_VALUE: return FALSE;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private BOOLEAN(int value, String name, String literal)
- {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue()
- {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral()
- {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- return literal;
- }
-
-} //BOOLEAN
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/BooleanValue.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/BooleanValue.java
deleted file mode 100644
index 426cbed..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/BooleanValue.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- */
-package org.eclipse.amp.amf.parameters.aPar;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.amp.amf.parameters.aPar.BooleanValue#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getBooleanValue()
- * @model
- * @generated
- */
-public interface BooleanValue extends Value
-{
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.amp.amf.parameters.aPar.BOOLEAN}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see org.eclipse.amp.amf.parameters.aPar.BOOLEAN
- * @see #setValue(BOOLEAN)
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getBooleanValue_Value()
- * @model
- * @generated
- */
- BOOLEAN getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.BooleanValue#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see org.eclipse.amp.amf.parameters.aPar.BOOLEAN
- * @see #getValue()
- * @generated
- */
- void setValue(BOOLEAN value);
-
-} // BooleanValue
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/IntValue.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/IntValue.java
deleted file mode 100644
index 0e33eaf..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/IntValue.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- */
-package org.eclipse.amp.amf.parameters.aPar;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Int Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.amp.amf.parameters.aPar.IntValue#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getIntValue()
- * @model
- * @generated
- */
-public interface IntValue extends Value
-{
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see #setValue(String)
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getIntValue_Value()
- * @model
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.IntValue#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
-} // IntValue
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/RealValue.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/RealValue.java
deleted file mode 100644
index edae73b..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/RealValue.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- */
-package org.eclipse.amp.amf.parameters.aPar;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Real Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.amp.amf.parameters.aPar.RealValue#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getRealValue()
- * @model
- * @generated
- */
-public interface RealValue extends Value
-{
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see #setValue(String)
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getRealValue_Value()
- * @model
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.RealValue#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
-} // RealValue
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/StringValue.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/StringValue.java
deleted file mode 100644
index 8cde8ff..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/StringValue.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- */
-package org.eclipse.amp.amf.parameters.aPar;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.amp.amf.parameters.aPar.StringValue#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getStringValue()
- * @model
- * @generated
- */
-public interface StringValue extends Value
-{
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see #setValue(String)
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getStringValue_Value()
- * @model
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.StringValue#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
-} // StringValue
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Value.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Value.java
deleted file mode 100644
index 4600461..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Value.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- */
-package org.eclipse.amp.amf.parameters.aPar;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getValue()
- * @model
- * @generated
- */
-public interface Value extends EObject
-{
-} // Value
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parseTreeConstruction/AParParsetreeConstructor.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parseTreeConstruction/AParParsetreeConstructor.java
index 7210586..8ef018f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parseTreeConstruction/AParParsetreeConstructor.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parseTreeConstruction/AParParsetreeConstructor.java
@@ -16,11 +16,13 @@
@Inject
private AParGrammarAccess grammarAccess;
-
+
+ @Override
public AParGrammarAccess getGrammarAccess() {
return grammarAccess;
}
+ @Override
protected AbstractToken getRootToken(IInstanceDescription inst) {
return new ThisRootNode(inst);
}
@@ -30,12 +32,18 @@
super(inst);
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Model_Group(this, this, 0, inst);
case 1: return new Import_Group(this, this, 1, inst);
case 2: return new Incorporates_Group(this, this, 2, inst);
case 3: return new Parameter_Group(this, this, 3, inst);
+ case 4: return new Value_Alternatives(this, this, 4, inst);
+ case 5: return new IntValue_ValueAssignment(this, this, 5, inst);
+ case 6: return new RealValue_ValueAssignment(this, this, 6, inst);
+ case 7: return new StringValue_ValueAssignment(this, this, 7, inst);
+ case 8: return new BooleanValue_ValueAssignment(this, this, 8, inst);
default: return null;
}
}
@@ -56,10 +64,12 @@
super(parent, next, no, current);
}
+ @Override
public Group getGrammarElement() {
return grammarAccess.getModelAccess().getGroup();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Model_ParametersAssignment_3(parent, this, 0, inst);
@@ -69,6 +79,7 @@
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getModelRule().getType().getClassifier())) return null;
return tryConsumeVal();
@@ -82,16 +93,19 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getModelAccess().getNameAssignment_0();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("name",false)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
@@ -112,10 +126,12 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getModelAccess().getModelAssignment_1();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Import_Group(this, this, 0, inst);
@@ -123,6 +139,7 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("model",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("model");
@@ -138,6 +155,7 @@
return null;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
if(value == inst.getDelegate() && !inst.isConsumed()) return null;
switch(index) {
@@ -154,10 +172,12 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getModelAccess().getIncorporatesAssignment_2();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Incorporates_Group(this, this, 0, inst);
@@ -165,6 +185,7 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("incorporates",false)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("incorporates");
@@ -180,6 +201,7 @@
return null;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
if(value == inst.getDelegate() && !inst.isConsumed()) return null;
switch(index) {
@@ -197,10 +219,12 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getModelAccess().getParametersAssignment_3();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Parameter_Group(this, this, 0, inst);
@@ -208,6 +232,7 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("parameters",false)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("parameters");
@@ -223,6 +248,7 @@
return null;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
if(value == inst.getDelegate() && !inst.isConsumed()) return null;
switch(index) {
@@ -252,10 +278,12 @@
super(parent, next, no, current);
}
+ @Override
public Group getGrammarElement() {
return grammarAccess.getImportAccess().getGroup();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Import_ImportURIAssignment_1(parent, this, 0, inst);
@@ -263,6 +291,7 @@
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getImportRule().getType().getClassifier())) return null;
return tryConsumeVal();
@@ -276,10 +305,12 @@
super(parent, next, no, current);
}
+ @Override
public Keyword getGrammarElement() {
return grammarAccess.getImportAccess().getModelKeyword_0();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
@@ -295,10 +326,12 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getImportAccess().getImportURIAssignment_1();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Import_ModelKeyword_0(parent, this, 0, inst);
@@ -306,6 +339,7 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("importURI",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("importURI");
@@ -337,10 +371,12 @@
super(parent, next, no, current);
}
+ @Override
public Group getGrammarElement() {
return grammarAccess.getIncorporatesAccess().getGroup();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Incorporates_ImportURIAssignment_1(parent, this, 0, inst);
@@ -348,6 +384,7 @@
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getIncorporatesRule().getType().getClassifier())) return null;
return tryConsumeVal();
@@ -361,10 +398,12 @@
super(parent, next, no, current);
}
+ @Override
public Keyword getGrammarElement() {
return grammarAccess.getIncorporatesAccess().getIncorporatesKeyword_0();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
@@ -380,10 +419,12 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getIncorporatesAccess().getImportURIAssignment_1();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Incorporates_IncorporatesKeyword_0(parent, this, 0, inst);
@@ -391,6 +432,7 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("importURI",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("importURI");
@@ -422,10 +464,12 @@
super(parent, next, no, current);
}
+ @Override
public Group getGrammarElement() {
return grammarAccess.getParameterAccess().getGroup();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Parameter_ValueAssignment_2(parent, this, 0, inst);
@@ -433,6 +477,7 @@
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getParameterRule().getType().getClassifier())) return null;
return tryConsumeVal();
@@ -446,16 +491,19 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getParameterAccess().getAttributeAssignment_0();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
default: return parent.createParentFollower(this, index, index, inst);
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("attribute",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("attribute");
@@ -479,10 +527,12 @@
super(parent, next, no, current);
}
+ @Override
public Keyword getGrammarElement() {
return grammarAccess.getParameterAccess().getEqualsSignKeyword_1();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Parameter_AttributeAssignment_0(parent, this, 0, inst);
@@ -499,10 +549,12 @@
super(parent, next, no, current);
}
+ @Override
public Assignment getGrammarElement() {
return grammarAccess.getParameterAccess().getValueAssignment_2();
}
+ @Override
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
case 0: return new Value_Alternatives(this, this, 0, inst);
@@ -510,6 +562,7 @@
}
}
+ @Override
protected IInstanceDescription tryConsumeVal() {
if((value = current.getConsumable("value",true)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("value");
@@ -525,6 +578,7 @@
return null;
}
+ @Override
public AbstractToken createParentFollower(AbstractToken next, int actIndex, int index, IInstanceDescription inst) {
if(value == inst.getDelegate() && !inst.isConsumed()) return null;
switch(index) {
@@ -552,10 +606,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);
@@ -566,6 +622,7 @@
}
}
+ @Override
public IInstanceDescription tryConsume() {
if(!current.isInstanceOf(grammarAccess.getValueRule().getType().getClassifier())) return null;
return tryConsumeVal();
@@ -579,10 +636,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);
@@ -590,12 +649,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);
@@ -610,10 +671,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);
@@ -621,12 +684,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);
@@ -641,10 +706,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);
@@ -652,12 +719,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);
@@ -672,10 +741,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);
@@ -683,12 +754,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);
@@ -714,20 +787,24 @@
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");
@@ -758,20 +835,24 @@
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");
@@ -802,20 +883,24 @@
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");
@@ -846,20 +931,24 @@
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");
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/AParParser.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/AParParser.java
index 9f52ec7..1d74797 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/AParParser.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/AParParser.java
@@ -10,6 +10,7 @@
import org.eclipse.xtext.parser.antlr.XtextTokenStream;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import org.eclipse.amp.amf.parameters.services.AParGrammarAccess;
@@ -21,13 +22,16 @@
@Inject
private AParGrammarAccess grammarAccess;
+ @Inject
+ private Provider<org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer> lexerProvider;
+
@Override
protected IParseResult parse(String ruleName, ANTLRInputStream in) {
- org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer lexer = new org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer(in);
+ org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer lexer = lexerProvider.get();
+ lexer.setCharStream(in);
XtextTokenStream stream = new XtextTokenStream(lexer, antlrTokenDefProvider);
stream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
- org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParParser parser = new org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParParser(
- stream, getElementFactory(), grammarAccess);
+ org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParParser parser = createParser(stream);
parser.setTokenTypeMap(antlrTokenDefProvider.getTokenDefMap());
try {
if(ruleName != null)
@@ -38,6 +42,10 @@
}
}
+ protected org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParParser createParser(XtextTokenStream stream) {
+ return new org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParParser(stream, getElementFactory(), getGrammarAccess());
+ }
+
@Override
protected String getDefaultRuleName() {
return "Model";
@@ -50,4 +58,12 @@
public void setGrammarAccess(AParGrammarAccess grammarAccess) {
this.grammarAccess = grammarAccess;
}
+
+ public Provider<org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer> getLexerProvider() {
+ return this.lexerProvider;
+ }
+
+ public void setGrammarAccess(Provider<org.eclipse.amp.amf.parameters.parser.antlr.internal.InternalAParLexer> lexerProvider) {
+ this.lexerProvider = lexerProvider;
+ }
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g
index 96f0d66..487ab56 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g
@@ -79,94 +79,107 @@
// Rule Model
ruleModel returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
}:
-((
-
- lv_name_0= RULE_STRING
- {
- createLeafNode(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0(), "name");
- }
-
- {
+((
+(
+ lv_name_0_0=RULE_STRING
+ {
+ createLeafNode(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0(), "name");
+ }
+ {
if ($current==null) {
$current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
try {
- set($current, "name", lv_name_0, "STRING", lastConsumedNode);
+ set(
+ $current,
+ "name",
+ lv_name_0_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
-
-)?(
-
-
- {
+
+)
+)?(
+(
+ {
currentNode=createCompositeNode(grammarAccess.getModelAccess().getModelImportParserRuleCall_1_0(), currentNode);
}
- lv_model_1=ruleImport
- {
+ lv_model_1_0=ruleImport {
if ($current==null) {
$current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), $current);
}
-
try {
- add($current, "model", lv_model_1, "Import", currentNode);
+ add(
+ $current,
+ "model",
+ lv_model_1_0,
+ "Import",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
currentNode = currentNode.getParent();
}
-
-)(
-
-
- {
+
+)
+)(
+(
+ {
currentNode=createCompositeNode(grammarAccess.getModelAccess().getIncorporatesIncorporatesParserRuleCall_2_0(), currentNode);
}
- lv_incorporates_2=ruleIncorporates
- {
+ lv_incorporates_2_0=ruleIncorporates {
if ($current==null) {
$current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), $current);
}
-
try {
- add($current, "incorporates", lv_incorporates_2, "Incorporates", currentNode);
+ add(
+ $current,
+ "incorporates",
+ lv_incorporates_2_0,
+ "Incorporates",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
currentNode = currentNode.getParent();
}
-
-)*(
-
-
- {
+
+)
+)*(
+(
+ {
currentNode=createCompositeNode(grammarAccess.getModelAccess().getParametersParameterParserRuleCall_3_0(), currentNode);
}
- lv_parameters_3=ruleParameter
- {
+ lv_parameters_3_0=ruleParameter {
if ($current==null) {
$current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), $current);
}
-
try {
- add($current, "parameters", lv_parameters_3, "Parameter", currentNode);
+ add(
+ $current,
+ "parameters",
+ lv_parameters_3_0,
+ "Parameter",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
currentNode = currentNode.getParent();
}
-
+
+)
)*);
@@ -183,7 +196,7 @@
// Rule Import
ruleImport returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
@@ -192,26 +205,30 @@
{
createLeafNode(grammarAccess.getImportAccess().getModelKeyword_0(), null);
}
-(
-
- lv_importURI_1= RULE_STRING
- {
- createLeafNode(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
- }
-
- {
+(
+(
+ lv_importURI_1_0=RULE_STRING
+ {
+ createLeafNode(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
+ }
+ {
if ($current==null) {
$current = factory.create(grammarAccess.getImportRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
try {
- set($current, "importURI", lv_importURI_1, "STRING", lastConsumedNode);
+ set(
+ $current,
+ "importURI",
+ lv_importURI_1_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
-
+
+)
));
@@ -228,7 +245,7 @@
// Rule Incorporates
ruleIncorporates returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
@@ -237,26 +254,30 @@
{
createLeafNode(grammarAccess.getIncorporatesAccess().getIncorporatesKeyword_0(), null);
}
-(
-
- lv_importURI_1= RULE_STRING
- {
- createLeafNode(grammarAccess.getIncorporatesAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
- }
-
- {
+(
+(
+ lv_importURI_1_0=RULE_STRING
+ {
+ createLeafNode(grammarAccess.getIncorporatesAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
+ }
+ {
if ($current==null) {
$current = factory.create(grammarAccess.getIncorporatesRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
try {
- set($current, "importURI", lv_importURI_1, "STRING", lastConsumedNode);
+ set(
+ $current,
+ "importURI",
+ lv_importURI_1_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
-
+
+)
));
@@ -273,14 +294,13 @@
// Rule Parameter
ruleParameter returns [EObject current=null]
- @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @init { @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
lastConsumedNode = currentNode;
}:
-((
-
-
+((
+(
{
if ($current==null) {
$current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
@@ -292,33 +312,35 @@
createLeafNode(grammarAccess.getParameterAccess().getAttributeSAttributeCrossReference_0_0(), "attribute");
}
- // TODO assign feature to currentNode
-
+)
)'='
{
createLeafNode(grammarAccess.getParameterAccess().getEqualsSignKeyword_1(), null);
}
-(
-
-
- {
+(
+(
+ {
currentNode=createCompositeNode(grammarAccess.getParameterAccess().getValueValueParserRuleCall_2_0(), currentNode);
}
- lv_value_2=ruleValue
- {
+ lv_value_2_0=ruleValue {
if ($current==null) {
$current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), $current);
}
-
try {
- set($current, "value", lv_value_2, "Value", currentNode);
+ set(
+ $current,
+ "value",
+ lv_value_2_0,
+ "Value",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
currentNode = currentNode.getParent();
}
-
+
+)
));
@@ -335,7 +357,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;
@@ -395,31 +417,35 @@
// 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);
}
}
-
+
+)
);
@@ -436,31 +462,35 @@
// 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);
}
}
-
+
+)
);
@@ -477,31 +507,35 @@
// 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);
}
}
-
+
+)
);
@@ -518,32 +552,35 @@
// 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();
}
-
+
+)
);
@@ -575,6 +612,8 @@
RULE_REAL : '-'? ('0'..'9')* '.' ('0'..'9')*;
+RULE_DESC_STRING : '\u00AB' ('\\' ('b'|'t'|'n'|'f'|'r'|'\u00AB'|'\u00BB'|'\\')|~(('\\'|'\u00AB'|'\u00BB')))* '\u00BB';
+
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.tokens b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.tokens
index 8c5602e..798218f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.tokens
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.tokens
@@ -1,14 +1,15 @@
-RULE_ID=7
+RULE_ID=8
RULE_STRING=4
-RULE_ANY_OTHER=12
-RULE_INT=8
+RULE_ANY_OTHER=13
+RULE_INT=9
RULE_REAL=6
-RULE_WS=11
-RULE_SL_COMMENT=10
+RULE_WS=12
+RULE_SL_COMMENT=11
+RULE_DESC_STRING=7
RULE_INTEGER=5
-RULE_ML_COMMENT=9
-'true'=16
-'false'=17
-'='=15
-'model'=13
-'incorporates'=14
+RULE_ML_COMMENT=10
+'true'=17
+'false'=18
+'='=16
+'model'=14
+'incorporates'=15
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParLexer.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParLexer.java
index 9411b49..83d9bb5 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParLexer.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParLexer.java
@@ -11,55 +11,37 @@
import java.util.ArrayList;
public class InternalAParLexer extends Lexer {
- public static final int RULE_ID=7;
- public static final int RULE_STRING=4;
- public static final int RULE_ANY_OTHER=12;
- public static final int RULE_INT=8;
- public static final int RULE_REAL=6;
- public static final int T13=13;
- public static final int T14=14;
- public static final int T15=15;
- public static final int RULE_WS=11;
- public static final int Tokens=18;
- public static final int T16=16;
- public static final int RULE_SL_COMMENT=10;
+ public static final int RULE_ID=8;
+ public static final int RULE_ANY_OTHER=13;
public static final int EOF=-1;
+ public static final int RULE_SL_COMMENT=11;
+ public static final int Tokens=19;
+ public static final int RULE_ML_COMMENT=10;
+ public static final int RULE_STRING=4;
+ public static final int RULE_INT=9;
+ public static final int RULE_REAL=6;
+ public static final int T14=14;
+ public static final int RULE_WS=12;
+ public static final int T15=15;
+ public static final int RULE_DESC_STRING=7;
+ public static final int T16=16;
public static final int T17=17;
+ public static final int T18=18;
public static final int RULE_INTEGER=5;
- public static final int RULE_ML_COMMENT=9;
public InternalAParLexer() {;}
public InternalAParLexer(CharStream input) {
super(input);
}
public String getGrammarFileName() { return "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g"; }
- // $ANTLR start T13
- public final void mT13() throws RecognitionException {
- try {
- int _type = T13;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:10:5: ( 'model' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:10:7: 'model'
- {
- match("model");
-
-
- }
-
- this.type = _type;
- }
- finally {
- }
- }
- // $ANTLR end T13
-
// $ANTLR start T14
public final void mT14() throws RecognitionException {
try {
int _type = T14;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:11:5: ( 'incorporates' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:11:7: 'incorporates'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:10:5: ( 'model' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:10:7: 'model'
{
- match("incorporates");
+ match("model");
}
@@ -75,10 +57,11 @@
public final void mT15() throws RecognitionException {
try {
int _type = T15;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:5: ( '=' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:7: '='
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:11:5: ( 'incorporates' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:11:7: 'incorporates'
{
- match('=');
+ match("incorporates");
+
}
@@ -93,11 +76,10 @@
public final void mT16() throws RecognitionException {
try {
int _type = T16;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:13:5: ( 'true' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:13:7: 'true'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:5: ( '=' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:7: '='
{
- match("true");
-
+ match('=');
}
@@ -112,6 +94,25 @@
public final void mT17() throws RecognitionException {
try {
int _type = T17;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:13:5: ( 'true' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:13:7: 'true'
+ {
+ match("true");
+
+
+ }
+
+ this.type = _type;
+ }
+ finally {
+ }
+ }
+ // $ANTLR end T17
+
+ // $ANTLR start T18
+ public final void mT18() throws RecognitionException {
+ try {
+ int _type = T18;
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:14:5: ( 'false' )
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:14:7: 'false'
{
@@ -125,16 +126,16 @@
finally {
}
}
- // $ANTLR end T17
+ // $ANTLR end T18
// $ANTLR start RULE_INTEGER
public final void mRULE_INTEGER() throws RecognitionException {
try {
int _type = RULE_INTEGER;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:574:14: ( ( '-' )? ( '0' .. '9' )+ )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:574:16: ( '-' )? ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:611:14: ( ( '-' )? ( '0' .. '9' )+ )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:611:16: ( '-' )? ( '0' .. '9' )+
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:574:16: ( '-' )?
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:611:16: ( '-' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -143,7 +144,7 @@
}
switch (alt1) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:574:16: '-'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:611:16: '-'
{
match('-');
@@ -152,7 +153,7 @@
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:574:21: ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:611:21: ( '0' .. '9' )+
int cnt2=0;
loop2:
do {
@@ -166,7 +167,7 @@
switch (alt2) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:574:22: '0' .. '9'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:611:22: '0' .. '9'
{
matchRange('0','9');
@@ -196,10 +197,10 @@
public final void mRULE_REAL() throws RecognitionException {
try {
int _type = RULE_REAL;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:11: ( ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )* )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:13: ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:11: ( ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:13: ( '-' )? ( '0' .. '9' )* '.' ( '0' .. '9' )*
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:13: ( '-' )?
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:13: ( '-' )?
int alt3=2;
int LA3_0 = input.LA(1);
@@ -208,7 +209,7 @@
}
switch (alt3) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:13: '-'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:13: '-'
{
match('-');
@@ -217,7 +218,7 @@
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:18: ( '0' .. '9' )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:18: ( '0' .. '9' )*
loop4:
do {
int alt4=2;
@@ -230,7 +231,7 @@
switch (alt4) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:19: '0' .. '9'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:19: '0' .. '9'
{
matchRange('0','9');
@@ -243,7 +244,7 @@
} while (true);
match('.');
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:34: ( '0' .. '9' )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:34: ( '0' .. '9' )*
loop5:
do {
int alt5=2;
@@ -256,7 +257,7 @@
switch (alt5) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:576:35: '0' .. '9'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:613:35: '0' .. '9'
{
matchRange('0','9');
@@ -278,23 +279,96 @@
}
// $ANTLR end RULE_REAL
+ // $ANTLR start RULE_DESC_STRING
+ public final void mRULE_DESC_STRING() throws RecognitionException {
+ try {
+ int _type = RULE_DESC_STRING;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:615:18: ( '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:615:20: '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB'
+ {
+ match('\u00AB');
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:615:29: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\u00AB' | '\\u00BB' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )*
+ loop6:
+ do {
+ int alt6=3;
+ int LA6_0 = input.LA(1);
+
+ if ( (LA6_0=='\\') ) {
+ alt6=1;
+ }
+ else if ( ((LA6_0>='\u0000' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\u00AA')||(LA6_0>='\u00AC' && LA6_0<='\u00BA')||(LA6_0>='\u00BC' && LA6_0<='\uFFFE')) ) {
+ alt6=2;
+ }
+
+
+ switch (alt6) {
+ case 1 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:615: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' ) {
+ input.consume();
+
+ }
+ else {
+ MismatchedSetException mse =
+ new MismatchedSetException(null,input);
+ recover(mse); throw mse;
+ }
+
+
+ }
+ break;
+ case 2 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:615: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();
+
+ }
+ else {
+ MismatchedSetException mse =
+ new MismatchedSetException(null,input);
+ recover(mse); throw mse;
+ }
+
+
+ }
+ break;
+
+ default :
+ break loop6;
+ }
+ } while (true);
+
+ match('\u00BB');
+
+ }
+
+ this.type = _type;
+ }
+ finally {
+ }
+ }
+ // $ANTLR end RULE_DESC_STRING
+
// $ANTLR start RULE_ID
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:578:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:578:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:617:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:617:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:578:11: ( '^' )?
- int alt6=2;
- int LA6_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:617:11: ( '^' )?
+ int alt7=2;
+ int LA7_0 = input.LA(1);
- if ( (LA6_0=='^') ) {
- alt6=1;
+ if ( (LA7_0=='^') ) {
+ alt7=1;
}
- switch (alt6) {
+ switch (alt7) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:578:11: '^'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:617:11: '^'
{
match('^');
@@ -313,18 +387,18 @@
recover(mse); throw mse;
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:578:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
- loop7:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:617:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ loop8:
do {
- int alt7=2;
- int LA7_0 = input.LA(1);
+ int alt8=2;
+ int LA8_0 = input.LA(1);
- if ( ((LA7_0>='0' && LA7_0<='9')||(LA7_0>='A' && LA7_0<='Z')||LA7_0=='_'||(LA7_0>='a' && LA7_0<='z')) ) {
- alt7=1;
+ if ( ((LA8_0>='0' && LA8_0<='9')||(LA8_0>='A' && LA8_0<='Z')||LA8_0=='_'||(LA8_0>='a' && LA8_0<='z')) ) {
+ alt8=1;
}
- switch (alt7) {
+ switch (alt8) {
case 1 :
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:
{
@@ -343,7 +417,7 @@
break;
default :
- break loop7;
+ break loop8;
}
} while (true);
@@ -361,24 +435,24 @@
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:580:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:580:12: ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:619:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:619:12: ( '0' .. '9' )+
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:580:12: ( '0' .. '9' )+
- int cnt8=0;
- loop8:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:619:12: ( '0' .. '9' )+
+ int cnt9=0;
+ loop9:
do {
- int alt8=2;
- int LA8_0 = input.LA(1);
+ int alt9=2;
+ int LA9_0 = input.LA(1);
- if ( ((LA8_0>='0' && LA8_0<='9')) ) {
- alt8=1;
+ if ( ((LA9_0>='0' && LA9_0<='9')) ) {
+ alt9=1;
}
- switch (alt8) {
+ switch (alt9) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:580:13: '0' .. '9'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:619:13: '0' .. '9'
{
matchRange('0','9');
@@ -386,12 +460,12 @@
break;
default :
- if ( cnt8 >= 1 ) break loop8;
+ if ( cnt9 >= 1 ) break loop9;
EarlyExitException eee =
- new EarlyExitException(8, input);
+ new EarlyExitException(9, input);
throw eee;
}
- cnt8++;
+ cnt9++;
} while (true);
@@ -408,47 +482,47 @@
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
- int alt11=2;
- int LA11_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ int alt12=2;
+ int LA12_0 = input.LA(1);
- if ( (LA11_0=='\"') ) {
- alt11=1;
+ if ( (LA12_0=='\"') ) {
+ alt12=1;
}
- else if ( (LA11_0=='\'') ) {
- alt11=2;
+ else if ( (LA12_0=='\'') ) {
+ alt12=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("582:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 11, 0, input);
+ new NoViableAltException("621:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 12, 0, input);
throw nvae;
}
- switch (alt11) {
+ switch (alt12) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
- loop9:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ loop10:
do {
- int alt9=3;
- int LA9_0 = input.LA(1);
+ int alt10=3;
+ int LA10_0 = input.LA(1);
- if ( (LA9_0=='\\') ) {
- alt9=1;
+ if ( (LA10_0=='\\') ) {
+ alt10=1;
}
- else if ( ((LA9_0>='\u0000' && LA9_0<='!')||(LA9_0>='#' && LA9_0<='[')||(LA9_0>=']' && LA9_0<='\uFFFE')) ) {
- alt9=2;
+ else if ( ((LA10_0>='\u0000' && LA10_0<='!')||(LA10_0>='#' && LA10_0<='[')||(LA10_0>=']' && LA10_0<='\uFFFE')) ) {
+ alt10=2;
}
- switch (alt9) {
+ switch (alt10) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621: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' ) {
@@ -465,7 +539,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:62: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:62: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -482,7 +556,7 @@
break;
default :
- break loop9;
+ break loop10;
}
} while (true);
@@ -491,26 +565,26 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
- loop10:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ loop11:
do {
- int alt10=3;
- int LA10_0 = input.LA(1);
+ int alt11=3;
+ int LA11_0 = input.LA(1);
- if ( (LA10_0=='\\') ) {
- alt10=1;
+ if ( (LA11_0=='\\') ) {
+ alt11=1;
}
- else if ( ((LA10_0>='\u0000' && LA10_0<='&')||(LA10_0>='(' && LA10_0<='[')||(LA10_0>=']' && LA10_0<='\uFFFE')) ) {
- alt10=2;
+ else if ( ((LA11_0>='\u0000' && LA11_0<='&')||(LA11_0>='(' && LA11_0<='[')||(LA11_0>=']' && LA11_0<='\uFFFE')) ) {
+ alt11=2;
}
- switch (alt10) {
+ switch (alt11) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621: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' ) {
@@ -527,7 +601,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:582:129: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:621:129: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -544,7 +618,7 @@
break;
default :
- break loop10;
+ break loop11;
}
} while (true);
@@ -569,37 +643,37 @@
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:584:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:584:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:623:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:623:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:584:24: ( options {greedy=false; } : . )*
- loop12:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:623:24: ( options {greedy=false; } : . )*
+ loop13:
do {
- int alt12=2;
- int LA12_0 = input.LA(1);
+ int alt13=2;
+ int LA13_0 = input.LA(1);
- if ( (LA12_0=='*') ) {
- int LA12_1 = input.LA(2);
+ if ( (LA13_0=='*') ) {
+ int LA13_1 = input.LA(2);
- if ( (LA12_1=='/') ) {
- alt12=2;
+ if ( (LA13_1=='/') ) {
+ alt13=2;
}
- else if ( ((LA12_1>='\u0000' && LA12_1<='.')||(LA12_1>='0' && LA12_1<='\uFFFE')) ) {
- alt12=1;
+ else if ( ((LA13_1>='\u0000' && LA13_1<='.')||(LA13_1>='0' && LA13_1<='\uFFFE')) ) {
+ alt13=1;
}
}
- else if ( ((LA12_0>='\u0000' && LA12_0<=')')||(LA12_0>='+' && LA12_0<='\uFFFE')) ) {
- alt12=1;
+ else if ( ((LA13_0>='\u0000' && LA13_0<=')')||(LA13_0>='+' && LA13_0<='\uFFFE')) ) {
+ alt13=1;
}
- switch (alt12) {
+ switch (alt13) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:584:52: .
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:623:52: .
{
matchAny();
@@ -607,7 +681,7 @@
break;
default :
- break loop12;
+ break loop13;
}
} while (true);
@@ -627,25 +701,25 @@
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:24: (~ ( ( '\\n' | '\\r' ) ) )*
- loop13:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ loop14:
do {
- int alt13=2;
- int LA13_0 = input.LA(1);
+ int alt14=2;
+ int LA14_0 = input.LA(1);
- if ( ((LA13_0>='\u0000' && LA13_0<='\t')||(LA13_0>='\u000B' && LA13_0<='\f')||(LA13_0>='\u000E' && LA13_0<='\uFFFE')) ) {
- alt13=1;
+ if ( ((LA14_0>='\u0000' && LA14_0<='\t')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\uFFFE')) ) {
+ alt14=1;
}
- switch (alt13) {
+ switch (alt14) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625: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();
@@ -662,31 +736,31 @@
break;
default :
- break loop13;
+ break loop14;
}
} while (true);
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:40: ( ( '\\r' )? '\\n' )?
- int alt15=2;
- int LA15_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:40: ( ( '\\r' )? '\\n' )?
+ int alt16=2;
+ int LA16_0 = input.LA(1);
- if ( (LA15_0=='\n'||LA15_0=='\r') ) {
- alt15=1;
+ if ( (LA16_0=='\n'||LA16_0=='\r') ) {
+ alt16=1;
}
- switch (alt15) {
+ switch (alt16) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:41: ( '\\r' )?
- int alt14=2;
- int LA14_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:41: ( '\\r' )?
+ int alt15=2;
+ int LA15_0 = input.LA(1);
- if ( (LA14_0=='\r') ) {
- alt14=1;
+ if ( (LA15_0=='\r') ) {
+ alt15=1;
}
- switch (alt14) {
+ switch (alt15) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:586:41: '\\r'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:625:41: '\\r'
{
match('\r');
@@ -716,22 +790,22 @@
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:588:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:588:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:627:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:627:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:588:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
- int cnt16=0;
- loop16:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:627:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ int cnt17=0;
+ loop17:
do {
- int alt16=2;
- int LA16_0 = input.LA(1);
+ int alt17=2;
+ int LA17_0 = input.LA(1);
- if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {
- alt16=1;
+ if ( ((LA17_0>='\t' && LA17_0<='\n')||LA17_0=='\r'||LA17_0==' ') ) {
+ alt17=1;
}
- switch (alt16) {
+ switch (alt17) {
case 1 :
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:
{
@@ -750,12 +824,12 @@
break;
default :
- if ( cnt16 >= 1 ) break loop16;
+ if ( cnt17 >= 1 ) break loop17;
EarlyExitException eee =
- new EarlyExitException(16, input);
+ new EarlyExitException(17, input);
throw eee;
}
- cnt16++;
+ cnt17++;
} while (true);
@@ -772,8 +846,8 @@
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:590:16: ( . )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:590:18: .
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:629:16: ( . )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:629:18: .
{
matchAny();
@@ -787,45 +861,45 @@
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:8: ( T13 | T14 | T15 | T16 | T17 | RULE_INTEGER | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
- int alt17=14;
- alt17 = dfa17.predict(input);
- switch (alt17) {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:8: ( T14 | T15 | T16 | T17 | T18 | RULE_INTEGER | RULE_REAL | RULE_DESC_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ int alt18=15;
+ alt18 = dfa18.predict(input);
+ switch (alt18) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:10: T13
- {
- mT13();
-
- }
- break;
- case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:14: T14
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:10: T14
{
mT14();
}
break;
- case 3 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:18: T15
+ case 2 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:14: T15
{
mT15();
}
break;
- case 4 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:22: T16
+ case 3 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:18: T16
{
mT16();
}
break;
- case 5 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:26: T17
+ case 4 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:22: T17
{
mT17();
}
break;
+ case 5 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:26: T18
+ {
+ mT18();
+
+ }
+ break;
case 6 :
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:30: RULE_INTEGER
{
@@ -841,49 +915,56 @@
}
break;
case 8 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:53: RULE_ID
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:53: RULE_DESC_STRING
+ {
+ mRULE_DESC_STRING();
+
+ }
+ break;
+ case 9 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:70: RULE_ID
{
mRULE_ID();
}
break;
- case 9 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:61: RULE_INT
+ case 10 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:78: RULE_INT
{
mRULE_INT();
}
break;
- case 10 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:70: RULE_STRING
+ case 11 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:87: RULE_STRING
{
mRULE_STRING();
}
break;
- case 11 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:82: RULE_ML_COMMENT
+ case 12 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:99: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
- case 12 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:98: RULE_SL_COMMENT
+ case 13 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:115: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
- case 13 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:114: RULE_WS
+ case 14 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:131: RULE_WS
{
mRULE_WS();
}
break;
- case 14 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:122: RULE_ANY_OTHER
+ case 15 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:139: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
@@ -895,120 +976,122 @@
}
- protected DFA17 dfa17 = new DFA17(this);
- static final String DFA17_eotS =
- "\1\uffff\2\21\1\uffff\2\21\1\17\1\31\1\uffff\1\17\1\uffff\3\17\2"+
- "\uffff\1\21\1\uffff\1\21\1\uffff\2\21\1\31\1\uffff\1\31\5\uffff"+
- "\6\21\1\50\1\21\1\52\1\21\1\uffff\1\54\1\uffff\1\21\1\uffff\5\21"+
- "\1\63\1\uffff";
- static final String DFA17_eofS =
- "\64\uffff";
- static final String DFA17_minS =
- "\1\0\1\157\1\156\1\uffff\1\162\1\141\2\56\1\uffff\1\101\1\uffff"+
- "\2\0\1\52\2\uffff\1\144\1\uffff\1\143\1\uffff\1\165\1\154\1\56\1"+
+ protected DFA18 dfa18 = new DFA18(this);
+ static final String DFA18_eotS =
+ "\1\uffff\2\22\1\uffff\2\22\1\20\1\31\1\uffff\2\20\1\uffff\3\20\2"+
+ "\uffff\1\22\1\uffff\1\22\1\uffff\2\22\1\31\2\uffff\1\31\5\uffff"+
+ "\6\22\1\52\1\22\1\54\1\22\1\uffff\1\56\1\uffff\1\22\1\uffff\5\22"+
+ "\1\65\1\uffff";
+ static final String DFA18_eofS =
+ "\66\uffff";
+ static final String DFA18_minS =
+ "\1\0\1\157\1\156\1\uffff\1\162\1\141\2\56\1\uffff\1\0\1\101\1\uffff"+
+ "\2\0\1\52\2\uffff\1\144\1\uffff\1\143\1\uffff\1\165\1\154\1\56\2"+
"\uffff\1\56\5\uffff\1\145\1\157\1\145\1\163\1\154\1\162\1\60\1\145"+
"\1\60\1\160\1\uffff\1\60\1\uffff\1\157\1\uffff\1\162\1\141\1\164"+
"\1\145\1\163\1\60\1\uffff";
- static final String DFA17_maxS =
- "\1\ufffe\1\157\1\156\1\uffff\1\162\1\141\2\71\1\uffff\1\172\1\uffff"+
- "\2\ufffe\1\57\2\uffff\1\144\1\uffff\1\143\1\uffff\1\165\1\154\1"+
- "\71\1\uffff\1\71\5\uffff\1\145\1\157\1\145\1\163\1\154\1\162\1\172"+
- "\1\145\1\172\1\160\1\uffff\1\172\1\uffff\1\157\1\uffff\1\162\1\141"+
- "\1\164\1\145\1\163\1\172\1\uffff";
- static final String DFA17_acceptS =
- "\3\uffff\1\3\4\uffff\1\7\1\uffff\1\10\3\uffff\1\15\1\16\1\uffff"+
- "\1\10\1\uffff\1\3\3\uffff\1\7\1\uffff\1\6\1\12\1\13\1\14\1\15\12"+
- "\uffff\1\4\1\uffff\1\1\1\uffff\1\5\6\uffff\1\2";
- static final String DFA17_specialS =
- "\64\uffff}>";
- static final String[] DFA17_transitionS = {
- "\11\17\2\16\2\17\1\16\22\17\1\16\1\17\1\13\4\17\1\14\5\17\1"+
- "\6\1\10\1\15\12\7\3\17\1\3\3\17\32\12\3\17\1\11\1\12\1\17\5"+
- "\12\1\5\2\12\1\2\3\12\1\1\6\12\1\4\6\12\uff84\17",
- "\1\20",
- "\1\22",
+ static final String DFA18_maxS =
+ "\1\ufffe\1\157\1\156\1\uffff\1\162\1\141\2\71\1\uffff\1\ufffe\1"+
+ "\172\1\uffff\2\ufffe\1\57\2\uffff\1\144\1\uffff\1\143\1\uffff\1"+
+ "\165\1\154\1\71\2\uffff\1\71\5\uffff\1\145\1\157\1\145\1\163\1\154"+
+ "\1\162\1\172\1\145\1\172\1\160\1\uffff\1\172\1\uffff\1\157\1\uffff"+
+ "\1\162\1\141\1\164\1\145\1\163\1\172\1\uffff";
+ static final String DFA18_acceptS =
+ "\3\uffff\1\3\4\uffff\1\7\2\uffff\1\11\3\uffff\1\16\1\17\1\uffff"+
+ "\1\11\1\uffff\1\3\3\uffff\1\7\1\6\1\uffff\1\10\1\13\1\15\1\14\1"+
+ "\16\12\uffff\1\4\1\uffff\1\1\1\uffff\1\5\6\uffff\1\2";
+ static final String DFA18_specialS =
+ "\66\uffff}>";
+ static final String[] DFA18_transitionS = {
+ "\11\20\2\17\2\20\1\17\22\20\1\17\1\20\1\14\4\20\1\15\5\20\1"+
+ "\6\1\10\1\16\12\7\3\20\1\3\3\20\32\13\3\20\1\12\1\13\1\20\5"+
+ "\13\1\5\2\13\1\2\3\13\1\1\6\13\1\4\6\13\60\20\1\11\uff53\20",
+ "\1\21",
+ "\1\23",
"",
- "\1\24",
"\1\25",
- "\1\27\1\uffff\12\26",
- "\1\27\1\uffff\12\30",
+ "\1\26",
+ "\1\30\1\uffff\12\27",
+ "\1\30\1\uffff\12\32",
"",
- "\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\u00ab\33\1\uffff\uff53\33",
+ "\32\22\4\uffff\1\22\1\uffff\32\22",
"",
- "\uffff\32",
- "\uffff\32",
- "\1\33\4\uffff\1\34",
+ "\uffff\34",
+ "\uffff\34",
+ "\1\36\4\uffff\1\35",
"",
"",
- "\1\36",
- "",
- "\1\37",
- "",
"\1\40",
+ "",
"\1\41",
- "\1\27\1\uffff\12\26",
- "",
- "\1\27\1\uffff\12\30",
- "",
- "",
- "",
- "",
"",
"\1\42",
"\1\43",
+ "\1\30\1\uffff\12\27",
+ "",
+ "",
+ "\1\30\1\uffff\12\32",
+ "",
+ "",
+ "",
+ "",
+ "",
"\1\44",
"\1\45",
"\1\46",
"\1\47",
- "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\1\50",
"\1\51",
- "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
"\1\53",
- "",
- "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
- "",
+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
"\1\55",
"",
- "\1\56",
+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
+ "",
"\1\57",
+ "",
"\1\60",
"\1\61",
"\1\62",
- "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\1\63",
+ "\1\64",
+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
""
};
- static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);
- static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);
- static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);
- static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);
- static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);
- static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);
- static final short[][] DFA17_transition;
+ static final short[] DFA18_eot = DFA.unpackEncodedString(DFA18_eotS);
+ static final short[] DFA18_eof = DFA.unpackEncodedString(DFA18_eofS);
+ static final char[] DFA18_min = DFA.unpackEncodedStringToUnsignedChars(DFA18_minS);
+ static final char[] DFA18_max = DFA.unpackEncodedStringToUnsignedChars(DFA18_maxS);
+ static final short[] DFA18_accept = DFA.unpackEncodedString(DFA18_acceptS);
+ static final short[] DFA18_special = DFA.unpackEncodedString(DFA18_specialS);
+ static final short[][] DFA18_transition;
static {
- int numStates = DFA17_transitionS.length;
- DFA17_transition = new short[numStates][];
+ int numStates = DFA18_transitionS.length;
+ DFA18_transition = new short[numStates][];
for (int i=0; i<numStates; i++) {
- DFA17_transition[i] = DFA.unpackEncodedString(DFA17_transitionS[i]);
+ DFA18_transition[i] = DFA.unpackEncodedString(DFA18_transitionS[i]);
}
}
- class DFA17 extends DFA {
+ class DFA18 extends DFA {
- public DFA17(BaseRecognizer recognizer) {
+ public DFA18(BaseRecognizer recognizer) {
this.recognizer = recognizer;
- this.decisionNumber = 17;
- this.eot = DFA17_eot;
- this.eof = DFA17_eof;
- this.min = DFA17_min;
- this.max = DFA17_max;
- this.accept = DFA17_accept;
- this.special = DFA17_special;
- this.transition = DFA17_transition;
+ this.decisionNumber = 18;
+ this.eot = DFA18_eot;
+ this.eof = DFA18_eof;
+ this.min = DFA18_min;
+ this.max = DFA18_max;
+ this.accept = DFA18_accept;
+ this.special = DFA18_special;
+ this.transition = DFA18_transition;
}
public String getDescription() {
- return "1:1: Tokens : ( T13 | T14 | T15 | T16 | T17 | RULE_INTEGER | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+ return "1:1: Tokens : ( T14 | T15 | T16 | T17 | T18 | RULE_INTEGER | RULE_REAL | RULE_DESC_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
}
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParParser.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParParser.java
index 239c90f..0f0cdc3 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParParser.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAParParser.java
@@ -24,18 +24,19 @@
public class InternalAParParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_INTEGER", "RULE_REAL", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'incorporates'", "'='", "'true'", "'false'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_INTEGER", "RULE_REAL", "RULE_DESC_STRING", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'incorporates'", "'='", "'true'", "'false'"
};
- public static final int RULE_ID=7;
+ public static final int RULE_ID=8;
public static final int RULE_STRING=4;
- public static final int RULE_ANY_OTHER=12;
- public static final int RULE_INT=8;
+ public static final int RULE_ANY_OTHER=13;
+ public static final int RULE_INT=9;
public static final int RULE_REAL=6;
- public static final int RULE_WS=11;
- public static final int RULE_SL_COMMENT=10;
+ public static final int RULE_WS=12;
+ public static final int RULE_SL_COMMENT=11;
public static final int EOF=-1;
+ public static final int RULE_DESC_STRING=7;
public static final int RULE_INTEGER=5;
- public static final int RULE_ML_COMMENT=9;
+ public static final int RULE_ML_COMMENT=10;
public InternalAParParser(TokenStream input) {
super(input);
@@ -105,28 +106,28 @@
// $ANTLR start ruleModel
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:81:1: ruleModel returns [EObject current=null] : ( (lv_name_0= RULE_STRING )? (lv_model_1= ruleImport ) (lv_incorporates_2= ruleIncorporates )* (lv_parameters_3= ruleParameter )* ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:81:1: ruleModel returns [EObject current=null] : ( ( (lv_name_0_0= RULE_STRING ) )? ( (lv_model_1_0= ruleImport ) ) ( (lv_incorporates_2_0= ruleIncorporates ) )* ( (lv_parameters_3_0= ruleParameter ) )* ) ;
public final EObject ruleModel() throws RecognitionException {
EObject current = null;
- Token lv_name_0=null;
- EObject lv_model_1 = null;
+ Token lv_name_0_0=null;
+ EObject lv_model_1_0 = null;
- EObject lv_incorporates_2 = null;
+ EObject lv_incorporates_2_0 = null;
- EObject lv_parameters_3 = null;
+ EObject lv_parameters_3_0 = null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:86:6: ( ( (lv_name_0= RULE_STRING )? (lv_model_1= ruleImport ) (lv_incorporates_2= ruleIncorporates )* (lv_parameters_3= ruleParameter )* ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( (lv_name_0= RULE_STRING )? (lv_model_1= ruleImport ) (lv_incorporates_2= ruleIncorporates )* (lv_parameters_3= ruleParameter )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:86:6: ( ( ( (lv_name_0_0= RULE_STRING ) )? ( (lv_model_1_0= ruleImport ) ) ( (lv_incorporates_2_0= ruleIncorporates ) )* ( (lv_parameters_3_0= ruleParameter ) )* ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( ( (lv_name_0_0= RULE_STRING ) )? ( (lv_model_1_0= ruleImport ) ) ( (lv_incorporates_2_0= ruleIncorporates ) )* ( (lv_parameters_3_0= ruleParameter ) )* )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( (lv_name_0= RULE_STRING )? (lv_model_1= ruleImport ) (lv_incorporates_2= ruleIncorporates )* (lv_parameters_3= ruleParameter )* )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: (lv_name_0= RULE_STRING )? (lv_model_1= ruleImport ) (lv_incorporates_2= ruleIncorporates )* (lv_parameters_3= ruleParameter )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( ( (lv_name_0_0= RULE_STRING ) )? ( (lv_model_1_0= ruleImport ) ) ( (lv_incorporates_2_0= ruleIncorporates ) )* ( (lv_parameters_3_0= ruleParameter ) )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: ( (lv_name_0_0= RULE_STRING ) )? ( (lv_model_1_0= ruleImport ) ) ( (lv_incorporates_2_0= ruleIncorporates ) )* ( (lv_parameters_3_0= ruleParameter ) )*
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: (lv_name_0= RULE_STRING )?
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: ( (lv_name_0_0= RULE_STRING ) )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -135,39 +136,52 @@
}
switch (alt1) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:89:6: lv_name_0= RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:88:1: (lv_name_0_0= RULE_STRING )
{
- lv_name_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleModel130);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:88:1: (lv_name_0_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:89:3: lv_name_0_0= RULE_STRING
+ {
+ lv_name_0_0=(Token)input.LT(1);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleModel125);
- createLeafNode(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0(), "name");
-
+ createLeafNode(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0(), "name");
+
if (current==null) {
current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
try {
- set(current, "name", lv_name_0, "STRING", lastConsumedNode);
+ set(
+ current,
+ "name",
+ lv_name_0_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
+
+
+ }
break;
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:107:3: (lv_model_1= ruleImport )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:110:6: lv_model_1= ruleImport
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:111:3: ( (lv_model_1_0= ruleImport ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:112:1: (lv_model_1_0= ruleImport )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:112:1: (lv_model_1_0= ruleImport )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:113:3: lv_model_1_0= ruleImport
{
currentNode=createCompositeNode(grammarAccess.getModelAccess().getModelImportParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleImport_in_ruleModel173);
- lv_model_1=ruleImport();
+ pushFollow(FOLLOW_ruleImport_in_ruleModel152);
+ lv_model_1_0=ruleImport();
_fsp--;
@@ -175,9 +189,13 @@
current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), current);
}
-
try {
- add(current, "model", lv_model_1, "Import", currentNode);
+ add(
+ current,
+ "model",
+ lv_model_1_0,
+ "Import",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -186,26 +204,32 @@
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:128:2: (lv_incorporates_2= ruleIncorporates )*
+
+ }
+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:135:2: ( (lv_incorporates_2_0= ruleIncorporates ) )*
loop2:
do {
int alt2=2;
int LA2_0 = input.LA(1);
- if ( (LA2_0==14) ) {
+ if ( (LA2_0==15) ) {
alt2=1;
}
switch (alt2) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:131:6: lv_incorporates_2= ruleIncorporates
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:136:1: (lv_incorporates_2_0= ruleIncorporates )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:136:1: (lv_incorporates_2_0= ruleIncorporates )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:137:3: lv_incorporates_2_0= ruleIncorporates
{
currentNode=createCompositeNode(grammarAccess.getModelAccess().getIncorporatesIncorporatesParserRuleCall_2_0(), currentNode);
- pushFollow(FOLLOW_ruleIncorporates_in_ruleModel211);
- lv_incorporates_2=ruleIncorporates();
+ pushFollow(FOLLOW_ruleIncorporates_in_ruleModel173);
+ lv_incorporates_2_0=ruleIncorporates();
_fsp--;
@@ -213,9 +237,13 @@
current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), current);
}
-
try {
- add(current, "incorporates", lv_incorporates_2, "Incorporates", currentNode);
+ add(
+ current,
+ "incorporates",
+ lv_incorporates_2_0,
+ "Incorporates",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -223,6 +251,9 @@
}
+
+
+ }
break;
default :
@@ -230,7 +261,7 @@
}
} while (true);
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:149:3: (lv_parameters_3= ruleParameter )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:159:3: ( (lv_parameters_3_0= ruleParameter ) )*
loop3:
do {
int alt3=2;
@@ -243,13 +274,16 @@
switch (alt3) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:152:6: lv_parameters_3= ruleParameter
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:160:1: (lv_parameters_3_0= ruleParameter )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:160:1: (lv_parameters_3_0= ruleParameter )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:161:3: lv_parameters_3_0= ruleParameter
{
currentNode=createCompositeNode(grammarAccess.getModelAccess().getParametersParameterParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_ruleModel250);
- lv_parameters_3=ruleParameter();
+ pushFollow(FOLLOW_ruleParameter_in_ruleModel195);
+ lv_parameters_3_0=ruleParameter();
_fsp--;
@@ -257,9 +291,13 @@
current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), current);
}
-
try {
- add(current, "parameters", lv_parameters_3, "Parameter", currentNode);
+ add(
+ current,
+ "parameters",
+ lv_parameters_3_0,
+ "Parameter",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -267,6 +305,9 @@
}
+
+
+ }
break;
default :
@@ -297,7 +338,7 @@
// $ANTLR start entryRuleImport
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:177:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:190:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
public final EObject entryRuleImport() throws RecognitionException {
EObject current = null;
@@ -305,16 +346,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:177:48: (iv_ruleImport= ruleImport EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:178:2: iv_ruleImport= ruleImport EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:190:48: (iv_ruleImport= ruleImport EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:191:2: iv_ruleImport= ruleImport EOF
{
currentNode = createCompositeNode(grammarAccess.getImportRule(), currentNode);
- pushFollow(FOLLOW_ruleImport_in_entryRuleImport288);
+ pushFollow(FOLLOW_ruleImport_in_entryRuleImport229);
iv_ruleImport=ruleImport();
_fsp--;
current =iv_ruleImport;
- match(input,EOF,FOLLOW_EOF_in_entryRuleImport298);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleImport239);
}
@@ -332,41 +373,48 @@
// $ANTLR start ruleImport
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:185:1: ruleImport returns [EObject current=null] : ( 'model' (lv_importURI_1= RULE_STRING ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:198:1: ruleImport returns [EObject current=null] : ( 'model' ( (lv_importURI_1_0= RULE_STRING ) ) ) ;
public final EObject ruleImport() throws RecognitionException {
EObject current = null;
- Token lv_importURI_1=null;
+ Token lv_importURI_1_0=null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:190:6: ( ( 'model' (lv_importURI_1= RULE_STRING ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:191:1: ( 'model' (lv_importURI_1= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:203:6: ( ( 'model' ( (lv_importURI_1_0= RULE_STRING ) ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:204:1: ( 'model' ( (lv_importURI_1_0= RULE_STRING ) ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:191:1: ( 'model' (lv_importURI_1= RULE_STRING ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:191:2: 'model' (lv_importURI_1= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:204:1: ( 'model' ( (lv_importURI_1_0= RULE_STRING ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:204:2: 'model' ( (lv_importURI_1_0= RULE_STRING ) )
{
- match(input,13,FOLLOW_13_in_ruleImport332);
+ match(input,14,FOLLOW_14_in_ruleImport273);
createLeafNode(grammarAccess.getImportAccess().getModelKeyword_0(), null);
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:195:1: (lv_importURI_1= RULE_STRING )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:197:6: lv_importURI_1= RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:208:1: ( (lv_importURI_1_0= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:209:1: (lv_importURI_1_0= RULE_STRING )
{
- lv_importURI_1=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport354);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:209:1: (lv_importURI_1_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:210:3: lv_importURI_1_0= RULE_STRING
+ {
+ lv_importURI_1_0=(Token)input.LT(1);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport290);
- createLeafNode(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
-
+ createLeafNode(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
+
if (current==null) {
current = factory.create(grammarAccess.getImportRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
try {
- set(current, "importURI", lv_importURI_1, "STRING", lastConsumedNode);
+ set(
+ current,
+ "importURI",
+ lv_importURI_1_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -380,6 +428,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -397,7 +448,7 @@
// $ANTLR start entryRuleIncorporates
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:222:1: entryRuleIncorporates returns [EObject current=null] : iv_ruleIncorporates= ruleIncorporates EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:239:1: entryRuleIncorporates returns [EObject current=null] : iv_ruleIncorporates= ruleIncorporates EOF ;
public final EObject entryRuleIncorporates() throws RecognitionException {
EObject current = null;
@@ -405,16 +456,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:222:54: (iv_ruleIncorporates= ruleIncorporates EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:223:2: iv_ruleIncorporates= ruleIncorporates EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:239:54: (iv_ruleIncorporates= ruleIncorporates EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:240:2: iv_ruleIncorporates= ruleIncorporates EOF
{
currentNode = createCompositeNode(grammarAccess.getIncorporatesRule(), currentNode);
- pushFollow(FOLLOW_ruleIncorporates_in_entryRuleIncorporates395);
+ pushFollow(FOLLOW_ruleIncorporates_in_entryRuleIncorporates328);
iv_ruleIncorporates=ruleIncorporates();
_fsp--;
current =iv_ruleIncorporates;
- match(input,EOF,FOLLOW_EOF_in_entryRuleIncorporates405);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleIncorporates338);
}
@@ -432,41 +483,48 @@
// $ANTLR start ruleIncorporates
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:230:1: ruleIncorporates returns [EObject current=null] : ( 'incorporates' (lv_importURI_1= RULE_STRING ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:247:1: ruleIncorporates returns [EObject current=null] : ( 'incorporates' ( (lv_importURI_1_0= RULE_STRING ) ) ) ;
public final EObject ruleIncorporates() throws RecognitionException {
EObject current = null;
- Token lv_importURI_1=null;
+ Token lv_importURI_1_0=null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:235:6: ( ( 'incorporates' (lv_importURI_1= RULE_STRING ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:236:1: ( 'incorporates' (lv_importURI_1= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:252:6: ( ( 'incorporates' ( (lv_importURI_1_0= RULE_STRING ) ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:253:1: ( 'incorporates' ( (lv_importURI_1_0= RULE_STRING ) ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:236:1: ( 'incorporates' (lv_importURI_1= RULE_STRING ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:236:2: 'incorporates' (lv_importURI_1= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:253:1: ( 'incorporates' ( (lv_importURI_1_0= RULE_STRING ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:253:2: 'incorporates' ( (lv_importURI_1_0= RULE_STRING ) )
{
- match(input,14,FOLLOW_14_in_ruleIncorporates439);
+ match(input,15,FOLLOW_15_in_ruleIncorporates372);
createLeafNode(grammarAccess.getIncorporatesAccess().getIncorporatesKeyword_0(), null);
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:240:1: (lv_importURI_1= RULE_STRING )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:242:6: lv_importURI_1= RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:257:1: ( (lv_importURI_1_0= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:258:1: (lv_importURI_1_0= RULE_STRING )
{
- lv_importURI_1=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleIncorporates461);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:258:1: (lv_importURI_1_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:259:3: lv_importURI_1_0= RULE_STRING
+ {
+ lv_importURI_1_0=(Token)input.LT(1);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleIncorporates389);
- createLeafNode(grammarAccess.getIncorporatesAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
-
+ createLeafNode(grammarAccess.getIncorporatesAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI");
+
if (current==null) {
current = factory.create(grammarAccess.getIncorporatesRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
try {
- set(current, "importURI", lv_importURI_1, "STRING", lastConsumedNode);
+ set(
+ current,
+ "importURI",
+ lv_importURI_1_0,
+ "STRING",
+ lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -480,6 +538,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -497,7 +558,7 @@
// $ANTLR start entryRuleParameter
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:267:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:288:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
public final EObject entryRuleParameter() throws RecognitionException {
EObject current = null;
@@ -505,16 +566,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:267:51: (iv_ruleParameter= ruleParameter EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:268:2: iv_ruleParameter= ruleParameter EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:288:51: (iv_ruleParameter= ruleParameter EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:289:2: iv_ruleParameter= ruleParameter EOF
{
currentNode = createCompositeNode(grammarAccess.getParameterRule(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter502);
+ pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter427);
iv_ruleParameter=ruleParameter();
_fsp--;
current =iv_ruleParameter;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParameter512);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParameter437);
}
@@ -532,24 +593,27 @@
// $ANTLR start ruleParameter
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:275:1: ruleParameter returns [EObject current=null] : ( ( RULE_STRING ) '=' (lv_value_2= ruleValue ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:296:1: ruleParameter returns [EObject current=null] : ( ( ( RULE_STRING ) ) '=' ( (lv_value_2_0= ruleValue ) ) ) ;
public final EObject ruleParameter() throws RecognitionException {
EObject current = null;
- EObject lv_value_2 = null;
+ EObject lv_value_2_0 = null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:280:6: ( ( ( RULE_STRING ) '=' (lv_value_2= ruleValue ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:281:1: ( ( RULE_STRING ) '=' (lv_value_2= ruleValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:301:6: ( ( ( ( RULE_STRING ) ) '=' ( (lv_value_2_0= ruleValue ) ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:302:1: ( ( ( RULE_STRING ) ) '=' ( (lv_value_2_0= ruleValue ) ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:281:1: ( ( RULE_STRING ) '=' (lv_value_2= ruleValue ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:281:2: ( RULE_STRING ) '=' (lv_value_2= ruleValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:302:1: ( ( ( RULE_STRING ) ) '=' ( (lv_value_2_0= ruleValue ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:302:2: ( ( RULE_STRING ) ) '=' ( (lv_value_2_0= ruleValue ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:281:2: ( RULE_STRING )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:284:3: RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:302:2: ( ( RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:303:1: ( RULE_STRING )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:303:1: ( RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:304:3: RULE_STRING
{
if (current==null) {
@@ -557,25 +621,31 @@
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleParameter559);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleParameter480);
createLeafNode(grammarAccess.getParameterAccess().getAttributeSAttributeCrossReference_0_0(), "attribute");
}
- match(input,15,FOLLOW_15_in_ruleParameter571);
+
+ }
+
+ match(input,16,FOLLOW_16_in_ruleParameter489);
createLeafNode(grammarAccess.getParameterAccess().getEqualsSignKeyword_1(), null);
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:301:1: (lv_value_2= ruleValue )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:304:6: lv_value_2= ruleValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:320:1: ( (lv_value_2_0= ruleValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:321:1: (lv_value_2_0= ruleValue )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:321:1: (lv_value_2_0= ruleValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:322:3: lv_value_2_0= ruleValue
{
currentNode=createCompositeNode(grammarAccess.getParameterAccess().getValueValueParserRuleCall_2_0(), currentNode);
- pushFollow(FOLLOW_ruleValue_in_ruleParameter605);
- lv_value_2=ruleValue();
+ pushFollow(FOLLOW_ruleValue_in_ruleParameter510);
+ lv_value_2_0=ruleValue();
_fsp--;
@@ -583,9 +653,13 @@
current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
associateNodeWithAstElement(currentNode.getParent(), current);
}
-
try {
- set(current, "value", lv_value_2, "Value", currentNode);
+ set(
+ current,
+ "value",
+ lv_value_2_0,
+ "Value",
+ currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -600,6 +674,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -617,7 +694,7 @@
// $ANTLR start entryRuleValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:329:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:351:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
public final EObject entryRuleValue() throws RecognitionException {
EObject current = null;
@@ -625,16 +702,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:329:47: (iv_ruleValue= ruleValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:330:2: iv_ruleValue= ruleValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:351:47: (iv_ruleValue= ruleValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:352:2: iv_ruleValue= ruleValue EOF
{
currentNode = createCompositeNode(grammarAccess.getValueRule(), currentNode);
- pushFollow(FOLLOW_ruleValue_in_entryRuleValue642);
+ pushFollow(FOLLOW_ruleValue_in_entryRuleValue543);
iv_ruleValue=ruleValue();
_fsp--;
current =iv_ruleValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleValue652);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleValue553);
}
@@ -652,7 +729,7 @@
// $ANTLR start ruleValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:337: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.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:359: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;
@@ -665,13 +742,13 @@
EObject this_BooleanValue_3 = null;
- EObject temp=null; setCurrentLookahead(); resetLookahead();
+ @SuppressWarnings("unused") EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:342:6: ( (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:343:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:364:6: ( (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:365:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:343:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:365:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )
int alt4=4;
switch ( input.LA(1) ) {
case RULE_INTEGER:
@@ -689,27 +766,27 @@
alt4=3;
}
break;
- case 16:
case 17:
+ case 18:
{
alt4=4;
}
break;
default:
NoViableAltException nvae =
- new NoViableAltException("343:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )", 4, 0, input);
+ new NoViableAltException("365:1: (this_IntValue_0= ruleIntValue | this_StringValue_1= ruleStringValue | this_RealValue_2= ruleRealValue | this_BooleanValue_3= ruleBooleanValue )", 4, 0, input);
throw nvae;
}
switch (alt4) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:344:5: this_IntValue_0= ruleIntValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:366:5: this_IntValue_0= ruleIntValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getIntValueParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleIntValue_in_ruleValue699);
+ pushFollow(FOLLOW_ruleIntValue_in_ruleValue600);
this_IntValue_0=ruleIntValue();
_fsp--;
@@ -721,12 +798,12 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:354:5: this_StringValue_1= ruleStringValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:376:5: this_StringValue_1= ruleStringValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getStringValueParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleStringValue_in_ruleValue726);
+ pushFollow(FOLLOW_ruleStringValue_in_ruleValue627);
this_StringValue_1=ruleStringValue();
_fsp--;
@@ -738,12 +815,12 @@
}
break;
case 3 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:364:5: this_RealValue_2= ruleRealValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:386:5: this_RealValue_2= ruleRealValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getRealValueParserRuleCall_2(), currentNode);
- pushFollow(FOLLOW_ruleRealValue_in_ruleValue753);
+ pushFollow(FOLLOW_ruleRealValue_in_ruleValue654);
this_RealValue_2=ruleRealValue();
_fsp--;
@@ -755,12 +832,12 @@
}
break;
case 4 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:374:5: this_BooleanValue_3= ruleBooleanValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:396:5: this_BooleanValue_3= ruleBooleanValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getBooleanValueParserRuleCall_3(), currentNode);
- pushFollow(FOLLOW_ruleBooleanValue_in_ruleValue780);
+ pushFollow(FOLLOW_ruleBooleanValue_in_ruleValue681);
this_BooleanValue_3=ruleBooleanValue();
_fsp--;
@@ -794,7 +871,7 @@
// $ANTLR start entryRuleIntValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:389:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:411:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
public final EObject entryRuleIntValue() throws RecognitionException {
EObject current = null;
@@ -802,16 +879,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:389:50: (iv_ruleIntValue= ruleIntValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:390:2: iv_ruleIntValue= ruleIntValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:411:50: (iv_ruleIntValue= ruleIntValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:412:2: iv_ruleIntValue= ruleIntValue EOF
{
currentNode = createCompositeNode(grammarAccess.getIntValueRule(), currentNode);
- pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue812);
+ pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue713);
iv_ruleIntValue=ruleIntValue();
_fsp--;
current =iv_ruleIntValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue822);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue723);
}
@@ -829,34 +906,41 @@
// $ANTLR start ruleIntValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:397:1: ruleIntValue returns [EObject current=null] : (lv_value_0= RULE_INTEGER ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:419: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.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:402:6: ( (lv_value_0= RULE_INTEGER ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:403:1: (lv_value_0= RULE_INTEGER )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:424:6: ( ( (lv_value_0_0= RULE_INTEGER ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:425:1: ( (lv_value_0_0= RULE_INTEGER ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:403:1: (lv_value_0= RULE_INTEGER )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:405:6: lv_value_0= RULE_INTEGER
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:425:1: ( (lv_value_0_0= RULE_INTEGER ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:426:1: (lv_value_0_0= RULE_INTEGER )
{
- lv_value_0=(Token)input.LT(1);
- match(input,RULE_INTEGER,FOLLOW_RULE_INTEGER_in_ruleIntValue868);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:426:1: (lv_value_0_0= RULE_INTEGER )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:427:3: lv_value_0_0= RULE_INTEGER
+ {
+ lv_value_0_0=(Token)input.LT(1);
+ match(input,RULE_INTEGER,FOLLOW_RULE_INTEGER_in_ruleIntValue764);
- 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);
}
@@ -867,6 +951,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -884,7 +971,7 @@
// $ANTLR start entryRuleRealValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:430:1: entryRuleRealValue returns [EObject current=null] : iv_ruleRealValue= ruleRealValue EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:456:1: entryRuleRealValue returns [EObject current=null] : iv_ruleRealValue= ruleRealValue EOF ;
public final EObject entryRuleRealValue() throws RecognitionException {
EObject current = null;
@@ -892,16 +979,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:430:51: (iv_ruleRealValue= ruleRealValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:431:2: iv_ruleRealValue= ruleRealValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:456:51: (iv_ruleRealValue= ruleRealValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:457:2: iv_ruleRealValue= ruleRealValue EOF
{
currentNode = createCompositeNode(grammarAccess.getRealValueRule(), currentNode);
- pushFollow(FOLLOW_ruleRealValue_in_entryRuleRealValue908);
+ pushFollow(FOLLOW_ruleRealValue_in_entryRuleRealValue801);
iv_ruleRealValue=ruleRealValue();
_fsp--;
current =iv_ruleRealValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleRealValue918);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleRealValue811);
}
@@ -919,34 +1006,41 @@
// $ANTLR start ruleRealValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:438:1: ruleRealValue returns [EObject current=null] : (lv_value_0= RULE_REAL ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:464: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.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:443:6: ( (lv_value_0= RULE_REAL ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:444:1: (lv_value_0= RULE_REAL )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:469:6: ( ( (lv_value_0_0= RULE_REAL ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:470:1: ( (lv_value_0_0= RULE_REAL ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:444:1: (lv_value_0= RULE_REAL )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:446:6: lv_value_0= RULE_REAL
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:470:1: ( (lv_value_0_0= RULE_REAL ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:471:1: (lv_value_0_0= RULE_REAL )
{
- lv_value_0=(Token)input.LT(1);
- match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealValue964);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:471:1: (lv_value_0_0= RULE_REAL )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:472:3: lv_value_0_0= RULE_REAL
+ {
+ lv_value_0_0=(Token)input.LT(1);
+ match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealValue852);
- 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);
}
@@ -957,6 +1051,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -974,7 +1071,7 @@
// $ANTLR start entryRuleStringValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:471:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:501:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
public final EObject entryRuleStringValue() throws RecognitionException {
EObject current = null;
@@ -982,16 +1079,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:471:53: (iv_ruleStringValue= ruleStringValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:472:2: iv_ruleStringValue= ruleStringValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:501:53: (iv_ruleStringValue= ruleStringValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:502:2: iv_ruleStringValue= ruleStringValue EOF
{
currentNode = createCompositeNode(grammarAccess.getStringValueRule(), currentNode);
- pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue1004);
+ pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue889);
iv_ruleStringValue=ruleStringValue();
_fsp--;
current =iv_ruleStringValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue1014);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue899);
}
@@ -1009,34 +1106,41 @@
// $ANTLR start ruleStringValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:479:1: ruleStringValue returns [EObject current=null] : (lv_value_0= RULE_STRING ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:509: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.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:484:6: ( (lv_value_0= RULE_STRING ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:485:1: (lv_value_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:514:6: ( ( (lv_value_0_0= RULE_STRING ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:515:1: ( (lv_value_0_0= RULE_STRING ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:485:1: (lv_value_0= RULE_STRING )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:487:6: lv_value_0= RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:515:1: ( (lv_value_0_0= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:516:1: (lv_value_0_0= RULE_STRING )
{
- lv_value_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue1060);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:516:1: (lv_value_0_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:517:3: lv_value_0_0= RULE_STRING
+ {
+ lv_value_0_0=(Token)input.LT(1);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue940);
- 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);
}
@@ -1047,6 +1151,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -1064,7 +1171,7 @@
// $ANTLR start entryRuleBooleanValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:512:1: entryRuleBooleanValue returns [EObject current=null] : iv_ruleBooleanValue= ruleBooleanValue EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:546:1: entryRuleBooleanValue returns [EObject current=null] : iv_ruleBooleanValue= ruleBooleanValue EOF ;
public final EObject entryRuleBooleanValue() throws RecognitionException {
EObject current = null;
@@ -1072,16 +1179,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:512:54: (iv_ruleBooleanValue= ruleBooleanValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:513:2: iv_ruleBooleanValue= ruleBooleanValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:546:54: (iv_ruleBooleanValue= ruleBooleanValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:547:2: iv_ruleBooleanValue= ruleBooleanValue EOF
{
currentNode = createCompositeNode(grammarAccess.getBooleanValueRule(), currentNode);
- pushFollow(FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue1100);
+ pushFollow(FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue977);
iv_ruleBooleanValue=ruleBooleanValue();
_fsp--;
current =iv_ruleBooleanValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanValue1110);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanValue987);
}
@@ -1099,27 +1206,30 @@
// $ANTLR start ruleBooleanValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:520:1: ruleBooleanValue returns [EObject current=null] : (lv_value_0= ruleBOOLEAN ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:554: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.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:525:6: ( (lv_value_0= ruleBOOLEAN ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:526:1: (lv_value_0= ruleBOOLEAN )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:559:6: ( ( (lv_value_0_0= ruleBOOLEAN ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:560:1: ( (lv_value_0_0= ruleBOOLEAN ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:526:1: (lv_value_0= ruleBOOLEAN )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:529:6: lv_value_0= ruleBOOLEAN
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:560:1: ( (lv_value_0_0= ruleBOOLEAN ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:561:1: (lv_value_0_0= ruleBOOLEAN )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:561:1: (lv_value_0_0= ruleBOOLEAN )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:562:3: lv_value_0_0= ruleBOOLEAN
{
currentNode=createCompositeNode(grammarAccess.getBooleanValueAccess().getValueBOOLEANEnumRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleBOOLEAN_in_ruleBooleanValue1168);
- lv_value_0=ruleBOOLEAN();
+ pushFollow(FOLLOW_ruleBOOLEAN_in_ruleBooleanValue1032);
+ lv_value_0_0=ruleBOOLEAN();
_fsp--;
@@ -1127,9 +1237,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);
}
@@ -1141,6 +1255,9 @@
}
+
+ }
+
resetLookahead();
lastConsumedNode = currentNode;
@@ -1158,39 +1275,39 @@
// $ANTLR start ruleBOOLEAN
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:554:1: ruleBOOLEAN returns [Enumerator current=null] : ( ( 'true' ) | ( 'false' ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:591:1: ruleBOOLEAN returns [Enumerator current=null] : ( ( 'true' ) | ( 'false' ) ) ;
public final Enumerator ruleBOOLEAN() throws RecognitionException {
Enumerator current = null;
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:558:6: ( ( ( 'true' ) | ( 'false' ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:559:1: ( ( 'true' ) | ( 'false' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:595:6: ( ( ( 'true' ) | ( 'false' ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:596:1: ( ( 'true' ) | ( 'false' ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:559:1: ( ( 'true' ) | ( 'false' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:596:1: ( ( 'true' ) | ( 'false' ) )
int alt5=2;
int LA5_0 = input.LA(1);
- if ( (LA5_0==16) ) {
+ if ( (LA5_0==17) ) {
alt5=1;
}
- else if ( (LA5_0==17) ) {
+ else if ( (LA5_0==18) ) {
alt5=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("559:1: ( ( 'true' ) | ( 'false' ) )", 5, 0, input);
+ new NoViableAltException("596:1: ( ( 'true' ) | ( 'false' ) )", 5, 0, input);
throw nvae;
}
switch (alt5) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:559:2: ( 'true' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:596:2: ( 'true' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:559:2: ( 'true' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:559:4: 'true'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:596:2: ( 'true' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:596:4: 'true'
{
- match(input,16,FOLLOW_16_in_ruleBOOLEAN1218);
+ match(input,17,FOLLOW_17_in_ruleBOOLEAN1078);
current = grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_0(), null);
@@ -1202,12 +1319,12 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:565:6: ( 'false' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:602:6: ( 'false' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:565:6: ( 'false' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:565:8: 'false'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:602:6: ( 'false' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:602:8: 'false'
{
- match(input,17,FOLLOW_17_in_ruleBOOLEAN1233);
+ match(input,18,FOLLOW_18_in_ruleBOOLEAN1093);
current = grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_1(), null);
@@ -1244,42 +1361,42 @@
public static final BitSet FOLLOW_ruleModel_in_entryRuleModel73 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleModel83 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleModel130 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_ruleImport_in_ruleModel173 = new BitSet(new long[]{0x0000000000004012L});
- public static final BitSet FOLLOW_ruleIncorporates_in_ruleModel211 = new BitSet(new long[]{0x0000000000004012L});
- public static final BitSet FOLLOW_ruleParameter_in_ruleModel250 = new BitSet(new long[]{0x0000000000000012L});
- public static final BitSet FOLLOW_ruleImport_in_entryRuleImport288 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleImport298 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_13_in_ruleImport332 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleImport354 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIncorporates_in_entryRuleIncorporates395 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleIncorporates405 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleIncorporates439 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleIncorporates461 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter502 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParameter512 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleParameter559 = new BitSet(new long[]{0x0000000000008000L});
- public static final BitSet FOLLOW_15_in_ruleParameter571 = new BitSet(new long[]{0x0000000000030070L});
- public static final BitSet FOLLOW_ruleValue_in_ruleParameter605 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValue_in_entryRuleValue642 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValue652 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntValue_in_ruleValue699 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringValue_in_ruleValue726 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRealValue_in_ruleValue753 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanValue_in_ruleValue780 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue812 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleIntValue822 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_INTEGER_in_ruleIntValue868 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRealValue_in_entryRuleRealValue908 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleRealValue918 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_REAL_in_ruleRealValue964 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue1004 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleStringValue1014 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue1060 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue1100 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleBooleanValue1110 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBOOLEAN_in_ruleBooleanValue1168 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_ruleBOOLEAN1218 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_17_in_ruleBOOLEAN1233 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleModel125 = new BitSet(new long[]{0x0000000000004000L});
+ public static final BitSet FOLLOW_ruleImport_in_ruleModel152 = new BitSet(new long[]{0x0000000000008012L});
+ public static final BitSet FOLLOW_ruleIncorporates_in_ruleModel173 = new BitSet(new long[]{0x0000000000008012L});
+ public static final BitSet FOLLOW_ruleParameter_in_ruleModel195 = new BitSet(new long[]{0x0000000000000012L});
+ public static final BitSet FOLLOW_ruleImport_in_entryRuleImport229 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleImport239 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_14_in_ruleImport273 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleImport290 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIncorporates_in_entryRuleIncorporates328 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleIncorporates338 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleIncorporates372 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleIncorporates389 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter427 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParameter437 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleParameter480 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_16_in_ruleParameter489 = new BitSet(new long[]{0x0000000000060070L});
+ public static final BitSet FOLLOW_ruleValue_in_ruleParameter510 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleValue_in_entryRuleValue543 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleValue553 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntValue_in_ruleValue600 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringValue_in_ruleValue627 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRealValue_in_ruleValue654 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanValue_in_ruleValue681 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue713 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleIntValue723 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_INTEGER_in_ruleIntValue764 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRealValue_in_entryRuleRealValue801 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleRealValue811 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_REAL_in_ruleRealValue852 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue889 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleStringValue899 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue940 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue977 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleBooleanValue987 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBOOLEAN_in_ruleBooleanValue1032 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_17_in_ruleBOOLEAN1078 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleBOOLEAN1093 = new BitSet(new long[]{0x0000000000000002L});
}
\ No newline at end of file
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar__.g b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar__.g
index c42a1aa..737e17a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar__.g
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar__.g
@@ -7,37 +7,40 @@
import org.eclipse.xtext.parser.antlr.Lexer;
}
-T13 : 'model' ;
-T14 : 'incorporates' ;
-T15 : '=' ;
-T16 : 'true' ;
-T17 : 'false' ;
+T14 : 'model' ;
+T15 : 'incorporates' ;
+T16 : '=' ;
+T17 : 'true' ;
+T18 : 'false' ;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 574
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 611
RULE_INTEGER : '-'? ('0'..'9')+;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 576
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 613
RULE_REAL : '-'? ('0'..'9')* '.' ('0'..'9')*;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 578
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 615
+RULE_DESC_STRING : '\u00AB' ('\\' ('b'|'t'|'n'|'f'|'r'|'\u00AB'|'\u00BB'|'\\')|~(('\\'|'\u00AB'|'\u00BB')))* '\u00BB';
+
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 617
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 580
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 619
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 582
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 621
RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 584
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 623
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 586
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 625
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 588
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 627
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 590
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 629
RULE_ANY_OTHER : .;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/services/AParGrammarAccess.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/services/AParGrammarAccess.java
index 54a2650..ef72594 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/services/AParGrammarAccess.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/services/AParGrammarAccess.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.amp.amf.abase.services.ABaseGrammarAccess;
@Singleton
-public class AParGrammarAccess implements IGrammarAccess {
+public class AParGrammarAccess extends AbstractGrammarElementFinder {
- public class ModelElements implements IParserRuleAccess {
+ public class ModelElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Model");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
@@ -61,7 +61,7 @@
public RuleCall getParametersParameterParserRuleCall_3_0() { return cParametersParameterParserRuleCall_3_0; }
}
- public class ImportElements implements IParserRuleAccess {
+ public class ImportElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cModelKeyword_0 = (Keyword)cGroup.eContents().get(0);
@@ -85,7 +85,7 @@
public RuleCall getImportURISTRINGTerminalRuleCall_1_0() { return cImportURISTRINGTerminalRuleCall_1_0; }
}
- public class IncorporatesElements implements IParserRuleAccess {
+ public class IncorporatesElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Incorporates");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cIncorporatesKeyword_0 = (Keyword)cGroup.eContents().get(0);
@@ -109,7 +109,7 @@
public RuleCall getImportURISTRINGTerminalRuleCall_1_0() { return cImportURISTRINGTerminalRuleCall_1_0; }
}
- public class ParameterElements implements IParserRuleAccess {
+ public class ParameterElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Parameter");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Assignment cAttributeAssignment_0 = (Assignment)cGroup.eContents().get(0);
@@ -284,6 +284,13 @@
return gaABase.getREALRule();
}
+ //terminal DESC_STRING:
+ // "\u00AB" ("\\" ("b" | "t" | "n" | "f" | "r" | "\u00AB" | "\u00BB" | "\\") | !("\\" | "\u00AB" |
+ // "\u00BB"))* "\u00BB";
+ public TerminalRule getDESC_STRINGRule() {
+ return gaABase.getDESC_STRINGRule();
+ }
+
//terminal ID:
// "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
public TerminalRule getIDRule() {
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/validation/AbstractAParJavaValidator.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/validation/AbstractAParJavaValidator.java
index 44f6dc7..cddfd68 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/validation/AbstractAParJavaValidator.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/validation/AbstractAParJavaValidator.java
@@ -11,7 +11,7 @@
public class AbstractAParJavaValidator extends AbstractDeclarativeValidator {
@Override
- protected List<? extends EPackage> getEPackages() {
+ protected List<EPackage> getEPackages() {
List<EPackage> result = new ArrayList<EPackage>();
result.add(org.eclipse.amp.amf.parameters.aPar.AParPackage.eINSTANCE);
return result;
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.properties b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.properties
new file mode 100644
index 0000000..46351c1
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.properties
@@ -0,0 +1 @@
+file.extensions=apar
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/GenerateAPar.mwe b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/GenerateAPar.mwe
index 0d2ed71..7b91863 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/GenerateAPar.mwe
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/GenerateAPar.mwe
@@ -41,6 +41,10 @@
<fragment class="org.eclipse.xtext.generator.parser.PackratParserFragment"/>
-->
+ <!-- check-based API for validation -->
+ <!--
+ <fragment class="org.eclipse.xtext.generator.validation.CheckFragment"/>
+ -->
<!-- java-based API for validation -->
<fragment class="org.eclipse.xtext.generator.validation.JavaValidatorFragment">
@@ -68,10 +72,15 @@
and will be ignored if it's not available. -->
<fragment class="org.eclipse.xtext.generator.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/milestones.">
+ 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>
<!-- <fragment class="de.itemis.xtext.antlr.XtextAntlrUiGeneratorFragment"/> -->
+ <!-- project wizard (optional) -->
+ <!--
+ <fragment class="org.eclipse.xtext.ui.generator.projectWizard.SimpleProjectWizardFragment"
+ generatorProjectName="${projectName}.generator" modelFileExtension="${file.extensions}"/>
+ -->
</language>
</component>
</workflow>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParScopeProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParScopeProvider.java
index 9931e1b..b66265a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParScopeProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParScopeProvider.java
@@ -30,9 +30,9 @@
import org.eclipse.ui.statushandlers.StatusManager;
import org.eclipse.xtext.scoping.IScope;
import org.eclipse.xtext.scoping.IScopedElement;
-import org.eclipse.xtext.scoping.impl.DefaultScopeProvider;
import org.eclipse.xtext.scoping.impl.ScopedElement;
-import org.eclipse.xtext.xtend.scoping.Scope;
+import org.eclipse.xtext.scoping.impl.SimpleNameScopeProvider;
+import org.eclipse.xtext.scoping.impl.SimpleScope;
import org.metaabm.MetaABMPackage;
import org.metaabm.SAttribute;
import org.metaabm.SAttributed;
@@ -47,7 +47,7 @@
*
*/
@Singleton
-public class AParScopeProvider extends DefaultScopeProvider {
+public class AParScopeProvider extends SimpleNameScopeProvider {
/**
* @param context
@@ -73,10 +73,7 @@
}
}
}
- Scope attrScope = new Scope();
- attrScope.setOuterScope(defaultScope);
- attrScope.setElements(allElems);
- // }
+ IScope attrScope = new SimpleScope(defaultScope, allElems);
return attrScope;
}
return defaultScope;