Update for XText support for apar files. See Bug 283905.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore
index 8497a9a..830296f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore
@@ -7,7 +7,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="model" upperBound="-1"
eType="#//Import" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="incorporates" upperBound="-1"
- eType="#//Import" containment="true"/>
+ eType="#//Incorporates" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
eType="#//Parameter" containment="true"/>
</eClassifiers>
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 8f9ccca..a704c08 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
@@ -19,7 +19,7 @@
<terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
</tokens>
<tokens xsi:type="xtext:Assignment" cardinality="*" feature="incorporates" operator="+=">
- <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
+ <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
</tokens>
<tokens xsi:type="xtext:Assignment" cardinality="*" feature="parameters" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="/0/@rules.3"/>
@@ -108,7 +108,7 @@
<classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/amp/amf/parameters/APar#//BooleanValue"/>
</type>
<alternatives xsi:type="xtext:Assignment" feature="value" operator="=">
- <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.10"/>
+ <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
</alternatives>
</rules>
<rules xsi:type="xtext:TerminalRule" name="FLOAT">
@@ -121,6 +121,18 @@
<tokens xsi:type="xtext:RuleCall" rule="/1/@rules.1"/>
</alternatives>
</rules>
+ <rules xsi:type="xtext:TerminalRule" name="QUALIFIED_NAME">
+ <type metamodel="/0/@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:RuleCall" rule="/1/@rules.0"/>
+ <tokens xsi:type="xtext:Group" cardinality="*">
+ <tokens xsi:type="xtext:Keyword" value="."/>
+ <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>
+ </tokens>
+ </alternatives>
+ </rules>
<rules xsi:type="xtext:EnumRule" name="BOOLEAN">
<type metamodel="/0/@metamodelDeclarations.0">
<classifier xsi:type="ecore:EEnum" href="http://www.eclipse.org/amp/amf/parameters/APar#//BOOLEAN"/>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Engine.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Engine.java
deleted file mode 100644
index d24eb12..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Engine.java
+++ /dev/null
@@ -1,199 +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>Engine</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getEngine()
- * @model
- * @generated
- */
-public enum Engine implements Enumerator
-{
- /**
- * The '<em><b>STOP PERIOD</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #STOP_PERIOD_VALUE
- * @generated
- * @ordered
- */
- STOP_PERIOD(0, "STOP_PERIOD", "STOP PERIOD");
-
- /**
- * The '<em><b>STOP PERIOD</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>STOP PERIOD</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #STOP_PERIOD
- * @model literal="STOP PERIOD"
- * @generated
- * @ordered
- */
- public static final int STOP_PERIOD_VALUE = 0;
-
- /**
- * An array of all the '<em><b>Engine</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final Engine[] VALUES_ARRAY =
- new Engine[]
- {
- STOP_PERIOD,
- };
-
- /**
- * A public read-only list of all the '<em><b>Engine</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<Engine> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Engine</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Engine get(String literal)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- Engine result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Engine</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Engine getByName(String name)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- Engine result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Engine</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Engine get(int value)
- {
- switch (value)
- {
- case STOP_PERIOD_VALUE: return STOP_PERIOD;
- }
- 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 Engine(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;
- }
-
-} //Engine
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java
index 5665026..38d7220 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java
@@ -47,7 +47,7 @@
/**
* Returns the value of the '<em><b>Incorporates</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Import}.
+ * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Incorporates}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Incorporates</em>' containment reference list isn't clear,
@@ -59,7 +59,7 @@
* @model containment="true"
* @generated
*/
- EList<Import> getIncorporates();
+ EList<Incorporates> getIncorporates();
/**
* Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java
index 761455e..8e76f61 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java
@@ -491,7 +491,7 @@
// Initialize classes and features; add operations and parameters
initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getModel_Model(), this.getImport(), null, "model", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getModel_Incorporates(), this.getImport(), null, "incorporates", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getModel_Incorporates(), this.getIncorporates(), null, "incorporates", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModel_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java
index 5c71beb..7e2682e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java
@@ -9,6 +9,7 @@
import org.eclipse.amp.amf.parameters.aPar.AParPackage;
import org.eclipse.amp.amf.parameters.aPar.Import;
+import org.eclipse.amp.amf.parameters.aPar.Incorporates;
import org.eclipse.amp.amf.parameters.aPar.Model;
import org.eclipse.amp.amf.parameters.aPar.Parameter;
@@ -59,7 +60,7 @@
* @generated
* @ordered
*/
- protected EList<Import> incorporates;
+ protected EList<Incorporates> incorporates;
/**
* The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
@@ -111,11 +112,11 @@
* <!-- end-user-doc -->
* @generated
*/
- public EList<Import> getIncorporates()
+ public EList<Incorporates> getIncorporates()
{
if (incorporates == null)
{
- incorporates = new EObjectContainmentEList<Import>(Import.class, this, AParPackage.MODEL__INCORPORATES);
+ incorporates = new EObjectContainmentEList<Incorporates>(Incorporates.class, this, AParPackage.MODEL__INCORPORATES);
}
return incorporates;
}
@@ -191,7 +192,7 @@
return;
case AParPackage.MODEL__INCORPORATES:
getIncorporates().clear();
- getIncorporates().addAll((Collection<? extends Import>)newValue);
+ getIncorporates().addAll((Collection<? extends Incorporates>)newValue);
return;
case AParPackage.MODEL__PARAMETERS:
getParameters().clear();
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 ea595fc..c2e557c 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
@@ -50,11 +50,11 @@
/************ begin Rule Model ****************
*
* Model:
- * model+=Import incorporates+=Import* parameters+=Parameter*;
+ * model+=Import incorporates+=Incorporates* parameters+=Parameter*;
*
**/
-// model+=Import incorporates+=Import* parameters+=Parameter*
+// model+=Import incorporates+=Incorporates* parameters+=Parameter*
protected class Model_Group extends GroupToken {
public Model_Group(AbstractToken parent, AbstractToken next, int no, IInstanceDescription current) {
@@ -121,7 +121,7 @@
}
}
-// incorporates+=Import*
+// incorporates+=Incorporates*
protected class Model_IncorporatesAssignment_1 extends AssignmentToken {
public Model_IncorporatesAssignment_1(AbstractToken parent, AbstractToken next, int no, IInstanceDescription current) {
@@ -134,7 +134,7 @@
public AbstractToken createFollower(int index, IInstanceDescription inst) {
switch(index) {
- case 0: return new Import_Group(this, this, 0, inst);
+ case 0: return new Incorporates_Group(this, this, 0, inst);
default: return null;
}
}
@@ -144,9 +144,9 @@
IInstanceDescription obj = current.cloneAndConsume("incorporates");
if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
IInstanceDescription param = getDescr((EObject)value);
- if(param.isInstanceOf(grammarAccess.getImportRule().getType().getClassifier())) {
+ if(param.isInstanceOf(grammarAccess.getIncorporatesRule().getType().getClassifier())) {
type = AssignmentType.PRC;
- element = grammarAccess.getModelAccess().getIncorporatesImportParserRuleCall_1_0();
+ element = grammarAccess.getModelAccess().getIncorporatesIncorporatesParserRuleCall_1_0();
consumed = obj;
return param;
}
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 e85fbc7..2f2f52f 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
@@ -109,9 +109,9 @@
{
- currentNode=createCompositeNode(grammarAccess.getModelAccess().getIncorporatesImportParserRuleCall_1_0(), currentNode);
+ currentNode=createCompositeNode(grammarAccess.getModelAccess().getIncorporatesIncorporatesParserRuleCall_1_0(), currentNode);
}
- lv_incorporates_1=ruleImport
+ lv_incorporates_1=ruleIncorporates
{
if ($current==null) {
$current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
@@ -119,7 +119,7 @@
}
try {
- add($current, "incorporates", lv_incorporates_1, "Import", currentNode);
+ add($current, "incorporates", lv_incorporates_1, "Incorporates", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -198,6 +198,49 @@
+// Entry rule entryRuleIncorporates
+entryRuleIncorporates returns [EObject current=null] :
+ { currentNode = createCompositeNode(grammarAccess.getIncorporatesRule(), currentNode); }
+ iv_ruleIncorporates=ruleIncorporates
+ { $current=$iv_ruleIncorporates.current; }
+ EOF
+;
+
+// Rule Incorporates
+ruleIncorporates returns [EObject current=null]
+ @init { EObject temp=null; setCurrentLookahead(); resetLookahead();
+ }
+ @after { resetLookahead();
+ lastConsumedNode = currentNode;
+ }:
+('incorporates'
+ {
+ createLeafNode(grammarAccess.getIncorporatesAccess().getIncorporatesKeyword_0(), null);
+ }
+(
+
+ lv_importURI_1= 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);
+ } catch (ValueConverterException vce) {
+ handleValueConverterException(vce);
+ }
+ }
+
+));
+
+
+
// Entry rule entryRuleParameter
@@ -523,6 +566,8 @@
RULE_FLOAT : RULE_INT '.' RULE_INT;
+RULE_QUALIFIED_NAME : RULE_ID ('.' RULE_ID)*;
+
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 8dcbaf8..199be4f 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,13 +1,15 @@
RULE_ID=7
RULE_STRING=4
-RULE_ANY_OTHER=11
+RULE_ANY_OTHER=12
RULE_INT=5
-RULE_WS=10
+RULE_QUALIFIED_NAME=8
+RULE_WS=11
RULE_FLOAT=6
-RULE_SL_COMMENT=9
-RULE_ML_COMMENT=8
-'FALSE'=15
-'true'=14
-'false'=16
-'TRUE'=13
-'model'=12
+RULE_SL_COMMENT=10
+RULE_ML_COMMENT=9
+'FALSE'=17
+'true'=16
+'false'=18
+'TRUE'=15
+'model'=13
+'incorporates'=14
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 32a97a5..7b736be 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
@@ -12,53 +12,36 @@
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=11;
- public static final int RULE_INT=5;
- public static final int T12=12;
- public static final int T13=13;
- public static final int T14=14;
- public static final int T15=15;
+ public static final int RULE_ANY_OTHER=12;
public static final int RULE_FLOAT=6;
- public static final int RULE_WS=10;
- public static final int Tokens=17;
- public static final int T16=16;
- public static final int RULE_SL_COMMENT=9;
public static final int EOF=-1;
- public static final int RULE_ML_COMMENT=8;
+ public static final int RULE_SL_COMMENT=10;
+ public static final int Tokens=19;
+ public static final int RULE_ML_COMMENT=9;
+ public static final int RULE_STRING=4;
+ public static final int RULE_INT=5;
+ public static final int T13=13;
+ public static final int RULE_QUALIFIED_NAME=8;
+ public static final int T14=14;
+ public static final int RULE_WS=11;
+ public static final int T15=15;
+ public static final int T16=16;
+ public static final int T17=17;
+ public static final int T18=18;
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 T12
- public final void mT12() throws RecognitionException {
- try {
- int _type = T12;
- // ../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 T12
-
// $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:11:5: ( 'TRUE' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:11:7: 'TRUE'
+ // ../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("TRUE");
+ match("model");
}
@@ -74,10 +57,10 @@
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:12:5: ( 'true' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:7: 'true'
+ // ../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("true");
+ match("incorporates");
}
@@ -93,10 +76,10 @@
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:13:5: ( 'FALSE' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:13:7: 'FALSE'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:5: ( 'TRUE' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:12:7: 'TRUE'
{
- match("FALSE");
+ match("TRUE");
}
@@ -112,10 +95,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:14:5: ( 'false' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:14:7: 'false'
+ // ../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("false");
+ match("true");
}
@@ -127,12 +110,50 @@
}
// $ANTLR end T16
+ // $ANTLR start T17
+ 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:14:5: ( 'FALSE' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:14:7: 'FALSE'
+ {
+ match("FALSE");
+
+
+ }
+
+ 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:15:5: ( 'false' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:15:7: 'false'
+ {
+ match("false");
+
+
+ }
+
+ this.type = _type;
+ }
+ finally {
+ }
+ }
+ // $ANTLR end T18
+
// $ANTLR start RULE_FLOAT
public final void mRULE_FLOAT() throws RecognitionException {
try {
int _type = RULE_FLOAT;
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:524:12: ( RULE_INT '.' RULE_INT )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:524:14: RULE_INT '.' RULE_INT
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:567:12: ( RULE_INT '.' RULE_INT )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:567:14: RULE_INT '.' RULE_INT
{
mRULE_INT();
match('.');
@@ -147,23 +168,67 @@
}
// $ANTLR end RULE_FLOAT
+ // $ANTLR start RULE_QUALIFIED_NAME
+ public final void mRULE_QUALIFIED_NAME() throws RecognitionException {
+ try {
+ int _type = RULE_QUALIFIED_NAME;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:569:21: ( RULE_ID ( '.' RULE_ID )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:569:23: RULE_ID ( '.' RULE_ID )*
+ {
+ mRULE_ID();
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:569:31: ( '.' RULE_ID )*
+ loop1:
+ do {
+ int alt1=2;
+ int LA1_0 = input.LA(1);
+
+ if ( (LA1_0=='.') ) {
+ alt1=1;
+ }
+
+
+ switch (alt1) {
+ case 1 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:569:32: '.' RULE_ID
+ {
+ match('.');
+ mRULE_ID();
+
+ }
+ break;
+
+ default :
+ break loop1;
+ }
+ } while (true);
+
+
+ }
+
+ this.type = _type;
+ }
+ finally {
+ }
+ }
+ // $ANTLR end RULE_QUALIFIED_NAME
+
// $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:526: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:526: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:571: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:571: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:526:11: ( '^' )?
- int alt1=2;
- int LA1_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:571:11: ( '^' )?
+ int alt2=2;
+ int LA2_0 = input.LA(1);
- if ( (LA1_0=='^') ) {
- alt1=1;
+ if ( (LA2_0=='^') ) {
+ alt2=1;
}
- switch (alt1) {
+ switch (alt2) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:526:11: '^'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:571:11: '^'
{
match('^');
@@ -182,18 +247,18 @@
recover(mse); throw mse;
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:526:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
- loop2:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:571:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ loop3:
do {
- int alt2=2;
- int LA2_0 = input.LA(1);
+ int alt3=2;
+ int LA3_0 = input.LA(1);
- if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
- alt2=1;
+ if ( ((LA3_0>='0' && LA3_0<='9')||(LA3_0>='A' && LA3_0<='Z')||LA3_0=='_'||(LA3_0>='a' && LA3_0<='z')) ) {
+ alt3=1;
}
- switch (alt2) {
+ switch (alt3) {
case 1 :
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:
{
@@ -212,7 +277,7 @@
break;
default :
- break loop2;
+ break loop3;
}
} while (true);
@@ -230,24 +295,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:528:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:528:12: ( '0' .. '9' )+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:573:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:573:12: ( '0' .. '9' )+
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:528:12: ( '0' .. '9' )+
- int cnt3=0;
- loop3:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:573:12: ( '0' .. '9' )+
+ int cnt4=0;
+ loop4:
do {
- int alt3=2;
- int LA3_0 = input.LA(1);
+ int alt4=2;
+ int LA4_0 = input.LA(1);
- if ( ((LA3_0>='0' && LA3_0<='9')) ) {
- alt3=1;
+ if ( ((LA4_0>='0' && LA4_0<='9')) ) {
+ alt4=1;
}
- switch (alt3) {
+ switch (alt4) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:528:13: '0' .. '9'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:573:13: '0' .. '9'
{
matchRange('0','9');
@@ -255,12 +320,12 @@
break;
default :
- if ( cnt3 >= 1 ) break loop3;
+ if ( cnt4 >= 1 ) break loop4;
EarlyExitException eee =
- new EarlyExitException(3, input);
+ new EarlyExitException(4, input);
throw eee;
}
- cnt3++;
+ cnt4++;
} while (true);
@@ -277,47 +342,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:530: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:530: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:575: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:575: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:530:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
- 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:575:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ int alt7=2;
+ int LA7_0 = input.LA(1);
- if ( (LA6_0=='\"') ) {
- alt6=1;
+ if ( (LA7_0=='\"') ) {
+ alt7=1;
}
- else if ( (LA6_0=='\'') ) {
- alt6=2;
+ else if ( (LA7_0=='\'') ) {
+ alt7=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("530:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("575:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 7, 0, input);
throw nvae;
}
- switch (alt6) {
+ switch (alt7) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
- loop4:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ loop5:
do {
- int alt4=3;
- int LA4_0 = input.LA(1);
+ int alt5=3;
+ int LA5_0 = input.LA(1);
- if ( (LA4_0=='\\') ) {
- alt4=1;
+ if ( (LA5_0=='\\') ) {
+ alt5=1;
}
- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
- alt4=2;
+ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
+ alt5=2;
}
- switch (alt4) {
+ switch (alt5) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575: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' ) {
@@ -334,7 +399,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:62: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575:62: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -351,7 +416,7 @@
break;
default :
- break loop4;
+ break loop5;
}
} while (true);
@@ -360,26 +425,26 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
- loop5:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ loop6:
do {
- int alt5=3;
- int LA5_0 = input.LA(1);
+ int alt6=3;
+ int LA6_0 = input.LA(1);
- if ( (LA5_0=='\\') ) {
- alt5=1;
+ if ( (LA6_0=='\\') ) {
+ alt6=1;
}
- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
- alt5=2;
+ else if ( ((LA6_0>='\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFE')) ) {
+ alt6=2;
}
- switch (alt5) {
+ switch (alt6) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575: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' ) {
@@ -396,7 +461,7 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:530:129: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:575:129: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -413,7 +478,7 @@
break;
default :
- break loop5;
+ break loop6;
}
} while (true);
@@ -438,37 +503,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:532:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:532:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:577:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:577:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:532:24: ( options {greedy=false; } : . )*
- loop7:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:577:24: ( options {greedy=false; } : . )*
+ loop8:
do {
- int alt7=2;
- int LA7_0 = input.LA(1);
+ int alt8=2;
+ int LA8_0 = input.LA(1);
- if ( (LA7_0=='*') ) {
- int LA7_1 = input.LA(2);
+ if ( (LA8_0=='*') ) {
+ int LA8_1 = input.LA(2);
- if ( (LA7_1=='/') ) {
- alt7=2;
+ if ( (LA8_1=='/') ) {
+ alt8=2;
}
- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
- alt7=1;
+ else if ( ((LA8_1>='\u0000' && LA8_1<='.')||(LA8_1>='0' && LA8_1<='\uFFFE')) ) {
+ alt8=1;
}
}
- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
- alt7=1;
+ else if ( ((LA8_0>='\u0000' && LA8_0<=')')||(LA8_0>='+' && LA8_0<='\uFFFE')) ) {
+ 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:532:52: .
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:577:52: .
{
matchAny();
@@ -476,7 +541,7 @@
break;
default :
- break loop7;
+ break loop8;
}
} while (true);
@@ -496,25 +561,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:534:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:534:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:534:24: (~ ( ( '\\n' | '\\r' ) ) )*
- loop8:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ loop9:
do {
- int alt8=2;
- int LA8_0 = input.LA(1);
+ int alt9=2;
+ int LA9_0 = input.LA(1);
- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
- alt8=1;
+ if ( ((LA9_0>='\u0000' && LA9_0<='\t')||(LA9_0>='\u000B' && LA9_0<='\f')||(LA9_0>='\u000E' && LA9_0<='\uFFFE')) ) {
+ 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:534:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579: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();
@@ -531,31 +596,31 @@
break;
default :
- break loop8;
+ break loop9;
}
} while (true);
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:534:40: ( ( '\\r' )? '\\n' )?
- int alt10=2;
- int LA10_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:40: ( ( '\\r' )? '\\n' )?
+ int alt11=2;
+ int LA11_0 = input.LA(1);
- if ( (LA10_0=='\n'||LA10_0=='\r') ) {
- alt10=1;
+ if ( (LA11_0=='\n'||LA11_0=='\r') ) {
+ alt11=1;
}
- switch (alt10) {
+ switch (alt11) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:534:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:534:41: ( '\\r' )?
- int alt9=2;
- int LA9_0 = input.LA(1);
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:41: ( '\\r' )?
+ int alt10=2;
+ int LA10_0 = input.LA(1);
- if ( (LA9_0=='\r') ) {
- alt9=1;
+ if ( (LA10_0=='\r') ) {
+ alt10=1;
}
- switch (alt9) {
+ switch (alt10) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:534:41: '\\r'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:579:41: '\\r'
{
match('\r');
@@ -585,22 +650,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:536:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:536:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:581:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:581:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:536:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
- int cnt11=0;
- loop11:
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:581:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ int cnt12=0;
+ loop12:
do {
- int alt11=2;
- int LA11_0 = input.LA(1);
+ int alt12=2;
+ int LA12_0 = input.LA(1);
- if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
- alt11=1;
+ if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
+ alt12=1;
}
- switch (alt11) {
+ switch (alt12) {
case 1 :
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:
{
@@ -619,12 +684,12 @@
break;
default :
- if ( cnt11 >= 1 ) break loop11;
+ if ( cnt12 >= 1 ) break loop12;
EarlyExitException eee =
- new EarlyExitException(11, input);
+ new EarlyExitException(12, input);
throw eee;
}
- cnt11++;
+ cnt12++;
} while (true);
@@ -641,8 +706,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:538:16: ( . )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:538:18: .
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:583:16: ( . )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:583:18: .
{
matchAny();
@@ -656,96 +721,110 @@
// $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: ( T12 | T13 | T14 | T15 | T16 | RULE_FLOAT | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
- int alt12=13;
- alt12 = dfa12.predict(input);
- switch (alt12) {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:8: ( T13 | T14 | T15 | T16 | T17 | T18 | RULE_FLOAT | RULE_QUALIFIED_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ int alt13=15;
+ alt13 = dfa13.predict(input);
+ switch (alt13) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:10: T12
- {
- mT12();
-
- }
- break;
- case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:14: T13
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:10: T13
{
mT13();
}
break;
- case 3 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:18: T14
+ case 2 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:14: T14
{
mT14();
}
break;
- case 4 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:22: T15
+ case 3 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:18: T15
{
mT15();
}
break;
- case 5 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:26: T16
+ case 4 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:22: 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
+ {
+ mT17();
+
+ }
+ break;
case 6 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:30: RULE_FLOAT
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:30: T18
+ {
+ mT18();
+
+ }
+ break;
+ case 7 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:34: RULE_FLOAT
{
mRULE_FLOAT();
}
break;
- case 7 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:41: RULE_ID
+ case 8 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:45: RULE_QUALIFIED_NAME
+ {
+ mRULE_QUALIFIED_NAME();
+
+ }
+ break;
+ case 9 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:65: RULE_ID
{
mRULE_ID();
}
break;
- case 8 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:49: RULE_INT
+ case 10 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:73: RULE_INT
{
mRULE_INT();
}
break;
- case 9 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:58: RULE_STRING
+ case 11 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:82: RULE_STRING
{
mRULE_STRING();
}
break;
- case 10 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:70: RULE_ML_COMMENT
+ case 12 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:94: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
- case 11 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:86: RULE_SL_COMMENT
+ case 13 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:110: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
- case 12 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:102: RULE_WS
+ case 14 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:126: RULE_WS
{
mRULE_WS();
}
break;
- case 13 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:110: RULE_ANY_OTHER
+ case 15 :
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:1:134: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
@@ -757,109 +836,123 @@
}
- protected DFA12 dfa12 = new DFA12(this);
- static final String DFA12_eotS =
- "\1\uffff\5\17\1\24\1\15\1\uffff\3\15\2\uffff\1\17\1\uffff\4\17\2"+
- "\uffff\1\24\4\uffff\6\17\1\46\1\47\2\17\1\52\2\uffff\1\53\1\54\3"+
- "\uffff";
- static final String DFA12_eofS =
- "\55\uffff";
- static final String DFA12_minS =
- "\1\0\1\157\1\122\1\162\1\101\1\141\1\56\1\101\1\uffff\2\0\1\52\2"+
- "\uffff\1\144\1\uffff\1\125\1\165\1\114\1\154\2\uffff\1\56\4\uffff"+
- "\1\145\1\105\1\145\1\123\1\163\1\154\2\60\1\105\1\145\1\60\2\uffff"+
- "\2\60\3\uffff";
- static final String DFA12_maxS =
- "\1\ufffe\1\157\1\122\1\162\1\101\1\141\1\71\1\172\1\uffff\2\ufffe"+
- "\1\57\2\uffff\1\144\1\uffff\1\125\1\165\1\114\1\154\2\uffff\1\71"+
- "\4\uffff\1\145\1\105\1\145\1\123\1\163\1\154\2\172\1\105\1\145\1"+
- "\172\2\uffff\2\172\3\uffff";
- static final String DFA12_acceptS =
- "\10\uffff\1\7\3\uffff\1\14\1\15\1\uffff\1\7\4\uffff\1\10\1\6\1\uffff"+
- "\1\11\1\12\1\13\1\14\13\uffff\1\2\1\3\2\uffff\1\1\1\4\1\5";
- static final String DFA12_specialS =
- "\55\uffff}>";
- static final String[] DFA12_transitionS = {
- "\11\15\2\14\2\15\1\14\22\15\1\14\1\15\1\11\4\15\1\12\7\15\1"+
- "\13\12\6\7\15\5\10\1\4\15\10\1\2\6\10\3\15\1\7\1\10\1\15\5\10"+
- "\1\5\6\10\1\1\6\10\1\3\6\10\uff84\15",
- "\1\16",
- "\1\20",
- "\1\21",
- "\1\22",
- "\1\23",
- "\1\25\1\uffff\12\26",
- "\32\17\4\uffff\1\17\1\uffff\32\17",
- "",
- "\uffff\27",
- "\uffff\27",
- "\1\30\4\uffff\1\31",
+ protected DFA13 dfa13 = new DFA13(this);
+ static final String DFA13_eotS =
+ "\1\uffff\6\20\1\27\1\16\1\20\3\16\2\uffff\1\20\1\uffff\6\20\2\uffff"+
+ "\1\27\1\20\4\uffff\10\20\1\55\1\56\2\20\1\61\1\20\2\uffff\1\63\1"+
+ "\64\1\uffff\1\20\2\uffff\5\20\1\73\1\uffff";
+ static final String DFA13_eofS =
+ "\74\uffff";
+ static final String DFA13_minS =
+ "\1\0\6\60\1\56\1\101\1\60\2\0\1\52\2\uffff\1\60\1\uffff\6\60\2\uffff"+
+ "\1\56\1\60\4\uffff\10\60\2\56\2\60\1\56\1\60\2\uffff\2\56\1\uffff"+
+ "\1\60\2\uffff\5\60\1\56\1\uffff";
+ static final String DFA13_maxS =
+ "\1\ufffe\6\172\1\71\2\172\2\ufffe\1\57\2\uffff\1\172\1\uffff\6\172"+
+ "\2\uffff\1\71\1\172\4\uffff\16\172\2\uffff\2\172\1\uffff\1\172\2"+
+ "\uffff\6\172\1\uffff";
+ static final String DFA13_acceptS =
+ "\15\uffff\1\16\1\17\1\uffff\1\10\6\uffff\1\12\1\7\2\uffff\1\13\1"+
+ "\14\1\15\1\16\16\uffff\1\3\1\4\2\uffff\1\1\1\uffff\1\5\1\6\6\uffff"+
+ "\1\2";
+ static final String DFA13_specialS =
+ "\74\uffff}>";
+ static final String[] DFA13_transitionS = {
+ "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\12\4\16\1\13\7\16\1"+
+ "\14\12\7\7\16\5\11\1\5\15\11\1\3\6\11\3\16\1\10\1\11\1\16\5"+
+ "\11\1\6\2\11\1\2\3\11\1\1\6\11\1\4\6\11\uff84\16",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\16\21\1\17\13\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\15\21\1\22\14\21",
+ "\12\21\7\uffff\21\21\1\23\10\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\21\21\1\24\10\21",
+ "\12\21\7\uffff\1\25\31\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\1\26\31\21",
+ "\1\30\1\uffff\12\31",
+ "\32\32\4\uffff\1\32\1\uffff\32\32",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\uffff\33",
+ "\uffff\33",
+ "\1\34\4\uffff\1\35",
"",
"",
- "\1\33",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\3\21\1\37\26\21",
"",
- "\1\34",
- "\1\35",
- "\1\36",
- "\1\37",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\2\21\1\40\27\21",
+ "\12\21\7\uffff\24\21\1\41\5\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\24\21\1\42\5\21",
+ "\12\21\7\uffff\13\21\1\43\16\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\13\21\1\44\16\21",
"",
"",
- "\1\25\1\uffff\12\26",
+ "\1\30\1\uffff\12\31",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
"",
"",
"",
"",
- "\1\40",
- "\1\41",
- "\1\42",
- "\1\43",
- "\1\44",
- "\1\45",
- "\12\17\7\uffff\32\17\4\uffff\1\17\1\uffff\32\17",
- "\12\17\7\uffff\32\17\4\uffff\1\17\1\uffff\32\17",
- "\1\50",
- "\1\51",
- "\12\17\7\uffff\32\17\4\uffff\1\17\1\uffff\32\17",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\4\21\1\45\25\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\16\21\1\46\13\21",
+ "\12\21\7\uffff\4\21\1\47\25\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\4\21\1\50\25\21",
+ "\12\21\7\uffff\22\21\1\51\7\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\22\21\1\52\7\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\13\21\1\53\16\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\21\21\1\54\10\21",
+ "\1\20\1\uffff\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\1\20\1\uffff\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\4\21\1\57\25\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\4\21\1\60\25\21",
+ "\1\20\1\uffff\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\17\21\1\62\12\21",
"",
"",
- "\12\17\7\uffff\32\17\4\uffff\1\17\1\uffff\32\17",
- "\12\17\7\uffff\32\17\4\uffff\1\17\1\uffff\32\17",
+ "\1\20\1\uffff\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "\1\20\1\uffff\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
+ "",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\16\21\1\65\13\21",
"",
"",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\21\21\1\66\10\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\1\67\31\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\23\21\1\70\6\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\4\21\1\71\25\21",
+ "\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\22\21\1\72\7\21",
+ "\1\20\1\uffff\12\21\7\uffff\32\21\4\uffff\1\21\1\uffff\32\21",
""
};
- static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
- static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
- static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
- static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
- static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
- static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
- static final short[][] DFA12_transition;
+ static final short[] DFA13_eot = DFA.unpackEncodedString(DFA13_eotS);
+ static final short[] DFA13_eof = DFA.unpackEncodedString(DFA13_eofS);
+ static final char[] DFA13_min = DFA.unpackEncodedStringToUnsignedChars(DFA13_minS);
+ static final char[] DFA13_max = DFA.unpackEncodedStringToUnsignedChars(DFA13_maxS);
+ static final short[] DFA13_accept = DFA.unpackEncodedString(DFA13_acceptS);
+ static final short[] DFA13_special = DFA.unpackEncodedString(DFA13_specialS);
+ static final short[][] DFA13_transition;
static {
- int numStates = DFA12_transitionS.length;
- DFA12_transition = new short[numStates][];
+ int numStates = DFA13_transitionS.length;
+ DFA13_transition = new short[numStates][];
for (int i=0; i<numStates; i++) {
- DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
+ DFA13_transition[i] = DFA.unpackEncodedString(DFA13_transitionS[i]);
}
}
- class DFA12 extends DFA {
+ class DFA13 extends DFA {
- public DFA12(BaseRecognizer recognizer) {
+ public DFA13(BaseRecognizer recognizer) {
this.recognizer = recognizer;
- this.decisionNumber = 12;
- this.eot = DFA12_eot;
- this.eof = DFA12_eof;
- this.min = DFA12_min;
- this.max = DFA12_max;
- this.accept = DFA12_accept;
- this.special = DFA12_special;
- this.transition = DFA12_transition;
+ this.decisionNumber = 13;
+ this.eot = DFA13_eot;
+ this.eof = DFA13_eof;
+ this.min = DFA13_min;
+ this.max = DFA13_max;
+ this.accept = DFA13_accept;
+ this.special = DFA13_special;
+ this.transition = DFA13_transition;
}
public String getDescription() {
- return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | RULE_FLOAT | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+ return "1:1: Tokens : ( T13 | T14 | T15 | T16 | T17 | T18 | RULE_FLOAT | RULE_QUALIFIED_NAME | 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 dbb9c1e..6d488a6 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,17 +24,18 @@
public class InternalAParParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_INT", "RULE_FLOAT", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'TRUE'", "'true'", "'FALSE'", "'false'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_INT", "RULE_FLOAT", "RULE_ID", "RULE_QUALIFIED_NAME", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'incorporates'", "'TRUE'", "'true'", "'FALSE'", "'false'"
};
public static final int RULE_ID=7;
public static final int RULE_STRING=4;
- public static final int RULE_ANY_OTHER=11;
+ public static final int RULE_ANY_OTHER=12;
public static final int RULE_INT=5;
- public static final int RULE_WS=10;
+ public static final int RULE_QUALIFIED_NAME=8;
+ public static final int RULE_WS=11;
public static final int RULE_FLOAT=6;
- public static final int RULE_SL_COMMENT=9;
+ public static final int RULE_SL_COMMENT=10;
public static final int EOF=-1;
- public static final int RULE_ML_COMMENT=8;
+ public static final int RULE_ML_COMMENT=9;
public InternalAParParser(TokenStream input) {
super(input);
@@ -104,7 +105,7 @@
// $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_model_0= ruleImport ) (lv_incorporates_1= ruleImport )* (lv_parameters_2= 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_model_0= ruleImport ) (lv_incorporates_1= ruleIncorporates )* (lv_parameters_2= ruleParameter )* ) ;
public final EObject ruleModel() throws RecognitionException {
EObject current = null;
@@ -118,11 +119,11 @@
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_model_0= ruleImport ) (lv_incorporates_1= ruleImport )* (lv_parameters_2= ruleParameter )* ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( (lv_model_0= ruleImport ) (lv_incorporates_1= ruleImport )* (lv_parameters_2= ruleParameter )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:86:6: ( ( (lv_model_0= ruleImport ) (lv_incorporates_1= ruleIncorporates )* (lv_parameters_2= ruleParameter )* ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( (lv_model_0= ruleImport ) (lv_incorporates_1= ruleIncorporates )* (lv_parameters_2= ruleParameter )* )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( (lv_model_0= ruleImport ) (lv_incorporates_1= ruleImport )* (lv_parameters_2= ruleParameter )* )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: (lv_model_0= ruleImport ) (lv_incorporates_1= ruleImport )* (lv_parameters_2= ruleParameter )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:1: ( (lv_model_0= ruleImport ) (lv_incorporates_1= ruleIncorporates )* (lv_parameters_2= ruleParameter )* )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: (lv_model_0= ruleImport ) (lv_incorporates_1= ruleIncorporates )* (lv_parameters_2= ruleParameter )*
{
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:87:2: (lv_model_0= ruleImport )
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:90:6: lv_model_0= ruleImport
@@ -150,26 +151,26 @@
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:108:2: (lv_incorporates_1= ruleImport )*
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:108:2: (lv_incorporates_1= ruleIncorporates )*
loop1:
do {
int alt1=2;
int LA1_0 = input.LA(1);
- if ( (LA1_0==12) ) {
+ if ( (LA1_0==14) ) {
alt1=1;
}
switch (alt1) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:111:6: lv_incorporates_1= ruleImport
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:111:6: lv_incorporates_1= ruleIncorporates
{
- currentNode=createCompositeNode(grammarAccess.getModelAccess().getIncorporatesImportParserRuleCall_1_0(), currentNode);
+ currentNode=createCompositeNode(grammarAccess.getModelAccess().getIncorporatesIncorporatesParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleImport_in_ruleModel180);
- lv_incorporates_1=ruleImport();
+ pushFollow(FOLLOW_ruleIncorporates_in_ruleModel180);
+ lv_incorporates_1=ruleIncorporates();
_fsp--;
@@ -179,7 +180,7 @@
}
try {
- add(current, "incorporates", lv_incorporates_1, "Import", currentNode);
+ add(current, "incorporates", lv_incorporates_1, "Incorporates", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -311,7 +312,7 @@
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:171:1: ( 'model' (lv_importURI_1= RULE_STRING ) )
// ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:171:2: 'model' (lv_importURI_1= RULE_STRING )
{
- match(input,12,FOLLOW_12_in_ruleImport301);
+ match(input,13,FOLLOW_13_in_ruleImport301);
createLeafNode(grammarAccess.getImportAccess().getModelKeyword_0(), null);
@@ -360,8 +361,108 @@
// $ANTLR end ruleImport
+ // $ANTLR start entryRuleIncorporates
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:202:1: entryRuleIncorporates returns [EObject current=null] : iv_ruleIncorporates= ruleIncorporates EOF ;
+ public final EObject entryRuleIncorporates() throws RecognitionException {
+ EObject current = null;
+
+ EObject iv_ruleIncorporates = null;
+
+
+ try {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:202:54: (iv_ruleIncorporates= ruleIncorporates EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:203:2: iv_ruleIncorporates= ruleIncorporates EOF
+ {
+ currentNode = createCompositeNode(grammarAccess.getIncorporatesRule(), currentNode);
+ pushFollow(FOLLOW_ruleIncorporates_in_entryRuleIncorporates364);
+ iv_ruleIncorporates=ruleIncorporates();
+ _fsp--;
+
+ current =iv_ruleIncorporates;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleIncorporates374);
+
+ }
+
+ }
+
+ catch (RecognitionException re) {
+ recover(input,re);
+ appendSkippedTokens();
+ }
+ finally {
+ }
+ return current;
+ }
+ // $ANTLR end entryRuleIncorporates
+
+
+ // $ANTLR start ruleIncorporates
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:210:1: ruleIncorporates returns [EObject current=null] : ( 'incorporates' (lv_importURI_1= RULE_STRING ) ) ;
+ public final EObject ruleIncorporates() throws RecognitionException {
+ EObject current = null;
+
+ Token lv_importURI_1=null;
+
+ EObject temp=null; setCurrentLookahead(); resetLookahead();
+
+ try {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:215:6: ( ( 'incorporates' (lv_importURI_1= RULE_STRING ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:216:1: ( 'incorporates' (lv_importURI_1= RULE_STRING ) )
+ {
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:216:1: ( 'incorporates' (lv_importURI_1= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:216:2: 'incorporates' (lv_importURI_1= RULE_STRING )
+ {
+ match(input,14,FOLLOW_14_in_ruleIncorporates408);
+
+ createLeafNode(grammarAccess.getIncorporatesAccess().getIncorporatesKeyword_0(), null);
+
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:220:1: (lv_importURI_1= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:222:6: lv_importURI_1= RULE_STRING
+ {
+ lv_importURI_1=(Token)input.LT(1);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleIncorporates430);
+
+ 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);
+ } catch (ValueConverterException vce) {
+ handleValueConverterException(vce);
+ }
+
+
+ }
+
+
+ }
+
+
+ }
+
+ resetLookahead();
+ lastConsumedNode = currentNode;
+
+ }
+
+ catch (RecognitionException re) {
+ recover(input,re);
+ appendSkippedTokens();
+ }
+ finally {
+ }
+ return current;
+ }
+ // $ANTLR end ruleIncorporates
+
+
// $ANTLR start entryRuleParameter
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:204: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:247:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
public final EObject entryRuleParameter() throws RecognitionException {
EObject current = null;
@@ -369,16 +470,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:204:51: (iv_ruleParameter= ruleParameter EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:205:2: iv_ruleParameter= ruleParameter EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:247:51: (iv_ruleParameter= ruleParameter EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:248:2: iv_ruleParameter= ruleParameter EOF
{
currentNode = createCompositeNode(grammarAccess.getParameterRule(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter366);
+ pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter471);
iv_ruleParameter=ruleParameter();
_fsp--;
current =iv_ruleParameter;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParameter376);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParameter481);
}
@@ -396,7 +497,7 @@
// $ANTLR start ruleParameter
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:212:1: ruleParameter returns [EObject current=null] : ( ( RULE_STRING ) (lv_value_1= ruleValue ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:255:1: ruleParameter returns [EObject current=null] : ( ( RULE_STRING ) (lv_value_1= ruleValue ) ) ;
public final EObject ruleParameter() throws RecognitionException {
EObject current = null;
@@ -406,14 +507,14 @@
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:217:6: ( ( ( RULE_STRING ) (lv_value_1= ruleValue ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:218:1: ( ( RULE_STRING ) (lv_value_1= ruleValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:260:6: ( ( ( RULE_STRING ) (lv_value_1= ruleValue ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:261:1: ( ( RULE_STRING ) (lv_value_1= ruleValue ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:218:1: ( ( RULE_STRING ) (lv_value_1= ruleValue ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:218:2: ( RULE_STRING ) (lv_value_1= ruleValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:261:1: ( ( RULE_STRING ) (lv_value_1= ruleValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:261:2: ( RULE_STRING ) (lv_value_1= ruleValue )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:218:2: ( RULE_STRING )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:221:3: RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:261:2: ( RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:264:3: RULE_STRING
{
if (current==null) {
@@ -421,20 +522,20 @@
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleParameter423);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleParameter528);
createLeafNode(grammarAccess.getParameterAccess().getAttributeSAttributeCrossReference_0_0(), "attribute");
}
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:234:2: (lv_value_1= ruleValue )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:237:6: lv_value_1= ruleValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:277:2: (lv_value_1= ruleValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:280:6: lv_value_1= ruleValue
{
currentNode=createCompositeNode(grammarAccess.getParameterAccess().getValueValueParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleValue_in_ruleParameter460);
+ pushFollow(FOLLOW_ruleValue_in_ruleParameter565);
lv_value_1=ruleValue();
_fsp--;
@@ -477,7 +578,7 @@
// $ANTLR start entryRuleValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:262: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:305:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
public final EObject entryRuleValue() throws RecognitionException {
EObject current = null;
@@ -485,16 +586,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:262:47: (iv_ruleValue= ruleValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:263:2: iv_ruleValue= ruleValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:305:47: (iv_ruleValue= ruleValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:306:2: iv_ruleValue= ruleValue EOF
{
currentNode = createCompositeNode(grammarAccess.getValueRule(), currentNode);
- pushFollow(FOLLOW_ruleValue_in_entryRuleValue497);
+ pushFollow(FOLLOW_ruleValue_in_entryRuleValue602);
iv_ruleValue=ruleValue();
_fsp--;
current =iv_ruleValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleValue507);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleValue612);
}
@@ -512,7 +613,7 @@
// $ANTLR start ruleValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:270:1: ruleValue returns [EObject current=null] : (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:313:1: ruleValue returns [EObject current=null] : (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) ) ;
public final EObject ruleValue() throws RecognitionException {
EObject current = null;
@@ -521,13 +622,13 @@
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:275:6: ( (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:276:1: (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:318:6: ( (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:319:1: (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:276:1: (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:278:6: lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:319:1: (lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:321:6: lv_value_0= ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:278:17: ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:321:17: ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue )
int alt3=4;
switch ( input.LA(1) ) {
case RULE_INT:
@@ -545,29 +646,29 @@
alt3=3;
}
break;
- case 13:
- case 14:
case 15:
case 16:
+ case 17:
+ case 18:
{
alt3=4;
}
break;
default:
NoViableAltException nvae =
- new NoViableAltException("278:17: ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue )", 3, 0, input);
+ new NoViableAltException("321:17: ( ruleIntValue | ruleFloatValue | ruleStringValue | ruleBooleanValue )", 3, 0, input);
throw nvae;
}
switch (alt3) {
case 1 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:278:19: ruleIntValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:321:19: ruleIntValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getValueIntValueParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleIntValue_in_ruleValue557);
+ pushFollow(FOLLOW_ruleIntValue_in_ruleValue662);
ruleIntValue();
_fsp--;
@@ -578,12 +679,12 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:285:7: ruleFloatValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:328:7: ruleFloatValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getValueFloatValueParserRuleCall_0_1(), currentNode);
- pushFollow(FOLLOW_ruleFloatValue_in_ruleValue571);
+ pushFollow(FOLLOW_ruleFloatValue_in_ruleValue676);
ruleFloatValue();
_fsp--;
@@ -594,12 +695,12 @@
}
break;
case 3 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:292:7: ruleStringValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:335:7: ruleStringValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getValueStringValueParserRuleCall_0_2(), currentNode);
- pushFollow(FOLLOW_ruleStringValue_in_ruleValue585);
+ pushFollow(FOLLOW_ruleStringValue_in_ruleValue690);
ruleStringValue();
_fsp--;
@@ -610,12 +711,12 @@
}
break;
case 4 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:299:7: ruleBooleanValue
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:342:7: ruleBooleanValue
{
currentNode=createCompositeNode(grammarAccess.getValueAccess().getValueBooleanValueParserRuleCall_0_3(), currentNode);
- pushFollow(FOLLOW_ruleBooleanValue_in_ruleValue599);
+ pushFollow(FOLLOW_ruleBooleanValue_in_ruleValue704);
ruleBooleanValue();
_fsp--;
@@ -663,7 +764,7 @@
// $ANTLR start entryRuleIntValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:327: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:370:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
public final EObject entryRuleIntValue() throws RecognitionException {
EObject current = null;
@@ -671,16 +772,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:327:50: (iv_ruleIntValue= ruleIntValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:328:2: iv_ruleIntValue= ruleIntValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:370:50: (iv_ruleIntValue= ruleIntValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:371:2: iv_ruleIntValue= ruleIntValue EOF
{
currentNode = createCompositeNode(grammarAccess.getIntValueRule(), currentNode);
- pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue640);
+ pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue745);
iv_ruleIntValue=ruleIntValue();
_fsp--;
current =iv_ruleIntValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue650);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue755);
}
@@ -698,7 +799,7 @@
// $ANTLR start ruleIntValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:335:1: ruleIntValue returns [EObject current=null] : (lv_value_0= RULE_INT ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:378:1: ruleIntValue returns [EObject current=null] : (lv_value_0= RULE_INT ) ;
public final EObject ruleIntValue() throws RecognitionException {
EObject current = null;
@@ -707,14 +808,14 @@
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:340:6: ( (lv_value_0= RULE_INT ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:341:1: (lv_value_0= RULE_INT )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:383:6: ( (lv_value_0= RULE_INT ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:384:1: (lv_value_0= RULE_INT )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:341:1: (lv_value_0= RULE_INT )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:343:6: lv_value_0= RULE_INT
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:384:1: (lv_value_0= RULE_INT )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:386:6: lv_value_0= RULE_INT
{
lv_value_0=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntValue696);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntValue801);
createLeafNode(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0(), "value");
@@ -753,7 +854,7 @@
// $ANTLR start entryRuleFloatValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:368:1: entryRuleFloatValue returns [EObject current=null] : iv_ruleFloatValue= ruleFloatValue EOF ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:411:1: entryRuleFloatValue returns [EObject current=null] : iv_ruleFloatValue= ruleFloatValue EOF ;
public final EObject entryRuleFloatValue() throws RecognitionException {
EObject current = null;
@@ -761,16 +862,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:368:52: (iv_ruleFloatValue= ruleFloatValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:369:2: iv_ruleFloatValue= ruleFloatValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:411:52: (iv_ruleFloatValue= ruleFloatValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:412:2: iv_ruleFloatValue= ruleFloatValue EOF
{
currentNode = createCompositeNode(grammarAccess.getFloatValueRule(), currentNode);
- pushFollow(FOLLOW_ruleFloatValue_in_entryRuleFloatValue736);
+ pushFollow(FOLLOW_ruleFloatValue_in_entryRuleFloatValue841);
iv_ruleFloatValue=ruleFloatValue();
_fsp--;
current =iv_ruleFloatValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleFloatValue746);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleFloatValue851);
}
@@ -788,7 +889,7 @@
// $ANTLR start ruleFloatValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:376:1: ruleFloatValue returns [EObject current=null] : (lv_value_0= RULE_FLOAT ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:419:1: ruleFloatValue returns [EObject current=null] : (lv_value_0= RULE_FLOAT ) ;
public final EObject ruleFloatValue() throws RecognitionException {
EObject current = null;
@@ -797,14 +898,14 @@
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:381:6: ( (lv_value_0= RULE_FLOAT ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:382:1: (lv_value_0= RULE_FLOAT )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:424:6: ( (lv_value_0= RULE_FLOAT ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:425:1: (lv_value_0= RULE_FLOAT )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:382:1: (lv_value_0= RULE_FLOAT )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:384:6: lv_value_0= RULE_FLOAT
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:425:1: (lv_value_0= RULE_FLOAT )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:427:6: lv_value_0= RULE_FLOAT
{
lv_value_0=(Token)input.LT(1);
- match(input,RULE_FLOAT,FOLLOW_RULE_FLOAT_in_ruleFloatValue792);
+ match(input,RULE_FLOAT,FOLLOW_RULE_FLOAT_in_ruleFloatValue897);
createLeafNode(grammarAccess.getFloatValueAccess().getValueFLOATTerminalRuleCall_0(), "value");
@@ -843,7 +944,7 @@
// $ANTLR start entryRuleStringValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:409: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:452:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
public final EObject entryRuleStringValue() throws RecognitionException {
EObject current = null;
@@ -851,16 +952,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:409:53: (iv_ruleStringValue= ruleStringValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:410:2: iv_ruleStringValue= ruleStringValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:452:53: (iv_ruleStringValue= ruleStringValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:453:2: iv_ruleStringValue= ruleStringValue EOF
{
currentNode = createCompositeNode(grammarAccess.getStringValueRule(), currentNode);
- pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue832);
+ pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue937);
iv_ruleStringValue=ruleStringValue();
_fsp--;
current =iv_ruleStringValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue842);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue947);
}
@@ -878,7 +979,7 @@
// $ANTLR start ruleStringValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:417: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:460:1: ruleStringValue returns [EObject current=null] : (lv_value_0= RULE_STRING ) ;
public final EObject ruleStringValue() throws RecognitionException {
EObject current = null;
@@ -887,14 +988,14 @@
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:422:6: ( (lv_value_0= RULE_STRING ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:423:1: (lv_value_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:465:6: ( (lv_value_0= RULE_STRING ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:466:1: (lv_value_0= RULE_STRING )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:423:1: (lv_value_0= RULE_STRING )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:425:6: lv_value_0= RULE_STRING
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:466:1: (lv_value_0= RULE_STRING )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:468:6: lv_value_0= RULE_STRING
{
lv_value_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue888);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue993);
createLeafNode(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0(), "value");
@@ -933,7 +1034,7 @@
// $ANTLR start entryRuleBooleanValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:450: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:493:1: entryRuleBooleanValue returns [EObject current=null] : iv_ruleBooleanValue= ruleBooleanValue EOF ;
public final EObject entryRuleBooleanValue() throws RecognitionException {
EObject current = null;
@@ -941,16 +1042,16 @@
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:450:54: (iv_ruleBooleanValue= ruleBooleanValue EOF )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:451:2: iv_ruleBooleanValue= ruleBooleanValue EOF
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:493:54: (iv_ruleBooleanValue= ruleBooleanValue EOF )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:494:2: iv_ruleBooleanValue= ruleBooleanValue EOF
{
currentNode = createCompositeNode(grammarAccess.getBooleanValueRule(), currentNode);
- pushFollow(FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue928);
+ pushFollow(FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue1033);
iv_ruleBooleanValue=ruleBooleanValue();
_fsp--;
current =iv_ruleBooleanValue;
- match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanValue938);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanValue1043);
}
@@ -968,7 +1069,7 @@
// $ANTLR start ruleBooleanValue
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:458: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:501:1: ruleBooleanValue returns [EObject current=null] : (lv_value_0= ruleBOOLEAN ) ;
public final EObject ruleBooleanValue() throws RecognitionException {
EObject current = null;
@@ -978,16 +1079,16 @@
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:463:6: ( (lv_value_0= ruleBOOLEAN ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:464:1: (lv_value_0= ruleBOOLEAN )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:506:6: ( (lv_value_0= ruleBOOLEAN ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:507:1: (lv_value_0= ruleBOOLEAN )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:464:1: (lv_value_0= ruleBOOLEAN )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:467:6: lv_value_0= ruleBOOLEAN
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:507:1: (lv_value_0= ruleBOOLEAN )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:510:6: lv_value_0= ruleBOOLEAN
{
currentNode=createCompositeNode(grammarAccess.getBooleanValueAccess().getValueBOOLEANEnumRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleBOOLEAN_in_ruleBooleanValue996);
+ pushFollow(FOLLOW_ruleBOOLEAN_in_ruleBooleanValue1101);
lv_value_0=ruleBOOLEAN();
_fsp--;
@@ -1027,53 +1128,53 @@
// $ANTLR start ruleBOOLEAN
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:492:1: ruleBOOLEAN returns [Enumerator current=null] : ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) ) ;
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:535:1: ruleBOOLEAN returns [Enumerator current=null] : ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( '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:496:6: ( ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) ) )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:497:1: ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:539:6: ( ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:540:1: ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:497:1: ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:540:1: ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) )
int alt4=4;
switch ( input.LA(1) ) {
- case 13:
+ case 15:
{
alt4=1;
}
break;
- case 14:
+ case 16:
{
alt4=2;
}
break;
- case 15:
+ case 17:
{
alt4=3;
}
break;
- case 16:
+ case 18:
{
alt4=4;
}
break;
default:
NoViableAltException nvae =
- new NoViableAltException("497:1: ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) )", 4, 0, input);
+ new NoViableAltException("540:1: ( ( 'TRUE' ) | ( 'true' ) | ( 'FALSE' ) | ( 'false' ) )", 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:497:2: ( 'TRUE' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:540:2: ( 'TRUE' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:497:2: ( 'TRUE' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:497:4: 'TRUE'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:540:2: ( 'TRUE' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:540:4: 'TRUE'
{
- match(input,13,FOLLOW_13_in_ruleBOOLEAN1046);
+ match(input,15,FOLLOW_15_in_ruleBOOLEAN1151);
current = grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_0(), null);
@@ -1085,12 +1186,12 @@
}
break;
case 2 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:503:6: ( 'true' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:546:6: ( 'true' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:503:6: ( 'true' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:503:8: 'true'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:546:6: ( 'true' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:546:8: 'true'
{
- match(input,14,FOLLOW_14_in_ruleBOOLEAN1061);
+ match(input,16,FOLLOW_16_in_ruleBOOLEAN1166);
current = grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getTRUEEnumLiteralDeclaration_1(), null);
@@ -1102,12 +1203,12 @@
}
break;
case 3 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:509:6: ( 'FALSE' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:552:6: ( 'FALSE' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:509:6: ( 'FALSE' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:509:8: 'FALSE'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:552:6: ( 'FALSE' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:552:8: 'FALSE'
{
- match(input,15,FOLLOW_15_in_ruleBOOLEAN1076);
+ match(input,17,FOLLOW_17_in_ruleBOOLEAN1181);
current = grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_2(), null);
@@ -1119,12 +1220,12 @@
}
break;
case 4 :
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:515:6: ( 'false' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:558:6: ( 'false' )
{
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:515:6: ( 'false' )
- // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:515:8: 'false'
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:558:6: ( 'false' )
+ // ../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g:558:8: 'false'
{
- match(input,16,FOLLOW_16_in_ruleBOOLEAN1091);
+ match(input,18,FOLLOW_18_in_ruleBOOLEAN1196);
current = grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
createLeafNode(grammarAccess.getBOOLEANAccess().getFALSEEnumLiteralDeclaration_3(), null);
@@ -1161,38 +1262,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_ruleImport_in_ruleModel142 = new BitSet(new long[]{0x0000000000001012L});
- public static final BitSet FOLLOW_ruleImport_in_ruleModel180 = new BitSet(new long[]{0x0000000000001012L});
+ public static final BitSet FOLLOW_ruleImport_in_ruleModel142 = new BitSet(new long[]{0x0000000000004012L});
+ public static final BitSet FOLLOW_ruleIncorporates_in_ruleModel180 = new BitSet(new long[]{0x0000000000004012L});
public static final BitSet FOLLOW_ruleParameter_in_ruleModel219 = new BitSet(new long[]{0x0000000000000012L});
public static final BitSet FOLLOW_ruleImport_in_entryRuleImport257 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleImport267 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_12_in_ruleImport301 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_13_in_ruleImport301 = new BitSet(new long[]{0x0000000000000010L});
public static final BitSet FOLLOW_RULE_STRING_in_ruleImport323 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter366 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParameter376 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleParameter423 = new BitSet(new long[]{0x000000000001E070L});
- public static final BitSet FOLLOW_ruleValue_in_ruleParameter460 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValue_in_entryRuleValue497 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValue507 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntValue_in_ruleValue557 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFloatValue_in_ruleValue571 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringValue_in_ruleValue585 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanValue_in_ruleValue599 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue640 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleIntValue650 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleIntValue696 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFloatValue_in_entryRuleFloatValue736 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleFloatValue746 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_FLOAT_in_ruleFloatValue792 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue832 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleStringValue842 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue888 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue928 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleBooleanValue938 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBOOLEAN_in_ruleBooleanValue996 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_13_in_ruleBOOLEAN1046 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleBOOLEAN1061 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_15_in_ruleBOOLEAN1076 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_ruleBOOLEAN1091 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIncorporates_in_entryRuleIncorporates364 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleIncorporates374 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_14_in_ruleIncorporates408 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleIncorporates430 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter471 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParameter481 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleParameter528 = new BitSet(new long[]{0x0000000000078070L});
+ public static final BitSet FOLLOW_ruleValue_in_ruleParameter565 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleValue_in_entryRuleValue602 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleValue612 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntValue_in_ruleValue662 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFloatValue_in_ruleValue676 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringValue_in_ruleValue690 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanValue_in_ruleValue704 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue745 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleIntValue755 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleIntValue801 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFloatValue_in_entryRuleFloatValue841 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleFloatValue851 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_FLOAT_in_ruleFloatValue897 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue937 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleStringValue947 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue993 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanValue_in_entryRuleBooleanValue1033 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleBooleanValue1043 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBOOLEAN_in_ruleBooleanValue1101 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleBOOLEAN1151 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_16_in_ruleBOOLEAN1166 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_17_in_ruleBOOLEAN1181 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleBOOLEAN1196 = 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 6273fdb..f070e4f 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,34 +7,38 @@
import org.eclipse.xtext.parser.antlr.Lexer;
}
-T12 : 'model' ;
-T13 : 'TRUE' ;
-T14 : 'true' ;
-T15 : 'FALSE' ;
-T16 : 'false' ;
+T13 : 'model' ;
+T14 : 'incorporates' ;
+T15 : 'TRUE' ;
+T16 : 'true' ;
+T17 : 'FALSE' ;
+T18 : 'false' ;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 524
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 567
RULE_FLOAT : RULE_INT '.' RULE_INT;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 526
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 569
+RULE_QUALIFIED_NAME : RULE_ID ('.' RULE_ID)*;
+
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 571
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" 528
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 573
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 530
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 575
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" 532
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 577
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" 534
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 579
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" 536
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 581
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 538
+// $ANTLR src "../org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/parser/antlr/internal/InternalAPar.g" 583
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 9fd627e..c3fc8f5 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
@@ -23,15 +23,15 @@
private final Assignment cModelAssignment_0 = (Assignment)cGroup.eContents().get(0);
private final RuleCall cModelImportParserRuleCall_0_0 = (RuleCall)cModelAssignment_0.eContents().get(0);
private final Assignment cIncorporatesAssignment_1 = (Assignment)cGroup.eContents().get(1);
- private final RuleCall cIncorporatesImportParserRuleCall_1_0 = (RuleCall)cIncorporatesAssignment_1.eContents().get(0);
+ private final RuleCall cIncorporatesIncorporatesParserRuleCall_1_0 = (RuleCall)cIncorporatesAssignment_1.eContents().get(0);
private final Assignment cParametersAssignment_2 = (Assignment)cGroup.eContents().get(2);
private final RuleCall cParametersParameterParserRuleCall_2_0 = (RuleCall)cParametersAssignment_2.eContents().get(0);
//Model:
- // model+=Import incorporates+=Import* parameters+=Parameter*;
+ // model+=Import incorporates+=Incorporates* parameters+=Parameter*;
public ParserRule getRule() { return rule; }
- //model+=Import incorporates+=Import* parameters+=Parameter*
+ //model+=Import incorporates+=Incorporates* parameters+=Parameter*
public Group getGroup() { return cGroup; }
//model+=Import
@@ -40,11 +40,11 @@
//Import
public RuleCall getModelImportParserRuleCall_0_0() { return cModelImportParserRuleCall_0_0; }
- //incorporates+=Import*
+ //incorporates+=Incorporates*
public Assignment getIncorporatesAssignment_1() { return cIncorporatesAssignment_1; }
- //Import
- public RuleCall getIncorporatesImportParserRuleCall_1_0() { return cIncorporatesImportParserRuleCall_1_0; }
+ //Incorporates
+ public RuleCall getIncorporatesIncorporatesParserRuleCall_1_0() { return cIncorporatesIncorporatesParserRuleCall_1_0; }
//parameters+=Parameter*
public Assignment getParametersAssignment_2() { return cParametersAssignment_2; }
@@ -242,10 +242,11 @@
private final EnumLiteralDeclaration cFALSEEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
private final Keyword cFALSEFalseKeyword_3_0 = (Keyword)cFALSEEnumLiteralDeclaration_3.eContents().get(0);
- //enum BOOLEAN returns BOOLEAN : TRUE | TRUE = "true" | FALSE | FALSE = "false" ;
+ //enum BOOLEAN:
+ // TRUE | TRUE="true" | FALSE | FALSE="false";
public EnumRule getRule() { return rule; }
- //TRUE | TRUE = "true" | FALSE | FALSE = "false"
+ //TRUE | TRUE="true" | FALSE | FALSE="false"
public Alternatives getAlternatives() { return cAlternatives; }
//TRUE
@@ -254,7 +255,7 @@
//"TRUE"
public Keyword getTRUETRUEKeyword_0_0() { return cTRUETRUEKeyword_0_0; }
- //TRUE = "true"
+ //TRUE="true"
public EnumLiteralDeclaration getTRUEEnumLiteralDeclaration_1() { return cTRUEEnumLiteralDeclaration_1; }
//"true"
@@ -266,7 +267,7 @@
//"FALSE"
public Keyword getFALSEFALSEKeyword_2_0() { return cFALSEFALSEKeyword_2_0; }
- //FALSE = "false"
+ //FALSE="false"
public EnumLiteralDeclaration getFALSEEnumLiteralDeclaration_3() { return cFALSEEnumLiteralDeclaration_3; }
//"false"
@@ -283,6 +284,7 @@
private StringValueElements pStringValue;
private BooleanValueElements pBooleanValue;
private TerminalRule tFLOAT;
+ private TerminalRule tQUALIFIED_NAME;
private BOOLEANElements unknownRuleBOOLEAN;
private final GrammarProvider grammarProvider;
@@ -307,7 +309,7 @@
//Model:
- // model+=Import incorporates+=Import* parameters+=Parameter*;
+ // model+=Import incorporates+=Incorporates* parameters+=Parameter*;
public ModelElements getModelAccess() {
return (pModel != null) ? pModel : (pModel = new ModelElements());
}
@@ -402,7 +404,14 @@
return (tFLOAT != null) ? tFLOAT : (tFLOAT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "FLOAT"));
}
- //enum BOOLEAN returns BOOLEAN : TRUE | TRUE = "true" | FALSE | FALSE = "false" ;
+ //terminal QUALIFIED_NAME:
+ // ID ("." ID)*;
+ public TerminalRule getQUALIFIED_NAMERule() {
+ return (tQUALIFIED_NAME != null) ? tQUALIFIED_NAME : (tQUALIFIED_NAME = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "QUALIFIED_NAME"));
+ }
+
+ //enum BOOLEAN:
+ // TRUE | TRUE="true" | FALSE | FALSE="false";
public BOOLEANElements getBOOLEANAccess() {
return (unknownRuleBOOLEAN != null) ? unknownRuleBOOLEAN : (unknownRuleBOOLEAN = new BOOLEANElements());
}
@@ -412,38 +421,38 @@
}
//terminal ID:
- // "^" ? ( "a" .. "z" | "A" .. "Z" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *;
+ // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
public TerminalRule getIDRule() {
return gaTerminals.getIDRule();
}
//terminal INT returns ecore::EInt:
- // "0" .. "9" +;
+ // "0".."9"+;
public TerminalRule getINTRule() {
return gaTerminals.getINTRule();
}
//terminal STRING:
- // "\"" ( "\\" ( "b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\" ) | ! ( "\\" | "\"" ) ) * "\"" | "\'" ( "\\" ( "b" |
- // "t" | "n" | "f" | "r" | "\"" | "\'" | "\\" ) | ! ( "\\" | "\'" ) ) * "\'";
+ // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" |
+ // "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
public TerminalRule getSTRINGRule() {
return gaTerminals.getSTRINGRule();
}
//terminal ML_COMMENT:
- // "/ *" -> "* /";
+ // "/ *"->"* /";
public TerminalRule getML_COMMENTRule() {
return gaTerminals.getML_COMMENTRule();
}
//terminal SL_COMMENT:
- // "//" ! ( "\n" | "\r" ) * ( "\r" ? "\n" ) ?;
+ // "//" !("\n" | "\r")* ("\r"? "\n")?;
public TerminalRule getSL_COMMENTRule() {
return gaTerminals.getSL_COMMENTRule();
}
//terminal WS:
- // ( " " | "\t" | "\r" | "\n" ) +;
+ // (" " | "\t" | "\r" | "\n")+;
public TerminalRule getWSRule() {
return gaTerminals.getWSRule();
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.xtext b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.xtext
index 4b006b9..450e25c 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.xtext
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/APar.xtext
@@ -6,9 +6,9 @@
Model :
model+=Import
- (incorporates+=Import)*
+ (incorporates+=Incorporates)*
(parameters+=Parameter)*;
-
+
Import :
'model' importURI=STRING;
@@ -36,6 +36,7 @@
terminal FLOAT :
INT "." INT;
+terminal QUALIFIED_NAME : ID ('.' ID)*;
enum BOOLEAN :
TRUE = 'TRUE' | TRUE = 'true' | FALSE = 'FALSE' | FALSE = 'false';
\ No newline at end of file
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParLinkingService.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParLinkingService.java
deleted file mode 100644
index 1a55417..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParLinkingService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2009 Metascape, LLC.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Metascape - Initial API and Implementation
- *
- * </copyright>
- *
- */
-
-package org.eclipse.amp.amf.parameters;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.xtext.linking.impl.DefaultLinkingService;
-import org.eclipse.xtext.linking.impl.IllegalNodeException;
-import org.eclipse.xtext.parsetree.AbstractNode;
-
-/**
- *
- * @author mparker
- *
- */
-public class AParLinkingService extends DefaultLinkingService {
-
- /**
- * @param context
- * @param refer
- * @param node
- * @return
- * @throws IllegalNodeException
- * @see org.eclipse.xtext.linking.impl.DefaultLinkingService#getLinkedObjects(org.eclipse.emf.ecore.EObject,
- * org.eclipse.emf.ecore.EReference, org.eclipse.xtext.parsetree.AbstractNode)
- */
- public List<EObject> getLinkedObjects(EObject context, EReference reference, AbstractNode node)
- throws IllegalNodeException {
-
- // ResourceSet resourceSet = context.eResource().getResourceSet();
- // Resource core = resourceSet.getResource(URI.createURI("http://metaabm.org/core_library.metaabm"), true);
- // EList<Resource> resources = resourceSet.getResources();
- // List<EObject> allElems = new ArrayList<EObject>();
- // if (reference.getEType() == MetaABMPackage.eINSTANCE.getSAttribute()) {
- // for (Resource resource : resources) {
- // EObject content = resource.getContents().get(0);
- // if (content instanceof SAttributed) {
- // for (SAttribute attr : ((SAttributed) content).getAttributes()) {
- // allElems.add(attr);
- // }
- // }
- // }
- // System.err.println(allElems);
- // return allElems;
- // }
- return super.getLinkedObjects(context, reference, node);
- }
-
- /**
- * @param object
- * @param reference
- * @param context
- * @return
- * @see org.eclipse.xtext.linking.impl.DefaultLinkingService#getLinkText(org.eclipse.emf.ecore.EObject,
- * org.eclipse.emf.ecore.EReference, org.eclipse.emf.ecore.EObject)
- */
- public String getLinkText(EObject object, EReference reference, EObject context) {
- return super.getLinkText(object, reference, context);
- }
-}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParRuntimeModule.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParRuntimeModule.java
index 76e5601..4f3ebef 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParRuntimeModule.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParRuntimeModule.java
@@ -3,24 +3,16 @@
*/
package org.eclipse.amp.amf.parameters;
-import org.eclipse.amp.amf.parameters.scoping.AParScopeProvider;
-import org.eclipse.xtext.linking.ILinkingService;
-import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.amp.amf.parameters.scoping.AParImportResolver;
+import org.eclipse.xtext.scoping.impl.ImportUriResolver;
+
/**
* Use this class to register components to be used within the IDE.
*/
public class AParRuntimeModule extends org.eclipse.amp.amf.parameters.AbstractAParRuntimeModule {
- /**
- * @return
- * @see org.eclipse.xtext.service.DefaultRuntimeModule#bindILinkingService()
- */
- public Class<? extends ILinkingService> bindILinkingService() {
- return AParLinkingService.class;
- }
-
- public Class<? extends IScopeProvider> bindIScopeProvider() {
- return AParScopeProvider.class;
+ public Class<? extends ImportUriResolver> bindImportUriResolver() {
+ return AParImportResolver.class;
}
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParScopeProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParScopeProvider.java
deleted file mode 100644
index 6ef76b7..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/AParScopeProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2009 Metascape, LLC.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Metascape - Initial API and Implementation
- *
- * </copyright>
- *
- */
-
-package org.eclipse.amp.amf.parameters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-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.metaabm.MetaABMPackage;
-import org.metaabm.SAttribute;
-import org.metaabm.SAttributed;
-
-/**
- *
- * @author mparker
- *
- */
-public class AParScopeProvider extends DefaultScopeProvider {
- /**
- * @param context
- * @param type
- * @return
- * @see org.eclipse.xtext.scoping.impl.DefaultScopeProvider#getScope(org.eclipse.emf.ecore.EObject,
- * org.eclipse.emf.ecore.EClass)
- */
- public IScope getScope(EObject context, EClass type) {
- return super.getScope(context, type);
- // ScopedElements.allInResource(context.eResource().eAdapters(), type, getImportUriResolver())
- }
-
- /**
- * @param context
- * @param reference
- * @return
- * @see org.eclipse.xtext.scoping.impl.DefaultScopeProvider#getScope(org.eclipse.emf.ecore.EObject,
- * org.eclipse.emf.ecore.EReference)
- */
- public IScope getScope(EObject context, EReference reference) {
- // todo optimization -- for obscure reasons we need to get the references loaded this way but it doesn't have to
- // happen every time.
- IScope defaultScope = super.getScope(context, reference);
- if (reference.getEType() == MetaABMPackage.eINSTANCE.getSAttribute()) {
- ResourceSet resourceSet = context.eResource().getResourceSet();
- resourceSet
- .getResource(
- URI
- .createURI("platform:/plugin/org.eclipse.amp.amf.parameters/org/eclipse/amp/amf/parameters/Engine.metaabm"),
- true);
- EList<Resource> resources = resourceSet.getResources();
- List<IScopedElement> allElems = new ArrayList<IScopedElement>();
- for (Resource resource : resources) {
- EObject content = resource.getContents().get(0);
- if (content instanceof SAttributed) {
- for (SAttribute attr : ((SAttributed) content).getAttributes()) {
- // don't want to allow parameter entries that can't be changed..which is also why we don't get
- // core attributes.
- if (!attr.isImmutable()) {
- allElems.add(ScopedElement.create(attr.getLabel(), attr));
- }
- }
- ;
- }
- }
- Scope scope = new Scope();
- scope.setOuterScope(defaultScope);
- scope.setElements(allElems);
- return scope;
- }
- return defaultScope;
- }
-}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParImportResolver.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParImportResolver.java
new file mode 100644
index 0000000..4d738c3
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src/org/eclipse/amp/amf/parameters/scoping/AParImportResolver.java
@@ -0,0 +1,47 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2009 Metascape, LLC.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Metascape - Initial API and Implementation
+ *
+ * </copyright>
+ *
+ */
+
+package org.eclipse.amp.amf.parameters.scoping;
+
+import org.eclipse.amp.amf.parameters.aPar.Import;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.scoping.impl.ImportUriResolver;
+
+/**
+ *
+ * @author mparker
+ *
+ */
+public class AParImportResolver extends ImportUriResolver {
+ /**
+ * @param object
+ * @return
+ * @see org.eclipse.xtext.scoping.impl.ImportUriResolver#resolve(org.eclipse.emf.ecore.EObject)
+ */
+ public String resolve(EObject object) {
+ if (object instanceof Import) {
+ Import model = (Import) object;
+ if (!model.getImportURI().startsWith("\\") && !model.getImportURI().startsWith("platform")
+ && !model.getImportURI().startsWith("..")) {
+ URI sourceURI = model.eResource().getURI();
+ String targetURI = sourceURI.trimSegments(sourceURI.segmentCount() - 2) + "/" + model.getImportURI();
+ model.setImportURI(targetURI);
+ }
+ }
+ return super.resolve(object);
+ }
+}