summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkohnlein2008-03-06 10:25:06 (EST)
committer jkohnlein2008-03-06 10:25:06 (EST)
commitc60389fc284be84915a07d7ef2bf1e643598c91a (patch)
tree314f5a08df775c1f193a97b6eaf4a49068e63130
parente86108a7dd1227a2a63ce4c2bb609e7227afa66a (diff)
downloadorg.eclipse.xpand-c60389fc284be84915a07d7ef2bf1e643598c91a.zip
org.eclipse.xpand-c60389fc284be84915a07d7ef2bf1e643598c91a.tar.gz
org.eclipse.xpand-c60389fc284be84915a07d7ef2bf1e643598c91a.tar.bz2
first AST parser
-rw-r--r--plugins/org.eclipse.xpand3.parser/.settings/org.eclipse.emf.codegen.builder.prefs3
-rw-r--r--plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java22
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java25
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java61
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java3
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java252
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java61
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java52
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java25
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java89
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java25
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java11
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java721
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java45
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java92
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java175
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java594
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java176
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java153
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java92
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java236
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java92
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java13
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java255
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java20
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java25
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java7
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java10
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java28
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java8
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java13
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java7
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java13
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java7
-rw-r--r--plugins/org.eclipse.xpand3.parser/model/Xpand3.ecore177
-rw-r--r--plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore66
-rw-r--r--plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf34
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node.g255
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java190
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java4707
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node__.g42
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/debugMeWithAntLR.g87
-rw-r--r--plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/ChildrenAliasIterator.java54
-rw-r--r--plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/ChildrenRuleIterator.java55
-rw-r--r--plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java206
-rw-r--r--plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java20
-rw-r--r--plugins/org.eclipse.xpand3.parser/text/description.txt23
-rw-r--r--tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/Node2AstTest.java36
-rw-r--r--tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/ParseStuff.java75
-rw-r--r--tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/test.txt (renamed from tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/test.txt)0
52 files changed, 6624 insertions, 2836 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/.settings/org.eclipse.emf.codegen.builder.prefs b/plugins/org.eclipse.xpand3.parser/.settings/org.eclipse.emf.codegen.builder.prefs
new file mode 100644
index 0000000..1d37188
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/.settings/org.eclipse.emf.codegen.builder.prefs
@@ -0,0 +1,3 @@
+#Thu Mar 06 14:30:47 CET 2008
+eclipse.preferences.version=1
+generate.modelCode=true
diff --git a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
index ea06b24..a3c9e4d 100644
--- a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.tmf.common;resolution:=optional;visibility:=reexport,
- org.eclipse.tmf.common.generator;bundle-version="1.0.0";resolution:=optional
+ org.eclipse.tmf.common.generator;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.xpand3;bundle-version="0.9.0";visibility:=reexport
Eclipse-LazyStart: true
Export-Package: org.eclipse.xpand3.internal.parser.xpand3node,
org.eclipse.xpand3.internal.parser.xpand3node.impl,
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java
new file mode 100644
index 0000000..2798135
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanOperatorNode.java,v 1.1 2008/03/06 15:25:17 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.internal.parser.xpand3node;
+
+import org.eclipse.tmf.common.node.CompositeNode;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean Operator Node</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getBooleanOperatorNode()
+ * @model
+ * @generated
+ */
+public interface BooleanOperatorNode extends CompositeNode {
+} // BooleanOperatorNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
index 3411e1d..0fa4308 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
@@ -2,10 +2,11 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterListNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: DeclaredParameterListNode.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -13,10 +14,32 @@ import org.eclipse.tmf.common.node.CompositeNode;
* A representation of the model object '<em><b>Declared Parameter List Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode#getParams <em>Params</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterListNode()
* @model
* @generated
*/
public interface DeclaredParameterListNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Params</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Params</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Params</em>' reference list.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterListNode_Params()
+ * @model
+ * @generated
+ */
+ EList<CompositeNode> getParams();
} // DeclaredParameterListNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
index 45d61b6..cf896c8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: DeclaredParameterNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -13,10 +13,69 @@ import org.eclipse.tmf.common.node.CompositeNode;
* A representation of the model object '<em><b>Declared Parameter Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode()
* @model
* @generated
*/
public interface DeclaredParameterNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' reference.
+ * @see #setName(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Name()
+ * @model
+ * @generated
+ */
+ CompositeNode getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' reference.
+ * @see #getName()
+ * @generated
+ */
+ void setName(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Ptype</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Ptype</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Ptype</em>' reference.
+ * @see #setPtype(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Ptype()
+ * @model
+ * @generated
+ */
+ CompositeNode getPtype();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Ptype</em>' reference.
+ * @see #getPtype()
+ * @generated
+ */
+ void setPtype(CompositeNode value);
} // DeclaredParameterNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java
index 0f03ea9..27d30f7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DefinitionNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: DefinitionNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -25,6 +25,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface DefinitionNode extends CompositeNode {
+
/**
* Returns the value of the '<em><b>Name</b></em>' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java
index 09556d9..422c2a6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java
@@ -2,21 +2,271 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ExtensionNode.java,v 1.2 2008/03/06 15:25:16 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.LeafNode;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Extension Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode()
* @model
* @generated
*/
public interface ExtensionNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Create</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Create</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Create</em>' reference.
+ * @see #setCreate(LeafNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Create()
+ * @model
+ * @generated
+ */
+ LeafNode getCreate();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Create</em>' reference.
+ * @see #getCreate()
+ * @generated
+ */
+ void setCreate(LeafNode value);
+
+ /**
+ * Returns the value of the '<em><b>Private</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Private</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Private</em>' reference.
+ * @see #setPrivate(LeafNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Private()
+ * @model
+ * @generated
+ */
+ LeafNode getPrivate();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Private</em>' reference.
+ * @see #getPrivate()
+ * @generated
+ */
+ void setPrivate(LeafNode value);
+
+ /**
+ * Returns the value of the '<em><b>Param List</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Param List</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Param List</em>' reference.
+ * @see #setParamList(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ParamList()
+ * @model
+ * @generated
+ */
+ CompositeNode getParamList();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Param List</em>' reference.
+ * @see #getParamList()
+ * @generated
+ */
+ void setParamList(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Extend Body</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Extend Body</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Extend Body</em>' reference.
+ * @see #setExtendBody(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ExtendBody()
+ * @model
+ * @generated
+ */
+ CompositeNode getExtendBody();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Extend Body</em>' reference.
+ * @see #getExtendBody()
+ * @generated
+ */
+ void setExtendBody(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Cached</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Cached</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Cached</em>' reference.
+ * @see #setCached(LeafNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Cached()
+ * @model
+ * @generated
+ */
+ LeafNode getCached();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Cached</em>' reference.
+ * @see #getCached()
+ * @generated
+ */
+ void setCached(LeafNode value);
+
+ /**
+ * Returns the value of the '<em><b>Java Return Type</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Java Return Type</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Java Return Type</em>' reference.
+ * @see #setJavaReturnType(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_JavaReturnType()
+ * @model
+ * @generated
+ */
+ CompositeNode getJavaReturnType();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Java Return Type</em>' reference.
+ * @see #getJavaReturnType()
+ * @generated
+ */
+ void setJavaReturnType(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Java Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Java Name</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Java Name</em>' reference.
+ * @see #setJavaName(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_JavaName()
+ * @model
+ * @generated
+ */
+ CompositeNode getJavaName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Java Name</em>' reference.
+ * @see #getJavaName()
+ * @generated
+ */
+ void setJavaName(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Return Type</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Type</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Type</em>' reference.
+ * @see #setReturnType(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ReturnType()
+ * @model
+ * @generated
+ */
+ CompositeNode getReturnType();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Type</em>' reference.
+ * @see #getReturnType()
+ * @generated
+ */
+ void setReturnType(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' reference.
+ * @see #setName(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Name()
+ * @model
+ * @generated
+ */
+ CompositeNode getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' reference.
+ * @see #getName()
+ * @generated
+ */
+ void setName(CompositeNode value);
} // ExtensionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java
index 9cf568b..7987512 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FeatureCallNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: FeatureCallNode.java,v 1.2 2008/03/06 15:25:14 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -13,10 +13,69 @@ import org.eclipse.tmf.common.node.CompositeNode;
* A representation of the model object '<em><b>Feature Call Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode()
* @model
* @generated
*/
public interface FeatureCallNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' reference.
+ * @see #setName(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Name()
+ * @model
+ * @generated
+ */
+ CompositeNode getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' reference.
+ * @see #getName()
+ * @generated
+ */
+ void setName(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Param List</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Param List</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Param List</em>' reference.
+ * @see #setParamList(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_ParamList()
+ * @model
+ * @generated
+ */
+ CompositeNode getParamList();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Param List</em>' reference.
+ * @see #getParamList()
+ * @generated
+ */
+ void setParamList(CompositeNode value);
} // FeatureCallNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java
index 912ba95..33c904c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java
@@ -2,10 +2,11 @@
* <copyright>
* </copyright>
*
- * $Id: InfixExpressionNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: InfixExpressionNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -13,10 +14,59 @@ import org.eclipse.tmf.common.node.CompositeNode;
* A representation of the model object '<em><b>Infix Expression Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode()
* @model
* @generated
*/
public interface InfixExpressionNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Calls</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Calls</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Calls</em>' reference list.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode_Calls()
+ * @model
+ * @generated
+ */
+ EList<CompositeNode> getCalls();
+
+ /**
+ * Returns the value of the '<em><b>Target</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Target</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Target</em>' reference.
+ * @see #setTarget(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode_Target()
+ * @model
+ * @generated
+ */
+ CompositeNode getTarget();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Target</em>' reference.
+ * @see #getTarget()
+ * @generated
+ */
+ void setTarget(CompositeNode value);
} // InfixExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
index b4816c9..2f079a8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
@@ -2,10 +2,11 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterListNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: ParameterListNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -13,10 +14,32 @@ import org.eclipse.tmf.common.node.CompositeNode;
* A representation of the model object '<em><b>Parameter List Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode#getParams <em>Params</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParameterListNode()
* @model
* @generated
*/
public interface ParameterListNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Params</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Params</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Params</em>' reference list.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParameterListNode_Params()
+ * @model
+ * @generated
+ */
+ EList<CompositeNode> getParams();
} // ParameterListNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
index 20692b3..eccc557 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
@@ -2,21 +2,108 @@
* <copyright>
* </copyright>
*
- * $Id: RelationalExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: RelationalExpressionNode.java,v 1.2 2008/03/06 15:25:16 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.LeafNode;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Relational Expression Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode()
* @model
* @generated
*/
public interface RelationalExpressionNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Right Operand</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Right Operand</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Right Operand</em>' reference.
+ * @see #setRightOperand(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_RightOperand()
+ * @model
+ * @generated
+ */
+ CompositeNode getRightOperand();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Right Operand</em>' reference.
+ * @see #getRightOperand()
+ * @generated
+ */
+ void setRightOperand(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Operator</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Operator</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Operator</em>' reference.
+ * @see #setOperator(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Operator()
+ * @model
+ * @generated
+ */
+ CompositeNode getOperator();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Operator</em>' reference.
+ * @see #getOperator()
+ * @generated
+ */
+ void setOperator(CompositeNode value);
+
+ /**
+ * Returns the value of the '<em><b>Left Operand</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Left Operand</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Left Operand</em>' reference.
+ * @see #setLeftOperand(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_LeftOperand()
+ * @model
+ * @generated
+ */
+ CompositeNode getLeftOperand();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Left Operand</em>' reference.
+ * @see #getLeftOperand()
+ * @generated
+ */
+ void setLeftOperand(CompositeNode value);
} // RelationalExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
index 8bb005d..25e56fb 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
@@ -2,10 +2,11 @@
* <copyright>
* </copyright>
*
- * $Id: SimpleTypeNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: SimpleTypeNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -13,10 +14,32 @@ import org.eclipse.tmf.common.node.CompositeNode;
* A representation of the model object '<em><b>Simple Type Node</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode#getNames <em>Names</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSimpleTypeNode()
* @model
* @generated
*/
public interface SimpleTypeNode extends CompositeNode {
+
+ /**
+ * Returns the value of the '<em><b>Names</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Names</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Names</em>' reference list.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSimpleTypeNode_Names()
+ * @model
+ * @generated
+ */
+ EList<CompositeNode> getNames();
} // SimpleTypeNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
index f5682e1..275f9b7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeFactory.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: Xpand3nodeFactory.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -332,6 +332,15 @@ public interface Xpand3nodeFactory extends EFactory {
RelationalExpressionNode createRelationalExpressionNode();
/**
+ * Returns a new object of class '<em>Boolean Operator Node</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Boolean Operator Node</em>'.
+ * @generated
+ */
+ BooleanOperatorNode createBooleanOperatorNode();
+
+ /**
* Returns a new object of class '<em>Additive Expression Node</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java
index a93b5dc..b9a2f86 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodePackage.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: Xpand3nodePackage.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -1243,13 +1243,94 @@ public interface Xpand3nodePackage extends EPackage {
int EXTENSION_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Create</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Private</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Param List</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Extend Body</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__EXTEND_BODY = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Cached</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__CACHED = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Java Return Type</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
+
+ /**
+ * The feature id for the '<em><b>Java Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__JAVA_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6;
+
+ /**
+ * The feature id for the '<em><b>Return Type</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 7;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8;
+
+ /**
* The number of structural features of the '<em>Extension Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EXTENSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int EXTENSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 9;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class.
@@ -1958,13 +2039,95 @@ public interface Xpand3nodePackage extends EPackage {
int RELATIONAL_EXPRESSION_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Left Operand</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Operator</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RELATIONAL_EXPRESSION_NODE__OPERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Right Operand</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+
+ /**
* The number of structural features of the '<em>Relational Expression Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RELATIONAL_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int RELATIONAL_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl <em>Boolean Operator Node</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanOperatorNode()
+ * @generated
+ */
+ int BOOLEAN_OPERATOR_NODE = 34;
+
+ /**
+ * The feature id for the '<em><b>Alias</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BOOLEAN_OPERATOR_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BOOLEAN_OPERATOR_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
+
+ /**
+ * The feature id for the '<em><b>Rule</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BOOLEAN_OPERATOR_NODE__RULE = NodePackage.COMPOSITE_NODE__RULE;
+
+ /**
+ * The feature id for the '<em><b>Rule ID</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BOOLEAN_OPERATOR_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
+
+ /**
+ * The number of structural features of the '<em>Boolean Operator Node</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BOOLEAN_OPERATOR_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
@@ -1974,7 +2137,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode()
* @generated
*/
- int ADDITIVE_EXPRESSION_NODE = 34;
+ int ADDITIVE_EXPRESSION_NODE = 35;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2029,7 +2192,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode()
* @generated
*/
- int MULTIPLICATIVE_EXPRESSION_NODE = 35;
+ int MULTIPLICATIVE_EXPRESSION_NODE = 36;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2084,7 +2247,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode()
* @generated
*/
- int UNARY_EXPRESSION_NODE = 36;
+ int UNARY_EXPRESSION_NODE = 37;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2139,7 +2302,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode()
* @generated
*/
- int INFIX_EXPRESSION_NODE = 37;
+ int INFIX_EXPRESSION_NODE = 38;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2178,13 +2341,31 @@ public interface Xpand3nodePackage extends EPackage {
int INFIX_EXPRESSION_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Calls</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int INFIX_EXPRESSION_NODE__CALLS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Target</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int INFIX_EXPRESSION_NODE__TARGET = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Infix Expression Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int INFIX_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int INFIX_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.StringLiteralNodeImpl <em>String Literal Node</em>}' class.
@@ -2194,7 +2375,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode()
* @generated
*/
- int STRING_LITERAL_NODE = 38;
+ int STRING_LITERAL_NODE = 39;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2249,7 +2430,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode()
* @generated
*/
- int PARANTHESIZED_EXPRESSION_NODE = 39;
+ int PARANTHESIZED_EXPRESSION_NODE = 40;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2304,7 +2485,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode()
* @generated
*/
- int GLOBAL_VAR_EXPRESSION_NODE = 40;
+ int GLOBAL_VAR_EXPRESSION_NODE = 41;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2359,7 +2540,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode()
* @generated
*/
- int FEATURE_CALL_NODE = 41;
+ int FEATURE_CALL_NODE = 42;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2398,13 +2579,31 @@ public interface Xpand3nodePackage extends EPackage {
int FEATURE_CALL_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Param List</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Feature Call Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int FEATURE_CALL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int FEATURE_CALL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class.
@@ -2414,7 +2613,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode()
* @generated
*/
- int LIST_LITERAL_NODE = 42;
+ int LIST_LITERAL_NODE = 43;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2469,7 +2668,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode()
* @generated
*/
- int CONSTRUCTOR_CALL_NODE = 43;
+ int CONSTRUCTOR_CALL_NODE = 44;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2524,7 +2723,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode()
* @generated
*/
- int BOOLEAN_LITERAL_NODE = 44;
+ int BOOLEAN_LITERAL_NODE = 45;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2579,7 +2778,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode()
* @generated
*/
- int NULL_LITERAL_NODE = 45;
+ int NULL_LITERAL_NODE = 46;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2634,7 +2833,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode()
* @generated
*/
- int NUMBER_LITERAL_NODE = 46;
+ int NUMBER_LITERAL_NODE = 47;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2689,7 +2888,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode()
* @generated
*/
- int COLLECTION_EXPRESSION_NODE = 47;
+ int COLLECTION_EXPRESSION_NODE = 48;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2744,7 +2943,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode()
* @generated
*/
- int DECLARED_PARAMETER_LIST_NODE = 48;
+ int DECLARED_PARAMETER_LIST_NODE = 49;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2783,13 +2982,22 @@ public interface Xpand3nodePackage extends EPackage {
int DECLARED_PARAMETER_LIST_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Params</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DECLARED_PARAMETER_LIST_NODE__PARAMS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Declared Parameter List Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DECLARED_PARAMETER_LIST_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int DECLARED_PARAMETER_LIST_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl <em>Declared Parameter Node</em>}' class.
@@ -2799,7 +3007,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode()
* @generated
*/
- int DECLARED_PARAMETER_NODE = 49;
+ int DECLARED_PARAMETER_NODE = 50;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2838,13 +3046,31 @@ public interface Xpand3nodePackage extends EPackage {
int DECLARED_PARAMETER_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Name</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Ptype</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Declared Parameter Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DECLARED_PARAMETER_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int DECLARED_PARAMETER_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class.
@@ -2854,7 +3080,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode()
* @generated
*/
- int PARAMETER_LIST_NODE = 50;
+ int PARAMETER_LIST_NODE = 51;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2893,13 +3119,22 @@ public interface Xpand3nodePackage extends EPackage {
int PARAMETER_LIST_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Params</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int PARAMETER_LIST_NODE__PARAMS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Parameter List Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PARAMETER_LIST_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int PARAMETER_LIST_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl <em>Collection Type Node</em>}' class.
@@ -2909,7 +3144,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode()
* @generated
*/
- int COLLECTION_TYPE_NODE = 51;
+ int COLLECTION_TYPE_NODE = 52;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2964,7 +3199,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode()
* @generated
*/
- int SIMPLE_TYPE_NODE = 52;
+ int SIMPLE_TYPE_NODE = 53;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3003,13 +3238,22 @@ public interface Xpand3nodePackage extends EPackage {
int SIMPLE_TYPE_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
+ * The feature id for the '<em><b>Names</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SIMPLE_TYPE_NODE__NAMES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Simple Type Node</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SIMPLE_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int SIMPLE_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IdentifierNodeImpl <em>Identifier Node</em>}' class.
@@ -3019,7 +3263,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode()
* @generated
*/
- int IDENTIFIER_NODE = 53;
+ int IDENTIFIER_NODE = 54;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3322,6 +3566,105 @@ public interface Xpand3nodePackage extends EPackage {
EClass getExtensionNode();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Create</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_Create();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Private</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_Private();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Param List</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_ParamList();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Extend Body</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_ExtendBody();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Cached</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_Cached();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Java Return Type</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_JavaReturnType();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Java Name</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_JavaName();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Return Type</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_ReturnType();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Name</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName()
+ * @see #getExtensionNode()
+ * @generated
+ */
+ EReference getExtensionNode_Name();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode <em>Java Type Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3452,6 +3795,49 @@ public interface Xpand3nodePackage extends EPackage {
EClass getRelationalExpressionNode();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Right Operand</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand()
+ * @see #getRelationalExpressionNode()
+ * @generated
+ */
+ EReference getRelationalExpressionNode_RightOperand();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode <em>Boolean Operator Node</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Boolean Operator Node</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode
+ * @generated
+ */
+ EClass getBooleanOperatorNode();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Operator</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator()
+ * @see #getRelationalExpressionNode()
+ * @generated
+ */
+ EReference getRelationalExpressionNode_Operator();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Left Operand</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand()
+ * @see #getRelationalExpressionNode()
+ * @generated
+ */
+ EReference getRelationalExpressionNode_LeftOperand();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3492,6 +3878,28 @@ public interface Xpand3nodePackage extends EPackage {
EClass getInfixExpressionNode();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Calls</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls()
+ * @see #getInfixExpressionNode()
+ * @generated
+ */
+ EReference getInfixExpressionNode_Calls();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Target</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget()
+ * @see #getInfixExpressionNode()
+ * @generated
+ */
+ EReference getInfixExpressionNode_Target();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode <em>String Literal Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3532,6 +3940,28 @@ public interface Xpand3nodePackage extends EPackage {
EClass getFeatureCallNode();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Name</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName()
+ * @see #getFeatureCallNode()
+ * @generated
+ */
+ EReference getFeatureCallNode_Name();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Param List</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList()
+ * @see #getFeatureCallNode()
+ * @generated
+ */
+ EReference getFeatureCallNode_ParamList();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode <em>List Literal Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3602,6 +4032,17 @@ public interface Xpand3nodePackage extends EPackage {
EClass getDeclaredParameterListNode();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode#getParams <em>Params</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Params</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode#getParams()
+ * @see #getDeclaredParameterListNode()
+ * @generated
+ */
+ EReference getDeclaredParameterListNode_Params();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode <em>Declared Parameter Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3612,6 +4053,28 @@ public interface Xpand3nodePackage extends EPackage {
EClass getDeclaredParameterNode();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Name</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName()
+ * @see #getDeclaredParameterNode()
+ * @generated
+ */
+ EReference getDeclaredParameterNode_Name();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Ptype</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype()
+ * @see #getDeclaredParameterNode()
+ * @generated
+ */
+ EReference getDeclaredParameterNode_Ptype();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode <em>Parameter List Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3622,6 +4085,17 @@ public interface Xpand3nodePackage extends EPackage {
EClass getParameterListNode();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode#getParams <em>Params</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Params</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode#getParams()
+ * @see #getParameterListNode()
+ * @generated
+ */
+ EReference getParameterListNode_Params();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode <em>Collection Type Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3642,6 +4116,17 @@ public interface Xpand3nodePackage extends EPackage {
EClass getSimpleTypeNode();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode#getNames <em>Names</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Names</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode#getNames()
+ * @see #getSimpleTypeNode()
+ * @generated
+ */
+ EReference getSimpleTypeNode_Names();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode <em>Identifier Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3916,6 +4401,78 @@ public interface Xpand3nodePackage extends EPackage {
EClass EXTENSION_NODE = eINSTANCE.getExtensionNode();
/**
+ * The meta object literal for the '<em><b>Create</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__CREATE = eINSTANCE.getExtensionNode_Create();
+
+ /**
+ * The meta object literal for the '<em><b>Private</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__PRIVATE = eINSTANCE.getExtensionNode_Private();
+
+ /**
+ * The meta object literal for the '<em><b>Param List</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__PARAM_LIST = eINSTANCE.getExtensionNode_ParamList();
+
+ /**
+ * The meta object literal for the '<em><b>Extend Body</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__EXTEND_BODY = eINSTANCE.getExtensionNode_ExtendBody();
+
+ /**
+ * The meta object literal for the '<em><b>Cached</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__CACHED = eINSTANCE.getExtensionNode_Cached();
+
+ /**
+ * The meta object literal for the '<em><b>Java Return Type</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__JAVA_RETURN_TYPE = eINSTANCE.getExtensionNode_JavaReturnType();
+
+ /**
+ * The meta object literal for the '<em><b>Java Name</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__JAVA_NAME = eINSTANCE.getExtensionNode_JavaName();
+
+ /**
+ * The meta object literal for the '<em><b>Return Type</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__RETURN_TYPE = eINSTANCE.getExtensionNode_ReturnType();
+
+ /**
+ * The meta object literal for the '<em><b>Name</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXTENSION_NODE__NAME = eINSTANCE.getExtensionNode_Name();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4046,6 +4603,40 @@ public interface Xpand3nodePackage extends EPackage {
EClass RELATIONAL_EXPRESSION_NODE = eINSTANCE.getRelationalExpressionNode();
/**
+ * The meta object literal for the '<em><b>Right Operand</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = eINSTANCE.getRelationalExpressionNode_RightOperand();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl <em>Boolean Operator Node</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanOperatorNode()
+ * @generated
+ */
+ EClass BOOLEAN_OPERATOR_NODE = eINSTANCE.getBooleanOperatorNode();
+
+ /**
+ * The meta object literal for the '<em><b>Operator</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RELATIONAL_EXPRESSION_NODE__OPERATOR = eINSTANCE.getRelationalExpressionNode_Operator();
+
+ /**
+ * The meta object literal for the '<em><b>Left Operand</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND = eINSTANCE.getRelationalExpressionNode_LeftOperand();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4086,6 +4677,22 @@ public interface Xpand3nodePackage extends EPackage {
EClass INFIX_EXPRESSION_NODE = eINSTANCE.getInfixExpressionNode();
/**
+ * The meta object literal for the '<em><b>Calls</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference INFIX_EXPRESSION_NODE__CALLS = eINSTANCE.getInfixExpressionNode_Calls();
+
+ /**
+ * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference INFIX_EXPRESSION_NODE__TARGET = eINSTANCE.getInfixExpressionNode_Target();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.StringLiteralNodeImpl <em>String Literal Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4126,6 +4733,22 @@ public interface Xpand3nodePackage extends EPackage {
EClass FEATURE_CALL_NODE = eINSTANCE.getFeatureCallNode();
/**
+ * The meta object literal for the '<em><b>Name</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference FEATURE_CALL_NODE__NAME = eINSTANCE.getFeatureCallNode_Name();
+
+ /**
+ * The meta object literal for the '<em><b>Param List</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference FEATURE_CALL_NODE__PARAM_LIST = eINSTANCE.getFeatureCallNode_ParamList();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4196,6 +4819,14 @@ public interface Xpand3nodePackage extends EPackage {
EClass DECLARED_PARAMETER_LIST_NODE = eINSTANCE.getDeclaredParameterListNode();
/**
+ * The meta object literal for the '<em><b>Params</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference DECLARED_PARAMETER_LIST_NODE__PARAMS = eINSTANCE.getDeclaredParameterListNode_Params();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl <em>Declared Parameter Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4206,6 +4837,22 @@ public interface Xpand3nodePackage extends EPackage {
EClass DECLARED_PARAMETER_NODE = eINSTANCE.getDeclaredParameterNode();
/**
+ * The meta object literal for the '<em><b>Name</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference DECLARED_PARAMETER_NODE__NAME = eINSTANCE.getDeclaredParameterNode_Name();
+
+ /**
+ * The meta object literal for the '<em><b>Ptype</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference DECLARED_PARAMETER_NODE__PTYPE = eINSTANCE.getDeclaredParameterNode_Ptype();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4216,6 +4863,14 @@ public interface Xpand3nodePackage extends EPackage {
EClass PARAMETER_LIST_NODE = eINSTANCE.getParameterListNode();
/**
+ * The meta object literal for the '<em><b>Params</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference PARAMETER_LIST_NODE__PARAMS = eINSTANCE.getParameterListNode_Params();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl <em>Collection Type Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4236,6 +4891,14 @@ public interface Xpand3nodePackage extends EPackage {
EClass SIMPLE_TYPE_NODE = eINSTANCE.getSimpleTypeNode();
/**
+ * The meta object literal for the '<em><b>Names</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference SIMPLE_TYPE_NODE__NAMES = eINSTANCE.getSimpleTypeNode_Names();
+
+ /**
* The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IdentifierNodeImpl <em>Identifier Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java
new file mode 100644
index 0000000..614ff9d
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java
@@ -0,0 +1,45 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanOperatorNodeImpl.java,v 1.1 2008/03/06 15:25:17 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
+
+import org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode;
+import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean Operator Node</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class BooleanOperatorNodeImpl extends CompositeNodeImpl implements BooleanOperatorNode {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected BooleanOperatorNodeImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return Xpand3nodePackage.Literals.BOOLEAN_OPERATOR_NODE;
+ }
+
+} //BooleanOperatorNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
index eea3112..fc7960e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
@@ -2,12 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterListNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: DeclaredParameterListNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode;
@@ -18,12 +22,26 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Declared Parameter List Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl#getParams <em>Params</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class DeclaredParameterListNodeImpl extends CompositeNodeImpl implements DeclaredParameterListNode {
/**
+ * The cached value of the '{@link #getParams() <em>Params</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParams()
+ * @generated
+ * @ordered
+ */
+ protected EList<CompositeNode> params;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +60,76 @@ public class DeclaredParameterListNodeImpl extends CompositeNodeImpl implements
return Xpand3nodePackage.Literals.DECLARED_PARAMETER_LIST_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<CompositeNode> getParams() {
+ if (params == null) {
+ params = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.DECLARED_PARAMETER_LIST_NODE__PARAMS);
+ }
+ return params;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_LIST_NODE__PARAMS:
+ return getParams();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_LIST_NODE__PARAMS:
+ getParams().clear();
+ getParams().addAll((Collection<? extends CompositeNode>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_LIST_NODE__PARAMS:
+ getParams().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_LIST_NODE__PARAMS:
+ return params != null && !params.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
} //DeclaredParameterListNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
index 9a7886e..c07a068 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
@@ -2,12 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: DeclaredParameterNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode;
@@ -18,12 +22,35 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Declared Parameter Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getPtype <em>Ptype</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements DeclaredParameterNode {
/**
+ * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode name;
+ /**
+ * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPtype()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode ptype;
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +69,150 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
return Xpand3nodePackage.Literals.DECLARED_PARAMETER_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getName() {
+ if (name != null && name.eIsProxy()) {
+ InternalEObject oldName = (InternalEObject)name;
+ name = (CompositeNode)eResolveProxy(oldName);
+ if (name != oldName) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name));
+ }
+ }
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setName(CompositeNode newName) {
+ CompositeNode oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getPtype() {
+ if (ptype != null && ptype.eIsProxy()) {
+ InternalEObject oldPtype = (InternalEObject)ptype;
+ ptype = (CompositeNode)eResolveProxy(oldPtype);
+ if (ptype != oldPtype) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype));
+ }
+ }
+ return ptype;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetPtype() {
+ return ptype;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setPtype(CompositeNode newPtype) {
+ CompositeNode oldPtype = ptype;
+ ptype = newPtype;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ if (resolve) return getName();
+ return basicGetName();
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+ if (resolve) return getPtype();
+ return basicGetPtype();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ setName((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+ setPtype((CompositeNode)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ setName((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+ setPtype((CompositeNode)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ return name != null;
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+ return ptype != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
} //DeclaredParameterNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java
index 560a405..dd04b15 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java
@@ -2,12 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ExtensionNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.LeafNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode;
@@ -18,12 +26,106 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Extension Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getCreate <em>Create</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getParamList <em>Param List</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getExtendBody <em>Extend Body</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getCached <em>Cached</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaReturnType <em>Java Return Type</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaName <em>Java Name</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>Return Type</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getName <em>Name</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNode {
/**
+ * The cached value of the '{@link #getCreate() <em>Create</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCreate()
+ * @generated
+ * @ordered
+ */
+ protected LeafNode create;
+ /**
+ * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPrivate()
+ * @generated
+ * @ordered
+ */
+ protected LeafNode private_;
+ /**
+ * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParamList()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode paramList;
+ /**
+ * The cached value of the '{@link #getExtendBody() <em>Extend Body</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getExtendBody()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode extendBody;
+ /**
+ * The cached value of the '{@link #getCached() <em>Cached</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCached()
+ * @generated
+ * @ordered
+ */
+ protected LeafNode cached;
+ /**
+ * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getJavaReturnType()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode javaReturnType;
+ /**
+ * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getJavaName()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode javaName;
+ /**
+ * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReturnType()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode returnType;
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode name;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +144,494 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
return Xpand3nodePackage.Literals.EXTENSION_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public LeafNode getCreate() {
+ if (create != null && create.eIsProxy()) {
+ InternalEObject oldCreate = (InternalEObject)create;
+ create = (LeafNode)eResolveProxy(oldCreate);
+ if (create != oldCreate) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create));
+ }
+ }
+ return create;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public LeafNode basicGetCreate() {
+ return create;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCreate(LeafNode newCreate) {
+ LeafNode oldCreate = create;
+ create = newCreate;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public LeafNode getPrivate() {
+ if (private_ != null && private_.eIsProxy()) {
+ InternalEObject oldPrivate = (InternalEObject)private_;
+ private_ = (LeafNode)eResolveProxy(oldPrivate);
+ if (private_ != oldPrivate) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PRIVATE, oldPrivate, private_));
+ }
+ }
+ return private_;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public LeafNode basicGetPrivate() {
+ return private_;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setPrivate(LeafNode newPrivate) {
+ LeafNode oldPrivate = private_;
+ private_ = newPrivate;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PRIVATE, oldPrivate, private_));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getParamList() {
+ if (paramList != null && paramList.eIsProxy()) {
+ InternalEObject oldParamList = (InternalEObject)paramList;
+ paramList = (CompositeNode)eResolveProxy(oldParamList);
+ if (paramList != oldParamList) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList));
+ }
+ }
+ return paramList;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetParamList() {
+ return paramList;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setParamList(CompositeNode newParamList) {
+ CompositeNode oldParamList = paramList;
+ paramList = newParamList;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getExtendBody() {
+ if (extendBody != null && extendBody.eIsProxy()) {
+ InternalEObject oldExtendBody = (InternalEObject)extendBody;
+ extendBody = (CompositeNode)eResolveProxy(oldExtendBody);
+ if (extendBody != oldExtendBody) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody));
+ }
+ }
+ return extendBody;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetExtendBody() {
+ return extendBody;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setExtendBody(CompositeNode newExtendBody) {
+ CompositeNode oldExtendBody = extendBody;
+ extendBody = newExtendBody;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public LeafNode getCached() {
+ if (cached != null && cached.eIsProxy()) {
+ InternalEObject oldCached = (InternalEObject)cached;
+ cached = (LeafNode)eResolveProxy(oldCached);
+ if (cached != oldCached) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CACHED, oldCached, cached));
+ }
+ }
+ return cached;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public LeafNode basicGetCached() {
+ return cached;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCached(LeafNode newCached) {
+ LeafNode oldCached = cached;
+ cached = newCached;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CACHED, oldCached, cached));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getJavaReturnType() {
+ if (javaReturnType != null && javaReturnType.eIsProxy()) {
+ InternalEObject oldJavaReturnType = (InternalEObject)javaReturnType;
+ javaReturnType = (CompositeNode)eResolveProxy(oldJavaReturnType);
+ if (javaReturnType != oldJavaReturnType) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType));
+ }
+ }
+ return javaReturnType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetJavaReturnType() {
+ return javaReturnType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setJavaReturnType(CompositeNode newJavaReturnType) {
+ CompositeNode oldJavaReturnType = javaReturnType;
+ javaReturnType = newJavaReturnType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getJavaName() {
+ if (javaName != null && javaName.eIsProxy()) {
+ InternalEObject oldJavaName = (InternalEObject)javaName;
+ javaName = (CompositeNode)eResolveProxy(oldJavaName);
+ if (javaName != oldJavaName) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME, oldJavaName, javaName));
+ }
+ }
+ return javaName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetJavaName() {
+ return javaName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setJavaName(CompositeNode newJavaName) {
+ CompositeNode oldJavaName = javaName;
+ javaName = newJavaName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME, oldJavaName, javaName));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getReturnType() {
+ if (returnType != null && returnType.eIsProxy()) {
+ InternalEObject oldReturnType = (InternalEObject)returnType;
+ returnType = (CompositeNode)eResolveProxy(oldReturnType);
+ if (returnType != oldReturnType) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType));
+ }
+ }
+ return returnType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetReturnType() {
+ return returnType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setReturnType(CompositeNode newReturnType) {
+ CompositeNode oldReturnType = returnType;
+ returnType = newReturnType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getName() {
+ if (name != null && name.eIsProxy()) {
+ InternalEObject oldName = (InternalEObject)name;
+ name = (CompositeNode)eResolveProxy(oldName);
+ if (name != oldName) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__NAME, oldName, name));
+ }
+ }
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setName(CompositeNode newName) {
+ CompositeNode oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__NAME, oldName, name));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ if (resolve) return getCreate();
+ return basicGetCreate();
+ case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
+ if (resolve) return getPrivate();
+ return basicGetPrivate();
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ if (resolve) return getParamList();
+ return basicGetParamList();
+ case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
+ if (resolve) return getExtendBody();
+ return basicGetExtendBody();
+ case Xpand3nodePackage.EXTENSION_NODE__CACHED:
+ if (resolve) return getCached();
+ return basicGetCached();
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
+ if (resolve) return getJavaReturnType();
+ return basicGetJavaReturnType();
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
+ if (resolve) return getJavaName();
+ return basicGetJavaName();
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ if (resolve) return getReturnType();
+ return basicGetReturnType();
+ case Xpand3nodePackage.EXTENSION_NODE__NAME:
+ if (resolve) return getName();
+ return basicGetName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ setCreate((LeafNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
+ setPrivate((LeafNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ setParamList((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
+ setExtendBody((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__CACHED:
+ setCached((LeafNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
+ setJavaReturnType((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
+ setJavaName((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ setReturnType((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__NAME:
+ setName((CompositeNode)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ setCreate((LeafNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
+ setPrivate((LeafNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ setParamList((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
+ setExtendBody((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__CACHED:
+ setCached((LeafNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
+ setJavaReturnType((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
+ setJavaName((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ setReturnType((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__NAME:
+ setName((CompositeNode)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ return create != null;
+ case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
+ return private_ != null;
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ return paramList != null;
+ case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
+ return extendBody != null;
+ case Xpand3nodePackage.EXTENSION_NODE__CACHED:
+ return cached != null;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
+ return javaReturnType != null;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
+ return javaName != null;
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ return returnType != null;
+ case Xpand3nodePackage.EXTENSION_NODE__NAME:
+ return name != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
} //ExtensionNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java
index 3d769ae..c0c3052 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java
@@ -2,12 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: FeatureCallNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: FeatureCallNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode;
@@ -18,12 +22,36 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Feature Call Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getParamList <em>Param List</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCallNode {
/**
+ * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode name;
+ /**
+ * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParamList()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode paramList;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +70,150 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal
return Xpand3nodePackage.Literals.FEATURE_CALL_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getName() {
+ if (name != null && name.eIsProxy()) {
+ InternalEObject oldName = (InternalEObject)name;
+ name = (CompositeNode)eResolveProxy(oldName);
+ if (name != oldName) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FEATURE_CALL_NODE__NAME, oldName, name));
+ }
+ }
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setName(CompositeNode newName) {
+ CompositeNode oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FEATURE_CALL_NODE__NAME, oldName, name));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getParamList() {
+ if (paramList != null && paramList.eIsProxy()) {
+ InternalEObject oldParamList = (InternalEObject)paramList;
+ paramList = (CompositeNode)eResolveProxy(oldParamList);
+ if (paramList != oldParamList) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST, oldParamList, paramList));
+ }
+ }
+ return paramList;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetParamList() {
+ return paramList;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setParamList(CompositeNode newParamList) {
+ CompositeNode oldParamList = paramList;
+ paramList = newParamList;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST, oldParamList, paramList));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
+ if (resolve) return getName();
+ return basicGetName();
+ case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
+ if (resolve) return getParamList();
+ return basicGetParamList();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
+ setName((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
+ setParamList((CompositeNode)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
+ setName((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
+ setParamList((CompositeNode)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
+ return name != null;
+ case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
+ return paramList != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
} //FeatureCallNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java
index aa9c1fb..6d7e66c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java
@@ -2,12 +2,19 @@
* <copyright>
* </copyright>
*
- * $Id: InfixExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: InfixExpressionNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode;
@@ -18,12 +25,35 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Infix Expression Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl#getCalls <em>Calls</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl#getTarget <em>Target</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixExpressionNode {
/**
+ * The cached value of the '{@link #getCalls() <em>Calls</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCalls()
+ * @generated
+ * @ordered
+ */
+ protected EList<CompositeNode> calls;
+ /**
+ * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTarget()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode target;
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +72,125 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE
return Xpand3nodePackage.Literals.INFIX_EXPRESSION_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<CompositeNode> getCalls() {
+ if (calls == null) {
+ calls = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS);
+ }
+ return calls;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getTarget() {
+ if (target != null && target.eIsProxy()) {
+ InternalEObject oldTarget = (InternalEObject)target;
+ target = (CompositeNode)eResolveProxy(oldTarget);
+ if (target != oldTarget) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET, oldTarget, target));
+ }
+ }
+ return target;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetTarget() {
+ return target;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setTarget(CompositeNode newTarget) {
+ CompositeNode oldTarget = target;
+ target = newTarget;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET, oldTarget, target));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS:
+ return getCalls();
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET:
+ if (resolve) return getTarget();
+ return basicGetTarget();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS:
+ getCalls().clear();
+ getCalls().addAll((Collection<? extends CompositeNode>)newValue);
+ return;
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET:
+ setTarget((CompositeNode)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS:
+ getCalls().clear();
+ return;
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET:
+ setTarget((CompositeNode)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS:
+ return calls != null && !calls.isEmpty();
+ case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET:
+ return target != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
} //InfixExpressionNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
index ed67b48..7e99668 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
@@ -2,12 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterListNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ParameterListNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode;
@@ -18,12 +22,26 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Parameter List Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl#getParams <em>Params</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class ParameterListNodeImpl extends CompositeNodeImpl implements ParameterListNode {
/**
+ * The cached value of the '{@link #getParams() <em>Params</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParams()
+ * @generated
+ * @ordered
+ */
+ protected EList<CompositeNode> params;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +60,76 @@ public class ParameterListNodeImpl extends CompositeNodeImpl implements Paramete
return Xpand3nodePackage.Literals.PARAMETER_LIST_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<CompositeNode> getParams() {
+ if (params == null) {
+ params = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.PARAMETER_LIST_NODE__PARAMS);
+ }
+ return params;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.PARAMETER_LIST_NODE__PARAMS:
+ return getParams();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.PARAMETER_LIST_NODE__PARAMS:
+ getParams().clear();
+ getParams().addAll((Collection<? extends CompositeNode>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.PARAMETER_LIST_NODE__PARAMS:
+ getParams().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.PARAMETER_LIST_NODE__PARAMS:
+ return params != null && !params.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
} //ParameterListNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
index 434382e..0e6482f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
@@ -2,12 +2,17 @@
* <copyright>
* </copyright>
*
- * $Id: RelationalExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: RelationalExpressionNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.LeafNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode;
@@ -18,12 +23,46 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Relational Expression Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getLeftOperand <em>Left Operand</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getOperator <em>Operator</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements RelationalExpressionNode {
/**
+ * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getLeftOperand()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode leftOperand;
+ /**
+ * The cached value of the '{@link #getOperator() <em>Operator</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOperator()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode operator;
+ /**
+ * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRightOperand()
+ * @generated
+ * @ordered
+ */
+ protected CompositeNode rightOperand;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +81,199 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
return Xpand3nodePackage.Literals.RELATIONAL_EXPRESSION_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getRightOperand() {
+ if (rightOperand != null && rightOperand.eIsProxy()) {
+ InternalEObject oldRightOperand = (InternalEObject)rightOperand;
+ rightOperand = (CompositeNode)eResolveProxy(oldRightOperand);
+ if (rightOperand != oldRightOperand) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND, oldRightOperand, rightOperand));
+ }
+ }
+ return rightOperand;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetRightOperand() {
+ return rightOperand;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRightOperand(CompositeNode newRightOperand) {
+ CompositeNode oldRightOperand = rightOperand;
+ rightOperand = newRightOperand;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND, oldRightOperand, rightOperand));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getOperator() {
+ if (operator != null && operator.eIsProxy()) {
+ InternalEObject oldOperator = (InternalEObject)operator;
+ operator = (CompositeNode)eResolveProxy(oldOperator);
+ if (operator != oldOperator) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR, oldOperator, operator));
+ }
+ }
+ return operator;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetOperator() {
+ return operator;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setOperator(CompositeNode newOperator) {
+ CompositeNode oldOperator = operator;
+ operator = newOperator;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR, oldOperator, operator));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode getLeftOperand() {
+ if (leftOperand != null && leftOperand.eIsProxy()) {
+ InternalEObject oldLeftOperand = (InternalEObject)leftOperand;
+ leftOperand = (CompositeNode)eResolveProxy(oldLeftOperand);
+ if (leftOperand != oldLeftOperand) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND, oldLeftOperand, leftOperand));
+ }
+ }
+ return leftOperand;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CompositeNode basicGetLeftOperand() {
+ return leftOperand;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setLeftOperand(CompositeNode newLeftOperand) {
+ CompositeNode oldLeftOperand = leftOperand;
+ leftOperand = newLeftOperand;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND, oldLeftOperand, leftOperand));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ if (resolve) return getLeftOperand();
+ return basicGetLeftOperand();
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
+ if (resolve) return getOperator();
+ return basicGetOperator();
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
+ if (resolve) return getRightOperand();
+ return basicGetRightOperand();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ setLeftOperand((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
+ setOperator((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
+ setRightOperand((CompositeNode)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ setLeftOperand((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
+ setOperator((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
+ setRightOperand((CompositeNode)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ return leftOperand != null;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
+ return operator != null;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
+ return rightOperand != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
} //RelationalExpressionNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
index 3a47f6e..c079f93 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
@@ -2,12 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: SimpleTypeNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: SimpleTypeNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode;
@@ -18,12 +22,26 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* An implementation of the model object '<em><b>Simple Type Node</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl#getNames <em>Names</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
public class SimpleTypeNodeImpl extends CompositeNodeImpl implements SimpleTypeNode {
/**
+ * The cached value of the '{@link #getNames() <em>Names</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNames()
+ * @generated
+ * @ordered
+ */
+ protected EList<CompositeNode> names;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -42,4 +60,76 @@ public class SimpleTypeNodeImpl extends CompositeNodeImpl implements SimpleTypeN
return Xpand3nodePackage.Literals.SIMPLE_TYPE_NODE;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<CompositeNode> getNames() {
+ if (names == null) {
+ names = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.SIMPLE_TYPE_NODE__NAMES);
+ }
+ return names;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3nodePackage.SIMPLE_TYPE_NODE__NAMES:
+ return getNames();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3nodePackage.SIMPLE_TYPE_NODE__NAMES:
+ getNames().clear();
+ getNames().addAll((Collection<? extends CompositeNode>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.SIMPLE_TYPE_NODE__NAMES:
+ getNames().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3nodePackage.SIMPLE_TYPE_NODE__NAMES:
+ return names != null && !names.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
} //SimpleTypeNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
index 4cbebe1..1e7a303 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeFactoryImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: Xpand3nodeFactoryImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
@@ -94,6 +94,7 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac
case Xpand3nodePackage.AND_EXPRESSION_NODE: return createAndExpressionNode();
case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE: return createImpliesExpressionNode();
case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE: return createRelationalExpressionNode();
+ case Xpand3nodePackage.BOOLEAN_OPERATOR_NODE: return createBooleanOperatorNode();
case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: return createAdditiveExpressionNode();
case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE: return createMultiplicativeExpressionNode();
case Xpand3nodePackage.UNARY_EXPRESSION_NODE: return createUnaryExpressionNode();
@@ -464,6 +465,16 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac
* <!-- end-user-doc -->
* @generated
*/
+ public BooleanOperatorNode createBooleanOperatorNode() {
+ BooleanOperatorNodeImpl booleanOperatorNode = new BooleanOperatorNodeImpl();
+ return booleanOperatorNode;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public AdditiveExpressionNode createAdditiveExpressionNode() {
AdditiveExpressionNodeImpl additiveExpressionNode = new AdditiveExpressionNodeImpl();
return additiveExpressionNode;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java
index 5ea85b3..4e8d29b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodePackageImpl.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: Xpand3nodePackageImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
@@ -18,6 +18,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode;
import org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode;
import org.eclipse.xpand3.internal.parser.xpand3node.AroundNode;
import org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode;
+import org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode;
import org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode;
import org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode;
import org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode;
@@ -321,6 +322,13 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ private EClass booleanOperatorNodeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass additiveExpressionNodeEClass = null;
/**
@@ -757,6 +765,87 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getExtensionNode_Create() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_Private() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_ParamList() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_ExtendBody() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_Cached() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_JavaReturnType() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_JavaName() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_ReturnType() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExtensionNode_Name() {
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getJavaTypeNode() {
return javaTypeNodeEClass;
}
@@ -874,6 +963,42 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getRelationalExpressionNode_RightOperand() {
+ return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getBooleanOperatorNode() {
+ return booleanOperatorNodeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRelationalExpressionNode_Operator() {
+ return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRelationalExpressionNode_LeftOperand() {
+ return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getAdditiveExpressionNode() {
return additiveExpressionNodeEClass;
}
@@ -910,6 +1035,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getInfixExpressionNode_Calls() {
+ return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getInfixExpressionNode_Target() {
+ return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getStringLiteralNode() {
return stringLiteralNodeEClass;
}
@@ -946,6 +1089,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getFeatureCallNode_Name() {
+ return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getFeatureCallNode_ParamList() {
+ return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getListLiteralNode() {
return listLiteralNodeEClass;
}
@@ -1009,6 +1170,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getDeclaredParameterListNode_Params() {
+ return (EReference)declaredParameterListNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getDeclaredParameterNode() {
return declaredParameterNodeEClass;
}
@@ -1018,6 +1188,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getDeclaredParameterNode_Name() {
+ return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getDeclaredParameterNode_Ptype() {
+ return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getParameterListNode() {
return parameterListNodeEClass;
}
@@ -1027,6 +1215,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getParameterListNode_Params() {
+ return (EReference)parameterListNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getCollectionTypeNode() {
return collectionTypeNodeEClass;
}
@@ -1045,6 +1242,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getSimpleTypeNode_Names() {
+ return (EReference)simpleTypeNodeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getIdentifierNode() {
return identifierNodeEClass;
}
@@ -1122,6 +1328,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
pointcutNodeEClass = createEClass(POINTCUT_NODE);
extensionNodeEClass = createEClass(EXTENSION_NODE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__CREATE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__PRIVATE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__PARAM_LIST);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__EXTEND_BODY);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__CACHED);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_RETURN_TYPE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_NAME);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__RETURN_TYPE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__NAME);
javaTypeNodeEClass = createEClass(JAVA_TYPE_NODE);
@@ -1148,6 +1363,11 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
impliesExpressionNodeEClass = createEClass(IMPLIES_EXPRESSION_NODE);
relationalExpressionNodeEClass = createEClass(RELATIONAL_EXPRESSION_NODE);
+ createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND);
+ createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__OPERATOR);
+ createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND);
+
+ booleanOperatorNodeEClass = createEClass(BOOLEAN_OPERATOR_NODE);
additiveExpressionNodeEClass = createEClass(ADDITIVE_EXPRESSION_NODE);
@@ -1156,6 +1376,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
unaryExpressionNodeEClass = createEClass(UNARY_EXPRESSION_NODE);
infixExpressionNodeEClass = createEClass(INFIX_EXPRESSION_NODE);
+ createEReference(infixExpressionNodeEClass, INFIX_EXPRESSION_NODE__CALLS);
+ createEReference(infixExpressionNodeEClass, INFIX_EXPRESSION_NODE__TARGET);
stringLiteralNodeEClass = createEClass(STRING_LITERAL_NODE);
@@ -1164,6 +1386,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
globalVarExpressionNodeEClass = createEClass(GLOBAL_VAR_EXPRESSION_NODE);
featureCallNodeEClass = createEClass(FEATURE_CALL_NODE);
+ createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME);
+ createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__PARAM_LIST);
listLiteralNodeEClass = createEClass(LIST_LITERAL_NODE);
@@ -1178,14 +1402,19 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
collectionExpressionNodeEClass = createEClass(COLLECTION_EXPRESSION_NODE);
declaredParameterListNodeEClass = createEClass(DECLARED_PARAMETER_LIST_NODE);
+ createEReference(declaredParameterListNodeEClass, DECLARED_PARAMETER_LIST_NODE__PARAMS);
declaredParameterNodeEClass = createEClass(DECLARED_PARAMETER_NODE);
+ createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__NAME);
+ createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__PTYPE);
parameterListNodeEClass = createEClass(PARAMETER_LIST_NODE);
+ createEReference(parameterListNodeEClass, PARAMETER_LIST_NODE__PARAMS);
collectionTypeNodeEClass = createEClass(COLLECTION_TYPE_NODE);
simpleTypeNodeEClass = createEClass(SIMPLE_TYPE_NODE);
+ createEReference(simpleTypeNodeEClass, SIMPLE_TYPE_NODE__NAMES);
identifierNodeEClass = createEClass(IDENTIFIER_NODE);
}
@@ -1255,6 +1484,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
andExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
impliesExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
relationalExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
+ booleanOperatorNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
additiveExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
multiplicativeExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
unaryExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
@@ -1322,6 +1552,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(pointcutNodeEClass, PointcutNode.class, "PointcutNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(extensionNodeEClass, ExtensionNode.class, "ExtensionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getExtensionNode_Create(), theNodePackage.getLeafNode(), null, "create", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_Private(), theNodePackage.getLeafNode(), null, "private", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_ExtendBody(), theNodePackage.getCompositeNode(), null, "extendBody", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_Cached(), theNodePackage.getLeafNode(), null, "cached", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_JavaReturnType(), theNodePackage.getCompositeNode(), null, "javaReturnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_JavaName(), theNodePackage.getCompositeNode(), null, "javaName", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_ReturnType(), theNodePackage.getCompositeNode(), null, "returnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(javaTypeNodeEClass, JavaTypeNode.class, "JavaTypeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1348,6 +1587,11 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(impliesExpressionNodeEClass, ImpliesExpressionNode.class, "ImpliesExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(relationalExpressionNodeEClass, RelationalExpressionNode.class, "RelationalExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getRelationalExpressionNode_LeftOperand(), theNodePackage.getCompositeNode(), null, "leftOperand", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRelationalExpressionNode_Operator(), theNodePackage.getCompositeNode(), null, "operator", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRelationalExpressionNode_RightOperand(), theNodePackage.getCompositeNode(), null, "rightOperand", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(booleanOperatorNodeEClass, BooleanOperatorNode.class, "BooleanOperatorNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(additiveExpressionNodeEClass, AdditiveExpressionNode.class, "AdditiveExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1356,6 +1600,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(unaryExpressionNodeEClass, UnaryExpressionNode.class, "UnaryExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(infixExpressionNodeEClass, InfixExpressionNode.class, "InfixExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getInfixExpressionNode_Calls(), theNodePackage.getCompositeNode(), null, "calls", null, 0, -1, InfixExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getInfixExpressionNode_Target(), theNodePackage.getCompositeNode(), null, "target", null, 0, 1, InfixExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(stringLiteralNodeEClass, StringLiteralNode.class, "StringLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1364,6 +1610,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(globalVarExpressionNodeEClass, GlobalVarExpressionNode.class, "GlobalVarExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(featureCallNodeEClass, FeatureCallNode.class, "FeatureCallNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getFeatureCallNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getFeatureCallNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(listLiteralNodeEClass, ListLiteralNode.class, "ListLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1378,14 +1626,19 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(collectionExpressionNodeEClass, CollectionExpressionNode.class, "CollectionExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(declaredParameterListNodeEClass, DeclaredParameterListNode.class, "DeclaredParameterListNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getDeclaredParameterListNode_Params(), theNodePackage.getCompositeNode(), null, "params", null, 0, -1, DeclaredParameterListNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(declaredParameterNodeEClass, DeclaredParameterNode.class, "DeclaredParameterNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getDeclaredParameterNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDeclaredParameterNode_Ptype(), theNodePackage.getCompositeNode(), null, "ptype", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(parameterListNodeEClass, ParameterListNode.class, "ParameterListNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getParameterListNode_Params(), theNodePackage.getCompositeNode(), null, "params", null, 0, -1, ParameterListNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(collectionTypeNodeEClass, CollectionTypeNode.class, "CollectionTypeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(simpleTypeNodeEClass, SimpleTypeNode.class, "SimpleTypeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getSimpleTypeNode_Names(), theNodePackage.getCompositeNode(), null, "names", null, 0, -1, SimpleTypeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(identifierNodeEClass, IdentifierNode.class, "IdentifierNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
index 867fe5b..30bf3e1 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeAdapterFactory.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: Xpand3nodeAdapterFactory.java,v 1.2 2008/03/06 15:25:13 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.util;
@@ -211,6 +211,10 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
return createRelationalExpressionNodeAdapter();
}
@Override
+ public Adapter caseBooleanOperatorNode(BooleanOperatorNode object) {
+ return createBooleanOperatorNodeAdapter();
+ }
+ @Override
public Adapter caseAdditiveExpressionNode(AdditiveExpressionNode object) {
return createAdditiveExpressionNodeAdapter();
}
@@ -795,6 +799,20 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode <em>Boolean Operator Node</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode
+ * @generated
+ */
+ public Adapter createBooleanOperatorNodeAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
index 582dc55..b699bed 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeSwitch.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: Xpand3nodeSwitch.java,v 1.2 2008/03/06 15:25:13 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.util;
@@ -362,6 +362,14 @@ public class Xpand3nodeSwitch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case Xpand3nodePackage.BOOLEAN_OPERATOR_NODE: {
+ BooleanOperatorNode booleanOperatorNode = (BooleanOperatorNode)theEObject;
+ T result = caseBooleanOperatorNode(booleanOperatorNode);
+ if (result == null) result = caseCompositeNode(booleanOperatorNode);
+ if (result == null) result = caseNode(booleanOperatorNode);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: {
AdditiveExpressionNode additiveExpressionNode = (AdditiveExpressionNode)theEObject;
T result = caseAdditiveExpressionNode(additiveExpressionNode);
@@ -1037,6 +1045,21 @@ public class Xpand3nodeSwitch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Boolean Operator Node</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Boolean Operator Node</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseBooleanOperatorNode(BooleanOperatorNode object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>Additive Expression Node</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java
new file mode 100644
index 0000000..84b955e
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanOperatorNodeValidator.java,v 1.1 2008/03/06 15:25:08 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface BooleanOperatorNodeValidator {
+ boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
index f1100c7..3015c44 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
@@ -2,10 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterListNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: DeclaredParameterListNodeValidator.java,v 1.2 2008/03/06 15:25:09 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.tmf.common.node.CompositeNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode}.
@@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface DeclaredParameterListNodeValidator {
boolean validate();
+ boolean validateParams(EList<CompositeNode> value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
index f2f2a83..b774f29 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
@@ -2,10 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: DeclaredParameterNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.tmf.common.node.CompositeNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode}.
@@ -16,4 +18,10 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface DeclaredParameterNodeValidator {
boolean validate();
+ boolean validateName(CompositeNode value);
+
+ boolean validatePtype(CompositeNode value);
+
+ boolean validateType(CompositeNode value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
index 6821554..1e0287f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
@@ -2,10 +2,14 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ExtensionNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.LeafNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode}.
@@ -16,4 +20,26 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface ExtensionNodeValidator {
boolean validate();
+ boolean validateCreate(LeafNode value);
+
+ boolean validatePrivate(LeafNode value);
+
+ boolean validateParamList(CompositeNode value);
+
+ boolean validateExtendBody(CompositeNode value);
+
+ boolean validateParams(CompositeNode value);
+
+ boolean validateParams(EList<CompositeNode> value);
+
+ boolean validateCached(LeafNode value);
+
+ boolean validateJavaReturnType(CompositeNode value);
+
+ boolean validateJavaName(CompositeNode value);
+
+ boolean validateReturnType(CompositeNode value);
+
+ boolean validateName(CompositeNode value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
index e828a34..78ecf04 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
@@ -2,10 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: FeatureCallNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: FeatureCallNodeValidator.java,v 1.2 2008/03/06 15:25:09 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.tmf.common.node.CompositeNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode}.
@@ -16,4 +18,8 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface FeatureCallNodeValidator {
boolean validate();
+ boolean validateName(CompositeNode value);
+
+ boolean validateParamList(CompositeNode value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
index 21f1bfc..0c4428a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
@@ -2,10 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: InfixExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: InfixExpressionNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.tmf.common.node.CompositeNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode}.
@@ -16,4 +19,12 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface InfixExpressionNodeValidator {
boolean validate();
+ boolean validateCalls(EList<CompositeNode> value);
+
+ boolean validateTarget(CompositeNode value);
+
+ boolean validateCall(CompositeNode value);
+
+ boolean validatePrimary(CompositeNode value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
index eea8578..39d537c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
@@ -2,10 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterListNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: ParameterListNodeValidator.java,v 1.2 2008/03/06 15:25:12 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.tmf.common.node.CompositeNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode}.
@@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface ParameterListNodeValidator {
boolean validate();
+ boolean validateParams(EList<CompositeNode> value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
index 7541fbb..d8a526f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
@@ -2,10 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: RelationalExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: RelationalExpressionNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.LeafNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode}.
@@ -16,4 +19,12 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface RelationalExpressionNodeValidator {
boolean validate();
+ boolean validateRightOperand(CompositeNode value);
+
+ boolean validateOperator(LeafNode value);
+
+ boolean validateLeftOperand(CompositeNode value);
+
+ boolean validateOperator(CompositeNode value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
index c58ac02..01ff5fa 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
@@ -2,10 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: SimpleTypeNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: SimpleTypeNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.tmf.common.node.CompositeNode;
+
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode}.
@@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation;
public interface SimpleTypeNodeValidator {
boolean validate();
+ boolean validateNames(EList<CompositeNode> value);
+
}
diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3.ecore b/plugins/org.eclipse.xpand3.parser/model/Xpand3.ecore
deleted file mode 100644
index 390ecd6..0000000
--- a/plugins/org.eclipse.xpand3.parser/model/Xpand3.ecore
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xpand3" nsURI="http://www.eclipse.org/tmf/common/Xpand3" nsPrefix="xpand3">
- <eClassifiers xsi:type="ecore:EClass" name="FileNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="decl" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="imp" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NsImportNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="ns">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DefinitionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DefinitionAroundNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SequenceNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TextSequenceNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TextNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ErrorStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExpandStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExpressionStmtNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FileStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ForeachStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IfStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ElseIfStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ElseStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="LetStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ProtectStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CheckNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AroundNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PointcutNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExtensionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JavaTypeNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Test_expressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="LetExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CastedExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ChainExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IfExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SwitchExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CasePartNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OrExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AndExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImpliesExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RelationalExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AdditiveExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MultiplicativeExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="UnaryExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="InfixExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StringLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ParanthesizedExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GlobalVarExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FeatureCallNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ListLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ConstructorCallNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BooleanLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NullLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NumberLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CollectionExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterListNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ParameterListNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CollectionTypeNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SimpleTypeNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IdentifierNode">
- <eSuperTypes href="platform:/resource/org.eclipse.xpand3/src/node.ecore#//CompositeNode"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
index 48d83d3..f68b732 100644
--- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
+++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
@@ -74,6 +74,33 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExtensionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="create">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="private">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="extendBody">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cached">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="javaReturnType">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="javaName">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="returnType">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="JavaTypeNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -113,6 +140,18 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RelationalExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="operator">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BooleanOperatorNode">
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AdditiveExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -125,6 +164,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InfixExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="calls" upperBound="-1">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="StringLiteralNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -137,6 +182,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeatureCallNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ListLiteralNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -158,18 +209,33 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterListNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ptype">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ParameterListNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CollectionTypeNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SimpleTypeNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="names" upperBound="-1">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IdentifierNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf
index e898c9f..4893ff4 100644
--- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf
+++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf
@@ -142,10 +142,10 @@ pointcut :
|'::' )*
;
-extension :
- ('private'|'cached'|'create')* type? identifier identifier? '(' declaredParameterList? ')' ':'
- ('JAVA' javaType '.' identifier '('(javaType (',' javaType )*)? ')'|
- expression )';'
+extension : // TODO create <identifier> <name< (...)
+ (private='private'|cached='cached'|create='create')* returnType=type? name=identifier '(' paramList=declaredParameterList? ')' ':'
+ ('JAVA' javaReturnType=javaType '.' javaName=identifier '('(javaType (',' javaType )*)? ')'|
+ extendBody=expression )';'
;
javaType :
@@ -210,10 +210,18 @@ normalizable impliesExpression :
;
normalizable relationalExpression :
- additiveExpression
- (('==' | '!=' | '>=' | '<=' | '>' | '<') additiveExpression )*
+ leftOperand=additiveExpression
+ (operator=booleanOperator rightOperand=additiveExpression )*
;
+booleanOperator :
+ '=='
+ | '!='
+ | '>='
+ | '<='
+ | '>'
+ | '<';
+
normalizable additiveExpression :
multiplicativeExpression
(('+'| '-') multiplicativeExpression )*
@@ -232,7 +240,7 @@ normalizable unaryExpression :
;
normalizable infixExpression :
- primaryExpression ( '.' featureCall )*
+ target=primaryExpression ( '.' calls+=featureCall )*
;
abstract normalizable primaryExpression :
@@ -259,7 +267,7 @@ globalVarExpression :
'GLOBALVAR' identifier ;
normalizable featureCall :
- identifier '(' (parameterList)? ')'
+ name=identifier '(' (paramList=parameterList)? ')'
| type
| collectionExpression
;
@@ -304,15 +312,15 @@ collectionExpression :
// helper
declaredParameterList :
- declaredParameter (',' declaredParameter )*
+ params+=declaredParameter (',' params+=declaredParameter )*
;
declaredParameter :
- type identifier
+ ptype=type name=identifier
;
parameterList :
- expression (',' expression )*
+ params+=expression (',' params+=expression )*
;
// type
@@ -328,8 +336,8 @@ collectionType :
;
simpleType :
- identifier
- ('::' identifier )*
+ names+=identifier
+ ('::' names+=identifier )*
;
identifier :
diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node.g b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node.g
index 6f6d6d2..29ad3de 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node.g
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node.g
@@ -27,12 +27,14 @@ package org.eclipse.xpand3.parser;
}
file returns [CompositeNode cn]
- @init{ cn = factory.createFileNode(); cn.setRule("file"); }
+ @init{ cn = factory.createFileNode();
+ }
@after{ cn = normalize(cn); } :
(((imp=nsImport { addToChildren(cn, imp); ((FileNode) cn).getImp().add(imp); })))* (((decl=abstractDeclaration { addToChildren(cn, decl); ((FileNode) cn).getDecl().add(decl); })))* (EOF)
;
nsImport returns [CompositeNode cn]
- @init{ cn = factory.createNsImportNode(); cn.setRule("nsImport"); } :
+ @init{ cn = factory.createNsImportNode();
+ } :
(LG { addLeafNodeForToken($cn, null); }) ('IMPORT' { addLeafNodeForToken($cn, null); }) (ns=simpleType { addToChildren(cn, ns); ((NsImportNode) cn).setNs(ns); }) (RG { addLeafNodeForToken($cn, null); })
| (LG { addLeafNodeForToken($cn, null); }) ('EXTENSION' { addLeafNodeForToken($cn, null); }) (ns=simpleType { addToChildren(cn, ns); ((NsImportNode) cn).setNs(ns); }) (RG { addLeafNodeForToken($cn, null); })
| ('import' { addLeafNodeForToken($cn, null); }) (unnamed0=type { addToChildren(cn, unnamed0); }) (';' { addLeafNodeForToken($cn, null); })
@@ -46,17 +48,20 @@ abstractDeclaration returns [CompositeNode cn] :
| (definitionAround { $cn = $definitionAround.cn; })
;
definition returns [CompositeNode cn]
- @init{ cn = factory.createDefinitionNode(); cn.setRule("definition"); } :
+ @init{ cn = factory.createDefinitionNode();
+ } :
(LG { addLeafNodeForToken($cn, null); }) (DEFINE { addLeafNodeForToken($cn, null); }) (name=identifier { addToChildren(cn, name); ((DefinitionNode) cn).setName(name); }) ((('(' { addLeafNodeForToken($cn, null); }) (((unnamed2=declaredParameterList { addToChildren(cn, unnamed2); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
| ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); })))? ('FOR' { addLeafNodeForToken($cn, null); }) (unnamed3=type { addToChildren(cn, unnamed3); }) (unnamed4=sequence { addToChildren(cn, unnamed4); }) (ENDDEFINE { addLeafNodeForToken($cn, null); }) (RG { addLeafNodeForToken($cn, null); })
;
definitionAround returns [CompositeNode cn]
- @init{ cn = factory.createDefinitionAroundNode(); cn.setRule("definitionAround"); } :
+ @init{ cn = factory.createDefinitionAroundNode();
+ } :
(LG { addLeafNodeForToken($cn, null); }) (AROUND { addLeafNodeForToken($cn, null); }) (unnamed5=pointcut { addToChildren(cn, unnamed5); }) ((('(' { addLeafNodeForToken($cn, null); }) (((unnamed6=declaredParameterList { addToChildren(cn, unnamed6); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
| ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); })))? ('FOR' { addLeafNodeForToken($cn, null); }) (unnamed7=type { addToChildren(cn, unnamed7); }) (unnamed8=sequence { addToChildren(cn, unnamed8); }) (ENDAROUND { addLeafNodeForToken($cn, null); }) (RG { addLeafNodeForToken($cn, null); })
;
sequence returns [CompositeNode cn]
- @init{ cn = factory.createSequenceNode(); cn.setRule("sequence"); } :
+ @init{ cn = factory.createSequenceNode();
+ } :
(unnamed9=textSequence { addToChildren(cn, unnamed9); }) (((unnamed10=statement { addToChildren(cn, unnamed10); }) (unnamed11=textSequence { addToChildren(cn, unnamed11); })))*
;
statement returns [CompositeNode cn] :
@@ -68,12 +73,14 @@ statement returns [CompositeNode cn] :
| (protectStatement { $cn = $protectStatement.cn; })
;
textSequence returns [CompositeNode cn]
- @init{ cn = factory.createTextSequenceNode(); cn.setRule("textSequence"); }
+ @init{ cn = factory.createTextSequenceNode();
+ }
@after{ cn = normalize(cn); } :
(unnamed12=text { addToChildren(cn, unnamed12); }) (((unnamed13=text { addToChildren(cn, unnamed13); })))*
;
text returns [CompositeNode cn]
- @init{ cn = factory.createTextNode(); cn.setRule("text"); } :
+ @init{ cn = factory.createTextNode();
+ } :
('-' { addLeafNodeForToken($cn, null); })? (TEXT { addLeafNodeForToken($cn, null); })
;
simpleStatement returns [CompositeNode cn] :
@@ -82,168 +89,204 @@ simpleStatement returns [CompositeNode cn] :
| (expressionStmt { $cn = $expressionStmt.cn; })
;
errorStatement returns [CompositeNode cn]
- @init{ cn = factory.createErrorStatementNode(); cn.setRule("errorStatement"); } :
+ @init{ cn = factory.createErrorStatementNode();
+ } :
('ERROR' { addLeafNodeForToken($cn, null); }) (unnamed14=expression { addToChildren(cn, unnamed14); })
;
expandStatement returns [CompositeNode cn]
- @init{ cn = factory.createExpandStatementNode(); cn.setRule("expandStatement"); } :
+ @init{ cn = factory.createExpandStatementNode();
+ } :
('EXPAND' { addLeafNodeForToken($cn, null); }) (unnamed15=simpleType { addToChildren(cn, unnamed15); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed16=parameterList { addToChildren(cn, unnamed16); }) (')' { addLeafNodeForToken($cn, null); })))? ((((('FOR' { addLeafNodeForToken($cn, null); }) (unnamed17=expression { addToChildren(cn, unnamed17); })))
| ((('FOREACH' { addLeafNodeForToken($cn, null); }) (unnamed18=expression { addToChildren(cn, unnamed18); }) ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (unnamed19=expression { addToChildren(cn, unnamed19); })))?))))?
;
expressionStmt returns [CompositeNode cn]
- @init{ cn = factory.createExpressionStmtNode(); cn.setRule("expressionStmt"); } :
+ @init{ cn = factory.createExpressionStmtNode();
+ } :
(unnamed20=expression { addToChildren(cn, unnamed20); })
;
fileStatement returns [CompositeNode cn]
- @init{ cn = factory.createFileStatementNode(); cn.setRule("fileStatement"); } :
+ @init{ cn = factory.createFileStatementNode();
+ } :
('FILE' { addLeafNodeForToken($cn, null); }) (unnamed21=expression { addToChildren(cn, unnamed21); }) (((unnamed22=identifier { addToChildren(cn, unnamed22); })))? (unnamed23=sequence { addToChildren(cn, unnamed23); }) ('ENDFILE' { addLeafNodeForToken($cn, null); })
;
foreachStatement returns [CompositeNode cn]
- @init{ cn = factory.createForeachStatementNode(); cn.setRule("foreachStatement"); } :
+ @init{ cn = factory.createForeachStatementNode();
+ } :
('FOREACH' { addLeafNodeForToken($cn, null); }) (unnamed24=expression { addToChildren(cn, unnamed24); }) ('AS' { addLeafNodeForToken($cn, null); }) (unnamed25=identifier { addToChildren(cn, unnamed25); }) ((('ITERATOR' { addLeafNodeForToken($cn, null); }) (unnamed26=identifier { addToChildren(cn, unnamed26); })))? ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (unnamed27=expression { addToChildren(cn, unnamed27); })))? (unnamed28=sequence { addToChildren(cn, unnamed28); }) ('ENDFOREACH' { addLeafNodeForToken($cn, null); })
;
ifStatement returns [CompositeNode cn]
- @init{ cn = factory.createIfStatementNode(); cn.setRule("ifStatement"); } :
+ @init{ cn = factory.createIfStatementNode();
+ } :
('IF' { addLeafNodeForToken($cn, null); }) (unnamed29=expression { addToChildren(cn, unnamed29); }) (unnamed30=sequence { addToChildren(cn, unnamed30); }) (unnamed31=elseIfStatement { addToChildren(cn, unnamed31); })* (unnamed32=elseStatement { addToChildren(cn, unnamed32); })? ('ENDIF' { addLeafNodeForToken($cn, null); })
;
elseIfStatement returns [CompositeNode cn]
- @init{ cn = factory.createElseIfStatementNode(); cn.setRule("elseIfStatement"); } :
+ @init{ cn = factory.createElseIfStatementNode();
+ } :
('ELSEIF' { addLeafNodeForToken($cn, null); }) (unnamed33=expression { addToChildren(cn, unnamed33); }) (unnamed34=sequence { addToChildren(cn, unnamed34); })
;
elseStatement returns [CompositeNode cn]
- @init{ cn = factory.createElseStatementNode(); cn.setRule("elseStatement"); } :
+ @init{ cn = factory.createElseStatementNode();
+ } :
('ELSE' { addLeafNodeForToken($cn, null); }) (unnamed35=sequence { addToChildren(cn, unnamed35); })
;
letStatement returns [CompositeNode cn]
- @init{ cn = factory.createLetStatementNode(); cn.setRule("letStatement"); } :
+ @init{ cn = factory.createLetStatementNode();
+ } :
('LET' { addLeafNodeForToken($cn, null); }) (unnamed36=expression { addToChildren(cn, unnamed36); }) ('AS' { addLeafNodeForToken($cn, null); }) (unnamed37=identifier { addToChildren(cn, unnamed37); }) (unnamed38=sequence { addToChildren(cn, unnamed38); }) ('ENDLET' { addLeafNodeForToken($cn, null); })
;
protectStatement returns [CompositeNode cn]
- @init{ cn = factory.createProtectStatementNode(); cn.setRule("protectStatement"); } :
+ @init{ cn = factory.createProtectStatementNode();
+ } :
('PROTECT' { addLeafNodeForToken($cn, null); }) ('CSTART' { addLeafNodeForToken($cn, null); }) (unnamed39=expression { addToChildren(cn, unnamed39); }) ('CEND' { addLeafNodeForToken($cn, null); }) (unnamed40=expression { addToChildren(cn, unnamed40); }) ('ID' { addLeafNodeForToken($cn, null); }) (unnamed41=expression { addToChildren(cn, unnamed41); }) ('DISABLE' { addLeafNodeForToken($cn, null); })? (unnamed42=sequence { addToChildren(cn, unnamed42); }) ('ENDPROTECT' { addLeafNodeForToken($cn, null); })
;
check returns [CompositeNode cn]
- @init{ cn = factory.createCheckNode(); cn.setRule("check"); } :
+ @init{ cn = factory.createCheckNode();
+ } :
('context' { addLeafNodeForToken($cn, null); }) (unnamed43=type { addToChildren(cn, unnamed43); }) ((('if' { addLeafNodeForToken($cn, null); }) (unnamed44=expression { addToChildren(cn, unnamed44); })))? ((('ERROR' { addLeafNodeForToken($cn, null); })
| ('WARNING' { addLeafNodeForToken($cn, null); }))) (unnamed45=expression { addToChildren(cn, unnamed45); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed46=expression { addToChildren(cn, unnamed46); }) (';' { addLeafNodeForToken($cn, null); })
;
around returns [CompositeNode cn]
- @init{ cn = factory.createAroundNode(); cn.setRule("around"); } :
+ @init{ cn = factory.createAroundNode();
+ } :
('around' { addLeafNodeForToken($cn, null); }) (unnamed47=pointcut { addToChildren(cn, unnamed47); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed48=declaredParameterList { addToChildren(cn, unnamed48); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
| ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed49=expression { addToChildren(cn, unnamed49); }) (';' { addLeafNodeForToken($cn, null); })
;
pointcut returns [CompositeNode cn]
- @init{ cn = factory.createPointcutNode(); cn.setRule("pointcut"); } :
+ @init{ cn = factory.createPointcutNode();
+ } :
((('*' { addLeafNodeForToken($cn, null); })
| (unnamed50=identifier { addToChildren(cn, unnamed50); }))) ((('*' { addLeafNodeForToken($cn, null); })
| (unnamed51=identifier { addToChildren(cn, unnamed51); })
| ('::' { addLeafNodeForToken($cn, null); })))*
;
extension returns [CompositeNode cn]
- @init{ cn = factory.createExtensionNode(); cn.setRule("extension"); } :
- ((('private' { addLeafNodeForToken($cn, null); })
- | ('cached' { addLeafNodeForToken($cn, null); })
- | ('create' { addLeafNodeForToken($cn, null); })))* (unnamed52=type { addToChildren(cn, unnamed52); })? (unnamed53=identifier { addToChildren(cn, unnamed53); }) (unnamed54=identifier { addToChildren(cn, unnamed54); })? ('(' { addLeafNodeForToken($cn, null); }) (unnamed55=declaredParameterList { addToChildren(cn, unnamed55); })? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) ((('JAVA' { addLeafNodeForToken($cn, null); }) (unnamed56=javaType { addToChildren(cn, unnamed56); }) ('.' { addLeafNodeForToken($cn, null); }) (unnamed57=identifier { addToChildren(cn, unnamed57); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed58=javaType { addToChildren(cn, unnamed58); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed59=javaType { addToChildren(cn, unnamed59); })))*))? (')' { addLeafNodeForToken($cn, null); })
- | (unnamed60=expression { addToChildren(cn, unnamed60); }))) (';' { addLeafNodeForToken($cn, null); })
+ @init{ cn = factory.createExtensionNode();
+ } :
+ ((('private' { addLeafNodeForToken($cn, "private"); })
+ | ('cached' { addLeafNodeForToken($cn, "cached"); })
+ | ('create' { addLeafNodeForToken($cn, "create"); })))* (returnType=type { addToChildren(cn, returnType); ((ExtensionNode) cn).setReturnType(returnType); })? (name=identifier { addToChildren(cn, name); ((ExtensionNode) cn).setName(name); }) ('(' { addLeafNodeForToken($cn, null); }) (paramList=declaredParameterList { addToChildren(cn, paramList); ((ExtensionNode) cn).setParamList(paramList); })? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) ((('JAVA' { addLeafNodeForToken($cn, null); }) (javaReturnType=javaType { addToChildren(cn, javaReturnType); ((ExtensionNode) cn).setJavaReturnType(javaReturnType); }) ('.' { addLeafNodeForToken($cn, null); }) (javaName=identifier { addToChildren(cn, javaName); ((ExtensionNode) cn).setJavaName(javaName); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed52=javaType { addToChildren(cn, unnamed52); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed53=javaType { addToChildren(cn, unnamed53); })))*))? (')' { addLeafNodeForToken($cn, null); })
+ | (extendBody=expression { addToChildren(cn, extendBody); ((ExtensionNode) cn).setExtendBody(extendBody); }))) (';' { addLeafNodeForToken($cn, null); })
;
javaType returns [CompositeNode cn]
- @init{ cn = factory.createJavaTypeNode(); cn.setRule("javaType"); } :
- (unnamed61=identifier { addToChildren(cn, unnamed61); }) ((('.' { addLeafNodeForToken($cn, null); }) (((unnamed62=identifier { addToChildren(cn, unnamed62); })
+ @init{ cn = factory.createJavaTypeNode();
+ } :
+ (unnamed54=identifier { addToChildren(cn, unnamed54); }) ((('.' { addLeafNodeForToken($cn, null); }) (((unnamed55=identifier { addToChildren(cn, unnamed55); })
| ('Collection' { addLeafNodeForToken($cn, null); })
| ('List' { addLeafNodeForToken($cn, null); })
| ('Set' { addLeafNodeForToken($cn, null); })))))*
;
test_expression returns [CompositeNode cn]
- @init{ cn = factory.createTest_expressionNode(); cn.setRule("test_expression"); }
+ @init{ cn = factory.createTest_expressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed63=expression { addToChildren(cn, unnamed63); }) (EOF)
+ (unnamed56=expression { addToChildren(cn, unnamed56); }) (EOF)
;
expression returns [CompositeNode cn]
- @init{ cn = factory.createExpressionNode(); cn.setRule("expression"); }
+ @init{ cn = factory.createExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed64=letExpression { addToChildren(cn, unnamed64); })
+ (unnamed57=letExpression { addToChildren(cn, unnamed57); })
;
letExpression returns [CompositeNode cn]
- @init{ cn = factory.createLetExpressionNode(); cn.setRule("letExpression"); }
+ @init{ cn = factory.createLetExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- ('let' { addLeafNodeForToken($cn, null); }) (unnamed65=identifier { addToChildren(cn, unnamed65); }) ('=' { addLeafNodeForToken($cn, null); }) (unnamed66=castedExpression { addToChildren(cn, unnamed66); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed67=expression { addToChildren(cn, unnamed67); })
- | (unnamed68=castedExpression { addToChildren(cn, unnamed68); })
+ ('let' { addLeafNodeForToken($cn, null); }) (unnamed58=identifier { addToChildren(cn, unnamed58); }) ('=' { addLeafNodeForToken($cn, null); }) (unnamed59=castedExpression { addToChildren(cn, unnamed59); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed60=expression { addToChildren(cn, unnamed60); })
+ | (unnamed61=castedExpression { addToChildren(cn, unnamed61); })
;
castedExpression returns [CompositeNode cn]
- @init{ cn = factory.createCastedExpressionNode(); cn.setRule("castedExpression"); }
+ @init{ cn = factory.createCastedExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- ('(' type ')' chainExpression)=>(('(' { addLeafNodeForToken($cn, null); }) (unnamed69=type { addToChildren(cn, unnamed69); }) (')' { addLeafNodeForToken($cn, null); }) (unnamed70=chainExpression { addToChildren(cn, unnamed70); }))
- | (unnamed71=chainExpression { addToChildren(cn, unnamed71); })
+ ('(' type ')' chainExpression)=>(('(' { addLeafNodeForToken($cn, null); }) (unnamed62=type { addToChildren(cn, unnamed62); }) (')' { addLeafNodeForToken($cn, null); }) (unnamed63=chainExpression { addToChildren(cn, unnamed63); }))
+ | (unnamed64=chainExpression { addToChildren(cn, unnamed64); })
;
chainExpression returns [CompositeNode cn]
- @init{ cn = factory.createChainExpressionNode(); cn.setRule("chainExpression"); }
+ @init{ cn = factory.createChainExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed72=ifExpression { addToChildren(cn, unnamed72); }) ((('->' { addLeafNodeForToken($cn, null); }) (unnamed73=ifExpression { addToChildren(cn, unnamed73); })))*
+ (unnamed65=ifExpression { addToChildren(cn, unnamed65); }) ((('->' { addLeafNodeForToken($cn, null); }) (unnamed66=ifExpression { addToChildren(cn, unnamed66); })))*
;
ifExpression returns [CompositeNode cn]
- @init{ cn = factory.createIfExpressionNode(); cn.setRule("ifExpression"); }
+ @init{ cn = factory.createIfExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed74=switchExpression { addToChildren(cn, unnamed74); }) ((('?' { addLeafNodeForToken($cn, null); }) (unnamed75=expression { addToChildren(cn, unnamed75); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed76=switchExpression { addToChildren(cn, unnamed76); })))?
- | ('if' { addLeafNodeForToken($cn, null); }) (unnamed77=expression { addToChildren(cn, unnamed77); }) ('then' { addLeafNodeForToken($cn, null); }) (unnamed78=switchExpression { addToChildren(cn, unnamed78); }) ((('else' { addLeafNodeForToken($cn, null); }) (unnamed79=switchExpression { addToChildren(cn, unnamed79); })))?
+ (unnamed67=switchExpression { addToChildren(cn, unnamed67); }) ((('?' { addLeafNodeForToken($cn, null); }) (unnamed68=expression { addToChildren(cn, unnamed68); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed69=switchExpression { addToChildren(cn, unnamed69); })))?
+ | ('if' { addLeafNodeForToken($cn, null); }) (unnamed70=expression { addToChildren(cn, unnamed70); }) ('then' { addLeafNodeForToken($cn, null); }) (unnamed71=switchExpression { addToChildren(cn, unnamed71); }) ((('else' { addLeafNodeForToken($cn, null); }) (unnamed72=switchExpression { addToChildren(cn, unnamed72); })))?
;
switchExpression returns [CompositeNode cn]
- @init{ cn = factory.createSwitchExpressionNode(); cn.setRule("switchExpression"); }
+ @init{ cn = factory.createSwitchExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- ('switch' { addLeafNodeForToken($cn, null); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed80=orExpression { addToChildren(cn, unnamed80); }) (')' { addLeafNodeForToken($cn, null); })))? ('{' { addLeafNodeForToken($cn, null); }) (unnamed81=casePart { addToChildren(cn, unnamed81); })* ('default' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed82=orExpression { addToChildren(cn, unnamed82); }) ('}' { addLeafNodeForToken($cn, null); })
- | (unnamed83=orExpression { addToChildren(cn, unnamed83); })
+ ('switch' { addLeafNodeForToken($cn, null); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed73=orExpression { addToChildren(cn, unnamed73); }) (')' { addLeafNodeForToken($cn, null); })))? ('{' { addLeafNodeForToken($cn, null); }) (unnamed74=casePart { addToChildren(cn, unnamed74); })* ('default' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed75=orExpression { addToChildren(cn, unnamed75); }) ('}' { addLeafNodeForToken($cn, null); })
+ | (unnamed76=orExpression { addToChildren(cn, unnamed76); })
;
casePart returns [CompositeNode cn]
- @init{ cn = factory.createCasePartNode(); cn.setRule("casePart"); } :
- ('case' { addLeafNodeForToken($cn, null); }) (unnamed84=expression { addToChildren(cn, unnamed84); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed85=expression { addToChildren(cn, unnamed85); })
+ @init{ cn = factory.createCasePartNode();
+ } :
+ ('case' { addLeafNodeForToken($cn, null); }) (unnamed77=expression { addToChildren(cn, unnamed77); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed78=expression { addToChildren(cn, unnamed78); })
;
orExpression returns [CompositeNode cn]
- @init{ cn = factory.createOrExpressionNode(); cn.setRule("orExpression"); }
+ @init{ cn = factory.createOrExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed86=andExpression { addToChildren(cn, unnamed86); }) ((('||' { addLeafNodeForToken($cn, null); }) (unnamed87=andExpression { addToChildren(cn, unnamed87); })))*
+ (unnamed79=andExpression { addToChildren(cn, unnamed79); }) ((('||' { addLeafNodeForToken($cn, null); }) (unnamed80=andExpression { addToChildren(cn, unnamed80); })))*
;
andExpression returns [CompositeNode cn]
- @init{ cn = factory.createAndExpressionNode(); cn.setRule("andExpression"); }
+ @init{ cn = factory.createAndExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed88=impliesExpression { addToChildren(cn, unnamed88); }) ((('&&' { addLeafNodeForToken($cn, null); }) (unnamed89=impliesExpression { addToChildren(cn, unnamed89); })))*
+ (unnamed81=impliesExpression { addToChildren(cn, unnamed81); }) ((('&&' { addLeafNodeForToken($cn, null); }) (unnamed82=impliesExpression { addToChildren(cn, unnamed82); })))*
;
impliesExpression returns [CompositeNode cn]
- @init{ cn = factory.createImpliesExpressionNode(); cn.setRule("impliesExpression"); }
+ @init{ cn = factory.createImpliesExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed90=relationalExpression { addToChildren(cn, unnamed90); }) ((('implies' { addLeafNodeForToken($cn, null); }) (unnamed91=relationalExpression { addToChildren(cn, unnamed91); })))*
+ (unnamed83=relationalExpression { addToChildren(cn, unnamed83); }) ((('implies' { addLeafNodeForToken($cn, null); }) (unnamed84=relationalExpression { addToChildren(cn, unnamed84); })))*
;
relationalExpression returns [CompositeNode cn]
- @init{ cn = factory.createRelationalExpressionNode(); cn.setRule("relationalExpression"); }
+ @init{ cn = factory.createRelationalExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed92=additiveExpression { addToChildren(cn, unnamed92); }) ((((('==' { addLeafNodeForToken($cn, null); })
+ (leftOperand=additiveExpression { addToChildren(cn, leftOperand); ((RelationalExpressionNode) cn).setLeftOperand(leftOperand); }) (((operator=booleanOperator { addToChildren(cn, operator); ((RelationalExpressionNode) cn).setOperator(operator); }) (rightOperand=additiveExpression { addToChildren(cn, rightOperand); ((RelationalExpressionNode) cn).setRightOperand(rightOperand); })))*
+;
+booleanOperator returns [CompositeNode cn]
+ @init{ cn = factory.createBooleanOperatorNode();
+ } :
+ ('==' { addLeafNodeForToken($cn, null); })
| ('!=' { addLeafNodeForToken($cn, null); })
| ('>=' { addLeafNodeForToken($cn, null); })
| ('<=' { addLeafNodeForToken($cn, null); })
| ('>' { addLeafNodeForToken($cn, null); })
- | ('<' { addLeafNodeForToken($cn, null); }))) (unnamed93=additiveExpression { addToChildren(cn, unnamed93); })))*
+ | ('<' { addLeafNodeForToken($cn, null); })
;
additiveExpression returns [CompositeNode cn]
- @init{ cn = factory.createAdditiveExpressionNode(); cn.setRule("additiveExpression"); }
+ @init{ cn = factory.createAdditiveExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed94=multiplicativeExpression { addToChildren(cn, unnamed94); }) ((((('+' { addLeafNodeForToken($cn, null); })
- | ('-' { addLeafNodeForToken($cn, null); }))) (unnamed95=multiplicativeExpression { addToChildren(cn, unnamed95); })))*
+ (unnamed85=multiplicativeExpression { addToChildren(cn, unnamed85); }) ((((('+' { addLeafNodeForToken($cn, null); })
+ | ('-' { addLeafNodeForToken($cn, null); }))) (unnamed86=multiplicativeExpression { addToChildren(cn, unnamed86); })))*
;
multiplicativeExpression returns [CompositeNode cn]
- @init{ cn = factory.createMultiplicativeExpressionNode(); cn.setRule("multiplicativeExpression"); }
+ @init{ cn = factory.createMultiplicativeExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed96=unaryExpression { addToChildren(cn, unnamed96); }) ((((('*' { addLeafNodeForToken($cn, null); })
- | ('/' { addLeafNodeForToken($cn, null); }))) (unnamed97=unaryExpression { addToChildren(cn, unnamed97); })))*
+ (unnamed87=unaryExpression { addToChildren(cn, unnamed87); }) ((((('*' { addLeafNodeForToken($cn, null); })
+ | ('/' { addLeafNodeForToken($cn, null); }))) (unnamed88=unaryExpression { addToChildren(cn, unnamed88); })))*
;
unaryExpression returns [CompositeNode cn]
- @init{ cn = factory.createUnaryExpressionNode(); cn.setRule("unaryExpression"); }
+ @init{ cn = factory.createUnaryExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed98=infixExpression { addToChildren(cn, unnamed98); })
- | ('!' { addLeafNodeForToken($cn, null); }) (unnamed99=infixExpression { addToChildren(cn, unnamed99); })
- | ('-' { addLeafNodeForToken($cn, null); }) (unnamed100=infixExpression { addToChildren(cn, unnamed100); })
+ (unnamed89=infixExpression { addToChildren(cn, unnamed89); })
+ | ('!' { addLeafNodeForToken($cn, null); }) (unnamed90=infixExpression { addToChildren(cn, unnamed90); })
+ | ('-' { addLeafNodeForToken($cn, null); }) (unnamed91=infixExpression { addToChildren(cn, unnamed91); })
;
infixExpression returns [CompositeNode cn]
- @init{ cn = factory.createInfixExpressionNode(); cn.setRule("infixExpression"); }
+ @init{ cn = factory.createInfixExpressionNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed101=primaryExpression { addToChildren(cn, unnamed101); }) ((('.' { addLeafNodeForToken($cn, null); }) (unnamed102=featureCall { addToChildren(cn, unnamed102); })))*
+ (target=primaryExpression { addToChildren(cn, target); ((InfixExpressionNode) cn).setTarget(target); }) ((('.' { addLeafNodeForToken($cn, null); }) (calls=featureCall { addToChildren(cn, calls); ((InfixExpressionNode) cn).getCalls().add(calls); })))*
;
primaryExpression returns [CompositeNode cn] :
(stringLiteral { $cn = $stringLiteral.cn; })
@@ -257,49 +300,59 @@ primaryExpression returns [CompositeNode cn] :
| (paranthesizedExpression { $cn = $paranthesizedExpression.cn; })
;
stringLiteral returns [CompositeNode cn]
- @init{ cn = factory.createStringLiteralNode(); cn.setRule("stringLiteral"); } :
+ @init{ cn = factory.createStringLiteralNode();
+ } :
(StringLiteral { addLeafNodeForToken($cn, null); })
;
paranthesizedExpression returns [CompositeNode cn]
- @init{ cn = factory.createParanthesizedExpressionNode(); cn.setRule("paranthesizedExpression"); } :
- ('(' { addLeafNodeForToken($cn, null); }) (unnamed103=expression { addToChildren(cn, unnamed103); }) (')' { addLeafNodeForToken($cn, null); })
+ @init{ cn = factory.createParanthesizedExpressionNode();
+ } :
+ ('(' { addLeafNodeForToken($cn, null); }) (unnamed92=expression { addToChildren(cn, unnamed92); }) (')' { addLeafNodeForToken($cn, null); })
;
globalVarExpression returns [CompositeNode cn]
- @init{ cn = factory.createGlobalVarExpressionNode(); cn.setRule("globalVarExpression"); } :
- ('GLOBALVAR' { addLeafNodeForToken($cn, null); }) (unnamed104=identifier { addToChildren(cn, unnamed104); })
+ @init{ cn = factory.createGlobalVarExpressionNode();
+ } :
+ ('GLOBALVAR' { addLeafNodeForToken($cn, null); }) (unnamed93=identifier { addToChildren(cn, unnamed93); })
;
featureCall returns [CompositeNode cn]
- @init{ cn = factory.createFeatureCallNode(); cn.setRule("featureCall"); }
+ @init{ cn = factory.createFeatureCallNode();
+ }
@after{ cn = normalize(cn); } :
- (unnamed105=identifier { addToChildren(cn, unnamed105); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed106=parameterList { addToChildren(cn, unnamed106); })))? (')' { addLeafNodeForToken($cn, null); })
- | (unnamed107=type { addToChildren(cn, unnamed107); })
- | (unnamed108=collectionExpression { addToChildren(cn, unnamed108); })
+ (name=identifier { addToChildren(cn, name); ((FeatureCallNode) cn).setName(name); }) ('(' { addLeafNodeForToken($cn, null); }) (((paramList=parameterList { addToChildren(cn, paramList); ((FeatureCallNode) cn).setParamList(paramList); })))? (')' { addLeafNodeForToken($cn, null); })
+ | (unnamed94=type { addToChildren(cn, unnamed94); })
+ | (unnamed95=collectionExpression { addToChildren(cn, unnamed95); })
;
listLiteral returns [CompositeNode cn]
- @init{ cn = factory.createListLiteralNode(); cn.setRule("listLiteral"); } :
- ('{' { addLeafNodeForToken($cn, null); }) (((unnamed109=expression { addToChildren(cn, unnamed109); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed110=expression { addToChildren(cn, unnamed110); })))*))? ('}' { addLeafNodeForToken($cn, null); })
+ @init{ cn = factory.createListLiteralNode();
+ } :
+ ('{' { addLeafNodeForToken($cn, null); }) (((unnamed96=expression { addToChildren(cn, unnamed96); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed97=expression { addToChildren(cn, unnamed97); })))*))? ('}' { addLeafNodeForToken($cn, null); })
;
constructorCall returns [CompositeNode cn]
- @init{ cn = factory.createConstructorCallNode(); cn.setRule("constructorCall"); } :
- ('new' { addLeafNodeForToken($cn, null); }) (unnamed111=simpleType { addToChildren(cn, unnamed111); })
+ @init{ cn = factory.createConstructorCallNode();
+ } :
+ ('new' { addLeafNodeForToken($cn, null); }) (unnamed98=simpleType { addToChildren(cn, unnamed98); })
;
booleanLiteral returns [CompositeNode cn]
- @init{ cn = factory.createBooleanLiteralNode(); cn.setRule("booleanLiteral"); } :
+ @init{ cn = factory.createBooleanLiteralNode();
+ } :
('false' { addLeafNodeForToken($cn, null); })
| ('true' { addLeafNodeForToken($cn, null); })
;
nullLiteral returns [CompositeNode cn]
- @init{ cn = factory.createNullLiteralNode(); cn.setRule("nullLiteral"); } :
+ @init{ cn = factory.createNullLiteralNode();
+ } :
('null' { addLeafNodeForToken($cn, null); })
;
numberLiteral returns [CompositeNode cn]
- @init{ cn = factory.createNumberLiteralNode(); cn.setRule("numberLiteral"); } :
+ @init{ cn = factory.createNumberLiteralNode();
+ } :
(IntLiteral { addLeafNodeForToken($cn, null); })
| (IntLiteral { addLeafNodeForToken($cn, null); }) ('.' { addLeafNodeForToken($cn, null); }) (IntLiteral { addLeafNodeForToken($cn, null); })
;
collectionExpression returns [CompositeNode cn]
- @init{ cn = factory.createCollectionExpressionNode(); cn.setRule("collectionExpression"); } :
- ('typeSelect' { addLeafNodeForToken($cn, null); }) ('(' { addLeafNodeForToken($cn, null); }) (unnamed112=type { addToChildren(cn, unnamed112); }) (')' { addLeafNodeForToken($cn, null); })
+ @init{ cn = factory.createCollectionExpressionNode();
+ } :
+ ('typeSelect' { addLeafNodeForToken($cn, null); }) ('(' { addLeafNodeForToken($cn, null); }) (unnamed99=type { addToChildren(cn, unnamed99); }) (')' { addLeafNodeForToken($cn, null); })
| ((('collect' { addLeafNodeForToken($cn, null); })
| ('select' { addLeafNodeForToken($cn, null); })
| ('selectFirst' { addLeafNodeForToken($cn, null); })
@@ -307,36 +360,42 @@ collectionExpression returns [CompositeNode cn]
| ('exists' { addLeafNodeForToken($cn, null); })
| ('notExists' { addLeafNodeForToken($cn, null); })
| ('sortBy' { addLeafNodeForToken($cn, null); })
- | ('forAll' { addLeafNodeForToken($cn, null); }))) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed113=identifier { addToChildren(cn, unnamed113); }) ('|' { addLeafNodeForToken($cn, null); })))? (unnamed114=expression { addToChildren(cn, unnamed114); }) (')' { addLeafNodeForToken($cn, null); })
+ | ('forAll' { addLeafNodeForToken($cn, null); }))) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed100=identifier { addToChildren(cn, unnamed100); }) ('|' { addLeafNodeForToken($cn, null); })))? (unnamed101=expression { addToChildren(cn, unnamed101); }) (')' { addLeafNodeForToken($cn, null); })
;
declaredParameterList returns [CompositeNode cn]
- @init{ cn = factory.createDeclaredParameterListNode(); cn.setRule("declaredParameterList"); } :
- (unnamed115=declaredParameter { addToChildren(cn, unnamed115); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed116=declaredParameter { addToChildren(cn, unnamed116); })))*
+ @init{ cn = factory.createDeclaredParameterListNode();
+ } :
+ (params=declaredParameter { addToChildren(cn, params); ((DeclaredParameterListNode) cn).getParams().add(params); }) (((',' { addLeafNodeForToken($cn, null); }) (params=declaredParameter { addToChildren(cn, params); ((DeclaredParameterListNode) cn).getParams().add(params); })))*
;
declaredParameter returns [CompositeNode cn]
- @init{ cn = factory.createDeclaredParameterNode(); cn.setRule("declaredParameter"); } :
- (unnamed117=type { addToChildren(cn, unnamed117); }) (unnamed118=identifier { addToChildren(cn, unnamed118); })
+ @init{ cn = factory.createDeclaredParameterNode();
+ } :
+ (ptype=type { addToChildren(cn, ptype); ((DeclaredParameterNode) cn).setPtype(ptype); }) (name=identifier { addToChildren(cn, name); ((DeclaredParameterNode) cn).setName(name); })
;
parameterList returns [CompositeNode cn]
- @init{ cn = factory.createParameterListNode(); cn.setRule("parameterList"); } :
- (unnamed119=expression { addToChildren(cn, unnamed119); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed120=expression { addToChildren(cn, unnamed120); })))*
+ @init{ cn = factory.createParameterListNode();
+ } :
+ (params=expression { addToChildren(cn, params); ((ParameterListNode) cn).getParams().add(params); }) (((',' { addLeafNodeForToken($cn, null); }) (params=expression { addToChildren(cn, params); ((ParameterListNode) cn).getParams().add(params); })))*
;
type returns [CompositeNode cn] :
(collectionType { $cn = $collectionType.cn; })
| (simpleType { $cn = $simpleType.cn; })
;
collectionType returns [CompositeNode cn]
- @init{ cn = factory.createCollectionTypeNode(); cn.setRule("collectionType"); } :
+ @init{ cn = factory.createCollectionTypeNode();
+ } :
((('Collection' { addLeafNodeForToken($cn, null); })
| ('List' { addLeafNodeForToken($cn, null); })
- | ('Set' { addLeafNodeForToken($cn, null); }))) ((('[' { addLeafNodeForToken($cn, null); }) (unnamed121=simpleType { addToChildren(cn, unnamed121); }) (']' { addLeafNodeForToken($cn, null); })))?
+ | ('Set' { addLeafNodeForToken($cn, null); }))) ((('[' { addLeafNodeForToken($cn, null); }) (unnamed102=simpleType { addToChildren(cn, unnamed102); }) (']' { addLeafNodeForToken($cn, null); })))?
;
simpleType returns [CompositeNode cn]
- @init{ cn = factory.createSimpleTypeNode(); cn.setRule("simpleType"); } :
- (unnamed122=identifier { addToChildren(cn, unnamed122); }) ((('::' { addLeafNodeForToken($cn, null); }) (unnamed123=identifier { addToChildren(cn, unnamed123); })))*
+ @init{ cn = factory.createSimpleTypeNode();
+ } :
+ (names=identifier { addToChildren(cn, names); ((SimpleTypeNode) cn).getNames().add(names); }) ((('::' { addLeafNodeForToken($cn, null); }) (names=identifier { addToChildren(cn, names); ((SimpleTypeNode) cn).getNames().add(names); })))*
;
identifier returns [CompositeNode cn]
- @init{ cn = factory.createIdentifierNode(); cn.setRule("identifier"); } :
+ @init{ cn = factory.createIdentifierNode();
+ } :
(Identifier { addLeafNodeForToken($cn, null); })
;
diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java
index 8a32c8c..153fffd 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-06 09:17:21
+// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-06 16:05:47
package org.eclipse.xpand3.parser;
@@ -1765,10 +1765,10 @@ public class Xpand3NodeLexer extends Lexer {
public void mIntLiteral() throws RecognitionException {
try {
int _type = IntLiteral;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -1780,23 +1780,23 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("344:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input);
+ new NoViableAltException("403:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input);
throw nvae;
}
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:4: '0'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:4: '0'
{
match('0');
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:10: '1' .. '9' ( '0' .. '9' )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:10: '1' .. '9' ( '0' .. '9' )*
{
matchRange('1','9');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:19: ( '0' .. '9' )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:19: ( '0' .. '9' )*
loop1:
do {
int alt1=2;
@@ -1809,7 +1809,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:19: '0' .. '9'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:19: '0' .. '9'
{
matchRange('0','9');
@@ -1841,7 +1841,7 @@ public class Xpand3NodeLexer extends Lexer {
public void mStringLiteral() throws RecognitionException {
try {
int _type = StringLiteral;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -1853,16 +1853,16 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("347:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input);
+ new NoViableAltException("406:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input);
throw nvae;
}
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"'
{
match('\"');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )*
loop3:
do {
int alt3=3;
@@ -1878,14 +1878,14 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:10: EscapeSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:10: EscapeSequence
{
mEscapeSequence();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:27: ~ ( '\\\\' | '\\\"' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:27: ~ ( '\\\\' | '\\\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1911,10 +1911,10 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\''
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )*
loop4:
do {
int alt4=3;
@@ -1930,14 +1930,14 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:15: EscapeSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:15: EscapeSequence
{
mEscapeSequence();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:32: ~ ( '\\'' | '\\\\' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:32: ~ ( '\\'' | '\\\\' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1974,7 +1974,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start EscapeSequence
public void mEscapeSequence() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:353:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape )
int alt6=3;
int LA6_0 = input.LA(1);
@@ -2011,7 +2011,7 @@ public class Xpand3NodeLexer extends Lexer {
break;
default:
NoViableAltException nvae =
- new NoViableAltException("352:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input);
+ new NoViableAltException("411:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input);
throw nvae;
}
@@ -2019,13 +2019,13 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("352:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input);
+ new NoViableAltException("411:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:353:3: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:3: '\\\\' ( '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' ) {
@@ -2042,14 +2042,14 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:9: UnicodeEscape
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:9: UnicodeEscape
{
mUnicodeEscape();
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:9: OctalEscape
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:9: OctalEscape
{
mOctalEscape();
@@ -2066,7 +2066,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start OctalEscape
public void mOctalEscape() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
int alt7=3;
int LA7_0 = input.LA(1);
@@ -2099,38 +2099,38 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("358:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input);
+ new NoViableAltException("417:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input);
throw nvae;
}
}
else {
NoViableAltException nvae =
- new NoViableAltException("358:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input);
+ new NoViableAltException("417:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input);
throw nvae;
}
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
{
match('\\');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:8: ( '0' .. '3' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:9: '0' .. '3'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:8: ( '0' .. '3' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:9: '0' .. '3'
{
matchRange('0','3');
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:19: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:20: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:19: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:20: '0' .. '7'
{
matchRange('0','7');
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:30: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:359:31: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:30: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:31: '0' .. '7'
{
matchRange('0','7');
@@ -2140,18 +2140,18 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
{
match('\\');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:14: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:15: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:14: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:15: '0' .. '7'
{
matchRange('0','7');
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:25: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:26: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:25: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:26: '0' .. '7'
{
matchRange('0','7');
@@ -2161,11 +2161,11 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:9: '\\\\' ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:9: '\\\\' ( '0' .. '7' )
{
match('\\');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:14: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:15: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:14: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:15: '0' .. '7'
{
matchRange('0','7');
@@ -2185,8 +2185,8 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start UnicodeEscape
public void mUnicodeEscape() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:365:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:365:3: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:3: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
{
match('\\');
match('u');
@@ -2206,8 +2206,8 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start HexDigit
public void mHexDigit() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:369:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:369:3: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:428:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:428:3: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
input.consume();
@@ -2232,8 +2232,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mDEFINE() throws RecognitionException {
try {
int _type = DEFINE;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:373:3: ( 'DEFINE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:373:3: 'DEFINE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:3: ( 'DEFINE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:3: 'DEFINE'
{
xpandMode=true;
match("DEFINE");
@@ -2252,8 +2252,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mENDDEFINE() throws RecognitionException {
try {
int _type = ENDDEFINE;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:377:3: ( 'ENDDEFINE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:377:3: 'ENDDEFINE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:3: ( 'ENDDEFINE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:3: 'ENDDEFINE'
{
match("ENDDEFINE");
@@ -2272,8 +2272,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mAROUND() throws RecognitionException {
try {
int _type = AROUND;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:3: ( 'AROUND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:3: 'AROUND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:440:3: ( 'AROUND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:440:3: 'AROUND'
{
xpandMode=true;
match("AROUND");
@@ -2292,8 +2292,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mENDAROUND() throws RecognitionException {
try {
int _type = ENDAROUND;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:385:3: ( 'ENDAROUND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:385:3: 'ENDAROUND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: ( 'ENDAROUND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: 'ENDAROUND'
{
match("ENDAROUND");
@@ -2312,10 +2312,10 @@ public class Xpand3NodeLexer extends Lexer {
public void mIdentifier() throws RecognitionException {
try {
int _type = Identifier;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:389:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:389:3: ( '^' )? Letter ( Letter | JavaIDDigit )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:3: ( '^' )? Letter ( Letter | JavaIDDigit )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:389:3: ( '^' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:3: ( '^' )?
int alt8=2;
int LA8_0 = input.LA(1);
@@ -2324,7 +2324,7 @@ public class Xpand3NodeLexer extends Lexer {
}
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:389:4: '^'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:4: '^'
{
match('^');
@@ -2334,7 +2334,7 @@ public class Xpand3NodeLexer extends Lexer {
}
mLetter();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:389:17: ( Letter | JavaIDDigit )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:17: ( Letter | JavaIDDigit )*
loop9:
do {
int alt9=2;
@@ -2381,7 +2381,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start Letter
public void mLetter() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:393:3: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:3: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:
{
if ( input.LA(1)=='$'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00D6')||(input.LA(1)>='\u00D8' && input.LA(1)<='\u00F6')||(input.LA(1)>='\u00F8' && input.LA(1)<='\u1FFF')||(input.LA(1)>='\u3040' && input.LA(1)<='\u318F')||(input.LA(1)>='\u3300' && input.LA(1)<='\u337F')||(input.LA(1)>='\u3400' && input.LA(1)<='\u3D2D')||(input.LA(1)>='\u4E00' && input.LA(1)<='\u9FFF')||(input.LA(1)>='\uF900' && input.LA(1)<='\uFAFF') ) {
@@ -2406,7 +2406,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start JavaIDDigit
public void mJavaIDDigit() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:8: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:8: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='\u0660' && input.LA(1)<='\u0669')||(input.LA(1)>='\u06F0' && input.LA(1)<='\u06F9')||(input.LA(1)>='\u0966' && input.LA(1)<='\u096F')||(input.LA(1)>='\u09E6' && input.LA(1)<='\u09EF')||(input.LA(1)>='\u0A66' && input.LA(1)<='\u0A6F')||(input.LA(1)>='\u0AE6' && input.LA(1)<='\u0AEF')||(input.LA(1)>='\u0B66' && input.LA(1)<='\u0B6F')||(input.LA(1)>='\u0BE7' && input.LA(1)<='\u0BEF')||(input.LA(1)>='\u0C66' && input.LA(1)<='\u0C6F')||(input.LA(1)>='\u0CE6' && input.LA(1)<='\u0CEF')||(input.LA(1)>='\u0D66' && input.LA(1)<='\u0D6F')||(input.LA(1)>='\u0E50' && input.LA(1)<='\u0E59')||(input.LA(1)>='\u0ED0' && input.LA(1)<='\u0ED9')||(input.LA(1)>='\u1040' && input.LA(1)<='\u1049') ) {
@@ -2432,8 +2432,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mWS() throws RecognitionException {
try {
int _type = WS;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:429:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:429:3: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:488:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:488:3: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||(input.LA(1)>='\f' && input.LA(1)<='\r')||input.LA(1)==' ' ) {
input.consume();
@@ -2460,12 +2460,12 @@ public class Xpand3NodeLexer extends Lexer {
public void mCOMMENT() throws RecognitionException {
try {
int _type = COMMENT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:3: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:3: '/*' ( options {greedy=false; } : . )* '*/'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:3: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:3: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:8: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:8: ( options {greedy=false; } : . )*
loop10:
do {
int alt10=2;
@@ -2490,7 +2490,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:36: .
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:36: .
{
matchAny();
@@ -2519,12 +2519,12 @@ public class Xpand3NodeLexer extends Lexer {
public void mLINE_COMMENT() throws RecognitionException {
try {
int _type = LINE_COMMENT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF )
{
match("//");
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:8: (~ ( '\\n' | '\\r' ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:8: (~ ( '\\n' | '\\r' ) )*
loop11:
do {
int alt11=2;
@@ -2537,7 +2537,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:8: ~ ( '\\n' | '\\r' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:8: ~ ( '\\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();
@@ -2558,7 +2558,7 @@ public class Xpand3NodeLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:22: ( ( '\\r' )? '\\n' | EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:22: ( ( '\\r' )? '\\n' | EOF )
int alt13=2;
int LA13_0 = input.LA(1);
@@ -2569,9 +2569,9 @@ public class Xpand3NodeLexer extends Lexer {
alt13=2;}
switch (alt13) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:23: ( '\\r' )? '\\n'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:23: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:23: ( '\\r' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:23: ( '\\r' )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -2580,7 +2580,7 @@ public class Xpand3NodeLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:23: '\\r'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:23: '\\r'
{
match('\r');
@@ -2594,7 +2594,7 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:34: EOF
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:34: EOF
{
match(EOF);
@@ -2618,8 +2618,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mREM_COMMENT_OUT() throws RecognitionException {
try {
int _type = REM_COMMENT_OUT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:441:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:441:3: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:3: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG
{
if ( !(!xpandMode) ) {
throw new FailedPredicateException(input, "REM_COMMENT_OUT", "!xpandMode");
@@ -2628,7 +2628,7 @@ public class Xpand3NodeLexer extends Lexer {
match("REM");
mRG();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:441:31: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:31: ( options {greedy=false; } : . )*
loop14:
do {
int alt14=2;
@@ -2707,7 +2707,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt14) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:441:59: .
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:59: .
{
matchAny();
@@ -2737,8 +2737,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mREM_COMMENT() throws RecognitionException {
try {
int _type = REM_COMMENT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:3: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:3: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM'
{
if ( !(xpandMode) ) {
throw new FailedPredicateException(input, "REM_COMMENT", "xpandMode");
@@ -2746,7 +2746,7 @@ public class Xpand3NodeLexer extends Lexer {
match("REM");
mRG();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:27: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:27: ( options {greedy=false; } : . )*
loop15:
do {
int alt15=2;
@@ -2816,7 +2816,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt15) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:55: .
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:55: .
{
matchAny();
@@ -2845,14 +2845,14 @@ public class Xpand3NodeLexer extends Lexer {
public void mTEXT() throws RecognitionException {
try {
int _type = TEXT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:3: ({...}? => RG (~ ( LG ) )* ( LG )? )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:3: {...}? => RG (~ ( LG ) )* ( LG )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: ({...}? => RG (~ ( LG ) )* ( LG )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: {...}? => RG (~ ( LG ) )* ( LG )?
{
if ( !(xpandMode) ) {
throw new FailedPredicateException(input, "TEXT", "xpandMode");
}
mRG();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:21: (~ ( LG ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:21: (~ ( LG ) )*
loop16:
do {
int alt16=2;
@@ -2865,7 +2865,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt16) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:21: ~ ( LG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:21: ~ ( LG )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -2886,7 +2886,7 @@ public class Xpand3NodeLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:28: ( LG )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:28: ( LG )?
int alt17=2;
int LA17_0 = input.LA(1);
@@ -2895,7 +2895,7 @@ public class Xpand3NodeLexer extends Lexer {
}
switch (alt17) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:29: LG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:29: LG
{
mLG();
@@ -2918,8 +2918,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mLG() throws RecognitionException {
try {
int _type = LG;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:3: ( '\\u00AB' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:3: '\\u00AB'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: ( '\\u00AB' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: '\\u00AB'
{
match('\u00AB');
@@ -2936,8 +2936,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mRG() throws RecognitionException {
try {
int _type = RG;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:457:3: ( '\\u00BB' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:457:3: '\\u00BB'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:516:3: ( '\\u00BB' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:516:3: '\\u00BB'
{
match('\u00BB');
diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java
index 0e13423..49044cc 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-06 09:17:20
+// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-06 16:05:46
package org.eclipse.xpand3.parser;
@@ -42,7 +42,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
public Xpand3NodeParser(TokenStream input) {
super(input);
- ruleMemo = new HashMap[60+1];
+ ruleMemo = new HashMap[61+1];
}
@@ -64,12 +64,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode decl = null;
- cn = factory.createFileNode(); cn.setRule("file");
+ cn = factory.createFileNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:2: ( ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:2: ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:2: ( ( (imp= nsImport ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (imp= nsImport ) ) )*
loop1:
do {
int alt1=2;
@@ -91,13 +92,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:3: ( (imp= nsImport ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (imp= nsImport ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:3: ( (imp= nsImport ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:4: (imp= nsImport )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (imp= nsImport ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (imp= nsImport )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:4: (imp= nsImport )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:5: imp= nsImport
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (imp= nsImport )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:5: imp= nsImport
{
pushFollow(FOLLOW_nsImport_in_file80);
imp=nsImport();
@@ -121,7 +122,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:85: ( ( (decl= abstractDeclaration ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:85: ( ( (decl= abstractDeclaration ) ) )*
loop2:
do {
int alt2=2;
@@ -134,13 +135,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:86: ( (decl= abstractDeclaration ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:86: ( (decl= abstractDeclaration ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:86: ( (decl= abstractDeclaration ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:87: (decl= abstractDeclaration )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:86: ( (decl= abstractDeclaration ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:87: (decl= abstractDeclaration )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:87: (decl= abstractDeclaration )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:88: decl= abstractDeclaration
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:87: (decl= abstractDeclaration )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:88: decl= abstractDeclaration
{
pushFollow(FOLLOW_abstractDeclaration_in_file93);
decl=abstractDeclaration();
@@ -164,8 +165,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:183: ( EOF )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:184: EOF
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:183: ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:184: EOF
{
match(input,EOF,FOLLOW_EOF_in_file102); if (failed) return cn;
@@ -190,7 +191,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start nsImport
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:34:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:35:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );
public CompositeNode nsImport() throws RecognitionException {
CompositeNode cn = null;
@@ -201,9 +202,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed1 = null;
- cn = factory.createNsImportNode(); cn.setRule("nsImport");
+ cn = factory.createNsImportNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:2: ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) )
int alt4=4;
switch ( input.LA(1) ) {
case LG:
@@ -219,7 +221,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("34:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 1, input);
+ new NoViableAltException("35:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 1, input);
throw nvae;
}
@@ -238,17 +240,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("34:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 0, input);
+ new NoViableAltException("35:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 0, input);
throw nvae;
}
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:2: ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:2: ( LG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:3: LG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( LG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:3: LG
{
match(input,LG,FOLLOW_LG_in_nsImport123); if (failed) return cn;
if ( backtracking==0 ) {
@@ -257,8 +259,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:43: ( 'IMPORT' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:44: 'IMPORT'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:43: ( 'IMPORT' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:44: 'IMPORT'
{
match(input,25,FOLLOW_25_in_nsImport129); if (failed) return cn;
if ( backtracking==0 ) {
@@ -267,8 +269,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:90: (ns= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:91: ns= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:90: (ns= simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:91: ns= simpleType
{
pushFollow(FOLLOW_simpleType_in_nsImport137);
ns=simpleType();
@@ -280,8 +282,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:164: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:165: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:164: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:165: RG
{
match(input,RG,FOLLOW_RG_in_nsImport143); if (failed) return cn;
if ( backtracking==0 ) {
@@ -294,10 +296,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:4: ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:4: ( LG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:5: LG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( LG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:5: LG
{
match(input,LG,FOLLOW_LG_in_nsImport152); if (failed) return cn;
if ( backtracking==0 ) {
@@ -306,8 +308,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:45: ( 'EXTENSION' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:46: 'EXTENSION'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:45: ( 'EXTENSION' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:46: 'EXTENSION'
{
match(input,26,FOLLOW_26_in_nsImport158); if (failed) return cn;
if ( backtracking==0 ) {
@@ -316,8 +318,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:95: (ns= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:96: ns= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:95: (ns= simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:96: ns= simpleType
{
pushFollow(FOLLOW_simpleType_in_nsImport166);
ns=simpleType();
@@ -329,8 +331,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:169: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:170: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:169: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:170: RG
{
match(input,RG,FOLLOW_RG_in_nsImport172); if (failed) return cn;
if ( backtracking==0 ) {
@@ -343,10 +345,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:4: ( 'import' ) (unnamed0= type ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:4: ( 'import' ) (unnamed0= type ) ( ';' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:4: ( 'import' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:5: 'import'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:4: ( 'import' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:5: 'import'
{
match(input,27,FOLLOW_27_in_nsImport181); if (failed) return cn;
if ( backtracking==0 ) {
@@ -355,8 +357,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:51: (unnamed0= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:52: unnamed0= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:51: (unnamed0= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:52: unnamed0= type
{
pushFollow(FOLLOW_type_in_nsImport189);
unnamed0=type();
@@ -368,8 +370,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:100: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:101: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:100: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:101: ';'
{
match(input,28,FOLLOW_28_in_nsImport195); if (failed) return cn;
if ( backtracking==0 ) {
@@ -382,10 +384,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:4: ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( 'extension' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:5: 'extension'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:4: ( 'extension' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:5: 'extension'
{
match(input,29,FOLLOW_29_in_nsImport204); if (failed) return cn;
if ( backtracking==0 ) {
@@ -394,8 +396,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:54: (unnamed1= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:55: unnamed1= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:54: (unnamed1= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:55: unnamed1= type
{
pushFollow(FOLLOW_type_in_nsImport212);
unnamed1=type();
@@ -407,7 +409,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:103: ( ( ( 'reexport' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:103: ( ( ( 'reexport' ) ) )?
int alt3=2;
int LA3_0 = input.LA(1);
@@ -416,13 +418,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:104: ( ( 'reexport' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:104: ( ( 'reexport' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:104: ( ( 'reexport' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:105: ( 'reexport' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:104: ( ( 'reexport' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:105: ( 'reexport' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:105: ( 'reexport' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:106: 'reexport'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:105: ( 'reexport' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:106: 'reexport'
{
match(input,30,FOLLOW_30_in_nsImport220); if (failed) return cn;
if ( backtracking==0 ) {
@@ -440,8 +442,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:157: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:158: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:157: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:158: ';'
{
match(input,28,FOLLOW_28_in_nsImport229); if (failed) return cn;
if ( backtracking==0 ) {
@@ -468,7 +470,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start abstractDeclaration
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );
public CompositeNode abstractDeclaration() throws RecognitionException {
CompositeNode cn = null;
@@ -484,7 +486,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:42:2: ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) )
int alt5=5;
switch ( input.LA(1) ) {
case 58:
@@ -512,16 +514,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
{
int LA5_4 = input.LA(2);
- if ( (LA5_4==AROUND) ) {
- alt5=5;
- }
- else if ( (LA5_4==DEFINE) ) {
+ if ( (LA5_4==DEFINE) ) {
alt5=4;
}
+ else if ( (LA5_4==AROUND) ) {
+ alt5=5;
+ }
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("41:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );", 5, 4, input);
+ new NoViableAltException("43:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );", 5, 4, input);
throw nvae;
}
@@ -530,17 +532,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("41:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );", 5, 0, input);
+ new NoViableAltException("43:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );", 5, 0, input);
throw nvae;
}
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:42:2: ( check )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( check )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:42:2: ( check )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:42:3: check
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( check )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:3: check
{
pushFollow(FOLLOW_check_in_abstractDeclaration247);
check1=check();
@@ -556,10 +558,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:4: ( around )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( around )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:4: ( around )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:5: around
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( around )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:5: around
{
pushFollow(FOLLOW_around_in_abstractDeclaration256);
around2=around();
@@ -575,10 +577,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:4: ( extension )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( extension )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:4: ( extension )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:5: extension
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( extension )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:5: extension
{
pushFollow(FOLLOW_extension_in_abstractDeclaration265);
extension3=extension();
@@ -594,10 +596,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( definition )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:4: ( definition )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( definition )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:5: definition
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:4: ( definition )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:5: definition
{
pushFollow(FOLLOW_definition_in_abstractDeclaration274);
definition4=definition();
@@ -613,10 +615,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 5 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( definitionAround )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:4: ( definitionAround )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( definitionAround )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:5: definitionAround
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:4: ( definitionAround )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:5: definitionAround
{
pushFollow(FOLLOW_definitionAround_in_abstractDeclaration283);
definitionAround5=definitionAround();
@@ -646,7 +648,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start definition
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:1: definition returns [CompositeNode cn] : ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:1: definition returns [CompositeNode cn] : ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG ) ;
public CompositeNode definition() throws RecognitionException {
CompositeNode cn = null;
@@ -659,13 +661,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed4 = null;
- cn = factory.createDefinitionNode(); cn.setRule("definition");
+ cn = factory.createDefinitionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:2: ( ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:2: ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:2: ( LG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:3: LG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( LG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:3: LG
{
match(input,LG,FOLLOW_LG_in_definition306); if (failed) return cn;
if ( backtracking==0 ) {
@@ -674,8 +677,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:43: ( DEFINE )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:44: DEFINE
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:43: ( DEFINE )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:44: DEFINE
{
match(input,DEFINE,FOLLOW_DEFINE_in_definition312); if (failed) return cn;
if ( backtracking==0 ) {
@@ -684,8 +687,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:88: (name= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:89: name= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:88: (name= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:89: name= identifier
{
pushFollow(FOLLOW_identifier_in_definition320);
name=identifier();
@@ -697,7 +700,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:172: ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:172: ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -706,13 +709,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:173: ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:173: ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:173: ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:174: ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:173: ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:174: ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:174: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:175: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:174: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:175: '('
{
match(input,31,FOLLOW_31_in_definition328); if (failed) return cn;
if ( backtracking==0 ) {
@@ -721,7 +724,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:216: ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:216: ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -730,9 +733,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -745,16 +748,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("50:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 8, 0, input);
+ new NoViableAltException("53:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 8, 0, input);
throw nvae;
}
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:218: (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:218: (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:218: (unnamed2= declaredParameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:219: unnamed2= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:218: (unnamed2= declaredParameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:219: unnamed2= declaredParameterList
{
pushFollow(FOLLOW_declaredParameterList_in_definition338);
unnamed2=declaredParameterList();
@@ -766,7 +769,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:284: ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:284: ( ( ( ',' )? ( '*' ) ) )?
int alt7=2;
int LA7_0 = input.LA(1);
@@ -775,12 +778,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:285: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:285: ( ( ',' )? ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:285: ( ( ',' )? ( '*' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:286: ( ',' )? ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:285: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:286: ( ',' )? ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:286: ( ',' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:286: ( ',' )?
int alt6=2;
int LA6_0 = input.LA(1);
@@ -789,7 +792,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:287: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:287: ','
{
match(input,32,FOLLOW_32_in_definition346); if (failed) return cn;
if ( backtracking==0 ) {
@@ -801,8 +804,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:329: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:330: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:329: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:330: '*'
{
match(input,33,FOLLOW_33_in_definition353); if (failed) return cn;
if ( backtracking==0 ) {
@@ -824,10 +827,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:4: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:4: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:5: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:5: '*'
{
match(input,33,FOLLOW_33_in_definition365); if (failed) return cn;
if ( backtracking==0 ) {
@@ -848,8 +851,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:49: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:50: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:49: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:50: ')'
{
match(input,34,FOLLOW_34_in_definition374); if (failed) return cn;
if ( backtracking==0 ) {
@@ -867,8 +870,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:94: ( 'FOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:95: 'FOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:94: ( 'FOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:95: 'FOR'
{
match(input,35,FOLLOW_35_in_definition383); if (failed) return cn;
if ( backtracking==0 ) {
@@ -877,8 +880,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:138: (unnamed3= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:139: unnamed3= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:138: (unnamed3= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:139: unnamed3= type
{
pushFollow(FOLLOW_type_in_definition391);
unnamed3=type();
@@ -890,8 +893,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:187: (unnamed4= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:188: unnamed4= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:187: (unnamed4= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:188: unnamed4= sequence
{
pushFollow(FOLLOW_sequence_in_definition399);
unnamed4=sequence();
@@ -903,8 +906,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:240: ( ENDDEFINE )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:241: ENDDEFINE
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:240: ( ENDDEFINE )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:241: ENDDEFINE
{
match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_definition405); if (failed) return cn;
if ( backtracking==0 ) {
@@ -913,8 +916,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:288: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:289: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:288: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:289: RG
{
match(input,RG,FOLLOW_RG_in_definition411); if (failed) return cn;
if ( backtracking==0 ) {
@@ -939,7 +942,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start definitionAround
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:1: definitionAround returns [CompositeNode cn] : ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:1: definitionAround returns [CompositeNode cn] : ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG ) ;
public CompositeNode definitionAround() throws RecognitionException {
CompositeNode cn = null;
@@ -952,13 +955,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed8 = null;
- cn = factory.createDefinitionAroundNode(); cn.setRule("definitionAround");
+ cn = factory.createDefinitionAroundNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:2: ( ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:2: ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:2: ( LG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:3: LG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( LG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:3: LG
{
match(input,LG,FOLLOW_LG_in_definitionAround434); if (failed) return cn;
if ( backtracking==0 ) {
@@ -967,8 +971,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:43: ( AROUND )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:44: AROUND
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:43: ( AROUND )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:44: AROUND
{
match(input,AROUND,FOLLOW_AROUND_in_definitionAround440); if (failed) return cn;
if ( backtracking==0 ) {
@@ -977,8 +981,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:88: (unnamed5= pointcut )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:89: unnamed5= pointcut
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:88: (unnamed5= pointcut )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:89: unnamed5= pointcut
{
pushFollow(FOLLOW_pointcut_in_definitionAround448);
unnamed5=pointcut();
@@ -990,7 +994,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:141: ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:141: ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
int alt15=2;
int LA15_0 = input.LA(1);
@@ -999,13 +1003,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt15) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:142: ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:142: ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:142: ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:143: ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:142: ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:143: ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:143: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:144: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:143: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:144: '('
{
match(input,31,FOLLOW_31_in_definitionAround456); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1014,7 +1018,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:185: ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:185: ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
int alt14=2;
int LA14_0 = input.LA(1);
@@ -1023,9 +1027,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt14) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
int alt13=2;
int LA13_0 = input.LA(1);
@@ -1038,16 +1042,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("55:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 13, 0, input);
+ new NoViableAltException("59:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 13, 0, input);
throw nvae;
}
switch (alt13) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:187: (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:187: (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:187: (unnamed6= declaredParameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:188: unnamed6= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:187: (unnamed6= declaredParameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:188: unnamed6= declaredParameterList
{
pushFollow(FOLLOW_declaredParameterList_in_definitionAround466);
unnamed6=declaredParameterList();
@@ -1059,7 +1063,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:253: ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:253: ( ( ( ',' )? ( '*' ) ) )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1068,12 +1072,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:254: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:254: ( ( ',' )? ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:254: ( ( ',' )? ( '*' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:255: ( ',' )? ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:254: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:255: ( ',' )? ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:255: ( ',' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:255: ( ',' )?
int alt11=2;
int LA11_0 = input.LA(1);
@@ -1082,7 +1086,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:256: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:256: ','
{
match(input,32,FOLLOW_32_in_definitionAround474); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1094,8 +1098,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:298: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:299: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:298: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:299: '*'
{
match(input,33,FOLLOW_33_in_definitionAround481); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1117,10 +1121,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:4: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:4: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:5: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:5: '*'
{
match(input,33,FOLLOW_33_in_definitionAround493); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1141,8 +1145,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:49: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:50: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:49: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:50: ')'
{
match(input,34,FOLLOW_34_in_definitionAround502); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1160,8 +1164,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:94: ( 'FOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:95: 'FOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:94: ( 'FOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:95: 'FOR'
{
match(input,35,FOLLOW_35_in_definitionAround511); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1170,8 +1174,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:138: (unnamed7= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:139: unnamed7= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:138: (unnamed7= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:139: unnamed7= type
{
pushFollow(FOLLOW_type_in_definitionAround519);
unnamed7=type();
@@ -1183,8 +1187,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:187: (unnamed8= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:188: unnamed8= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:187: (unnamed8= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:188: unnamed8= sequence
{
pushFollow(FOLLOW_sequence_in_definitionAround527);
unnamed8=sequence();
@@ -1196,8 +1200,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:240: ( ENDAROUND )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:241: ENDAROUND
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:240: ( ENDAROUND )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:241: ENDAROUND
{
match(input,ENDAROUND,FOLLOW_ENDAROUND_in_definitionAround533); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1206,8 +1210,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:288: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:289: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:288: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:289: RG
{
match(input,RG,FOLLOW_RG_in_definitionAround539); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1232,7 +1236,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start sequence
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:1: sequence returns [CompositeNode cn] : (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:62:1: sequence returns [CompositeNode cn] : (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )* ;
public CompositeNode sequence() throws RecognitionException {
CompositeNode cn = null;
@@ -1243,13 +1247,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed11 = null;
- cn = factory.createSequenceNode(); cn.setRule("sequence");
+ cn = factory.createSequenceNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:2: ( (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:2: (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: ( (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:2: (unnamed9= textSequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:3: unnamed9= textSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: (unnamed9= textSequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:3: unnamed9= textSequence
{
pushFollow(FOLLOW_textSequence_in_sequence564);
unnamed9=textSequence();
@@ -1261,7 +1266,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:59: ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:59: ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )*
loop16:
do {
int alt16=2;
@@ -1274,13 +1279,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt16) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:60: ( (unnamed10= statement ) (unnamed11= textSequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:60: ( (unnamed10= statement ) (unnamed11= textSequence ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:60: ( (unnamed10= statement ) (unnamed11= textSequence ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:61: (unnamed10= statement ) (unnamed11= textSequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:60: ( (unnamed10= statement ) (unnamed11= textSequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:61: (unnamed10= statement ) (unnamed11= textSequence )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:61: (unnamed10= statement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:62: unnamed10= statement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:61: (unnamed10= statement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:62: unnamed10= statement
{
pushFollow(FOLLOW_statement_in_sequence574);
unnamed10=statement();
@@ -1292,8 +1297,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:117: (unnamed11= textSequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:118: unnamed11= textSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:117: (unnamed11= textSequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:118: unnamed11= textSequence
{
pushFollow(FOLLOW_textSequence_in_sequence582);
unnamed11=textSequence();
@@ -1333,7 +1338,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start statement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:62:1: statement returns [CompositeNode cn] : ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:1: statement returns [CompositeNode cn] : ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) );
public CompositeNode statement() throws RecognitionException {
CompositeNode cn = null;
@@ -1351,7 +1356,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:63:2: ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) )
int alt17=6;
switch ( input.LA(1) ) {
case StringLiteral:
@@ -1415,17 +1420,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("62:1: statement returns [CompositeNode cn] : ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) );", 17, 0, input);
+ new NoViableAltException("67:1: statement returns [CompositeNode cn] : ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) );", 17, 0, input);
throw nvae;
}
switch (alt17) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:63:2: ( simpleStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( simpleStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:63:2: ( simpleStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:63:3: simpleStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( simpleStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:3: simpleStatement
{
pushFollow(FOLLOW_simpleStatement_in_statement603);
simpleStatement6=simpleStatement();
@@ -1441,10 +1446,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:64:4: ( fileStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:4: ( fileStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:64:4: ( fileStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:64:5: fileStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:4: ( fileStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:5: fileStatement
{
pushFollow(FOLLOW_fileStatement_in_statement612);
fileStatement7=fileStatement();
@@ -1460,10 +1465,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:4: ( foreachStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:4: ( foreachStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:4: ( foreachStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:5: foreachStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:4: ( foreachStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:5: foreachStatement
{
pushFollow(FOLLOW_foreachStatement_in_statement621);
foreachStatement8=foreachStatement();
@@ -1479,10 +1484,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:4: ( ifStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:4: ( ifStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:4: ( ifStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:5: ifStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:4: ( ifStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:5: ifStatement
{
pushFollow(FOLLOW_ifStatement_in_statement630);
ifStatement9=ifStatement();
@@ -1498,10 +1503,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 5 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:4: ( letStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:4: ( letStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:4: ( letStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:5: letStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:4: ( letStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:5: letStatement
{
pushFollow(FOLLOW_letStatement_in_statement639);
letStatement10=letStatement();
@@ -1517,10 +1522,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 6 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:4: ( protectStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( protectStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:4: ( protectStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:5: protectStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( protectStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:5: protectStatement
{
pushFollow(FOLLOW_protectStatement_in_statement648);
protectStatement11=protectStatement();
@@ -1550,7 +1555,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start textSequence
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:1: textSequence returns [CompositeNode cn] : (unnamed12= text ) ( ( (unnamed13= text ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:75:1: textSequence returns [CompositeNode cn] : (unnamed12= text ) ( ( (unnamed13= text ) ) )* ;
public CompositeNode textSequence() throws RecognitionException {
CompositeNode cn = null;
@@ -1559,13 +1564,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed13 = null;
- cn = factory.createTextSequenceNode(); cn.setRule("textSequence");
+ cn = factory.createTextSequenceNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:2: ( (unnamed12= text ) ( ( (unnamed13= text ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:2: (unnamed12= text ) ( ( (unnamed13= text ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: ( (unnamed12= text ) ( ( (unnamed13= text ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (unnamed12= text ) ( ( (unnamed13= text ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:2: (unnamed12= text )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:3: unnamed12= text
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (unnamed12= text )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:3: unnamed12= text
{
pushFollow(FOLLOW_text_in_textSequence678);
unnamed12=text();
@@ -1577,7 +1583,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:53: ( ( (unnamed13= text ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:53: ( ( (unnamed13= text ) ) )*
loop18:
do {
int alt18=2;
@@ -1599,13 +1605,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt18) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:54: ( (unnamed13= text ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:54: ( (unnamed13= text ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:54: ( (unnamed13= text ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:55: (unnamed13= text )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:54: ( (unnamed13= text ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:55: (unnamed13= text )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:55: (unnamed13= text )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:56: unnamed13= text
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:55: (unnamed13= text )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:56: unnamed13= text
{
pushFollow(FOLLOW_text_in_textSequence688);
unnamed13=text();
@@ -1648,16 +1654,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start text
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:75:1: text returns [CompositeNode cn] : ( '-' )? ( TEXT ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:81:1: text returns [CompositeNode cn] : ( '-' )? ( TEXT ) ;
public CompositeNode text() throws RecognitionException {
CompositeNode cn = null;
- cn = factory.createTextNode(); cn.setRule("text");
+ cn = factory.createTextNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:2: ( ( '-' )? ( TEXT ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:2: ( '-' )? ( TEXT )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:2: ( ( '-' )? ( TEXT ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:2: ( '-' )? ( TEXT )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:2: ( '-' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:2: ( '-' )?
int alt19=2;
int LA19_0 = input.LA(1);
@@ -1666,7 +1673,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt19) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:3: '-'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:3: '-'
{
match(input,36,FOLLOW_36_in_text714); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1678,8 +1685,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:45: ( TEXT )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:46: TEXT
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:45: ( TEXT )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:46: TEXT
{
match(input,TEXT,FOLLOW_TEXT_in_text721); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1704,7 +1711,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start simpleStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:1: simpleStatement returns [CompositeNode cn] : ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:1: simpleStatement returns [CompositeNode cn] : ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) );
public CompositeNode simpleStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -1716,7 +1723,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:2: ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) )
int alt20=3;
switch ( input.LA(1) ) {
case 37:
@@ -1763,17 +1770,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("79:1: simpleStatement returns [CompositeNode cn] : ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) );", 20, 0, input);
+ new NoViableAltException("86:1: simpleStatement returns [CompositeNode cn] : ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) );", 20, 0, input);
throw nvae;
}
switch (alt20) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:2: ( errorStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( errorStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:2: ( errorStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:3: errorStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( errorStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:3: errorStatement
{
pushFollow(FOLLOW_errorStatement_in_simpleStatement739);
errorStatement12=errorStatement();
@@ -1789,10 +1796,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:81:4: ( expandStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( expandStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:81:4: ( expandStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:81:5: expandStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( expandStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:5: expandStatement
{
pushFollow(FOLLOW_expandStatement_in_simpleStatement748);
expandStatement13=expandStatement();
@@ -1808,10 +1815,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:82:4: ( expressionStmt )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( expressionStmt )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:82:4: ( expressionStmt )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:82:5: expressionStmt
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( expressionStmt )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:5: expressionStmt
{
pushFollow(FOLLOW_expressionStmt_in_simpleStatement757);
expressionStmt14=expressionStmt();
@@ -1841,20 +1848,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start errorStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:1: errorStatement returns [CompositeNode cn] : ( 'ERROR' ) (unnamed14= expression ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:1: errorStatement returns [CompositeNode cn] : ( 'ERROR' ) (unnamed14= expression ) ;
public CompositeNode errorStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed14 = null;
- cn = factory.createErrorStatementNode(); cn.setRule("errorStatement");
+ cn = factory.createErrorStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:2: ( ( 'ERROR' ) (unnamed14= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:2: ( 'ERROR' ) (unnamed14= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( ( 'ERROR' ) (unnamed14= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( 'ERROR' ) (unnamed14= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:2: ( 'ERROR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:3: 'ERROR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( 'ERROR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:3: 'ERROR'
{
match(input,37,FOLLOW_37_in_errorStatement780); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1863,8 +1871,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:48: (unnamed14= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:49: unnamed14= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:48: (unnamed14= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:49: unnamed14= expression
{
pushFollow(FOLLOW_expression_in_errorStatement788);
unnamed14=expression();
@@ -1892,7 +1900,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start expandStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:1: expandStatement returns [CompositeNode cn] : ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )? ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:1: expandStatement returns [CompositeNode cn] : ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )? ;
public CompositeNode expandStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -1907,13 +1915,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed19 = null;
- cn = factory.createExpandStatementNode(); cn.setRule("expandStatement");
+ cn = factory.createExpandStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:2: ( ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )? )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:2: ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:2: ( 'EXPAND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:3: 'EXPAND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'EXPAND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:3: 'EXPAND'
{
match(input,38,FOLLOW_38_in_expandStatement811); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1922,8 +1931,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:49: (unnamed15= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:50: unnamed15= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:49: (unnamed15= simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:50: unnamed15= simpleType
{
pushFollow(FOLLOW_simpleType_in_expandStatement819);
unnamed15=simpleType();
@@ -1935,7 +1944,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:106: ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:106: ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )?
int alt21=2;
int LA21_0 = input.LA(1);
@@ -1944,13 +1953,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt21) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:107: ( ( '(' ) (unnamed16= parameterList ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:107: ( ( '(' ) (unnamed16= parameterList ) ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:107: ( ( '(' ) (unnamed16= parameterList ) ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:108: ( '(' ) (unnamed16= parameterList ) ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:107: ( ( '(' ) (unnamed16= parameterList ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:108: ( '(' ) (unnamed16= parameterList ) ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:108: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:109: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:108: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:109: '('
{
match(input,31,FOLLOW_31_in_expandStatement827); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1959,8 +1968,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:150: (unnamed16= parameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:151: unnamed16= parameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:150: (unnamed16= parameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:151: unnamed16= parameterList
{
pushFollow(FOLLOW_parameterList_in_expandStatement835);
unnamed16=parameterList();
@@ -1972,8 +1981,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:210: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:211: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:210: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:211: ')'
{
match(input,34,FOLLOW_34_in_expandStatement841); if (failed) return cn;
if ( backtracking==0 ) {
@@ -1991,7 +2000,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:255: ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:255: ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )?
int alt24=2;
int LA24_0 = input.LA(1);
@@ -2000,9 +2009,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt24) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )
int alt23=2;
int LA23_0 = input.LA(1);
@@ -2015,22 +2024,22 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("90:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )", 23, 0, input);
+ new NoViableAltException("99:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )", 23, 0, input);
throw nvae;
}
switch (alt23) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:257: ( ( ( 'FOR' ) (unnamed17= expression ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:257: ( ( ( 'FOR' ) (unnamed17= expression ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:257: ( ( ( 'FOR' ) (unnamed17= expression ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:258: ( ( 'FOR' ) (unnamed17= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:257: ( ( ( 'FOR' ) (unnamed17= expression ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:258: ( ( 'FOR' ) (unnamed17= expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:258: ( ( 'FOR' ) (unnamed17= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:259: ( 'FOR' ) (unnamed17= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:258: ( ( 'FOR' ) (unnamed17= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:259: ( 'FOR' ) (unnamed17= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:259: ( 'FOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:260: 'FOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:259: ( 'FOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:260: 'FOR'
{
match(input,35,FOLLOW_35_in_expandStatement854); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2039,8 +2048,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:303: (unnamed17= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:90:304: unnamed17= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:303: (unnamed17= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:304: unnamed17= expression
{
pushFollow(FOLLOW_expression_in_expandStatement862);
unnamed17=expression();
@@ -2062,16 +2071,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:4: ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:4: ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:4: ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:5: ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:4: ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:5: ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:5: ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:6: ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:5: ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:6: ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:6: ( 'FOREACH' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:7: 'FOREACH'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:6: ( 'FOREACH' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:7: 'FOREACH'
{
match(input,39,FOLLOW_39_in_expandStatement875); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2080,8 +2089,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:54: (unnamed18= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:55: unnamed18= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:54: (unnamed18= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:55: unnamed18= expression
{
pushFollow(FOLLOW_expression_in_expandStatement883);
unnamed18=expression();
@@ -2093,7 +2102,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:111: ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:111: ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )?
int alt22=2;
int LA22_0 = input.LA(1);
@@ -2102,13 +2111,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt22) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:112: ( ( 'SEPARATOR' ) (unnamed19= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:112: ( ( 'SEPARATOR' ) (unnamed19= expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:112: ( ( 'SEPARATOR' ) (unnamed19= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:113: ( 'SEPARATOR' ) (unnamed19= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:112: ( ( 'SEPARATOR' ) (unnamed19= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:113: ( 'SEPARATOR' ) (unnamed19= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:113: ( 'SEPARATOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:114: 'SEPARATOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:113: ( 'SEPARATOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:114: 'SEPARATOR'
{
match(input,40,FOLLOW_40_in_expandStatement891); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2117,8 +2126,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:163: (unnamed19= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:164: unnamed19= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:163: (unnamed19= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:164: unnamed19= expression
{
pushFollow(FOLLOW_expression_in_expandStatement899);
unnamed19=expression();
@@ -2173,20 +2182,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start expressionStmt
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:93:1: expressionStmt returns [CompositeNode cn] : (unnamed20= expression ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:1: expressionStmt returns [CompositeNode cn] : (unnamed20= expression ) ;
public CompositeNode expressionStmt() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed20 = null;
- cn = factory.createExpressionStmtNode(); cn.setRule("expressionStmt");
+ cn = factory.createExpressionStmtNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:2: ( (unnamed20= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:2: (unnamed20= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: ( (unnamed20= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: (unnamed20= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:2: (unnamed20= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:3: unnamed20= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: (unnamed20= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:3: unnamed20= expression
{
pushFollow(FOLLOW_expression_in_expressionStmt932);
unnamed20=expression();
@@ -2214,7 +2224,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start fileStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:97:1: fileStatement returns [CompositeNode cn] : ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:1: fileStatement returns [CompositeNode cn] : ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' ) ;
public CompositeNode fileStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -2225,13 +2235,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed23 = null;
- cn = factory.createFileStatementNode(); cn.setRule("fileStatement");
+ cn = factory.createFileStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'FILE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:3: 'FILE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( 'FILE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:3: 'FILE'
{
match(input,41,FOLLOW_41_in_fileStatement955); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2240,8 +2251,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:47: (unnamed21= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:48: unnamed21= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:47: (unnamed21= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:48: unnamed21= expression
{
pushFollow(FOLLOW_expression_in_fileStatement963);
unnamed21=expression();
@@ -2253,7 +2264,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:104: ( ( (unnamed22= identifier ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:104: ( ( (unnamed22= identifier ) ) )?
int alt25=2;
int LA25_0 = input.LA(1);
@@ -2262,13 +2273,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt25) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:105: ( (unnamed22= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:105: ( (unnamed22= identifier ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:105: ( (unnamed22= identifier ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:106: (unnamed22= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:105: ( (unnamed22= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:106: (unnamed22= identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:106: (unnamed22= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:107: unnamed22= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:106: (unnamed22= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:107: unnamed22= identifier
{
pushFollow(FOLLOW_identifier_in_fileStatement973);
unnamed22=identifier();
@@ -2289,8 +2300,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:166: (unnamed23= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:167: unnamed23= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:166: (unnamed23= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:167: unnamed23= sequence
{
pushFollow(FOLLOW_sequence_in_fileStatement984);
unnamed23=sequence();
@@ -2302,8 +2313,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:221: ( 'ENDFILE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:222: 'ENDFILE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:221: ( 'ENDFILE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:222: 'ENDFILE'
{
match(input,42,FOLLOW_42_in_fileStatement990); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2328,7 +2339,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start foreachStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:1: foreachStatement returns [CompositeNode cn] : ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:112:1: foreachStatement returns [CompositeNode cn] : ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' ) ;
public CompositeNode foreachStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -2343,13 +2354,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed28 = null;
- cn = factory.createForeachStatementNode(); cn.setRule("foreachStatement");
+ cn = factory.createForeachStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:2: ( ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:2: ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:2: ( 'FOREACH' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:3: 'FOREACH'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'FOREACH' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:3: 'FOREACH'
{
match(input,39,FOLLOW_39_in_foreachStatement1013); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2358,8 +2370,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:50: (unnamed24= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:51: unnamed24= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:50: (unnamed24= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:51: unnamed24= expression
{
pushFollow(FOLLOW_expression_in_foreachStatement1021);
unnamed24=expression();
@@ -2371,8 +2383,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:107: ( 'AS' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:108: 'AS'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:107: ( 'AS' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:108: 'AS'
{
match(input,43,FOLLOW_43_in_foreachStatement1027); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2381,8 +2393,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:150: (unnamed25= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:151: unnamed25= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:150: (unnamed25= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:151: unnamed25= identifier
{
pushFollow(FOLLOW_identifier_in_foreachStatement1035);
unnamed25=identifier();
@@ -2394,7 +2406,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:207: ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:207: ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )?
int alt26=2;
int LA26_0 = input.LA(1);
@@ -2403,13 +2415,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt26) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:208: ( ( 'ITERATOR' ) (unnamed26= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:208: ( ( 'ITERATOR' ) (unnamed26= identifier ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:208: ( ( 'ITERATOR' ) (unnamed26= identifier ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:209: ( 'ITERATOR' ) (unnamed26= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:208: ( ( 'ITERATOR' ) (unnamed26= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:209: ( 'ITERATOR' ) (unnamed26= identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:209: ( 'ITERATOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:210: 'ITERATOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:209: ( 'ITERATOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:210: 'ITERATOR'
{
match(input,44,FOLLOW_44_in_foreachStatement1043); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2418,8 +2430,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:258: (unnamed26= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:259: unnamed26= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:258: (unnamed26= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:259: unnamed26= identifier
{
pushFollow(FOLLOW_identifier_in_foreachStatement1051);
unnamed26=identifier();
@@ -2440,7 +2452,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:318: ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:318: ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )?
int alt27=2;
int LA27_0 = input.LA(1);
@@ -2449,13 +2461,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt27) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:319: ( ( 'SEPARATOR' ) (unnamed27= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:319: ( ( 'SEPARATOR' ) (unnamed27= expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:319: ( ( 'SEPARATOR' ) (unnamed27= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:320: ( 'SEPARATOR' ) (unnamed27= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:319: ( ( 'SEPARATOR' ) (unnamed27= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:320: ( 'SEPARATOR' ) (unnamed27= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:320: ( 'SEPARATOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:321: 'SEPARATOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:320: ( 'SEPARATOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:321: 'SEPARATOR'
{
match(input,40,FOLLOW_40_in_foreachStatement1062); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2464,8 +2476,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:370: (unnamed27= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:371: unnamed27= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:370: (unnamed27= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:371: unnamed27= expression
{
pushFollow(FOLLOW_expression_in_foreachStatement1070);
unnamed27=expression();
@@ -2486,8 +2498,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:430: (unnamed28= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:431: unnamed28= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:430: (unnamed28= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:431: unnamed28= sequence
{
pushFollow(FOLLOW_sequence_in_foreachStatement1081);
unnamed28=sequence();
@@ -2499,8 +2511,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:485: ( 'ENDFOREACH' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:103:486: 'ENDFOREACH'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:485: ( 'ENDFOREACH' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:486: 'ENDFOREACH'
{
match(input,45,FOLLOW_45_in_foreachStatement1087); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2525,7 +2537,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start ifStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:1: ifStatement returns [CompositeNode cn] : ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:117:1: ifStatement returns [CompositeNode cn] : ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' ) ;
public CompositeNode ifStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -2538,13 +2550,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed32 = null;
- cn = factory.createIfStatementNode(); cn.setRule("ifStatement");
+ cn = factory.createIfStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:2: ( ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:2: ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:2: ( 'IF' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:3: 'IF'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'IF' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:3: 'IF'
{
match(input,46,FOLLOW_46_in_ifStatement1110); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2553,8 +2566,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:45: (unnamed29= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:46: unnamed29= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:45: (unnamed29= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:46: unnamed29= expression
{
pushFollow(FOLLOW_expression_in_ifStatement1118);
unnamed29=expression();
@@ -2566,8 +2579,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:102: (unnamed30= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:103: unnamed30= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:102: (unnamed30= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:103: unnamed30= sequence
{
pushFollow(FOLLOW_sequence_in_ifStatement1126);
unnamed30=sequence();
@@ -2579,7 +2592,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:157: (unnamed31= elseIfStatement )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:157: (unnamed31= elseIfStatement )*
loop28:
do {
int alt28=2;
@@ -2592,7 +2605,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt28) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:158: unnamed31= elseIfStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:158: unnamed31= elseIfStatement
{
pushFollow(FOLLOW_elseIfStatement_in_ifStatement1134);
unnamed31=elseIfStatement();
@@ -2610,7 +2623,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:220: (unnamed32= elseStatement )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:220: (unnamed32= elseStatement )?
int alt29=2;
int LA29_0 = input.LA(1);
@@ -2619,7 +2632,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt29) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:221: unnamed32= elseStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:221: unnamed32= elseStatement
{
pushFollow(FOLLOW_elseStatement_in_ifStatement1143);
unnamed32=elseStatement();
@@ -2634,8 +2647,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:281: ( 'ENDIF' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:282: 'ENDIF'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:281: ( 'ENDIF' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:282: 'ENDIF'
{
match(input,47,FOLLOW_47_in_ifStatement1150); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2660,7 +2673,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start elseIfStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:109:1: elseIfStatement returns [CompositeNode cn] : ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:122:1: elseIfStatement returns [CompositeNode cn] : ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence ) ;
public CompositeNode elseIfStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -2669,13 +2682,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed34 = null;
- cn = factory.createElseIfStatementNode(); cn.setRule("elseIfStatement");
+ cn = factory.createElseIfStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:2: ( ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:2: ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:2: ( 'ELSEIF' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:3: 'ELSEIF'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( 'ELSEIF' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:3: 'ELSEIF'
{
match(input,48,FOLLOW_48_in_elseIfStatement1173); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2684,8 +2698,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:49: (unnamed33= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:50: unnamed33= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:49: (unnamed33= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:50: unnamed33= expression
{
pushFollow(FOLLOW_expression_in_elseIfStatement1181);
unnamed33=expression();
@@ -2697,8 +2711,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:106: (unnamed34= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:107: unnamed34= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:106: (unnamed34= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:107: unnamed34= sequence
{
pushFollow(FOLLOW_sequence_in_elseIfStatement1189);
unnamed34=sequence();
@@ -2726,20 +2740,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start elseStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:1: elseStatement returns [CompositeNode cn] : ( 'ELSE' ) (unnamed35= sequence ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:1: elseStatement returns [CompositeNode cn] : ( 'ELSE' ) (unnamed35= sequence ) ;
public CompositeNode elseStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed35 = null;
- cn = factory.createElseStatementNode(); cn.setRule("elseStatement");
+ cn = factory.createElseStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( ( 'ELSE' ) (unnamed35= sequence ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'ELSE' ) (unnamed35= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( ( 'ELSE' ) (unnamed35= sequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( 'ELSE' ) (unnamed35= sequence )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'ELSE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:3: 'ELSE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( 'ELSE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:3: 'ELSE'
{
match(input,49,FOLLOW_49_in_elseStatement1212); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2748,8 +2763,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:47: (unnamed35= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:48: unnamed35= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:47: (unnamed35= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:48: unnamed35= sequence
{
pushFollow(FOLLOW_sequence_in_elseStatement1220);
unnamed35=sequence();
@@ -2777,7 +2792,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start letStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:117:1: letStatement returns [CompositeNode cn] : ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:1: letStatement returns [CompositeNode cn] : ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' ) ;
public CompositeNode letStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -2788,13 +2803,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed38 = null;
- cn = factory.createLetStatementNode(); cn.setRule("letStatement");
+ cn = factory.createLetStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:2: ( ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:2: ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:2: ( 'LET' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:3: 'LET'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( 'LET' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:3: 'LET'
{
match(input,50,FOLLOW_50_in_letStatement1243); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2803,8 +2819,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:46: (unnamed36= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:47: unnamed36= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:46: (unnamed36= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:47: unnamed36= expression
{
pushFollow(FOLLOW_expression_in_letStatement1251);
unnamed36=expression();
@@ -2816,8 +2832,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:103: ( 'AS' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:104: 'AS'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:103: ( 'AS' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:104: 'AS'
{
match(input,43,FOLLOW_43_in_letStatement1257); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2826,8 +2842,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:146: (unnamed37= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:147: unnamed37= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:146: (unnamed37= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:147: unnamed37= identifier
{
pushFollow(FOLLOW_identifier_in_letStatement1265);
unnamed37=identifier();
@@ -2839,8 +2855,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:203: (unnamed38= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:204: unnamed38= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:203: (unnamed38= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:204: unnamed38= sequence
{
pushFollow(FOLLOW_sequence_in_letStatement1273);
unnamed38=sequence();
@@ -2852,8 +2868,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:258: ( 'ENDLET' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:259: 'ENDLET'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:258: ( 'ENDLET' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:259: 'ENDLET'
{
match(input,51,FOLLOW_51_in_letStatement1279); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2878,7 +2894,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start protectStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:1: protectStatement returns [CompositeNode cn] : ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:1: protectStatement returns [CompositeNode cn] : ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' ) ;
public CompositeNode protectStatement() throws RecognitionException {
CompositeNode cn = null;
@@ -2891,13 +2907,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed42 = null;
- cn = factory.createProtectStatementNode(); cn.setRule("protectStatement");
+ cn = factory.createProtectStatementNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:2: ( ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:2: ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:2: ( 'PROTECT' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:3: 'PROTECT'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( 'PROTECT' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:3: 'PROTECT'
{
match(input,52,FOLLOW_52_in_protectStatement1302); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2906,8 +2923,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:50: ( 'CSTART' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:51: 'CSTART'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:50: ( 'CSTART' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:51: 'CSTART'
{
match(input,53,FOLLOW_53_in_protectStatement1308); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2916,8 +2933,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:97: (unnamed39= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:98: unnamed39= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:97: (unnamed39= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:98: unnamed39= expression
{
pushFollow(FOLLOW_expression_in_protectStatement1316);
unnamed39=expression();
@@ -2929,8 +2946,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:154: ( 'CEND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:155: 'CEND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:154: ( 'CEND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:155: 'CEND'
{
match(input,54,FOLLOW_54_in_protectStatement1322); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2939,8 +2956,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:199: (unnamed40= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:200: unnamed40= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:199: (unnamed40= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:200: unnamed40= expression
{
pushFollow(FOLLOW_expression_in_protectStatement1330);
unnamed40=expression();
@@ -2952,8 +2969,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:256: ( 'ID' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:257: 'ID'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:256: ( 'ID' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:257: 'ID'
{
match(input,55,FOLLOW_55_in_protectStatement1336); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2962,8 +2979,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:299: (unnamed41= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:300: unnamed41= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:299: (unnamed41= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:300: unnamed41= expression
{
pushFollow(FOLLOW_expression_in_protectStatement1344);
unnamed41=expression();
@@ -2975,7 +2992,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:356: ( 'DISABLE' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:356: ( 'DISABLE' )?
int alt30=2;
int LA30_0 = input.LA(1);
@@ -2984,7 +3001,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt30) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:357: 'DISABLE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:357: 'DISABLE'
{
match(input,56,FOLLOW_56_in_protectStatement1350); if (failed) return cn;
if ( backtracking==0 ) {
@@ -2996,8 +3013,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:405: (unnamed42= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:406: unnamed42= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:405: (unnamed42= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:406: unnamed42= sequence
{
pushFollow(FOLLOW_sequence_in_protectStatement1359);
unnamed42=sequence();
@@ -3009,8 +3026,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:460: ( 'ENDPROTECT' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:461: 'ENDPROTECT'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:460: ( 'ENDPROTECT' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:461: 'ENDPROTECT'
{
match(input,57,FOLLOW_57_in_protectStatement1365); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3035,7 +3052,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start check
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:1: check returns [CompositeNode cn] : ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:142:1: check returns [CompositeNode cn] : ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' ) ;
public CompositeNode check() throws RecognitionException {
CompositeNode cn = null;
@@ -3048,13 +3065,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed46 = null;
- cn = factory.createCheckNode(); cn.setRule("check");
+ cn = factory.createCheckNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:2: ( ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:2: ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:2: ( 'context' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:3: 'context'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'context' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:3: 'context'
{
match(input,58,FOLLOW_58_in_check1388); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3063,8 +3081,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:50: (unnamed43= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:51: unnamed43= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:50: (unnamed43= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:51: unnamed43= type
{
pushFollow(FOLLOW_type_in_check1396);
unnamed43=type();
@@ -3076,7 +3094,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:101: ( ( ( 'if' ) (unnamed44= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:101: ( ( ( 'if' ) (unnamed44= expression ) ) )?
int alt31=2;
int LA31_0 = input.LA(1);
@@ -3085,13 +3103,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt31) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:102: ( ( 'if' ) (unnamed44= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:102: ( ( 'if' ) (unnamed44= expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:102: ( ( 'if' ) (unnamed44= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:103: ( 'if' ) (unnamed44= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:102: ( ( 'if' ) (unnamed44= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:103: ( 'if' ) (unnamed44= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:103: ( 'if' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:104: 'if'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:103: ( 'if' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:104: 'if'
{
match(input,59,FOLLOW_59_in_check1404); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3100,8 +3118,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:146: (unnamed44= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:147: unnamed44= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:146: (unnamed44= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:147: unnamed44= expression
{
pushFollow(FOLLOW_expression_in_check1412);
unnamed44=expression();
@@ -3122,10 +3140,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:206: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:207: ( ( 'ERROR' ) | ( 'WARNING' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:206: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:207: ( ( 'ERROR' ) | ( 'WARNING' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:207: ( ( 'ERROR' ) | ( 'WARNING' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:207: ( ( 'ERROR' ) | ( 'WARNING' ) )
int alt32=2;
int LA32_0 = input.LA(1);
@@ -3138,16 +3156,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("127:207: ( ( 'ERROR' ) | ( 'WARNING' ) )", 32, 0, input);
+ new NoViableAltException("145:207: ( ( 'ERROR' ) | ( 'WARNING' ) )", 32, 0, input);
throw nvae;
}
switch (alt32) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:208: ( 'ERROR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:208: ( 'ERROR' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:208: ( 'ERROR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:209: 'ERROR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:208: ( 'ERROR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:209: 'ERROR'
{
match(input,37,FOLLOW_37_in_check1423); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3160,10 +3178,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:4: ( 'WARNING' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:4: ( 'WARNING' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:4: ( 'WARNING' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:5: 'WARNING'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:4: ( 'WARNING' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:5: 'WARNING'
{
match(input,60,FOLLOW_60_in_check1432); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3181,8 +3199,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:54: (unnamed45= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:55: unnamed45= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:54: (unnamed45= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:55: unnamed45= expression
{
pushFollow(FOLLOW_expression_in_check1442);
unnamed45=expression();
@@ -3194,8 +3212,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:111: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:112: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:111: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:112: ':'
{
match(input,61,FOLLOW_61_in_check1448); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3204,8 +3222,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:153: (unnamed46= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:154: unnamed46= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:153: (unnamed46= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:154: unnamed46= expression
{
pushFollow(FOLLOW_expression_in_check1456);
unnamed46=expression();
@@ -3217,8 +3235,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:210: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:128:211: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:210: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:211: ';'
{
match(input,28,FOLLOW_28_in_check1462); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3243,7 +3261,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start around
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:1: around returns [CompositeNode cn] : ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:148:1: around returns [CompositeNode cn] : ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' ) ;
public CompositeNode around() throws RecognitionException {
CompositeNode cn = null;
@@ -3254,13 +3272,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed49 = null;
- cn = factory.createAroundNode(); cn.setRule("around");
+ cn = factory.createAroundNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:2: ( ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:2: ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:2: ( 'around' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:3: 'around'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'around' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:3: 'around'
{
match(input,62,FOLLOW_62_in_around1485); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3269,8 +3288,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:49: (unnamed47= pointcut )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:50: unnamed47= pointcut
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:49: (unnamed47= pointcut )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:50: unnamed47= pointcut
{
pushFollow(FOLLOW_pointcut_in_around1493);
unnamed47=pointcut();
@@ -3282,8 +3301,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:104: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:105: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:104: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:105: '('
{
match(input,31,FOLLOW_31_in_around1499); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3292,7 +3311,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:146: ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:146: ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
int alt36=2;
int LA36_0 = input.LA(1);
@@ -3301,9 +3320,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt36) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
int alt35=2;
int LA35_0 = input.LA(1);
@@ -3316,16 +3335,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("132:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 35, 0, input);
+ new NoViableAltException("151:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 35, 0, input);
throw nvae;
}
switch (alt35) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:148: (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:148: (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:148: (unnamed48= declaredParameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:149: unnamed48= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:148: (unnamed48= declaredParameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:149: unnamed48= declaredParameterList
{
pushFollow(FOLLOW_declaredParameterList_in_around1509);
unnamed48=declaredParameterList();
@@ -3337,7 +3356,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:216: ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:216: ( ( ( ',' )? ( '*' ) ) )?
int alt34=2;
int LA34_0 = input.LA(1);
@@ -3346,12 +3365,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt34) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:217: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:217: ( ( ',' )? ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:217: ( ( ',' )? ( '*' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:218: ( ',' )? ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:217: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:218: ( ',' )? ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:218: ( ',' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:218: ( ',' )?
int alt33=2;
int LA33_0 = input.LA(1);
@@ -3360,7 +3379,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt33) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:219: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:219: ','
{
match(input,32,FOLLOW_32_in_around1517); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3372,8 +3391,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:261: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:262: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:261: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:262: '*'
{
match(input,33,FOLLOW_33_in_around1524); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3395,10 +3414,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:4: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:4: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:5: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:5: '*'
{
match(input,33,FOLLOW_33_in_around1536); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3419,8 +3438,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:49: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:50: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:49: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:50: ')'
{
match(input,34,FOLLOW_34_in_around1545); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3429,8 +3448,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:91: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:92: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:91: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:92: ':'
{
match(input,61,FOLLOW_61_in_around1551); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3439,8 +3458,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:133: (unnamed49= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:134: unnamed49= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:133: (unnamed49= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:134: unnamed49= expression
{
pushFollow(FOLLOW_expression_in_around1559);
unnamed49=expression();
@@ -3452,8 +3471,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:190: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:191: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:190: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:191: ';'
{
match(input,28,FOLLOW_28_in_around1565); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3478,7 +3497,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start pointcut
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:1: pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:1: pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )* ;
public CompositeNode pointcut() throws RecognitionException {
CompositeNode cn = null;
@@ -3487,15 +3506,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
CompositeNode unnamed51 = null;
- cn = factory.createPointcutNode(); cn.setRule("pointcut");
+ cn = factory.createPointcutNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:2: ( ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:2: ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:2: ( ( ( '*' ) | (unnamed50= identifier ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:3: ( ( '*' ) | (unnamed50= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( '*' ) | (unnamed50= identifier ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: ( ( '*' ) | (unnamed50= identifier ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:3: ( ( '*' ) | (unnamed50= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: ( ( '*' ) | (unnamed50= identifier ) )
int alt37=2;
int LA37_0 = input.LA(1);
@@ -3508,16 +3528,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("137:3: ( ( '*' ) | (unnamed50= identifier ) )", 37, 0, input);
+ new NoViableAltException("157:3: ( ( '*' ) | (unnamed50= identifier ) )", 37, 0, input);
throw nvae;
}
switch (alt37) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:4: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:4: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:5: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:4: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:5: '*'
{
match(input,33,FOLLOW_33_in_pointcut1590); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3530,10 +3550,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:4: (unnamed50= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:4: (unnamed50= identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:4: (unnamed50= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:5: unnamed50= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:4: (unnamed50= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:5: unnamed50= identifier
{
pushFollow(FOLLOW_identifier_in_pointcut1601);
unnamed50=identifier();
@@ -3554,7 +3574,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:63: ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:63: ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )*
loop39:
do {
int alt39=2;
@@ -3567,9 +3587,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt39) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )
int alt38=3;
switch ( input.LA(1) ) {
case 33:
@@ -3590,17 +3610,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("138:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )", 38, 0, input);
+ new NoViableAltException("158:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )", 38, 0, input);
throw nvae;
}
switch (alt38) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:65: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:65: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:65: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:66: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:65: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:66: '*'
{
match(input,33,FOLLOW_33_in_pointcut1611); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3613,10 +3633,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:4: (unnamed51= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:4: (unnamed51= identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:4: (unnamed51= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:5: unnamed51= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:4: (unnamed51= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:5: unnamed51= identifier
{
pushFollow(FOLLOW_identifier_in_pointcut1622);
unnamed51=identifier();
@@ -3632,10 +3652,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:4: ( '::' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:160:4: ( '::' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:4: ( '::' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:5: '::'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:160:4: ( '::' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:160:5: '::'
{
match(input,63,FOLLOW_63_in_pointcut1631); if (failed) return cn;
if ( backtracking==0 ) {
@@ -3675,35 +3695,34 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start extension
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:142:1: extension returns [CompositeNode cn] : ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (unnamed52= type )? (unnamed53= identifier ) (unnamed54= identifier )? ( '(' ) (unnamed55= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) ) ) ( ';' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:1: extension returns [CompositeNode cn] : ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= type )? (name= identifier ) ( '(' ) (paramList= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) ) ( ';' ) ;
public CompositeNode extension() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed52 = null;
-
- CompositeNode unnamed53 = null;
+ CompositeNode returnType = null;
- CompositeNode unnamed54 = null;
+ CompositeNode name = null;
- CompositeNode unnamed55 = null;
+ CompositeNode paramList = null;
- CompositeNode unnamed56 = null;
+ CompositeNode javaReturnType = null;
- CompositeNode unnamed57 = null;
+ CompositeNode javaName = null;
- CompositeNode unnamed58 = null;
+ CompositeNode unnamed52 = null;
- CompositeNode unnamed59 = null;
+ CompositeNode unnamed53 = null;
- CompositeNode unnamed60 = null;
+ CompositeNode extendBody = null;
- cn = factory.createExtensionNode(); cn.setRule("extension");
+ cn = factory.createExtensionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:2: ( ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (unnamed52= type )? (unnamed53= identifier ) (unnamed54= identifier )? ( '(' ) (unnamed55= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) ) ) ( ';' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (unnamed52= type )? (unnamed53= identifier ) (unnamed54= identifier )? ( '(' ) (unnamed55= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) ) ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= type )? (name= identifier ) ( '(' ) (paramList= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) ) ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= type )? (name= identifier ) ( '(' ) (paramList= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) ) ( ';' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )*
loop41:
do {
int alt41=2;
@@ -3716,9 +3735,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt41) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )
int alt40=3;
switch ( input.LA(1) ) {
case 64:
@@ -3739,21 +3758,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("144:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )", 40, 0, input);
+ new NoViableAltException("165:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )", 40, 0, input);
throw nvae;
}
switch (alt40) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:4: ( 'private' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:4: ( 'private' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:4: ( 'private' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:5: 'private'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:4: ( 'private' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:5: 'private'
{
match(input,64,FOLLOW_64_in_extension1659); if (failed) return cn;
if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
+ addLeafNodeForToken(cn, "private");
}
}
@@ -3762,14 +3781,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:4: ( 'cached' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:4: ( 'cached' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:4: ( 'cached' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:5: 'cached'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:4: ( 'cached' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:5: 'cached'
{
match(input,65,FOLLOW_65_in_extension1668); if (failed) return cn;
if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
+ addLeafNodeForToken(cn, "cached");
}
}
@@ -3778,14 +3797,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:4: ( 'create' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:4: ( 'create' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:4: ( 'create' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:5: 'create'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:4: ( 'create' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:5: 'create'
{
match(input,66,FOLLOW_66_in_extension1677); if (failed) return cn;
if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
+ addLeafNodeForToken(cn, "create");
}
}
@@ -3805,7 +3824,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:54: (unnamed52= type )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:58: (returnType= type )?
int alt42=2;
int LA42_0 = input.LA(1);
@@ -3821,14 +3840,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt42) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:55: unnamed52= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:59: returnType= type
{
pushFollow(FOLLOW_type_in_extension1688);
- unnamed52=type();
+ returnType=type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed52);
+ addToChildren(cn, returnType); ((ExtensionNode) cn).setReturnType(returnType);
}
}
@@ -3836,70 +3855,46 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:106: (unnamed53= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:107: unnamed53= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:160: (name= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:161: name= identifier
{
pushFollow(FOLLOW_identifier_in_extension1697);
- unnamed53=identifier();
+ name=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed53);
- }
-
- }
-
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:163: (unnamed54= identifier )?
- int alt43=2;
- int LA43_0 = input.LA(1);
-
- if ( (LA43_0==Identifier) ) {
- alt43=1;
+ addToChildren(cn, name); ((ExtensionNode) cn).setName(name);
}
- switch (alt43) {
- case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:164: unnamed54= identifier
- {
- pushFollow(FOLLOW_identifier_in_extension1705);
- unnamed54=identifier();
- _fsp--;
- if (failed) return cn;
- if ( backtracking==0 ) {
- addToChildren(cn, unnamed54);
- }
-
- }
- break;
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:221: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:222: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:243: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:244: '('
{
- match(input,31,FOLLOW_31_in_extension1712); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_extension1703); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:263: (unnamed55= declaredParameterList )?
- int alt44=2;
- int LA44_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:285: (paramList= declaredParameterList )?
+ int alt43=2;
+ int LA43_0 = input.LA(1);
- if ( (LA44_0==Identifier||(LA44_0>=69 && LA44_0<=71)) ) {
- alt44=1;
+ if ( (LA43_0==Identifier||(LA43_0>=69 && LA43_0<=71)) ) {
+ alt43=1;
}
- switch (alt44) {
+ switch (alt43) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:264: unnamed55= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:286: paramList= declaredParameterList
{
- pushFollow(FOLLOW_declaredParameterList_in_extension1720);
- unnamed55=declaredParameterList();
+ pushFollow(FOLLOW_declaredParameterList_in_extension1711);
+ paramList=declaredParameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed55);
+ addToChildren(cn, paramList); ((ExtensionNode) cn).setParamList(paramList);
}
}
@@ -3907,170 +3902,170 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:332: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:333: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:400: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:401: ')'
{
- match(input,34,FOLLOW_34_in_extension1727); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_extension1718); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:374: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:375: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:442: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:443: ':'
{
- match(input,61,FOLLOW_61_in_extension1733); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_extension1724); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:416: ( ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:417: ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:484: ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:485: ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:417: ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) )
- int alt47=2;
- int LA47_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:485: ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) )
+ int alt46=2;
+ int LA46_0 = input.LA(1);
- if ( (LA47_0==67) ) {
- alt47=1;
+ if ( (LA46_0==67) ) {
+ alt46=1;
}
- else if ( ((LA47_0>=StringLiteral && LA47_0<=Identifier)||LA47_0==31||LA47_0==36||LA47_0==59||(LA47_0>=69 && LA47_0<=72)||(LA47_0>=78 && LA47_0<=79)||(LA47_0>=94 && LA47_0<=108)) ) {
- alt47=2;
+ else if ( ((LA46_0>=StringLiteral && LA46_0<=Identifier)||LA46_0==31||LA46_0==36||LA46_0==59||(LA46_0>=69 && LA46_0<=72)||(LA46_0>=78 && LA46_0<=79)||(LA46_0>=94 && LA46_0<=108)) ) {
+ alt46=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("146:417: ( ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' ) | (unnamed60= expression ) )", 47, 0, input);
+ new NoViableAltException("167:485: ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) )", 46, 0, input);
throw nvae;
}
- switch (alt47) {
+ switch (alt46) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:418: ( 'JAVA' ) (unnamed56= javaType ) ( '.' ) (unnamed57= identifier ) ( '(' ) ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:486: ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:418: ( 'JAVA' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:419: 'JAVA'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:486: ( 'JAVA' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:487: 'JAVA'
{
- match(input,67,FOLLOW_67_in_extension1741); if (failed) return cn;
+ match(input,67,FOLLOW_67_in_extension1732); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:463: (unnamed56= javaType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:464: unnamed56= javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:531: (javaReturnType= javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:532: javaReturnType= javaType
{
- pushFollow(FOLLOW_javaType_in_extension1749);
- unnamed56=javaType();
+ pushFollow(FOLLOW_javaType_in_extension1740);
+ javaReturnType=javaType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed56);
+ addToChildren(cn, javaReturnType); ((ExtensionNode) cn).setJavaReturnType(javaReturnType);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:518: ( '.' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:519: '.'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:652: ( '.' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:653: '.'
{
- match(input,68,FOLLOW_68_in_extension1755); if (failed) return cn;
+ match(input,68,FOLLOW_68_in_extension1746); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:560: (unnamed57= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:561: unnamed57= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:694: (javaName= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:695: javaName= identifier
{
- pushFollow(FOLLOW_identifier_in_extension1763);
- unnamed57=identifier();
+ pushFollow(FOLLOW_identifier_in_extension1754);
+ javaName=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed57);
+ addToChildren(cn, javaName); ((ExtensionNode) cn).setJavaName(javaName);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:617: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:618: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:793: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:794: '('
{
- match(input,31,FOLLOW_31_in_extension1769); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_extension1760); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:659: ( ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* ) )?
- int alt46=2;
- int LA46_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:835: ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )?
+ int alt45=2;
+ int LA45_0 = input.LA(1);
- if ( (LA46_0==Identifier) ) {
- alt46=1;
+ if ( (LA45_0==Identifier) ) {
+ alt45=1;
}
- switch (alt46) {
+ switch (alt45) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:660: ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:836: ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:660: ( (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:661: (unnamed58= javaType ) ( ( ( ',' ) (unnamed59= javaType ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:836: ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:837: (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:661: (unnamed58= javaType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:662: unnamed58= javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:837: (unnamed52= javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:838: unnamed52= javaType
{
- pushFollow(FOLLOW_javaType_in_extension1779);
- unnamed58=javaType();
+ pushFollow(FOLLOW_javaType_in_extension1770);
+ unnamed52=javaType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed58);
+ addToChildren(cn, unnamed52);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:716: ( ( ( ',' ) (unnamed59= javaType ) ) )*
- loop45:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:892: ( ( ( ',' ) (unnamed53= javaType ) ) )*
+ loop44:
do {
- int alt45=2;
- int LA45_0 = input.LA(1);
+ int alt44=2;
+ int LA44_0 = input.LA(1);
- if ( (LA45_0==32) ) {
- alt45=1;
+ if ( (LA44_0==32) ) {
+ alt44=1;
}
- switch (alt45) {
+ switch (alt44) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:717: ( ( ',' ) (unnamed59= javaType ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:893: ( ( ',' ) (unnamed53= javaType ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:717: ( ( ',' ) (unnamed59= javaType ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:718: ( ',' ) (unnamed59= javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:893: ( ( ',' ) (unnamed53= javaType ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:894: ( ',' ) (unnamed53= javaType )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:718: ( ',' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:719: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:894: ( ',' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:895: ','
{
- match(input,32,FOLLOW_32_in_extension1787); if (failed) return cn;
+ match(input,32,FOLLOW_32_in_extension1778); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:760: (unnamed59= javaType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:761: unnamed59= javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:936: (unnamed53= javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:937: unnamed53= javaType
{
- pushFollow(FOLLOW_javaType_in_extension1795);
- unnamed59=javaType();
+ pushFollow(FOLLOW_javaType_in_extension1786);
+ unnamed53=javaType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed59);
+ addToChildren(cn, unnamed53);
}
}
@@ -4083,7 +4078,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop45;
+ break loop44;
}
} while (true);
@@ -4096,10 +4091,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:821: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:822: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:997: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:998: ')'
{
- match(input,34,FOLLOW_34_in_extension1807); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_extension1798); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4110,17 +4105,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:147:4: (unnamed60= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:4: (extendBody= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:147:4: (unnamed60= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:147:5: unnamed60= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:4: (extendBody= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:5: extendBody= expression
{
- pushFollow(FOLLOW_expression_in_extension1818);
- unnamed60=expression();
+ pushFollow(FOLLOW_expression_in_extension1809);
+ extendBody=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed60);
+ addToChildren(cn, extendBody); ((ExtensionNode) cn).setExtendBody(extendBody);
}
}
@@ -4134,10 +4129,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:147:63: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:147:64: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:113: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:114: ';'
{
- match(input,28,FOLLOW_28_in_extension1826); if (failed) return cn;
+ match(input,28,FOLLOW_28_in_extension1817); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4160,123 +4155,124 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start javaType
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:149:1: javaType returns [CompositeNode cn] : (unnamed61= identifier ) ( ( ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:170:1: javaType returns [CompositeNode cn] : (unnamed54= identifier ) ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ;
public CompositeNode javaType() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed61 = null;
+ CompositeNode unnamed54 = null;
- CompositeNode unnamed62 = null;
+ CompositeNode unnamed55 = null;
- cn = factory.createJavaTypeNode(); cn.setRule("javaType");
+ cn = factory.createJavaTypeNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( (unnamed61= identifier ) ( ( ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: (unnamed61= identifier ) ( ( ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: ( (unnamed54= identifier ) ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: (unnamed54= identifier ) ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: (unnamed61= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:3: unnamed61= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: (unnamed54= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:3: unnamed54= identifier
{
- pushFollow(FOLLOW_identifier_in_javaType1851);
- unnamed61=identifier();
+ pushFollow(FOLLOW_identifier_in_javaType1842);
+ unnamed54=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed61);
+ addToChildren(cn, unnamed54);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:59: ( ( ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
- loop49:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:59: ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
+ loop48:
do {
- int alt49=2;
- int LA49_0 = input.LA(1);
+ int alt48=2;
+ int LA48_0 = input.LA(1);
- if ( (LA49_0==68) ) {
- int LA49_1 = input.LA(2);
+ if ( (LA48_0==68) ) {
+ int LA48_1 = input.LA(2);
- if ( (LA49_1==Identifier) ) {
- int LA49_3 = input.LA(3);
+ if ( (LA48_1==Identifier) ) {
+ int LA48_3 = input.LA(3);
- if ( (LA49_3==32||LA49_3==34||LA49_3==68) ) {
- alt49=1;
+ if ( (LA48_3==32||LA48_3==34||LA48_3==68) ) {
+ alt48=1;
}
}
- else if ( ((LA49_1>=69 && LA49_1<=71)) ) {
- alt49=1;
+ else if ( ((LA48_1>=69 && LA48_1<=71)) ) {
+ alt48=1;
}
}
- switch (alt49) {
+ switch (alt48) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:60: ( ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:60: ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:60: ( ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:61: ( '.' ) ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:60: ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:61: ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:61: ( '.' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:62: '.'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:61: ( '.' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:62: '.'
{
- match(input,68,FOLLOW_68_in_javaType1859); if (failed) return cn;
+ match(input,68,FOLLOW_68_in_javaType1850); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:103: ( ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:104: ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:103: ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:104: ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:104: ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
- int alt48=4;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:104: ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+ int alt47=4;
switch ( input.LA(1) ) {
case Identifier:
{
- alt48=1;
+ alt47=1;
}
break;
case 69:
{
- alt48=2;
+ alt47=2;
}
break;
case 70:
{
- alt48=3;
+ alt47=3;
}
break;
case 71:
{
- alt48=4;
+ alt47=4;
}
break;
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("151:104: ( (unnamed62= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 48, 0, input);
+ new NoViableAltException("173:104: ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 47, 0, input);
throw nvae;
}
- switch (alt48) {
+ switch (alt47) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:105: (unnamed62= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:105: (unnamed55= identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:105: (unnamed62= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:106: unnamed62= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:105: (unnamed55= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:106: unnamed55= identifier
{
- pushFollow(FOLLOW_identifier_in_javaType1869);
- unnamed62=identifier();
+ pushFollow(FOLLOW_identifier_in_javaType1860);
+ unnamed55=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed62);
+ addToChildren(cn, unnamed55);
}
}
@@ -4285,12 +4281,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:4: ( 'Collection' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:4: ( 'Collection' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:4: ( 'Collection' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:5: 'Collection'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:4: ( 'Collection' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:5: 'Collection'
{
- match(input,69,FOLLOW_69_in_javaType1878); if (failed) return cn;
+ match(input,69,FOLLOW_69_in_javaType1869); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4301,12 +4297,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:153:4: ( 'List' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:4: ( 'List' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:153:4: ( 'List' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:153:5: 'List'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:4: ( 'List' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:5: 'List'
{
- match(input,70,FOLLOW_70_in_javaType1887); if (failed) return cn;
+ match(input,70,FOLLOW_70_in_javaType1878); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4317,12 +4313,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:4: ( 'Set' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: ( 'Set' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:4: ( 'Set' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:5: 'Set'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: ( 'Set' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:5: 'Set'
{
- match(input,71,FOLLOW_71_in_javaType1896); if (failed) return cn;
+ match(input,71,FOLLOW_71_in_javaType1887); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4346,7 +4342,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop49;
+ break loop48;
}
} while (true);
@@ -4366,35 +4362,36 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start test_expression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:1: test_expression returns [CompositeNode cn] : (unnamed63= expression ) ( EOF ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:178:1: test_expression returns [CompositeNode cn] : (unnamed56= expression ) ( EOF ) ;
public CompositeNode test_expression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed63 = null;
+ CompositeNode unnamed56 = null;
- cn = factory.createTest_expressionNode(); cn.setRule("test_expression");
+ cn = factory.createTest_expressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:2: ( (unnamed63= expression ) ( EOF ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:2: (unnamed63= expression ) ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( (unnamed56= expression ) ( EOF ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: (unnamed56= expression ) ( EOF )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:2: (unnamed63= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:3: unnamed63= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: (unnamed56= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:3: unnamed56= expression
{
- pushFollow(FOLLOW_expression_in_test_expression1931);
- unnamed63=expression();
+ pushFollow(FOLLOW_expression_in_test_expression1922);
+ unnamed56=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed63);
+ addToChildren(cn, unnamed56);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:59: ( EOF )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:60: EOF
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:59: ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:60: EOF
{
- match(input,EOF,FOLLOW_EOF_in_test_expression1937); if (failed) return cn;
+ match(input,EOF,FOLLOW_EOF_in_test_expression1928); if (failed) return cn;
}
@@ -4417,27 +4414,28 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start expression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:161:1: expression returns [CompositeNode cn] : (unnamed64= letExpression ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:184:1: expression returns [CompositeNode cn] : (unnamed57= letExpression ) ;
public CompositeNode expression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed64 = null;
+ CompositeNode unnamed57 = null;
- cn = factory.createExpressionNode(); cn.setRule("expression");
+ cn = factory.createExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:164:2: ( (unnamed64= letExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:164:2: (unnamed64= letExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: ( (unnamed57= letExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: (unnamed57= letExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:164:2: (unnamed64= letExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:164:3: unnamed64= letExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: (unnamed57= letExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:3: unnamed57= letExpression
{
- pushFollow(FOLLOW_letExpression_in_expression1965);
- unnamed64=letExpression();
+ pushFollow(FOLLOW_letExpression_in_expression1956);
+ unnamed57=letExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed64);
+ addToChildren(cn, unnamed57);
}
}
@@ -4461,107 +4459,108 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start letExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:1: letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed65= identifier ) ( '=' ) (unnamed66= castedExpression ) ( ':' ) (unnamed67= expression ) | (unnamed68= castedExpression ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:1: letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression ) | (unnamed61= castedExpression ) );
public CompositeNode letExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed65 = null;
+ CompositeNode unnamed58 = null;
- CompositeNode unnamed66 = null;
+ CompositeNode unnamed59 = null;
- CompositeNode unnamed67 = null;
+ CompositeNode unnamed60 = null;
- CompositeNode unnamed68 = null;
+ CompositeNode unnamed61 = null;
- cn = factory.createLetExpressionNode(); cn.setRule("letExpression");
+ cn = factory.createLetExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:2: ( ( 'let' ) (unnamed65= identifier ) ( '=' ) (unnamed66= castedExpression ) ( ':' ) (unnamed67= expression ) | (unnamed68= castedExpression ) )
- int alt50=2;
- int LA50_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression ) | (unnamed61= castedExpression ) )
+ int alt49=2;
+ int LA49_0 = input.LA(1);
- if ( (LA50_0==72) ) {
- alt50=1;
+ if ( (LA49_0==72) ) {
+ alt49=1;
}
- else if ( ((LA50_0>=StringLiteral && LA50_0<=Identifier)||LA50_0==31||LA50_0==36||LA50_0==59||(LA50_0>=69 && LA50_0<=71)||(LA50_0>=78 && LA50_0<=79)||(LA50_0>=94 && LA50_0<=108)) ) {
- alt50=2;
+ else if ( ((LA49_0>=StringLiteral && LA49_0<=Identifier)||LA49_0==31||LA49_0==36||LA49_0==59||(LA49_0>=69 && LA49_0<=71)||(LA49_0>=78 && LA49_0<=79)||(LA49_0>=94 && LA49_0<=108)) ) {
+ alt49=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("166:1: letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed65= identifier ) ( '=' ) (unnamed66= castedExpression ) ( ':' ) (unnamed67= expression ) | (unnamed68= castedExpression ) );", 50, 0, input);
+ new NoViableAltException("190:1: letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression ) | (unnamed61= castedExpression ) );", 49, 0, input);
throw nvae;
}
- switch (alt50) {
+ switch (alt49) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:2: ( 'let' ) (unnamed65= identifier ) ( '=' ) (unnamed66= castedExpression ) ( ':' ) (unnamed67= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:2: ( 'let' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:3: 'let'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( 'let' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:3: 'let'
{
- match(input,72,FOLLOW_72_in_letExpression1993); if (failed) return cn;
+ match(input,72,FOLLOW_72_in_letExpression1984); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:46: (unnamed65= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:47: unnamed65= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:46: (unnamed58= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:47: unnamed58= identifier
{
- pushFollow(FOLLOW_identifier_in_letExpression2001);
- unnamed65=identifier();
+ pushFollow(FOLLOW_identifier_in_letExpression1992);
+ unnamed58=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed65);
+ addToChildren(cn, unnamed58);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:103: ( '=' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:104: '='
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:103: ( '=' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:104: '='
{
- match(input,73,FOLLOW_73_in_letExpression2007); if (failed) return cn;
+ match(input,73,FOLLOW_73_in_letExpression1998); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:145: (unnamed66= castedExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:146: unnamed66= castedExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:145: (unnamed59= castedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:146: unnamed59= castedExpression
{
- pushFollow(FOLLOW_castedExpression_in_letExpression2015);
- unnamed66=castedExpression();
+ pushFollow(FOLLOW_castedExpression_in_letExpression2006);
+ unnamed59=castedExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed66);
+ addToChildren(cn, unnamed59);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:208: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:209: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:208: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:209: ':'
{
- match(input,61,FOLLOW_61_in_letExpression2021); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_letExpression2012); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:250: (unnamed67= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:251: unnamed67= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:250: (unnamed60= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:251: unnamed60= expression
{
- pushFollow(FOLLOW_expression_in_letExpression2029);
- unnamed67=expression();
+ pushFollow(FOLLOW_expression_in_letExpression2020);
+ unnamed60=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed67);
+ addToChildren(cn, unnamed60);
}
}
@@ -4570,17 +4569,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:170:4: (unnamed68= castedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:4: (unnamed61= castedExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:170:4: (unnamed68= castedExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:170:5: unnamed68= castedExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:4: (unnamed61= castedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:5: unnamed61= castedExpression
{
- pushFollow(FOLLOW_castedExpression_in_letExpression2040);
- unnamed68=castedExpression();
+ pushFollow(FOLLOW_castedExpression_in_letExpression2031);
+ unnamed61=castedExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed68);
+ addToChildren(cn, unnamed61);
}
}
@@ -4606,71 +4605,72 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start castedExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:172:1: castedExpression returns [CompositeNode cn] : ( ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed69= type ) ( ')' ) (unnamed70= chainExpression ) ) | (unnamed71= chainExpression ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:1: castedExpression returns [CompositeNode cn] : ( ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) ) | (unnamed64= chainExpression ) );
public CompositeNode castedExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed69 = null;
+ CompositeNode unnamed62 = null;
- CompositeNode unnamed70 = null;
+ CompositeNode unnamed63 = null;
- CompositeNode unnamed71 = null;
+ CompositeNode unnamed64 = null;
- cn = factory.createCastedExpressionNode(); cn.setRule("castedExpression");
+ cn = factory.createCastedExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed69= type ) ( ')' ) (unnamed70= chainExpression ) ) | (unnamed71= chainExpression ) )
- int alt51=2;
- alt51 = dfa51.predict(input);
- switch (alt51) {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:2: ( ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) ) | (unnamed64= chainExpression ) )
+ int alt50=2;
+ alt50 = dfa50.predict(input);
+ switch (alt50) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed69= type ) ( ')' ) (unnamed70= chainExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:2: ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:34: ( ( '(' ) (unnamed69= type ) ( ')' ) (unnamed70= chainExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:35: ( '(' ) (unnamed69= type ) ( ')' ) (unnamed70= chainExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:34: ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:35: ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:35: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:36: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:35: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:36: '('
{
- match(input,31,FOLLOW_31_in_castedExpression2079); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_castedExpression2070); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:77: (unnamed69= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:78: unnamed69= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:77: (unnamed62= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:78: unnamed62= type
{
- pushFollow(FOLLOW_type_in_castedExpression2087);
- unnamed69=type();
+ pushFollow(FOLLOW_type_in_castedExpression2078);
+ unnamed62=type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed69);
+ addToChildren(cn, unnamed62);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:128: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:129: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:128: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:129: ')'
{
- match(input,34,FOLLOW_34_in_castedExpression2093); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_castedExpression2084); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:170: (unnamed70= chainExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:171: unnamed70= chainExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:170: (unnamed63= chainExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:171: unnamed63= chainExpression
{
- pushFollow(FOLLOW_chainExpression_in_castedExpression2101);
- unnamed70=chainExpression();
+ pushFollow(FOLLOW_chainExpression_in_castedExpression2092);
+ unnamed63=chainExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed70);
+ addToChildren(cn, unnamed63);
}
}
@@ -4682,17 +4682,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: (unnamed71= chainExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:4: (unnamed64= chainExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: (unnamed71= chainExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:5: unnamed71= chainExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:4: (unnamed64= chainExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:5: unnamed64= chainExpression
{
- pushFollow(FOLLOW_chainExpression_in_castedExpression2113);
- unnamed71=chainExpression();
+ pushFollow(FOLLOW_chainExpression_in_castedExpression2104);
+ unnamed64=chainExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed71);
+ addToChildren(cn, unnamed64);
}
}
@@ -4718,70 +4718,71 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start chainExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:178:1: chainExpression returns [CompositeNode cn] : (unnamed72= ifExpression ) ( ( ( '->' ) (unnamed73= ifExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:204:1: chainExpression returns [CompositeNode cn] : (unnamed65= ifExpression ) ( ( ( '->' ) (unnamed66= ifExpression ) ) )* ;
public CompositeNode chainExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed72 = null;
+ CompositeNode unnamed65 = null;
- CompositeNode unnamed73 = null;
+ CompositeNode unnamed66 = null;
- cn = factory.createChainExpressionNode(); cn.setRule("chainExpression");
+ cn = factory.createChainExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:2: ( (unnamed72= ifExpression ) ( ( ( '->' ) (unnamed73= ifExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:2: (unnamed72= ifExpression ) ( ( ( '->' ) (unnamed73= ifExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:2: ( (unnamed65= ifExpression ) ( ( ( '->' ) (unnamed66= ifExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:2: (unnamed65= ifExpression ) ( ( ( '->' ) (unnamed66= ifExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:2: (unnamed72= ifExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:3: unnamed72= ifExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:2: (unnamed65= ifExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:3: unnamed65= ifExpression
{
- pushFollow(FOLLOW_ifExpression_in_chainExpression2143);
- unnamed72=ifExpression();
+ pushFollow(FOLLOW_ifExpression_in_chainExpression2134);
+ unnamed65=ifExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed72);
+ addToChildren(cn, unnamed65);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:61: ( ( ( '->' ) (unnamed73= ifExpression ) ) )*
- loop52:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:61: ( ( ( '->' ) (unnamed66= ifExpression ) ) )*
+ loop51:
do {
- int alt52=2;
- int LA52_0 = input.LA(1);
+ int alt51=2;
+ int LA51_0 = input.LA(1);
- if ( (LA52_0==74) ) {
- alt52=1;
+ if ( (LA51_0==74) ) {
+ alt51=1;
}
- switch (alt52) {
+ switch (alt51) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:62: ( ( '->' ) (unnamed73= ifExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:62: ( ( '->' ) (unnamed66= ifExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:62: ( ( '->' ) (unnamed73= ifExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:63: ( '->' ) (unnamed73= ifExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:62: ( ( '->' ) (unnamed66= ifExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:63: ( '->' ) (unnamed66= ifExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:63: ( '->' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:64: '->'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:63: ( '->' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:64: '->'
{
- match(input,74,FOLLOW_74_in_chainExpression2151); if (failed) return cn;
+ match(input,74,FOLLOW_74_in_chainExpression2142); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:106: (unnamed73= ifExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:107: unnamed73= ifExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:106: (unnamed66= ifExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:107: unnamed66= ifExpression
{
- pushFollow(FOLLOW_ifExpression_in_chainExpression2159);
- unnamed73=ifExpression();
+ pushFollow(FOLLOW_ifExpression_in_chainExpression2150);
+ unnamed66=ifExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed73);
+ addToChildren(cn, unnamed66);
}
}
@@ -4794,7 +4795,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop52;
+ break loop51;
}
} while (true);
@@ -4817,115 +4818,116 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start ifExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:1: ifExpression returns [CompositeNode cn] : ( (unnamed74= switchExpression ) ( ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) ) )? | ( 'if' ) (unnamed77= expression ) ( 'then' ) (unnamed78= switchExpression ) ( ( ( 'else' ) (unnamed79= switchExpression ) ) )? );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:210:1: ifExpression returns [CompositeNode cn] : ( (unnamed67= switchExpression ) ( ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) ) )? | ( 'if' ) (unnamed70= expression ) ( 'then' ) (unnamed71= switchExpression ) ( ( ( 'else' ) (unnamed72= switchExpression ) ) )? );
public CompositeNode ifExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed74 = null;
+ CompositeNode unnamed67 = null;
- CompositeNode unnamed75 = null;
+ CompositeNode unnamed68 = null;
- CompositeNode unnamed76 = null;
+ CompositeNode unnamed69 = null;
- CompositeNode unnamed77 = null;
+ CompositeNode unnamed70 = null;
- CompositeNode unnamed78 = null;
+ CompositeNode unnamed71 = null;
- CompositeNode unnamed79 = null;
+ CompositeNode unnamed72 = null;
- cn = factory.createIfExpressionNode(); cn.setRule("ifExpression");
+ cn = factory.createIfExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:2: ( (unnamed74= switchExpression ) ( ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) ) )? | ( 'if' ) (unnamed77= expression ) ( 'then' ) (unnamed78= switchExpression ) ( ( ( 'else' ) (unnamed79= switchExpression ) ) )? )
- int alt55=2;
- int LA55_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:2: ( (unnamed67= switchExpression ) ( ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) ) )? | ( 'if' ) (unnamed70= expression ) ( 'then' ) (unnamed71= switchExpression ) ( ( ( 'else' ) (unnamed72= switchExpression ) ) )? )
+ int alt54=2;
+ int LA54_0 = input.LA(1);
- if ( ((LA55_0>=StringLiteral && LA55_0<=Identifier)||LA55_0==31||LA55_0==36||(LA55_0>=69 && LA55_0<=71)||(LA55_0>=78 && LA55_0<=79)||(LA55_0>=94 && LA55_0<=108)) ) {
- alt55=1;
+ if ( ((LA54_0>=StringLiteral && LA54_0<=Identifier)||LA54_0==31||LA54_0==36||(LA54_0>=69 && LA54_0<=71)||(LA54_0>=78 && LA54_0<=79)||(LA54_0>=94 && LA54_0<=108)) ) {
+ alt54=1;
}
- else if ( (LA55_0==59) ) {
- alt55=2;
+ else if ( (LA54_0==59) ) {
+ alt54=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("183:1: ifExpression returns [CompositeNode cn] : ( (unnamed74= switchExpression ) ( ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) ) )? | ( 'if' ) (unnamed77= expression ) ( 'then' ) (unnamed78= switchExpression ) ( ( ( 'else' ) (unnamed79= switchExpression ) ) )? );", 55, 0, input);
+ new NoViableAltException("210:1: ifExpression returns [CompositeNode cn] : ( (unnamed67= switchExpression ) ( ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) ) )? | ( 'if' ) (unnamed70= expression ) ( 'then' ) (unnamed71= switchExpression ) ( ( ( 'else' ) (unnamed72= switchExpression ) ) )? );", 54, 0, input);
throw nvae;
}
- switch (alt55) {
+ switch (alt54) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:2: (unnamed74= switchExpression ) ( ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:2: (unnamed67= switchExpression ) ( ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:2: (unnamed74= switchExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:3: unnamed74= switchExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:2: (unnamed67= switchExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:3: unnamed67= switchExpression
{
- pushFollow(FOLLOW_switchExpression_in_ifExpression2192);
- unnamed74=switchExpression();
+ pushFollow(FOLLOW_switchExpression_in_ifExpression2183);
+ unnamed67=switchExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed74);
+ addToChildren(cn, unnamed67);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:65: ( ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) ) )?
- int alt53=2;
- int LA53_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:65: ( ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) ) )?
+ int alt52=2;
+ int LA52_0 = input.LA(1);
- if ( (LA53_0==75) ) {
- alt53=1;
+ if ( (LA52_0==75) ) {
+ alt52=1;
}
- switch (alt53) {
+ switch (alt52) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:66: ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:66: ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:66: ( ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:67: ( '?' ) (unnamed75= expression ) ( ':' ) (unnamed76= switchExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:66: ( ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:67: ( '?' ) (unnamed68= expression ) ( ':' ) (unnamed69= switchExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:67: ( '?' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:68: '?'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:67: ( '?' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:68: '?'
{
- match(input,75,FOLLOW_75_in_ifExpression2200); if (failed) return cn;
+ match(input,75,FOLLOW_75_in_ifExpression2191); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:109: (unnamed75= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:110: unnamed75= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:109: (unnamed68= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:110: unnamed68= expression
{
- pushFollow(FOLLOW_expression_in_ifExpression2208);
- unnamed75=expression();
+ pushFollow(FOLLOW_expression_in_ifExpression2199);
+ unnamed68=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed75);
+ addToChildren(cn, unnamed68);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:166: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:167: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:166: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:167: ':'
{
- match(input,61,FOLLOW_61_in_ifExpression2214); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_ifExpression2205); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:208: (unnamed76= switchExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:209: unnamed76= switchExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:208: (unnamed69= switchExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:209: unnamed69= switchExpression
{
- pushFollow(FOLLOW_switchExpression_in_ifExpression2222);
- unnamed76=switchExpression();
+ pushFollow(FOLLOW_switchExpression_in_ifExpression2213);
+ unnamed69=switchExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed76);
+ addToChildren(cn, unnamed69);
}
}
@@ -4943,87 +4945,87 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:4: ( 'if' ) (unnamed77= expression ) ( 'then' ) (unnamed78= switchExpression ) ( ( ( 'else' ) (unnamed79= switchExpression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:4: ( 'if' ) (unnamed70= expression ) ( 'then' ) (unnamed71= switchExpression ) ( ( ( 'else' ) (unnamed72= switchExpression ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:4: ( 'if' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:5: 'if'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:4: ( 'if' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:5: 'if'
{
- match(input,59,FOLLOW_59_in_ifExpression2234); if (failed) return cn;
+ match(input,59,FOLLOW_59_in_ifExpression2225); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:47: (unnamed77= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:48: unnamed77= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:47: (unnamed70= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:48: unnamed70= expression
{
- pushFollow(FOLLOW_expression_in_ifExpression2242);
- unnamed77=expression();
+ pushFollow(FOLLOW_expression_in_ifExpression2233);
+ unnamed70=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed77);
+ addToChildren(cn, unnamed70);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:104: ( 'then' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:105: 'then'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:104: ( 'then' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:105: 'then'
{
- match(input,76,FOLLOW_76_in_ifExpression2248); if (failed) return cn;
+ match(input,76,FOLLOW_76_in_ifExpression2239); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:149: (unnamed78= switchExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:150: unnamed78= switchExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:149: (unnamed71= switchExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:150: unnamed71= switchExpression
{
- pushFollow(FOLLOW_switchExpression_in_ifExpression2256);
- unnamed78=switchExpression();
+ pushFollow(FOLLOW_switchExpression_in_ifExpression2247);
+ unnamed71=switchExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed78);
+ addToChildren(cn, unnamed71);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:212: ( ( ( 'else' ) (unnamed79= switchExpression ) ) )?
- int alt54=2;
- int LA54_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:212: ( ( ( 'else' ) (unnamed72= switchExpression ) ) )?
+ int alt53=2;
+ int LA53_0 = input.LA(1);
- if ( (LA54_0==77) ) {
- alt54=1;
+ if ( (LA53_0==77) ) {
+ alt53=1;
}
- switch (alt54) {
+ switch (alt53) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:213: ( ( 'else' ) (unnamed79= switchExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:213: ( ( 'else' ) (unnamed72= switchExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:213: ( ( 'else' ) (unnamed79= switchExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:214: ( 'else' ) (unnamed79= switchExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:213: ( ( 'else' ) (unnamed72= switchExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:214: ( 'else' ) (unnamed72= switchExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:214: ( 'else' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:215: 'else'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:214: ( 'else' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:215: 'else'
{
- match(input,77,FOLLOW_77_in_ifExpression2264); if (failed) return cn;
+ match(input,77,FOLLOW_77_in_ifExpression2255); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:259: (unnamed79= switchExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:187:260: unnamed79= switchExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:259: (unnamed72= switchExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:215:260: unnamed72= switchExpression
{
- pushFollow(FOLLOW_switchExpression_in_ifExpression2272);
- unnamed79=switchExpression();
+ pushFollow(FOLLOW_switchExpression_in_ifExpression2263);
+ unnamed72=switchExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed79);
+ addToChildren(cn, unnamed72);
}
}
@@ -5058,93 +5060,94 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start switchExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:1: switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (unnamed80= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed81= casePart )* ( 'default' ) ( ':' ) (unnamed82= orExpression ) ( '}' ) | (unnamed83= orExpression ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:1: switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (unnamed73= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed74= casePart )* ( 'default' ) ( ':' ) (unnamed75= orExpression ) ( '}' ) | (unnamed76= orExpression ) );
public CompositeNode switchExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed80 = null;
+ CompositeNode unnamed73 = null;
- CompositeNode unnamed81 = null;
+ CompositeNode unnamed74 = null;
- CompositeNode unnamed82 = null;
+ CompositeNode unnamed75 = null;
- CompositeNode unnamed83 = null;
+ CompositeNode unnamed76 = null;
- cn = factory.createSwitchExpressionNode(); cn.setRule("switchExpression");
+ cn = factory.createSwitchExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:2: ( ( 'switch' ) ( ( ( '(' ) (unnamed80= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed81= casePart )* ( 'default' ) ( ':' ) (unnamed82= orExpression ) ( '}' ) | (unnamed83= orExpression ) )
- int alt58=2;
- int LA58_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:2: ( ( 'switch' ) ( ( ( '(' ) (unnamed73= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed74= casePart )* ( 'default' ) ( ':' ) (unnamed75= orExpression ) ( '}' ) | (unnamed76= orExpression ) )
+ int alt57=2;
+ int LA57_0 = input.LA(1);
- if ( (LA58_0==78) ) {
- alt58=1;
+ if ( (LA57_0==78) ) {
+ alt57=1;
}
- else if ( ((LA58_0>=StringLiteral && LA58_0<=Identifier)||LA58_0==31||LA58_0==36||(LA58_0>=69 && LA58_0<=71)||LA58_0==79||(LA58_0>=94 && LA58_0<=108)) ) {
- alt58=2;
+ else if ( ((LA57_0>=StringLiteral && LA57_0<=Identifier)||LA57_0==31||LA57_0==36||(LA57_0>=69 && LA57_0<=71)||LA57_0==79||(LA57_0>=94 && LA57_0<=108)) ) {
+ alt57=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("189:1: switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (unnamed80= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed81= casePart )* ( 'default' ) ( ':' ) (unnamed82= orExpression ) ( '}' ) | (unnamed83= orExpression ) );", 58, 0, input);
+ new NoViableAltException("217:1: switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (unnamed73= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed74= casePart )* ( 'default' ) ( ':' ) (unnamed75= orExpression ) ( '}' ) | (unnamed76= orExpression ) );", 57, 0, input);
throw nvae;
}
- switch (alt58) {
+ switch (alt57) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:2: ( 'switch' ) ( ( ( '(' ) (unnamed80= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed81= casePart )* ( 'default' ) ( ':' ) (unnamed82= orExpression ) ( '}' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:2: ( 'switch' ) ( ( ( '(' ) (unnamed73= orExpression ) ( ')' ) ) )? ( '{' ) (unnamed74= casePart )* ( 'default' ) ( ':' ) (unnamed75= orExpression ) ( '}' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:2: ( 'switch' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:3: 'switch'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:2: ( 'switch' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:3: 'switch'
{
- match(input,78,FOLLOW_78_in_switchExpression2303); if (failed) return cn;
+ match(input,78,FOLLOW_78_in_switchExpression2294); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:49: ( ( ( '(' ) (unnamed80= orExpression ) ( ')' ) ) )?
- int alt56=2;
- int LA56_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:49: ( ( ( '(' ) (unnamed73= orExpression ) ( ')' ) ) )?
+ int alt55=2;
+ int LA55_0 = input.LA(1);
- if ( (LA56_0==31) ) {
- alt56=1;
+ if ( (LA55_0==31) ) {
+ alt55=1;
}
- switch (alt56) {
+ switch (alt55) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:50: ( ( '(' ) (unnamed80= orExpression ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:50: ( ( '(' ) (unnamed73= orExpression ) ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:50: ( ( '(' ) (unnamed80= orExpression ) ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:51: ( '(' ) (unnamed80= orExpression ) ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:50: ( ( '(' ) (unnamed73= orExpression ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:51: ( '(' ) (unnamed73= orExpression ) ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:51: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:52: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:51: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:52: '('
{
- match(input,31,FOLLOW_31_in_switchExpression2311); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_switchExpression2302); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:93: (unnamed80= orExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:94: unnamed80= orExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:93: (unnamed73= orExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:94: unnamed73= orExpression
{
- pushFollow(FOLLOW_orExpression_in_switchExpression2319);
- unnamed80=orExpression();
+ pushFollow(FOLLOW_orExpression_in_switchExpression2310);
+ unnamed73=orExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed80);
+ addToChildren(cn, unnamed73);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:152: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:153: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:152: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:153: ')'
{
- match(input,34,FOLLOW_34_in_switchExpression2325); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_switchExpression2316); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -5160,84 +5163,84 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:197: ( '{' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:198: '{'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:197: ( '{' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:198: '{'
{
- match(input,79,FOLLOW_79_in_switchExpression2334); if (failed) return cn;
+ match(input,79,FOLLOW_79_in_switchExpression2325); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:239: (unnamed81= casePart )*
- loop57:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:239: (unnamed74= casePart )*
+ loop56:
do {
- int alt57=2;
- int LA57_0 = input.LA(1);
+ int alt56=2;
+ int LA56_0 = input.LA(1);
- if ( (LA57_0==82) ) {
- alt57=1;
+ if ( (LA56_0==82) ) {
+ alt56=1;
}
- switch (alt57) {
+ switch (alt56) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:240: unnamed81= casePart
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:240: unnamed74= casePart
{
- pushFollow(FOLLOW_casePart_in_switchExpression2342);
- unnamed81=casePart();
+ pushFollow(FOLLOW_casePart_in_switchExpression2333);
+ unnamed74=casePart();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed81);
+ addToChildren(cn, unnamed74);
}
}
break;
default :
- break loop57;
+ break loop56;
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:295: ( 'default' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:296: 'default'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:295: ( 'default' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:296: 'default'
{
- match(input,80,FOLLOW_80_in_switchExpression2349); if (failed) return cn;
+ match(input,80,FOLLOW_80_in_switchExpression2340); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:343: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:344: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:343: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:344: ':'
{
- match(input,61,FOLLOW_61_in_switchExpression2355); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_switchExpression2346); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:385: (unnamed82= orExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:386: unnamed82= orExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:385: (unnamed75= orExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:386: unnamed75= orExpression
{
- pushFollow(FOLLOW_orExpression_in_switchExpression2363);
- unnamed82=orExpression();
+ pushFollow(FOLLOW_orExpression_in_switchExpression2354);
+ unnamed75=orExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed82);
+ addToChildren(cn, unnamed75);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:444: ( '}' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:445: '}'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:444: ( '}' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:445: '}'
{
- match(input,81,FOLLOW_81_in_switchExpression2369); if (failed) return cn;
+ match(input,81,FOLLOW_81_in_switchExpression2360); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -5248,17 +5251,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:193:4: (unnamed83= orExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:4: (unnamed76= orExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:193:4: (unnamed83= orExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:193:5: unnamed83= orExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:4: (unnamed76= orExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:5: unnamed76= orExpression
{
- pushFollow(FOLLOW_orExpression_in_switchExpression2380);
- unnamed83=orExpression();
+ pushFollow(FOLLOW_orExpression_in_switchExpression2371);
+ unnamed76=orExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed83);
+ addToChildren(cn, unnamed76);
}
}
@@ -5284,62 +5287,63 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start casePart
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:1: casePart returns [CompositeNode cn] : ( 'case' ) (unnamed84= expression ) ( ':' ) (unnamed85= expression ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:1: casePart returns [CompositeNode cn] : ( 'case' ) (unnamed77= expression ) ( ':' ) (unnamed78= expression ) ;
public CompositeNode casePart() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed84 = null;
+ CompositeNode unnamed77 = null;
- CompositeNode unnamed85 = null;
+ CompositeNode unnamed78 = null;
- cn = factory.createCasePartNode(); cn.setRule("casePart");
+ cn = factory.createCasePartNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:2: ( ( 'case' ) (unnamed84= expression ) ( ':' ) (unnamed85= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:2: ( 'case' ) (unnamed84= expression ) ( ':' ) (unnamed85= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: ( ( 'case' ) (unnamed77= expression ) ( ':' ) (unnamed78= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: ( 'case' ) (unnamed77= expression ) ( ':' ) (unnamed78= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:2: ( 'case' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:3: 'case'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: ( 'case' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:3: 'case'
{
- match(input,82,FOLLOW_82_in_casePart2403); if (failed) return cn;
+ match(input,82,FOLLOW_82_in_casePart2394); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:47: (unnamed84= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:48: unnamed84= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:47: (unnamed77= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:48: unnamed77= expression
{
- pushFollow(FOLLOW_expression_in_casePart2411);
- unnamed84=expression();
+ pushFollow(FOLLOW_expression_in_casePart2402);
+ unnamed77=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed84);
+ addToChildren(cn, unnamed77);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:104: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:105: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:104: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:105: ':'
{
- match(input,61,FOLLOW_61_in_casePart2417); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_casePart2408); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:146: (unnamed85= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:147: unnamed85= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:146: (unnamed78= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:147: unnamed78= expression
{
- pushFollow(FOLLOW_expression_in_casePart2425);
- unnamed85=expression();
+ pushFollow(FOLLOW_expression_in_casePart2416);
+ unnamed78=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed85);
+ addToChildren(cn, unnamed78);
}
}
@@ -5360,70 +5364,71 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start orExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:1: orExpression returns [CompositeNode cn] : (unnamed86= andExpression ) ( ( ( '||' ) (unnamed87= andExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:229:1: orExpression returns [CompositeNode cn] : (unnamed79= andExpression ) ( ( ( '||' ) (unnamed80= andExpression ) ) )* ;
public CompositeNode orExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed86 = null;
+ CompositeNode unnamed79 = null;
- CompositeNode unnamed87 = null;
+ CompositeNode unnamed80 = null;
- cn = factory.createOrExpressionNode(); cn.setRule("orExpression");
+ cn = factory.createOrExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:2: ( (unnamed86= andExpression ) ( ( ( '||' ) (unnamed87= andExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:2: (unnamed86= andExpression ) ( ( ( '||' ) (unnamed87= andExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:2: ( (unnamed79= andExpression ) ( ( ( '||' ) (unnamed80= andExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:2: (unnamed79= andExpression ) ( ( ( '||' ) (unnamed80= andExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:2: (unnamed86= andExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:3: unnamed86= andExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:2: (unnamed79= andExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:3: unnamed79= andExpression
{
- pushFollow(FOLLOW_andExpression_in_orExpression2455);
- unnamed86=andExpression();
+ pushFollow(FOLLOW_andExpression_in_orExpression2446);
+ unnamed79=andExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed86);
+ addToChildren(cn, unnamed79);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:62: ( ( ( '||' ) (unnamed87= andExpression ) ) )*
- loop59:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:62: ( ( ( '||' ) (unnamed80= andExpression ) ) )*
+ loop58:
do {
- int alt59=2;
- int LA59_0 = input.LA(1);
+ int alt58=2;
+ int LA58_0 = input.LA(1);
- if ( (LA59_0==83) ) {
- alt59=1;
+ if ( (LA58_0==83) ) {
+ alt58=1;
}
- switch (alt59) {
+ switch (alt58) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:63: ( ( '||' ) (unnamed87= andExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:63: ( ( '||' ) (unnamed80= andExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:63: ( ( '||' ) (unnamed87= andExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:64: ( '||' ) (unnamed87= andExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:63: ( ( '||' ) (unnamed80= andExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:64: ( '||' ) (unnamed80= andExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:64: ( '||' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:65: '||'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:64: ( '||' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:65: '||'
{
- match(input,83,FOLLOW_83_in_orExpression2463); if (failed) return cn;
+ match(input,83,FOLLOW_83_in_orExpression2454); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:107: (unnamed87= andExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:202:108: unnamed87= andExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:107: (unnamed80= andExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:108: unnamed80= andExpression
{
- pushFollow(FOLLOW_andExpression_in_orExpression2471);
- unnamed87=andExpression();
+ pushFollow(FOLLOW_andExpression_in_orExpression2462);
+ unnamed80=andExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed87);
+ addToChildren(cn, unnamed80);
}
}
@@ -5436,7 +5441,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop59;
+ break loop58;
}
} while (true);
@@ -5459,70 +5464,71 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start andExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:204:1: andExpression returns [CompositeNode cn] : (unnamed88= impliesExpression ) ( ( ( '&&' ) (unnamed89= impliesExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:1: andExpression returns [CompositeNode cn] : (unnamed81= impliesExpression ) ( ( ( '&&' ) (unnamed82= impliesExpression ) ) )* ;
public CompositeNode andExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed88 = null;
+ CompositeNode unnamed81 = null;
- CompositeNode unnamed89 = null;
+ CompositeNode unnamed82 = null;
- cn = factory.createAndExpressionNode(); cn.setRule("andExpression");
+ cn = factory.createAndExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: ( (unnamed88= impliesExpression ) ( ( ( '&&' ) (unnamed89= impliesExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: (unnamed88= impliesExpression ) ( ( ( '&&' ) (unnamed89= impliesExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: ( (unnamed81= impliesExpression ) ( ( ( '&&' ) (unnamed82= impliesExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: (unnamed81= impliesExpression ) ( ( ( '&&' ) (unnamed82= impliesExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: (unnamed88= impliesExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:3: unnamed88= impliesExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: (unnamed81= impliesExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:3: unnamed81= impliesExpression
{
- pushFollow(FOLLOW_impliesExpression_in_andExpression2504);
- unnamed88=impliesExpression();
+ pushFollow(FOLLOW_impliesExpression_in_andExpression2495);
+ unnamed81=impliesExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed88);
+ addToChildren(cn, unnamed81);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:66: ( ( ( '&&' ) (unnamed89= impliesExpression ) ) )*
- loop60:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:66: ( ( ( '&&' ) (unnamed82= impliesExpression ) ) )*
+ loop59:
do {
- int alt60=2;
- int LA60_0 = input.LA(1);
+ int alt59=2;
+ int LA59_0 = input.LA(1);
- if ( (LA60_0==84) ) {
- alt60=1;
+ if ( (LA59_0==84) ) {
+ alt59=1;
}
- switch (alt60) {
+ switch (alt59) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:67: ( ( '&&' ) (unnamed89= impliesExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:67: ( ( '&&' ) (unnamed82= impliesExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:67: ( ( '&&' ) (unnamed89= impliesExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:68: ( '&&' ) (unnamed89= impliesExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:67: ( ( '&&' ) (unnamed82= impliesExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:68: ( '&&' ) (unnamed82= impliesExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:68: ( '&&' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:69: '&&'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:68: ( '&&' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:69: '&&'
{
- match(input,84,FOLLOW_84_in_andExpression2512); if (failed) return cn;
+ match(input,84,FOLLOW_84_in_andExpression2503); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:111: (unnamed89= impliesExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:112: unnamed89= impliesExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:111: (unnamed82= impliesExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:112: unnamed82= impliesExpression
{
- pushFollow(FOLLOW_impliesExpression_in_andExpression2520);
- unnamed89=impliesExpression();
+ pushFollow(FOLLOW_impliesExpression_in_andExpression2511);
+ unnamed82=impliesExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed89);
+ addToChildren(cn, unnamed82);
}
}
@@ -5535,7 +5541,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop60;
+ break loop59;
}
} while (true);
@@ -5558,70 +5564,71 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start impliesExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:1: impliesExpression returns [CompositeNode cn] : (unnamed90= relationalExpression ) ( ( ( 'implies' ) (unnamed91= relationalExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:241:1: impliesExpression returns [CompositeNode cn] : (unnamed83= relationalExpression ) ( ( ( 'implies' ) (unnamed84= relationalExpression ) ) )* ;
public CompositeNode impliesExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed90 = null;
+ CompositeNode unnamed83 = null;
- CompositeNode unnamed91 = null;
+ CompositeNode unnamed84 = null;
- cn = factory.createImpliesExpressionNode(); cn.setRule("impliesExpression");
+ cn = factory.createImpliesExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:2: ( (unnamed90= relationalExpression ) ( ( ( 'implies' ) (unnamed91= relationalExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:2: (unnamed90= relationalExpression ) ( ( ( 'implies' ) (unnamed91= relationalExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:2: ( (unnamed83= relationalExpression ) ( ( ( 'implies' ) (unnamed84= relationalExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:2: (unnamed83= relationalExpression ) ( ( ( 'implies' ) (unnamed84= relationalExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:2: (unnamed90= relationalExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:3: unnamed90= relationalExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:2: (unnamed83= relationalExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:3: unnamed83= relationalExpression
{
- pushFollow(FOLLOW_relationalExpression_in_impliesExpression2553);
- unnamed90=relationalExpression();
+ pushFollow(FOLLOW_relationalExpression_in_impliesExpression2544);
+ unnamed83=relationalExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed90);
+ addToChildren(cn, unnamed83);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:69: ( ( ( 'implies' ) (unnamed91= relationalExpression ) ) )*
- loop61:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:69: ( ( ( 'implies' ) (unnamed84= relationalExpression ) ) )*
+ loop60:
do {
- int alt61=2;
- int LA61_0 = input.LA(1);
+ int alt60=2;
+ int LA60_0 = input.LA(1);
- if ( (LA61_0==85) ) {
- alt61=1;
+ if ( (LA60_0==85) ) {
+ alt60=1;
}
- switch (alt61) {
+ switch (alt60) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:70: ( ( 'implies' ) (unnamed91= relationalExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:70: ( ( 'implies' ) (unnamed84= relationalExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:70: ( ( 'implies' ) (unnamed91= relationalExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:71: ( 'implies' ) (unnamed91= relationalExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:70: ( ( 'implies' ) (unnamed84= relationalExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:71: ( 'implies' ) (unnamed84= relationalExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:71: ( 'implies' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:72: 'implies'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:71: ( 'implies' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:72: 'implies'
{
- match(input,85,FOLLOW_85_in_impliesExpression2561); if (failed) return cn;
+ match(input,85,FOLLOW_85_in_impliesExpression2552); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:119: (unnamed91= relationalExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:120: unnamed91= relationalExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:119: (unnamed84= relationalExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:245:120: unnamed84= relationalExpression
{
- pushFollow(FOLLOW_relationalExpression_in_impliesExpression2569);
- unnamed91=relationalExpression();
+ pushFollow(FOLLOW_relationalExpression_in_impliesExpression2560);
+ unnamed84=relationalExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed91);
+ addToChildren(cn, unnamed84);
}
}
@@ -5634,7 +5641,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop61;
+ break loop60;
}
} while (true);
@@ -5657,228 +5664,257 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start relationalExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:214:1: relationalExpression returns [CompositeNode cn] : (unnamed92= additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:1: relationalExpression returns [CompositeNode cn] : (leftOperand= additiveExpression ) ( ( (operator= booleanOperator ) (rightOperand= additiveExpression ) ) )* ;
public CompositeNode relationalExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed92 = null;
+ CompositeNode leftOperand = null;
- CompositeNode unnamed93 = null;
+ CompositeNode operator = null;
+ CompositeNode rightOperand = null;
- cn = factory.createRelationalExpressionNode(); cn.setRule("relationalExpression");
+
+ cn = factory.createRelationalExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: ( (unnamed92= additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: (unnamed92= additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:2: ( (leftOperand= additiveExpression ) ( ( (operator= booleanOperator ) (rightOperand= additiveExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:2: (leftOperand= additiveExpression ) ( ( (operator= booleanOperator ) (rightOperand= additiveExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: (unnamed92= additiveExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:3: unnamed92= additiveExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:2: (leftOperand= additiveExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:3: leftOperand= additiveExpression
{
- pushFollow(FOLLOW_additiveExpression_in_relationalExpression2602);
- unnamed92=additiveExpression();
+ pushFollow(FOLLOW_additiveExpression_in_relationalExpression2593);
+ leftOperand=additiveExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed92);
+ addToChildren(cn, leftOperand); ((RelationalExpressionNode) cn).setLeftOperand(leftOperand);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:67: ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression ) ) )*
- loop63:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:132: ( ( (operator= booleanOperator ) (rightOperand= additiveExpression ) ) )*
+ loop61:
do {
- int alt63=2;
- int LA63_0 = input.LA(1);
+ int alt61=2;
+ int LA61_0 = input.LA(1);
- if ( ((LA63_0>=86 && LA63_0<=91)) ) {
- alt63=1;
+ if ( ((LA61_0>=86 && LA61_0<=91)) ) {
+ alt61=1;
}
- switch (alt63) {
+ switch (alt61) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:68: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:133: ( (operator= booleanOperator ) (rightOperand= additiveExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:68: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:69: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (unnamed93= additiveExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:133: ( (operator= booleanOperator ) (rightOperand= additiveExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:134: (operator= booleanOperator ) (rightOperand= additiveExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:69: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:70: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:134: (operator= booleanOperator )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:135: operator= booleanOperator
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:70: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
- int alt62=6;
- switch ( input.LA(1) ) {
- case 86:
- {
- alt62=1;
- }
- break;
- case 87:
- {
- alt62=2;
- }
- break;
- case 88:
- {
- alt62=3;
- }
- break;
- case 89:
- {
- alt62=4;
- }
- break;
- case 90:
- {
- alt62=5;
- }
- break;
- case 91:
- {
- alt62=6;
- }
- break;
- default:
- if (backtracking>0) {failed=true; return cn;}
- NoViableAltException nvae =
- new NoViableAltException("217:70: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )", 62, 0, input);
+ pushFollow(FOLLOW_booleanOperator_in_relationalExpression2603);
+ operator=booleanOperator();
+ _fsp--;
+ if (failed) return cn;
+ if ( backtracking==0 ) {
+ addToChildren(cn, operator); ((RelationalExpressionNode) cn).setOperator(operator);
+ }
- throw nvae;
}
- switch (alt62) {
- case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:71: ( '==' )
- {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:71: ( '==' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:72: '=='
- {
- match(input,86,FOLLOW_86_in_relationalExpression2612); if (failed) return cn;
- if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
- }
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:249: (rightOperand= additiveExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:250: rightOperand= additiveExpression
+ {
+ pushFollow(FOLLOW_additiveExpression_in_relationalExpression2611);
+ rightOperand=additiveExpression();
+ _fsp--;
+ if (failed) return cn;
+ if ( backtracking==0 ) {
+ addToChildren(cn, rightOperand); ((RelationalExpressionNode) cn).setRightOperand(rightOperand);
+ }
- }
+ }
- }
- break;
- case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:218:4: ( '!=' )
- {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:218:4: ( '!=' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:218:5: '!='
- {
- match(input,87,FOLLOW_87_in_relationalExpression2621); if (failed) return cn;
- if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
- }
+ }
- }
+ }
+ break;
- }
- break;
- case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:219:4: ( '>=' )
- {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:219:4: ( '>=' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:219:5: '>='
- {
- match(input,88,FOLLOW_88_in_relationalExpression2630); if (failed) return cn;
- if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
- }
+ default :
+ break loop61;
+ }
+ } while (true);
- }
+ }
- }
- break;
- case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:4: ( '<=' )
- {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:4: ( '<=' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:5: '<='
- {
- match(input,89,FOLLOW_89_in_relationalExpression2639); if (failed) return cn;
- if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
- }
+ if ( backtracking==0 ) {
+ cn = normalize(cn);
+ }
+ }
+ catch (RecognitionException re) {
+ reportError(re);
+ recover(input,re);
+ }
+ finally {
+ }
+ return cn;
+ }
+ // $ANTLR end relationalExpression
- }
+ // $ANTLR start booleanOperator
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:253:1: booleanOperator returns [CompositeNode cn] : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
+ public CompositeNode booleanOperator() throws RecognitionException {
+ CompositeNode cn = null;
+
+ cn = factory.createBooleanOperatorNode();
+
+ try {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:2: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
+ int alt62=6;
+ switch ( input.LA(1) ) {
+ case 86:
+ {
+ alt62=1;
+ }
+ break;
+ case 87:
+ {
+ alt62=2;
+ }
+ break;
+ case 88:
+ {
+ alt62=3;
+ }
+ break;
+ case 89:
+ {
+ alt62=4;
+ }
+ break;
+ case 90:
+ {
+ alt62=5;
+ }
+ break;
+ case 91:
+ {
+ alt62=6;
+ }
+ break;
+ default:
+ if (backtracking>0) {failed=true; return cn;}
+ NoViableAltException nvae =
+ new NoViableAltException("253:1: booleanOperator returns [CompositeNode cn] : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );", 62, 0, input);
- }
- break;
- case 5 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:4: ( '>' )
- {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:4: ( '>' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:5: '>'
- {
- match(input,90,FOLLOW_90_in_relationalExpression2648); if (failed) return cn;
- if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
- }
+ throw nvae;
+ }
- }
+ switch (alt62) {
+ case 1 :
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:2: ( '==' )
+ {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:2: ( '==' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:3: '=='
+ {
+ match(input,86,FOLLOW_86_in_booleanOperator2637); if (failed) return cn;
+ if ( backtracking==0 ) {
+ addLeafNodeForToken(cn, null);
+ }
+ }
- }
- break;
- case 6 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:4: ( '<' )
- {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:4: ( '<' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:5: '<'
- {
- match(input,91,FOLLOW_91_in_relationalExpression2657); if (failed) return cn;
- if ( backtracking==0 ) {
- addLeafNodeForToken(cn, null);
- }
- }
+ }
+ break;
+ case 2 :
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:257:4: ( '!=' )
+ {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:257:4: ( '!=' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:257:5: '!='
+ {
+ match(input,87,FOLLOW_87_in_booleanOperator2646); if (failed) return cn;
+ if ( backtracking==0 ) {
+ addLeafNodeForToken(cn, null);
+ }
+ }
- }
- break;
- }
+ }
+ break;
+ case 3 :
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:4: ( '>=' )
+ {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:4: ( '>=' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:5: '>='
+ {
+ match(input,88,FOLLOW_88_in_booleanOperator2655); if (failed) return cn;
+ if ( backtracking==0 ) {
+ addLeafNodeForToken(cn, null);
+ }
+ }
- }
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:48: (unnamed93= additiveExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:222:49: unnamed93= additiveExpression
- {
- pushFollow(FOLLOW_additiveExpression_in_relationalExpression2667);
- unnamed93=additiveExpression();
- _fsp--;
- if (failed) return cn;
- if ( backtracking==0 ) {
- addToChildren(cn, unnamed93);
- }
+ }
+ break;
+ case 4 :
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:4: ( '<=' )
+ {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:4: ( '<=' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:5: '<='
+ {
+ match(input,89,FOLLOW_89_in_booleanOperator2664); if (failed) return cn;
+ if ( backtracking==0 ) {
+ addLeafNodeForToken(cn, null);
+ }
- }
+ }
- }
+ }
+ break;
+ case 5 :
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:4: ( '>' )
+ {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:4: ( '>' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:5: '>'
+ {
+ match(input,90,FOLLOW_90_in_booleanOperator2673); if (failed) return cn;
+ if ( backtracking==0 ) {
+ addLeafNodeForToken(cn, null);
+ }
+
+ }
- }
- break;
+ }
+ break;
+ case 6 :
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:4: ( '<' )
+ {
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:4: ( '<' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:5: '<'
+ {
+ match(input,91,FOLLOW_91_in_booleanOperator2682); if (failed) return cn;
+ if ( backtracking==0 ) {
+ addLeafNodeForToken(cn, null);
+ }
- default :
- break loop63;
- }
- } while (true);
+ }
- }
+ }
+ break;
- if ( backtracking==0 ) {
- cn = normalize(cn);
}
}
catch (RecognitionException re) {
@@ -5889,92 +5925,93 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end relationalExpression
+ // $ANTLR end booleanOperator
// $ANTLR start additiveExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:1: additiveExpression returns [CompositeNode cn] : (unnamed94= multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:1: additiveExpression returns [CompositeNode cn] : (unnamed85= multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression ) ) )* ;
public CompositeNode additiveExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed94 = null;
+ CompositeNode unnamed85 = null;
- CompositeNode unnamed95 = null;
+ CompositeNode unnamed86 = null;
- cn = factory.createAdditiveExpressionNode(); cn.setRule("additiveExpression");
+ cn = factory.createAdditiveExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: ( (unnamed94= multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: (unnamed94= multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:2: ( (unnamed85= multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:2: (unnamed85= multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: (unnamed94= multiplicativeExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:3: unnamed94= multiplicativeExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:2: (unnamed85= multiplicativeExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:3: unnamed85= multiplicativeExpression
{
- pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2700);
- unnamed94=multiplicativeExpression();
+ pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2712);
+ unnamed85=multiplicativeExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed94);
+ addToChildren(cn, unnamed85);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:73: ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression ) ) )*
- loop65:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:73: ( ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression ) ) )*
+ loop64:
do {
- int alt65=2;
- int LA65_0 = input.LA(1);
+ int alt64=2;
+ int LA64_0 = input.LA(1);
- if ( (LA65_0==36) ) {
- int LA65_2 = input.LA(2);
+ if ( (LA64_0==36) ) {
+ int LA64_2 = input.LA(2);
- if ( ((LA65_2>=StringLiteral && LA65_2<=Identifier)||LA65_2==31||LA65_2==36||(LA65_2>=69 && LA65_2<=71)||LA65_2==79||(LA65_2>=94 && LA65_2<=108)) ) {
- alt65=1;
+ if ( ((LA64_2>=StringLiteral && LA64_2<=Identifier)||LA64_2==31||LA64_2==36||(LA64_2>=69 && LA64_2<=71)||LA64_2==79||(LA64_2>=94 && LA64_2<=108)) ) {
+ alt64=1;
}
}
- else if ( (LA65_0==92) ) {
- alt65=1;
+ else if ( (LA64_0==92) ) {
+ alt64=1;
}
- switch (alt65) {
+ switch (alt64) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:74: ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:74: ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:74: ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:75: ( ( ( '+' ) | ( '-' ) ) ) (unnamed95= multiplicativeExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:74: ( ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:75: ( ( ( '+' ) | ( '-' ) ) ) (unnamed86= multiplicativeExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:75: ( ( ( '+' ) | ( '-' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:76: ( ( '+' ) | ( '-' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:75: ( ( ( '+' ) | ( '-' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:76: ( ( '+' ) | ( '-' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:76: ( ( '+' ) | ( '-' ) )
- int alt64=2;
- int LA64_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:76: ( ( '+' ) | ( '-' ) )
+ int alt63=2;
+ int LA63_0 = input.LA(1);
- if ( (LA64_0==92) ) {
- alt64=1;
+ if ( (LA63_0==92) ) {
+ alt63=1;
}
- else if ( (LA64_0==36) ) {
- alt64=2;
+ else if ( (LA63_0==36) ) {
+ alt63=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("227:76: ( ( '+' ) | ( '-' ) )", 64, 0, input);
+ new NoViableAltException("267:76: ( ( '+' ) | ( '-' ) )", 63, 0, input);
throw nvae;
}
- switch (alt64) {
+ switch (alt63) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:77: ( '+' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:77: ( '+' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:77: ( '+' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:78: '+'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:77: ( '+' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:78: '+'
{
- match(input,92,FOLLOW_92_in_additiveExpression2710); if (failed) return cn;
+ match(input,92,FOLLOW_92_in_additiveExpression2722); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -5985,12 +6022,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:4: ( '-' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:268:4: ( '-' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:4: ( '-' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:5: '-'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:268:4: ( '-' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:268:5: '-'
{
- match(input,36,FOLLOW_36_in_additiveExpression2719); if (failed) return cn;
+ match(input,36,FOLLOW_36_in_additiveExpression2731); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -6006,15 +6043,15 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:48: (unnamed95= multiplicativeExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:49: unnamed95= multiplicativeExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:268:48: (unnamed86= multiplicativeExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:268:49: unnamed86= multiplicativeExpression
{
- pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2729);
- unnamed95=multiplicativeExpression();
+ pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2741);
+ unnamed86=multiplicativeExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed95);
+ addToChildren(cn, unnamed86);
}
}
@@ -6027,7 +6064,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop65;
+ break loop64;
}
} while (true);
@@ -6050,79 +6087,80 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start multiplicativeExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:230:1: multiplicativeExpression returns [CompositeNode cn] : (unnamed96= unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:270:1: multiplicativeExpression returns [CompositeNode cn] : (unnamed87= unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression ) ) )* ;
public CompositeNode multiplicativeExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed96 = null;
+ CompositeNode unnamed87 = null;
- CompositeNode unnamed97 = null;
+ CompositeNode unnamed88 = null;
- cn = factory.createMultiplicativeExpressionNode(); cn.setRule("multiplicativeExpression");
+ cn = factory.createMultiplicativeExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:2: ( (unnamed96= unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:2: (unnamed96= unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:2: ( (unnamed87= unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:2: (unnamed87= unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:2: (unnamed96= unaryExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:3: unnamed96= unaryExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:2: (unnamed87= unaryExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:3: unnamed87= unaryExpression
{
- pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2762);
- unnamed96=unaryExpression();
+ pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2774);
+ unnamed87=unaryExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed96);
+ addToChildren(cn, unnamed87);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:64: ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression ) ) )*
- loop67:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:64: ( ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression ) ) )*
+ loop66:
do {
- int alt67=2;
- int LA67_0 = input.LA(1);
+ int alt66=2;
+ int LA66_0 = input.LA(1);
- if ( (LA67_0==33||LA67_0==93) ) {
- alt67=1;
+ if ( (LA66_0==33||LA66_0==93) ) {
+ alt66=1;
}
- switch (alt67) {
+ switch (alt66) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:65: ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:65: ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:65: ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:66: ( ( ( '*' ) | ( '/' ) ) ) (unnamed97= unaryExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:65: ( ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:66: ( ( ( '*' ) | ( '/' ) ) ) (unnamed88= unaryExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:66: ( ( ( '*' ) | ( '/' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:67: ( ( '*' ) | ( '/' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:66: ( ( ( '*' ) | ( '/' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:67: ( ( '*' ) | ( '/' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:67: ( ( '*' ) | ( '/' ) )
- int alt66=2;
- int LA66_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:67: ( ( '*' ) | ( '/' ) )
+ int alt65=2;
+ int LA65_0 = input.LA(1);
- if ( (LA66_0==33) ) {
- alt66=1;
+ if ( (LA65_0==33) ) {
+ alt65=1;
}
- else if ( (LA66_0==93) ) {
- alt66=2;
+ else if ( (LA65_0==93) ) {
+ alt65=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("233:67: ( ( '*' ) | ( '/' ) )", 66, 0, input);
+ new NoViableAltException("274:67: ( ( '*' ) | ( '/' ) )", 65, 0, input);
throw nvae;
}
- switch (alt66) {
+ switch (alt65) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:68: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:68: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:68: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:233:69: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:68: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:69: '*'
{
- match(input,33,FOLLOW_33_in_multiplicativeExpression2772); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_multiplicativeExpression2784); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -6133,12 +6171,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:234:4: ( '/' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:4: ( '/' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:234:4: ( '/' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:234:5: '/'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:4: ( '/' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:5: '/'
{
- match(input,93,FOLLOW_93_in_multiplicativeExpression2781); if (failed) return cn;
+ match(input,93,FOLLOW_93_in_multiplicativeExpression2793); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -6154,15 +6192,15 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:234:48: (unnamed97= unaryExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:234:49: unnamed97= unaryExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:48: (unnamed88= unaryExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:49: unnamed88= unaryExpression
{
- pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2791);
- unnamed97=unaryExpression();
+ pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2803);
+ unnamed88=unaryExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed97);
+ addToChildren(cn, unnamed88);
}
}
@@ -6175,7 +6213,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop67;
+ break loop66;
}
} while (true);
@@ -6198,21 +6236,22 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start unaryExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:1: unaryExpression returns [CompositeNode cn] : ( (unnamed98= infixExpression ) | ( '!' ) (unnamed99= infixExpression ) | ( '-' ) (unnamed100= infixExpression ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:277:1: unaryExpression returns [CompositeNode cn] : ( (unnamed89= infixExpression ) | ( '!' ) (unnamed90= infixExpression ) | ( '-' ) (unnamed91= infixExpression ) );
public CompositeNode unaryExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed98 = null;
+ CompositeNode unnamed89 = null;
- CompositeNode unnamed99 = null;
+ CompositeNode unnamed90 = null;
- CompositeNode unnamed100 = null;
+ CompositeNode unnamed91 = null;
- cn = factory.createUnaryExpressionNode(); cn.setRule("unaryExpression");
+ cn = factory.createUnaryExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: ( (unnamed98= infixExpression ) | ( '!' ) (unnamed99= infixExpression ) | ( '-' ) (unnamed100= infixExpression ) )
- int alt68=3;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:281:2: ( (unnamed89= infixExpression ) | ( '!' ) (unnamed90= infixExpression ) | ( '-' ) (unnamed91= infixExpression ) )
+ int alt67=3;
switch ( input.LA(1) ) {
case StringLiteral:
case IntLiteral:
@@ -6237,40 +6276,40 @@ public class Xpand3NodeParser extends AbstractNodeParser {
case 107:
case 108:
{
- alt68=1;
+ alt67=1;
}
break;
case 94:
{
- alt68=2;
+ alt67=2;
}
break;
case 36:
{
- alt68=3;
+ alt67=3;
}
break;
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("236:1: unaryExpression returns [CompositeNode cn] : ( (unnamed98= infixExpression ) | ( '!' ) (unnamed99= infixExpression ) | ( '-' ) (unnamed100= infixExpression ) );", 68, 0, input);
+ new NoViableAltException("277:1: unaryExpression returns [CompositeNode cn] : ( (unnamed89= infixExpression ) | ( '!' ) (unnamed90= infixExpression ) | ( '-' ) (unnamed91= infixExpression ) );", 67, 0, input);
throw nvae;
}
- switch (alt68) {
+ switch (alt67) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: (unnamed98= infixExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:281:2: (unnamed89= infixExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: (unnamed98= infixExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:3: unnamed98= infixExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:281:2: (unnamed89= infixExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:281:3: unnamed89= infixExpression
{
- pushFollow(FOLLOW_infixExpression_in_unaryExpression2824);
- unnamed98=infixExpression();
+ pushFollow(FOLLOW_infixExpression_in_unaryExpression2836);
+ unnamed89=infixExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed98);
+ addToChildren(cn, unnamed89);
}
}
@@ -6279,27 +6318,27 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:4: ( '!' ) (unnamed99= infixExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:4: ( '!' ) (unnamed90= infixExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:4: ( '!' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:5: '!'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:4: ( '!' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:5: '!'
{
- match(input,94,FOLLOW_94_in_unaryExpression2833); if (failed) return cn;
+ match(input,94,FOLLOW_94_in_unaryExpression2845); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:46: (unnamed99= infixExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:47: unnamed99= infixExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:46: (unnamed90= infixExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:47: unnamed90= infixExpression
{
- pushFollow(FOLLOW_infixExpression_in_unaryExpression2841);
- unnamed99=infixExpression();
+ pushFollow(FOLLOW_infixExpression_in_unaryExpression2853);
+ unnamed90=infixExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed99);
+ addToChildren(cn, unnamed90);
}
}
@@ -6308,27 +6347,27 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:241:4: ( '-' ) (unnamed100= infixExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:4: ( '-' ) (unnamed91= infixExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:241:4: ( '-' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:241:5: '-'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:4: ( '-' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:5: '-'
{
- match(input,36,FOLLOW_36_in_unaryExpression2850); if (failed) return cn;
+ match(input,36,FOLLOW_36_in_unaryExpression2862); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:241:46: (unnamed100= infixExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:241:47: unnamed100= infixExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:46: (unnamed91= infixExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:47: unnamed91= infixExpression
{
- pushFollow(FOLLOW_infixExpression_in_unaryExpression2858);
- unnamed100=infixExpression();
+ pushFollow(FOLLOW_infixExpression_in_unaryExpression2870);
+ unnamed91=infixExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed100);
+ addToChildren(cn, unnamed91);
}
}
@@ -6354,70 +6393,71 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start infixExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:1: infixExpression returns [CompositeNode cn] : (unnamed101= primaryExpression ) ( ( ( '.' ) (unnamed102= featureCall ) ) )* ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:285:1: infixExpression returns [CompositeNode cn] : (target= primaryExpression ) ( ( ( '.' ) (calls= featureCall ) ) )* ;
public CompositeNode infixExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed101 = null;
+ CompositeNode target = null;
- CompositeNode unnamed102 = null;
+ CompositeNode calls = null;
- cn = factory.createInfixExpressionNode(); cn.setRule("infixExpression");
+ cn = factory.createInfixExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:2: ( (unnamed101= primaryExpression ) ( ( ( '.' ) (unnamed102= featureCall ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:2: (unnamed101= primaryExpression ) ( ( ( '.' ) (unnamed102= featureCall ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:2: ( (target= primaryExpression ) ( ( ( '.' ) (calls= featureCall ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:2: (target= primaryExpression ) ( ( ( '.' ) (calls= featureCall ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:2: (unnamed101= primaryExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:3: unnamed101= primaryExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:2: (target= primaryExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:3: target= primaryExpression
{
- pushFollow(FOLLOW_primaryExpression_in_infixExpression2888);
- unnamed101=primaryExpression();
+ pushFollow(FOLLOW_primaryExpression_in_infixExpression2900);
+ target=primaryExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed101);
+ addToChildren(cn, target); ((InfixExpressionNode) cn).setTarget(target);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:68: ( ( ( '.' ) (unnamed102= featureCall ) ) )*
- loop69:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:106: ( ( ( '.' ) (calls= featureCall ) ) )*
+ loop68:
do {
- int alt69=2;
- int LA69_0 = input.LA(1);
+ int alt68=2;
+ int LA68_0 = input.LA(1);
- if ( (LA69_0==68) ) {
- alt69=1;
+ if ( (LA68_0==68) ) {
+ alt68=1;
}
- switch (alt69) {
+ switch (alt68) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:69: ( ( '.' ) (unnamed102= featureCall ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:107: ( ( '.' ) (calls= featureCall ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:69: ( ( '.' ) (unnamed102= featureCall ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:70: ( '.' ) (unnamed102= featureCall )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:107: ( ( '.' ) (calls= featureCall ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:108: ( '.' ) (calls= featureCall )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:70: ( '.' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:71: '.'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:108: ( '.' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:109: '.'
{
- match(input,68,FOLLOW_68_in_infixExpression2896); if (failed) return cn;
+ match(input,68,FOLLOW_68_in_infixExpression2908); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:112: (unnamed102= featureCall )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246:113: unnamed102= featureCall
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:150: (calls= featureCall )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:151: calls= featureCall
{
- pushFollow(FOLLOW_featureCall_in_infixExpression2904);
- unnamed102=featureCall();
+ pushFollow(FOLLOW_featureCall_in_infixExpression2916);
+ calls=featureCall();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed102);
+ addToChildren(cn, calls); ((InfixExpressionNode) cn).getCalls().add(calls);
}
}
@@ -6430,7 +6470,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop69;
+ break loop68;
}
} while (true);
@@ -6453,7 +6493,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start primaryExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:248:1: primaryExpression returns [CompositeNode cn] : ( ( stringLiteral ) | ( featureCall ) | ( booleanLiteral ) | ( numberLiteral ) | ( nullLiteral ) | ( listLiteral ) | ( constructorCall ) | ( globalVarExpression ) | ( paranthesizedExpression ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:291:1: primaryExpression returns [CompositeNode cn] : ( ( stringLiteral ) | ( featureCall ) | ( booleanLiteral ) | ( numberLiteral ) | ( nullLiteral ) | ( listLiteral ) | ( constructorCall ) | ( globalVarExpression ) | ( paranthesizedExpression ) );
public CompositeNode primaryExpression() throws RecognitionException {
CompositeNode cn = null;
@@ -6477,12 +6517,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:249:2: ( ( stringLiteral ) | ( featureCall ) | ( booleanLiteral ) | ( numberLiteral ) | ( nullLiteral ) | ( listLiteral ) | ( constructorCall ) | ( globalVarExpression ) | ( paranthesizedExpression ) )
- int alt70=9;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:292:2: ( ( stringLiteral ) | ( featureCall ) | ( booleanLiteral ) | ( numberLiteral ) | ( nullLiteral ) | ( listLiteral ) | ( constructorCall ) | ( globalVarExpression ) | ( paranthesizedExpression ) )
+ int alt69=9;
switch ( input.LA(1) ) {
case StringLiteral:
{
- alt70=1;
+ alt69=1;
}
break;
case Identifier:
@@ -6499,61 +6539,61 @@ public class Xpand3NodeParser extends AbstractNodeParser {
case 107:
case 108:
{
- alt70=2;
+ alt69=2;
}
break;
case 97:
case 98:
{
- alt70=3;
+ alt69=3;
}
break;
case IntLiteral:
{
- alt70=4;
+ alt69=4;
}
break;
case 99:
{
- alt70=5;
+ alt69=5;
}
break;
case 79:
{
- alt70=6;
+ alt69=6;
}
break;
case 96:
{
- alt70=7;
+ alt69=7;
}
break;
case 95:
{
- alt70=8;
+ alt69=8;
}
break;
case 31:
{
- alt70=9;
+ alt69=9;
}
break;
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("248:1: primaryExpression returns [CompositeNode cn] : ( ( stringLiteral ) | ( featureCall ) | ( booleanLiteral ) | ( numberLiteral ) | ( nullLiteral ) | ( listLiteral ) | ( constructorCall ) | ( globalVarExpression ) | ( paranthesizedExpression ) );", 70, 0, input);
+ new NoViableAltException("291:1: primaryExpression returns [CompositeNode cn] : ( ( stringLiteral ) | ( featureCall ) | ( booleanLiteral ) | ( numberLiteral ) | ( nullLiteral ) | ( listLiteral ) | ( constructorCall ) | ( globalVarExpression ) | ( paranthesizedExpression ) );", 69, 0, input);
throw nvae;
}
- switch (alt70) {
+ switch (alt69) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:249:2: ( stringLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:292:2: ( stringLiteral )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:249:2: ( stringLiteral )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:249:3: stringLiteral
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:292:2: ( stringLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:292:3: stringLiteral
{
- pushFollow(FOLLOW_stringLiteral_in_primaryExpression2925);
+ pushFollow(FOLLOW_stringLiteral_in_primaryExpression2937);
stringLiteral15=stringLiteral();
_fsp--;
if (failed) return cn;
@@ -6567,12 +6607,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:4: ( featureCall )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:4: ( featureCall )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:4: ( featureCall )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:5: featureCall
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:4: ( featureCall )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:5: featureCall
{
- pushFollow(FOLLOW_featureCall_in_primaryExpression2934);
+ pushFollow(FOLLOW_featureCall_in_primaryExpression2946);
featureCall16=featureCall();
_fsp--;
if (failed) return cn;
@@ -6586,12 +6626,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:4: ( booleanLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:4: ( booleanLiteral )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:4: ( booleanLiteral )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:5: booleanLiteral
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:4: ( booleanLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:5: booleanLiteral
{
- pushFollow(FOLLOW_booleanLiteral_in_primaryExpression2943);
+ pushFollow(FOLLOW_booleanLiteral_in_primaryExpression2955);
booleanLiteral17=booleanLiteral();
_fsp--;
if (failed) return cn;
@@ -6605,12 +6645,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:4: ( numberLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( numberLiteral )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:4: ( numberLiteral )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:5: numberLiteral
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( numberLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:5: numberLiteral
{
- pushFollow(FOLLOW_numberLiteral_in_primaryExpression2952);
+ pushFollow(FOLLOW_numberLiteral_in_primaryExpression2964);
numberLiteral18=numberLiteral();
_fsp--;
if (failed) return cn;
@@ -6624,12 +6664,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 5 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:253:4: ( nullLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( nullLiteral )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:253:4: ( nullLiteral )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:253:5: nullLiteral
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( nullLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:5: nullLiteral
{
- pushFollow(FOLLOW_nullLiteral_in_primaryExpression2961);
+ pushFollow(FOLLOW_nullLiteral_in_primaryExpression2973);
nullLiteral19=nullLiteral();
_fsp--;
if (failed) return cn;
@@ -6643,12 +6683,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 6 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:4: ( listLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( listLiteral )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:4: ( listLiteral )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:5: listLiteral
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( listLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:5: listLiteral
{
- pushFollow(FOLLOW_listLiteral_in_primaryExpression2970);
+ pushFollow(FOLLOW_listLiteral_in_primaryExpression2982);
listLiteral20=listLiteral();
_fsp--;
if (failed) return cn;
@@ -6662,12 +6702,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 7 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:4: ( constructorCall )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( constructorCall )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:4: ( constructorCall )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:5: constructorCall
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( constructorCall )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:5: constructorCall
{
- pushFollow(FOLLOW_constructorCall_in_primaryExpression2979);
+ pushFollow(FOLLOW_constructorCall_in_primaryExpression2991);
constructorCall21=constructorCall();
_fsp--;
if (failed) return cn;
@@ -6681,12 +6721,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 8 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:4: ( globalVarExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:4: ( globalVarExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:4: ( globalVarExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:256:5: globalVarExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:4: ( globalVarExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:5: globalVarExpression
{
- pushFollow(FOLLOW_globalVarExpression_in_primaryExpression2988);
+ pushFollow(FOLLOW_globalVarExpression_in_primaryExpression3000);
globalVarExpression22=globalVarExpression();
_fsp--;
if (failed) return cn;
@@ -6700,12 +6740,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 9 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:257:4: ( paranthesizedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:300:4: ( paranthesizedExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:257:4: ( paranthesizedExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:257:5: paranthesizedExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:300:4: ( paranthesizedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:300:5: paranthesizedExpression
{
- pushFollow(FOLLOW_paranthesizedExpression_in_primaryExpression2997);
+ pushFollow(FOLLOW_paranthesizedExpression_in_primaryExpression3009);
paranthesizedExpression23=paranthesizedExpression();
_fsp--;
if (failed) return cn;
@@ -6733,19 +6773,20 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start stringLiteral
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:1: stringLiteral returns [CompositeNode cn] : ( StringLiteral ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:302:1: stringLiteral returns [CompositeNode cn] : ( StringLiteral ) ;
public CompositeNode stringLiteral() throws RecognitionException {
CompositeNode cn = null;
- cn = factory.createStringLiteralNode(); cn.setRule("stringLiteral");
+ cn = factory.createStringLiteralNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:2: ( ( StringLiteral ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:2: ( StringLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:2: ( ( StringLiteral ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:2: ( StringLiteral )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:2: ( StringLiteral )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:261:3: StringLiteral
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:2: ( StringLiteral )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:3: StringLiteral
{
- match(input,StringLiteral,FOLLOW_StringLiteral_in_stringLiteral3020); if (failed) return cn;
+ match(input,StringLiteral,FOLLOW_StringLiteral_in_stringLiteral3032); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -6768,45 +6809,46 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start paranthesizedExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:1: paranthesizedExpression returns [CompositeNode cn] : ( '(' ) (unnamed103= expression ) ( ')' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:1: paranthesizedExpression returns [CompositeNode cn] : ( '(' ) (unnamed92= expression ) ( ')' ) ;
public CompositeNode paranthesizedExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed103 = null;
+ CompositeNode unnamed92 = null;
- cn = factory.createParanthesizedExpressionNode(); cn.setRule("paranthesizedExpression");
+ cn = factory.createParanthesizedExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:2: ( ( '(' ) (unnamed103= expression ) ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:2: ( '(' ) (unnamed103= expression ) ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:2: ( ( '(' ) (unnamed92= expression ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:2: ( '(' ) (unnamed92= expression ) ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:2: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:3: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:2: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:3: '('
{
- match(input,31,FOLLOW_31_in_paranthesizedExpression3043); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_paranthesizedExpression3055); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:44: (unnamed103= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:45: unnamed103= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:44: (unnamed92= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:45: unnamed92= expression
{
- pushFollow(FOLLOW_expression_in_paranthesizedExpression3051);
- unnamed103=expression();
+ pushFollow(FOLLOW_expression_in_paranthesizedExpression3063);
+ unnamed92=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed103);
+ addToChildren(cn, unnamed92);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:103: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:104: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:101: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:102: ')'
{
- match(input,34,FOLLOW_34_in_paranthesizedExpression3057); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_paranthesizedExpression3069); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -6829,37 +6871,38 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start globalVarExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:267:1: globalVarExpression returns [CompositeNode cn] : ( 'GLOBALVAR' ) (unnamed104= identifier ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:312:1: globalVarExpression returns [CompositeNode cn] : ( 'GLOBALVAR' ) (unnamed93= identifier ) ;
public CompositeNode globalVarExpression() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed104 = null;
+ CompositeNode unnamed93 = null;
- cn = factory.createGlobalVarExpressionNode(); cn.setRule("globalVarExpression");
+ cn = factory.createGlobalVarExpressionNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:2: ( ( 'GLOBALVAR' ) (unnamed104= identifier ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:2: ( 'GLOBALVAR' ) (unnamed104= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:2: ( ( 'GLOBALVAR' ) (unnamed93= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:2: ( 'GLOBALVAR' ) (unnamed93= identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:2: ( 'GLOBALVAR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:3: 'GLOBALVAR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:2: ( 'GLOBALVAR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:3: 'GLOBALVAR'
{
- match(input,95,FOLLOW_95_in_globalVarExpression3080); if (failed) return cn;
+ match(input,95,FOLLOW_95_in_globalVarExpression3092); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:52: (unnamed104= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:53: unnamed104= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:52: (unnamed93= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:53: unnamed93= identifier
{
- pushFollow(FOLLOW_identifier_in_globalVarExpression3088);
- unnamed104=identifier();
+ pushFollow(FOLLOW_identifier_in_globalVarExpression3100);
+ unnamed93=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed104);
+ addToChildren(cn, unnamed93);
}
}
@@ -6880,38 +6923,39 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start featureCall
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:271:1: featureCall returns [CompositeNode cn] : ( (unnamed105= identifier ) ( '(' ) ( ( (unnamed106= parameterList ) ) )? ( ')' ) | (unnamed107= type ) | (unnamed108= collectionExpression ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:317:1: featureCall returns [CompositeNode cn] : ( (name= identifier ) ( '(' ) ( ( (paramList= parameterList ) ) )? ( ')' ) | (unnamed94= type ) | (unnamed95= collectionExpression ) );
public CompositeNode featureCall() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed105 = null;
+ CompositeNode name = null;
- CompositeNode unnamed106 = null;
+ CompositeNode paramList = null;
- CompositeNode unnamed107 = null;
+ CompositeNode unnamed94 = null;
- CompositeNode unnamed108 = null;
+ CompositeNode unnamed95 = null;
- cn = factory.createFeatureCallNode(); cn.setRule("featureCall");
+ cn = factory.createFeatureCallNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:2: ( (unnamed105= identifier ) ( '(' ) ( ( (unnamed106= parameterList ) ) )? ( ')' ) | (unnamed107= type ) | (unnamed108= collectionExpression ) )
- int alt72=3;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:2: ( (name= identifier ) ( '(' ) ( ( (paramList= parameterList ) ) )? ( ')' ) | (unnamed94= type ) | (unnamed95= collectionExpression ) )
+ int alt71=3;
switch ( input.LA(1) ) {
case Identifier:
{
- int LA72_1 = input.LA(2);
+ int LA71_1 = input.LA(2);
- if ( (LA72_1==EOF||LA72_1==TEXT||LA72_1==Identifier||LA72_1==28||(LA72_1>=32 && LA72_1<=34)||(LA72_1>=36 && LA72_1<=37)||LA72_1==40||LA72_1==43||(LA72_1>=54 && LA72_1<=56)||(LA72_1>=60 && LA72_1<=61)||LA72_1==63||LA72_1==68||(LA72_1>=74 && LA72_1<=77)||(LA72_1>=80 && LA72_1<=93)) ) {
- alt72=2;
+ if ( (LA71_1==EOF||LA71_1==TEXT||LA71_1==Identifier||LA71_1==28||(LA71_1>=32 && LA71_1<=34)||(LA71_1>=36 && LA71_1<=37)||LA71_1==40||LA71_1==43||(LA71_1>=54 && LA71_1<=56)||(LA71_1>=60 && LA71_1<=61)||LA71_1==63||LA71_1==68||(LA71_1>=74 && LA71_1<=77)||(LA71_1>=80 && LA71_1<=93)) ) {
+ alt71=2;
}
- else if ( (LA72_1==31) ) {
- alt72=1;
+ else if ( (LA71_1==31) ) {
+ alt71=1;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("271:1: featureCall returns [CompositeNode cn] : ( (unnamed105= identifier ) ( '(' ) ( ( (unnamed106= parameterList ) ) )? ( ')' ) | (unnamed107= type ) | (unnamed108= collectionExpression ) );", 72, 1, input);
+ new NoViableAltException("317:1: featureCall returns [CompositeNode cn] : ( (name= identifier ) ( '(' ) ( ( (paramList= parameterList ) ) )? ( ')' ) | (unnamed94= type ) | (unnamed95= collectionExpression ) );", 71, 1, input);
throw nvae;
}
@@ -6921,7 +6965,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
case 70:
case 71:
{
- alt72=2;
+ alt71=2;
}
break;
case 100:
@@ -6934,67 +6978,67 @@ public class Xpand3NodeParser extends AbstractNodeParser {
case 107:
case 108:
{
- alt72=3;
+ alt71=3;
}
break;
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("271:1: featureCall returns [CompositeNode cn] : ( (unnamed105= identifier ) ( '(' ) ( ( (unnamed106= parameterList ) ) )? ( ')' ) | (unnamed107= type ) | (unnamed108= collectionExpression ) );", 72, 0, input);
+ new NoViableAltException("317:1: featureCall returns [CompositeNode cn] : ( (name= identifier ) ( '(' ) ( ( (paramList= parameterList ) ) )? ( ')' ) | (unnamed94= type ) | (unnamed95= collectionExpression ) );", 71, 0, input);
throw nvae;
}
- switch (alt72) {
+ switch (alt71) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:2: (unnamed105= identifier ) ( '(' ) ( ( (unnamed106= parameterList ) ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:2: (name= identifier ) ( '(' ) ( ( (paramList= parameterList ) ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:2: (unnamed105= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:3: unnamed105= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:2: (name= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:3: name= identifier
{
- pushFollow(FOLLOW_identifier_in_featureCall3118);
- unnamed105=identifier();
+ pushFollow(FOLLOW_identifier_in_featureCall3130);
+ name=identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed105);
+ addToChildren(cn, name); ((FeatureCallNode) cn).setName(name);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:61: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:62: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:87: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:88: '('
{
- match(input,31,FOLLOW_31_in_featureCall3124); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_featureCall3136); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:103: ( ( (unnamed106= parameterList ) ) )?
- int alt71=2;
- int LA71_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:129: ( ( (paramList= parameterList ) ) )?
+ int alt70=2;
+ int LA70_0 = input.LA(1);
- if ( ((LA71_0>=StringLiteral && LA71_0<=Identifier)||LA71_0==31||LA71_0==36||LA71_0==59||(LA71_0>=69 && LA71_0<=72)||(LA71_0>=78 && LA71_0<=79)||(LA71_0>=94 && LA71_0<=108)) ) {
- alt71=1;
+ if ( ((LA70_0>=StringLiteral && LA70_0<=Identifier)||LA70_0==31||LA70_0==36||LA70_0==59||(LA70_0>=69 && LA70_0<=72)||(LA70_0>=78 && LA70_0<=79)||(LA70_0>=94 && LA70_0<=108)) ) {
+ alt70=1;
}
- switch (alt71) {
+ switch (alt70) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:104: ( (unnamed106= parameterList ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:130: ( (paramList= parameterList ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:104: ( (unnamed106= parameterList ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:105: (unnamed106= parameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:130: ( (paramList= parameterList ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:131: (paramList= parameterList )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:105: (unnamed106= parameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:106: unnamed106= parameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:131: (paramList= parameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:132: paramList= parameterList
{
- pushFollow(FOLLOW_parameterList_in_featureCall3134);
- unnamed106=parameterList();
+ pushFollow(FOLLOW_parameterList_in_featureCall3146);
+ paramList=parameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed106);
+ addToChildren(cn, paramList); ((FeatureCallNode) cn).setParamList(paramList);
}
}
@@ -7008,10 +7052,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:170: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:274:171: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:242: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:243: ')'
{
- match(input,34,FOLLOW_34_in_featureCall3143); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_featureCall3155); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -7022,17 +7066,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:4: (unnamed107= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:4: (unnamed94= type )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:4: (unnamed107= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:5: unnamed107= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:4: (unnamed94= type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:5: unnamed94= type
{
- pushFollow(FOLLOW_type_in_featureCall3154);
- unnamed107=type();
+ pushFollow(FOLLOW_type_in_featureCall3166);
+ unnamed94=type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed107);
+ addToChildren(cn, unnamed94);
}
}
@@ -7041,17 +7085,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:4: (unnamed108= collectionExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: (unnamed95= collectionExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:4: (unnamed108= collectionExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:5: unnamed108= collectionExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: (unnamed95= collectionExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:5: unnamed95= collectionExpression
{
- pushFollow(FOLLOW_collectionExpression_in_featureCall3165);
- unnamed108=collectionExpression();
+ pushFollow(FOLLOW_collectionExpression_in_featureCall3177);
+ unnamed95=collectionExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed108);
+ addToChildren(cn, unnamed95);
}
}
@@ -7077,94 +7121,95 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start listLiteral
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:278:1: listLiteral returns [CompositeNode cn] : ( '{' ) ( ( (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )* ) )? ( '}' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:325:1: listLiteral returns [CompositeNode cn] : ( '{' ) ( ( (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )* ) )? ( '}' ) ;
public CompositeNode listLiteral() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed109 = null;
+ CompositeNode unnamed96 = null;
- CompositeNode unnamed110 = null;
+ CompositeNode unnamed97 = null;
- cn = factory.createListLiteralNode(); cn.setRule("listLiteral");
+ cn = factory.createListLiteralNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:2: ( ( '{' ) ( ( (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )* ) )? ( '}' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:2: ( '{' ) ( ( (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )* ) )? ( '}' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:2: ( ( '{' ) ( ( (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )* ) )? ( '}' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:2: ( '{' ) ( ( (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )* ) )? ( '}' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:2: ( '{' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:3: '{'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:2: ( '{' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:3: '{'
{
- match(input,79,FOLLOW_79_in_listLiteral3188); if (failed) return cn;
+ match(input,79,FOLLOW_79_in_listLiteral3200); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:44: ( ( (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )* ) )?
- int alt74=2;
- int LA74_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:44: ( ( (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )* ) )?
+ int alt73=2;
+ int LA73_0 = input.LA(1);
- if ( ((LA74_0>=StringLiteral && LA74_0<=Identifier)||LA74_0==31||LA74_0==36||LA74_0==59||(LA74_0>=69 && LA74_0<=72)||(LA74_0>=78 && LA74_0<=79)||(LA74_0>=94 && LA74_0<=108)) ) {
- alt74=1;
+ if ( ((LA73_0>=StringLiteral && LA73_0<=Identifier)||LA73_0==31||LA73_0==36||LA73_0==59||(LA73_0>=69 && LA73_0<=72)||(LA73_0>=78 && LA73_0<=79)||(LA73_0>=94 && LA73_0<=108)) ) {
+ alt73=1;
}
- switch (alt74) {
+ switch (alt73) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:45: ( (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:45: ( (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )* )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:45: ( (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:46: (unnamed109= expression ) ( ( ( ',' ) (unnamed110= expression ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:45: ( (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:46: (unnamed96= expression ) ( ( ( ',' ) (unnamed97= expression ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:46: (unnamed109= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:47: unnamed109= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:46: (unnamed96= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:47: unnamed96= expression
{
- pushFollow(FOLLOW_expression_in_listLiteral3198);
- unnamed109=expression();
+ pushFollow(FOLLOW_expression_in_listLiteral3210);
+ unnamed96=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed109);
+ addToChildren(cn, unnamed96);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:105: ( ( ( ',' ) (unnamed110= expression ) ) )*
- loop73:
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:103: ( ( ( ',' ) (unnamed97= expression ) ) )*
+ loop72:
do {
- int alt73=2;
- int LA73_0 = input.LA(1);
+ int alt72=2;
+ int LA72_0 = input.LA(1);
- if ( (LA73_0==32) ) {
- alt73=1;
+ if ( (LA72_0==32) ) {
+ alt72=1;
}
- switch (alt73) {
+ switch (alt72) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:106: ( ( ',' ) (unnamed110= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:104: ( ( ',' ) (unnamed97= expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:106: ( ( ',' ) (unnamed110= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:107: ( ',' ) (unnamed110= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:104: ( ( ',' ) (unnamed97= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:105: ( ',' ) (unnamed97= expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:107: ( ',' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:108: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:105: ( ',' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:106: ','
{
- match(input,32,FOLLOW_32_in_listLiteral3206); if (failed) return cn;
+ match(input,32,FOLLOW_32_in_listLiteral3218); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:149: (unnamed110= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:150: unnamed110= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:147: (unnamed97= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:148: unnamed97= expression
{
- pushFollow(FOLLOW_expression_in_listLiteral3214);
- unnamed110=expression();
+ pushFollow(FOLLOW_expression_in_listLiteral3226);
+ unnamed97=expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed110);
+ addToChildren(cn, unnamed97);
}
}
@@ -7177,7 +7222,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
break;
default :
- break loop73;
+ break loop72;
}
} while (true);
@@ -7190,10 +7235,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:214: ( '}' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:215: '}'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:210: ( '}' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:328:211: '}'
{
- match(input,81,FOLLOW_81_in_listLiteral3226); if (failed) return cn;
+ match(input,81,FOLLOW_81_in_listLiteral3238); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -7216,37 +7261,38 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start constructorCall
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:1: constructorCall returns [CompositeNode cn] : ( 'new' ) (unnamed111= simpleType ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:1: constructorCall returns [CompositeNode cn] : ( 'new' ) (unnamed98= simpleType ) ;
public CompositeNode constructorCall() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode unnamed111 = null;
+ CompositeNode unnamed98 = null;
- cn = factory.createConstructorCallNode(); cn.setRule("constructorCall");
+ cn = factory.createConstructorCallNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:284:2: ( ( 'new' ) (unnamed111= simpleType ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:284:2: ( 'new' ) (unnamed111= simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:2: ( ( 'new' ) (unnamed98= simpleType ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:2: ( 'new' ) (unnamed98= simpleType )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:284:2: ( 'new' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:284:3: 'new'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:2: ( 'new' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:3: 'new'
{
- match(input,96,FOLLOW_96_in_constructorCall3249); if (failed) return cn;
+ match(input,96,FOLLOW_96_in_constructorCall3261); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:284:46: (unnamed111= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:284:47: unnamed111= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:46: (unnamed98= simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:47: unnamed98= simpleType
{
- pushFollow(FOLLOW_simpleType_in_constructorCall3257);
- unnamed111=simpleType();
+ pushFollow(FOLLOW_simpleType_in_constructorCall3269);
+ unnamed98=simpleType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- addToChildren(cn, unnamed111);
+ addToChildren(cn, unnamed98);
}
}
@@ -7267,37 +7313,38 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start booleanLiteral
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:1: booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:1: booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );
public CompositeNode booleanLiteral() throws RecognitionException {
CompositeNode cn = null;
- cn = factory.createBooleanLiteralNode(); cn.setRule("booleanLiteral");
+ cn = factory.createBooleanLiteralNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:288:2: ( ( 'false' ) | ( 'true' ) )
- int alt75=2;
- int LA75_0 = input.LA(1);
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:2: ( ( 'false' ) | ( 'true' ) )
+ int alt74=2;
+ int LA74_0 = input.LA(1);
- if ( (LA75_0==97) ) {
- alt75=1;
+ if ( (LA74_0==97) ) {
+ alt74=1;
}
- else if ( (LA75_0==98) ) {
- alt75=2;
+ else if ( (LA74_0==98) ) {
+ alt74=2;
}
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("286:1: booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );", 75, 0, input);
+ new NoViableAltException("335:1: booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );", 74, 0, input);
throw nvae;
}
- switch (alt75) {
+ switch (alt74) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:288:2: ( 'false' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:2: ( 'false' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:288:2: ( 'false' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:288:3: 'false'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:2: ( 'false' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:3: 'false'
{
- match(input,97,FOLLOW_97_in_booleanLiteral3280); if (failed) return cn;
+ match(input,97,FOLLOW_97_in_booleanLiteral3292); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -7308,12 +7355,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:4: ( 'true' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( 'true' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:4: ( 'true' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:5: 'true'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( 'true' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:5: 'true'
{
- match(input,98,FOLLOW_98_in_booleanLiteral3289); if (failed) return cn;
+ match(input,98,FOLLOW_98_in_booleanLiteral3301); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -7338,19 +7385,20 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// $ANTLR start nullLiteral
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:291:1: nullLiteral returns [CompositeNode cn] : ( 'null' ) ;
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:1: nullLiteral returns [CompositeNode cn] : ( 'null' ) ;
public CompositeNode nullLiteral() throws RecognitionException {
CompositeNode cn = null;
- cn = factory.createNullLiteralNode(); cn.setRule("nullLiteral");
+ cn = factory.createNullLiteralNode();
+
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:2: ( ( 'null' ) )
- // ./src-gen/org/eclipse