diff options
| author | jkohnlein | 2008-03-13 08:39:44 +0000 |
|---|---|---|
| committer | jkohnlein | 2008-03-13 08:39:44 +0000 |
| commit | 5a5e7bb03245da6921348b4dde43f3ac12e3af7b (patch) | |
| tree | 01ba5f01c0ffe7eca950f2edad466b9e15c6953e | |
| parent | 376dafa599eb7aea10afc327d2989a8c19dd87e8 (diff) | |
| download | org.eclipse.xpand-5a5e7bb03245da6921348b4dde43f3ac12e3af7b.tar.gz org.eclipse.xpand-5a5e7bb03245da6921348b4dde43f3ac12e3af7b.tar.xz org.eclipse.xpand-5a5e7bb03245da6921348b4dde43f3ac12e3af7b.zip | |
node 2 ast nearly finished
213 files changed, 9406 insertions, 4948 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java index 956ab7b9..a04e077c 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: AdditiveExpressionNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: AdditiveExpressionNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; +import org.eclipse.emf.common.util.EList; + import org.eclipse.tmf.common.node.CompositeNode; /** @@ -16,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getLeft <em>Left</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getRight <em>Right</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -26,56 +28,46 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface AdditiveExpressionNode extends CompositeNode { - /** - * Returns the value of the '<em><b>Right</b></em>' reference. + * Returns the value of the '<em><b>Nexts</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>Right</em>' reference isn't clear, + * If the meaning of the '<em>Nexts</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>Right</em>' reference. - * @see #setRight(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_Right() + * @return the value of the '<em>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_Nexts() * @model * @generated */ - CompositeNode getRight(); + EList<CompositeNode> getNexts(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getRight <em>Right</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Right</em>' reference. - * @see #getRight() - * @generated - */ - void setRight(CompositeNode value); - - /** - * Returns the value of the '<em><b>Left</b></em>' reference. + * Returns the value of the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Left</em>' reference isn't clear, + * If the meaning of the '<em>First</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</em>' reference. - * @see #setLeft(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_Left() + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_First() * @model * @generated */ - CompositeNode getLeft(); + CompositeNode getFirst(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getLeft <em>Left</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Left</em>' reference. - * @see #getLeft() + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() * @generated */ - void setLeft(CompositeNode value); + void setFirst(CompositeNode value); + } // AdditiveExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java index 80313a42..9d1f73f0 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: AndExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: AndExpressionNode.java,v 1.3 2008/03/13 08:40:01 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 +15,59 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>And Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode() * @model * @generated */ public interface AndExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>First</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>First</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode_First() + * @model + * @generated + */ + CompositeNode getFirst(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() + * @generated + */ + void setFirst(CompositeNode value); + + /** + * Returns the value of the '<em><b>Nexts</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>Nexts</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>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode_Nexts() + * @model + * @generated + */ + EList<CompositeNode> getNexts(); + } // AndExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java index ea4ae661..c63af9ef 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AroundNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: AroundNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java index a08c4177..d9ffc6f2 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: BooleanLiteralNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: BooleanLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java index 8f71ef8b..025a5608 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CasePartNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: CasePartNode.java,v 1.3 2008/03/13 08:40:00 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>Case Part Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCasePartNode() * @model * @generated */ public interface CasePartNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Condition</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Condition</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Condition</em>' reference. + * @see #setCondition(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCasePartNode_Condition() + * @model + * @generated + */ + CompositeNode getCondition(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Condition</em>' reference. + * @see #getCondition() + * @generated + */ + void setCondition(CompositeNode value); + + /** + * Returns the value of the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Expression</em>' reference. + * @see #setExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCasePartNode_Expression() + * @model + * @generated + */ + CompositeNode getExpression(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Expression</em>' reference. + * @see #getExpression() + * @generated + */ + void setExpression(CompositeNode value); + } // CasePartNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java index 16b4fe9a..ace70ab8 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CastedExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: CastedExpressionNode.java,v 1.3 2008/03/13 08:40:01 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>Casted Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode() * @model * @generated */ public interface CastedExpressionNode extends CompositeNode { + /** + * 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#getCastedExpressionNode_Target() + * @model + * @generated + */ + CompositeNode getTarget(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#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); + + /** + * Returns the value of the '<em><b>Type</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>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>Type</em>' reference. + * @see #setType(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode_Type() + * @model + * @generated + */ + CompositeNode getType(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Type</em>' reference. + * @see #getType() + * @generated + */ + void setType(CompositeNode value); + } // CastedExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java index 7acb6f99..3daddaef 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: ChainExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ChainExpressionNode.java,v 1.3 2008/03/13 08:40:01 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 +15,59 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>Chain Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode() * @model * @generated */ public interface ChainExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Nexts</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>Nexts</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>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode_Nexts() + * @model + * @generated + */ + EList<CompositeNode> getNexts(); + + /** + * Returns the value of the '<em><b>First</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>First</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode_First() + * @model + * @generated + */ + CompositeNode getFirst(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() + * @generated + */ + void setFirst(CompositeNode value); + } // ChainExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java index 57f831da..5d3f42bc 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java @@ -2,21 +2,189 @@ * <copyright> * </copyright> * - * $Id: CheckNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: CheckNode.java,v 1.3 2008/03/13 08:40:00 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>Check Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError <em>Error</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage <em>Message</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode() * @model * @generated */ public interface CheckNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Type</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>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>Type</em>' reference. + * @see #setType(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Type() + * @model + * @generated + */ + CompositeNode getType(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType <em>Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Type</em>' reference. + * @see #getType() + * @generated + */ + void setType(CompositeNode value); + + /** + * Returns the value of the '<em><b>Error</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Error</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Error</em>' reference. + * @see #setError(LeafNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Error() + * @model + * @generated + */ + LeafNode getError(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError <em>Error</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Error</em>' reference. + * @see #getError() + * @generated + */ + void setError(LeafNode value); + + /** + * Returns the value of the '<em><b>Message</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Message</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Message</em>' reference. + * @see #setMessage(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Message() + * @model + * @generated + */ + CompositeNode getMessage(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage <em>Message</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Message</em>' reference. + * @see #getMessage() + * @generated + */ + void setMessage(CompositeNode value); + + /** + * Returns the value of the '<em><b>If Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>If Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>If Expression</em>' reference. + * @see #setIfExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_IfExpression() + * @model + * @generated + */ + CompositeNode getIfExpression(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>If Expression</em>' reference. + * @see #getIfExpression() + * @generated + */ + void setIfExpression(CompositeNode value); + + /** + * Returns the value of the '<em><b>Warning</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Warning</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Warning</em>' reference. + * @see #setWarning(LeafNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Warning() + * @model + * @generated + */ + LeafNode getWarning(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Warning</em>' reference. + * @see #getWarning() + * @generated + */ + void setWarning(LeafNode value); + + /** + * Returns the value of the '<em><b>Constraint</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Constraint</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Constraint</em>' reference. + * @see #setConstraint(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Constraint() + * @model + * @generated + */ + CompositeNode getConstraint(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Constraint</em>' reference. + * @see #getConstraint() + * @generated + */ + void setConstraint(CompositeNode value); + } // CheckNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java index 1869604a..7a46e0f4 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CollectionExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: CollectionExpressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -13,10 +13,96 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>Collection Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode() * @model * @generated */ public interface CollectionExpressionNode extends CompositeNode { + + /** + * Returns the value of the '<em><b>Variable</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Variable</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Variable</em>' reference. + * @see #setVariable(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Variable() + * @model + * @generated + */ + CompositeNode getVariable(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Variable</em>' reference. + * @see #getVariable() + * @generated + */ + void setVariable(CompositeNode value); + + /** + * Returns the value of the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Expression</em>' reference. + * @see #setExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Expression() + * @model + * @generated + */ + CompositeNode getExpression(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Expression</em>' reference. + * @see #getExpression() + * @generated + */ + void setExpression(CompositeNode value); + + /** + * Returns the value of the '<em><b>Type</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>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>Type</em>' reference. + * @see #setType(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Type() + * @model + * @generated + */ + CompositeNode getType(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Type</em>' reference. + * @see #getType() + * @generated + */ + void setType(CompositeNode value); } // CollectionExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java index 6e36a0a9..42135fbd 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java @@ -2,21 +2,81 @@ * <copyright> * </copyright> * - * $Id: CollectionTypeNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: CollectionTypeNode.java,v 1.3 2008/03/13 08:40:00 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>Collection Type Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode() * @model * @generated */ public interface CollectionTypeNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Collection Type</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Collection 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>Collection Type</em>' reference. + * @see #setCollectionType(LeafNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode_CollectionType() + * @model + * @generated + */ + LeafNode getCollectionType(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Collection Type</em>' reference. + * @see #getCollectionType() + * @generated + */ + void setCollectionType(LeafNode value); + + /** + * Returns the value of the '<em><b>Element Type</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Element 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>Element Type</em>' reference. + * @see #setElementType(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode_ElementType() + * @model + * @generated + */ + CompositeNode getElementType(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Element Type</em>' reference. + * @see #getElementType() + * @generated + */ + void setElementType(CompositeNode value); + } // CollectionTypeNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java index 8ebe02d1..af2f8e8f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstructorCallNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: ConstructorCallNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; 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 697c783f..a2d71134 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclaredParameterListNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: DeclaredParameterListNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; 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 d7890754..cb822ead 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.4 2008/03/07 11:11:14 jkohnlein Exp $ + * $Id: DeclaredParameterNode.java,v 1.5 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -16,8 +16,8 @@ import org.eclipse.tmf.common.node.CompositeNode; * <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> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}</li> * </ul> * </p> * @@ -27,55 +27,55 @@ import org.eclipse.tmf.common.node.CompositeNode; */ public interface DeclaredParameterNode extends CompositeNode { /** - * Returns the value of the '<em><b>Name</b></em>' reference. + * Returns the value of the '<em><b>Ptype</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Name</em>' reference isn't clear, + * 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>Name</em>' reference. - * @see #setName(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Name() + * @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 getName(); + CompositeNode getPtype(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}' reference. + * 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>Name</em>' reference. - * @see #getName() + * @param value the new value of the '<em>Ptype</em>' reference. + * @see #getPtype() * @generated */ - void setName(CompositeNode value); + void setPtype(CompositeNode value); /** - * Returns the value of the '<em><b>Ptype</b></em>' reference. + * Returns the value of the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Ptype</em>' reference isn't clear, + * 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>Ptype</em>' reference. - * @see #setPtype(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Ptype() + * @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 getPtype(); + CompositeNode getName(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}' reference. + * 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>Ptype</em>' reference. - * @see #getPtype() + * @param value the new value of the '<em>Name</em>' reference. + * @see #getName() * @generated */ - void setPtype(CompositeNode value); + void setName(CompositeNode value); } // DeclaredParameterNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java index 1a863e27..fdc5747e 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DefinitionAroundNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: DefinitionAroundNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -28,7 +28,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface DefinitionAroundNode extends CompositeNode { - /** * Returns the value of the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> @@ -132,4 +131,5 @@ public interface DefinitionAroundNode extends CompositeNode { * @generated */ void setSequence(CompositeNode value); + } // DefinitionAroundNode 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 103859ff..6ebc7667 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.4 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: DefinitionNode.java,v 1.5 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -29,6 +29,32 @@ import org.eclipse.tmf.common.node.CompositeNode; */ public interface DefinitionNode 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#getDefinitionNode_Name() + * @model + * @generated + */ + CompositeNode getName(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#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>Type</b></em>' reference. * <!-- begin-user-doc --> * <p> @@ -81,32 +107,6 @@ public interface DefinitionNode extends CompositeNode { void setSequence(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#getDefinitionNode_Name() - * @model - * @generated - */ - CompositeNode getName(); - - /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#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> diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java index 1f74ffe6..8205abd5 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ElseIfStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ElseIfStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -26,7 +26,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ElseIfStatementNode extends CompositeNode { - /** * Returns the value of the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> @@ -78,4 +77,5 @@ public interface ElseIfStatementNode extends CompositeNode { * @generated */ void setExpression(CompositeNode value); + } // ElseIfStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java index 32d583e9..e92f3ee5 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ElseStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ElseStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -25,7 +25,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ElseStatementNode extends CompositeNode { - /** * Returns the value of the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> @@ -51,4 +50,5 @@ public interface ElseStatementNode extends CompositeNode { * @generated */ void setSequence(CompositeNode value); + } // ElseStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java index a96a4954..bfd0a2b2 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ErrorStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ErrorStatementNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -25,7 +25,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ErrorStatementNode extends CompositeNode { - /** * Returns the value of the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> @@ -51,4 +50,5 @@ public interface ErrorStatementNode extends CompositeNode { * @generated */ void setExpression(CompositeNode value); + } // ErrorStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java index 58789dc8..0dfec6c7 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExpandStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ExpandStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,6 +18,7 @@ import org.eclipse.tmf.common.node.CompositeNode; * <ul> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}</li> * </ul> @@ -28,7 +29,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ExpandStatementNode extends CompositeNode { - /** * Returns the value of the '<em><b>Separator</b></em>' reference. * <!-- begin-user-doc --> @@ -82,6 +82,32 @@ public interface ExpandStatementNode extends CompositeNode { void setParamList(CompositeNode value); /** + * Returns the value of the '<em><b>For Each Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>For Each Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>For Each Expression</em>' reference. + * @see #setForEachExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ForEachExpression() + * @model + * @generated + */ + CompositeNode getForEachExpression(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>For Each Expression</em>' reference. + * @see #getForEachExpression() + * @generated + */ + void setForEachExpression(CompositeNode value); + + /** * Returns the value of the '<em><b>For Expression</b></em>' reference. * <!-- begin-user-doc --> * <p> @@ -132,4 +158,5 @@ public interface ExpandStatementNode extends CompositeNode { * @generated */ void setName(CompositeNode value); + } // ExpandStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java deleted file mode 100644 index cb766e3d..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: ExpressionNode.java,v 1.2 2008/03/07 09:39:40 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>Expression Node</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpressionNode() - * @model - * @generated - */ -public interface ExpressionNode extends CompositeNode { -} // ExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java index f294adec..7ac6b453 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExpressionStmtNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ExpressionStmtNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -25,7 +25,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ExpressionStmtNode extends CompositeNode { - /** * Returns the value of the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> @@ -51,4 +50,5 @@ public interface ExpressionStmtNode extends CompositeNode { * @generated */ void setExpression(CompositeNode value); + } // ExpressionStmtNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionImportNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionImportNode.java index f005fc17..1b876b79 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionImportNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionImportNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExtensionImportNode.java,v 1.1 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ExtensionImportNode.java,v 1.2 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; 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 416ec3cb..21a269a0 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExtensionNode.java,v 1.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ExtensionNode.java,v 1.6 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -35,30 +35,30 @@ import org.eclipse.tmf.common.node.LeafNode; */ public interface ExtensionNode extends CompositeNode { /** - * Returns the value of the '<em><b>Create</b></em>' reference. + * Returns the value of the '<em><b>Param List</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Create</em>' reference isn't clear, + * 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>Create</em>' reference. - * @see #setCreate(LeafNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Create() + * @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 */ - LeafNode getCreate(); + CompositeNode getParamList(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}' reference. + * 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>Create</em>' reference. - * @see #getCreate() + * @param value the new value of the '<em>Param List</em>' reference. + * @see #getParamList() * @generated */ - void setCreate(LeafNode value); + void setParamList(CompositeNode value); /** * Returns the value of the '<em><b>Private</b></em>' reference. @@ -87,108 +87,108 @@ public interface ExtensionNode extends CompositeNode { void setPrivate(LeafNode value); /** - * Returns the value of the '<em><b>Param List</b></em>' reference. + * Returns the value of the '<em><b>Return Type</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Param List</em>' reference isn't clear, + * 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>Param List</em>' reference. - * @see #setParamList(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ParamList() + * @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 getParamList(); + CompositeNode getReturnType(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}' reference. + * 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>Param List</em>' reference. - * @see #getParamList() + * @param value the new value of the '<em>Return Type</em>' reference. + * @see #getReturnType() * @generated */ - void setParamList(CompositeNode value); + void setReturnType(CompositeNode value); /** - * Returns the value of the '<em><b>Extend Body</b></em>' reference. + * Returns the value of the '<em><b>Java Return Type</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Extend Body</em>' reference isn't clear, + * 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>Extend Body</em>' reference. - * @see #setExtendBody(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ExtendBody() + * @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 getExtendBody(); + CompositeNode getJavaReturnType(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}' reference. + * 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>Extend Body</em>' reference. - * @see #getExtendBody() + * @param value the new value of the '<em>Java Return Type</em>' reference. + * @see #getJavaReturnType() * @generated */ - void setExtendBody(CompositeNode value); + void setJavaReturnType(CompositeNode value); /** - * Returns the value of the '<em><b>Cached</b></em>' reference. + * Returns the value of the '<em><b>Create</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Cached</em>' reference isn't clear, + * 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>Cached</em>' reference. - * @see #setCached(LeafNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Cached() + * @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 getCached(); + LeafNode getCreate(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}' reference. + * 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>Cached</em>' reference. - * @see #getCached() + * @param value the new value of the '<em>Create</em>' reference. + * @see #getCreate() * @generated */ - void setCached(LeafNode value); + void setCreate(LeafNode value); /** - * Returns the value of the '<em><b>Java Return Type</b></em>' reference. + * Returns the value of the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Java Return Type</em>' reference isn't clear, + * 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>Java Return Type</em>' reference. - * @see #setJavaReturnType(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_JavaReturnType() + * @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 getJavaReturnType(); + CompositeNode getName(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}' reference. + * 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>Java Return Type</em>' reference. - * @see #getJavaReturnType() + * @param value the new value of the '<em>Name</em>' reference. + * @see #getName() * @generated */ - void setJavaReturnType(CompositeNode value); + void setName(CompositeNode value); /** * Returns the value of the '<em><b>Java Name</b></em>' reference. @@ -217,55 +217,55 @@ public interface ExtensionNode extends CompositeNode { void setJavaName(CompositeNode value); /** - * Returns the value of the '<em><b>Return Type</b></em>' reference. + * Returns the value of the '<em><b>Cached</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Return Type</em>' reference isn't clear, + * 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>Return Type</em>' reference. - * @see #setReturnType(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ReturnType() + * @return the value of the '<em>Cached</em>' reference. + * @see #setCached(LeafNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Cached() * @model * @generated */ - CompositeNode getReturnType(); + LeafNode getCached(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}' reference. + * 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>Return Type</em>' reference. - * @see #getReturnType() + * @param value the new value of the '<em>Cached</em>' reference. + * @see #getCached() * @generated */ - void setReturnType(CompositeNode value); + void setCached(LeafNode value); /** - * Returns the value of the '<em><b>Name</b></em>' reference. + * Returns the value of the '<em><b>Extend Body</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Name</em>' reference isn't clear, + * 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>Name</em>' reference. - * @see #setName(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Name() + * @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 getName(); + CompositeNode getExtendBody(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}' reference. + * 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>Name</em>' reference. - * @see #getName() + * @param value the new value of the '<em>Extend Body</em>' reference. + * @see #getExtendBody() * @generated */ - void setName(CompositeNode value); + void setExtendBody(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 c15daedb..6f8f3f81 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.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: FeatureCallNode.java,v 1.6 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -16,9 +16,9 @@ import org.eclipse.tmf.common.node.CompositeNode; * <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#getType <em>Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}</li> * </ul> * </p> * @@ -28,30 +28,30 @@ import org.eclipse.tmf.common.node.CompositeNode; */ public interface FeatureCallNode extends CompositeNode { /** - * Returns the value of the '<em><b>Type</b></em>' reference. + * Returns the value of the '<em><b>Param List</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Type</em>' reference isn't clear, + * 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>Type</em>' reference. - * @see #setType(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Type() + * @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 getType(); + CompositeNode getParamList(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}' reference. + * 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>Type</em>' reference. - * @see #getType() + * @param value the new value of the '<em>Param List</em>' reference. + * @see #getParamList() * @generated */ - void setType(CompositeNode value); + void setParamList(CompositeNode value); /** * Returns the value of the '<em><b>Name</b></em>' reference. @@ -80,29 +80,29 @@ public interface FeatureCallNode extends CompositeNode { void setName(CompositeNode value); /** - * Returns the value of the '<em><b>Param List</b></em>' reference. + * Returns the value of the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Param List</em>' reference isn't clear, + * If the meaning of the '<em>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>Param List</em>' reference. - * @see #setParamList(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_ParamList() + * @return the value of the '<em>Type</em>' reference. + * @see #setType(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Type() * @model * @generated */ - CompositeNode getParamList(); + CompositeNode getType(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Param List</em>' reference. - * @see #getParamList() + * @param value the new value of the '<em>Type</em>' reference. + * @see #getType() * @generated */ - void setParamList(CompositeNode value); + void setType(CompositeNode value); } // FeatureCallNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java index 227e3a20..f2a98c12 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FileNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: FileNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java index 46f6f74b..1794f953 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FileStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: FileStatementNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -27,32 +27,31 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface FileStatementNode extends CompositeNode { - /** - * Returns the value of the '<em><b>Name Expression</b></em>' reference. + * Returns the value of the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Name Expression</em>' reference isn't clear, + * If the meaning of the '<em>Sequence</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 Expression</em>' reference. - * @see #setNameExpression(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_NameExpression() + * @return the value of the '<em>Sequence</em>' reference. + * @see #setSequence(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_Sequence() * @model * @generated */ - CompositeNode getNameExpression(); + CompositeNode getSequence(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Name Expression</em>' reference. - * @see #getNameExpression() + * @param value the new value of the '<em>Sequence</em>' reference. + * @see #getSequence() * @generated */ - void setNameExpression(CompositeNode value); + void setSequence(CompositeNode value); /** * Returns the value of the '<em><b>Identifier</b></em>' reference. @@ -81,28 +80,29 @@ public interface FileStatementNode extends CompositeNode { void setIdentifier(CompositeNode value); /** - * Returns the value of the '<em><b>Sequence</b></em>' reference. + * Returns the value of the '<em><b>Name Expression</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Sequence</em>' reference isn't clear, + * If the meaning of the '<em>Name Expression</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Sequence</em>' reference. - * @see #setSequence(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_Sequence() + * @return the value of the '<em>Name Expression</em>' reference. + * @see #setNameExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_NameExpression() * @model * @generated */ - CompositeNode getSequence(); + CompositeNode getNameExpression(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Sequence</em>' reference. - * @see #getSequence() + * @param value the new value of the '<em>Name Expression</em>' reference. + * @see #getNameExpression() * @generated */ - void setSequence(CompositeNode value); + void setNameExpression(CompositeNode value); + } // FileStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java index 9219fd2c..b865ea17 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ForeachStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ForeachStatementNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -29,7 +29,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ForeachStatementNode extends CompositeNode { - /** * Returns the value of the '<em><b>Iterator</b></em>' reference. * <!-- begin-user-doc --> @@ -57,56 +56,56 @@ public interface ForeachStatementNode extends CompositeNode { void setIterator(CompositeNode value); /** - * Returns the value of the '<em><b>Separator Expression</b></em>' reference. + * Returns the value of the '<em><b>Identifier</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Separator Expression</em>' reference isn't clear, + * If the meaning of the '<em>Identifier</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Separator Expression</em>' reference. - * @see #setSeparatorExpression(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_SeparatorExpression() + * @return the value of the '<em>Identifier</em>' reference. + * @see #setIdentifier(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Identifier() * @model * @generated */ - CompositeNode getSeparatorExpression(); + CompositeNode getIdentifier(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Separator Expression</em>' reference. - * @see #getSeparatorExpression() + * @param value the new value of the '<em>Identifier</em>' reference. + * @see #getIdentifier() * @generated */ - void setSeparatorExpression(CompositeNode value); + void setIdentifier(CompositeNode value); /** - * Returns the value of the '<em><b>Identifier</b></em>' reference. + * Returns the value of the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Identifier</em>' reference isn't clear, + * If the meaning of the '<em>Sequence</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Identifier</em>' reference. - * @see #setIdentifier(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Identifier() + * @return the value of the '<em>Sequence</em>' reference. + * @see #setSequence(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Sequence() * @model * @generated */ - CompositeNode getIdentifier(); + CompositeNode getSequence(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Identifier</em>' reference. - * @see #getIdentifier() + * @param value the new value of the '<em>Sequence</em>' reference. + * @see #getSequence() * @generated */ - void setIdentifier(CompositeNode value); + void setSequence(CompositeNode value); /** * Returns the value of the '<em><b>For Expression</b></em>' reference. @@ -135,28 +134,29 @@ public interface ForeachStatementNode extends CompositeNode { void setForExpression(CompositeNode value); /** - * Returns the value of the '<em><b>Sequence</b></em>' reference. + * Returns the value of the '<em><b>Separator Expression</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Sequence</em>' reference isn't clear, + * If the meaning of the '<em>Separator Expression</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Sequence</em>' reference. - * @see #setSequence(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Sequence() + * @return the value of the '<em>Separator Expression</em>' reference. + * @see #setSeparatorExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_SeparatorExpression() * @model * @generated */ - CompositeNode getSequence(); + CompositeNode getSeparatorExpression(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Sequence</em>' reference. - * @see #getSequence() + * @param value the new value of the '<em>Separator Expression</em>' reference. + * @see #getSeparatorExpression() * @generated */ - void setSequence(CompositeNode value); + void setSeparatorExpression(CompositeNode value); + } // ForeachStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java index 7b5d4d70..927b5fbb 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: GlobalVarExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: GlobalVarExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java index 6f1e00a4..717eace8 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IdentifierNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: IdentifierNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java index b47a96c7..25c5825f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IfExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: IfExpressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -13,10 +13,123 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>If Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode() * @model * @generated */ public interface IfExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Then</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Then</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Then</em>' reference. + * @see #setThen(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Then() + * @model + * @generated + */ + CompositeNode getThen(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Then</em>' reference. + * @see #getThen() + * @generated + */ + void setThen(CompositeNode value); + + /** + * Returns the value of the '<em><b>Else</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Else</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Else</em>' reference. + * @see #setElse(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Else() + * @model + * @generated + */ + CompositeNode getElse(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Else</em>' reference. + * @see #getElse() + * @generated + */ + void setElse(CompositeNode value); + + /** + * Returns the value of the '<em><b>Condition0</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Condition0</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Condition0</em>' reference. + * @see #setCondition0(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Condition0() + * @model + * @generated + */ + CompositeNode getCondition0(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Condition0</em>' reference. + * @see #getCondition0() + * @generated + */ + void setCondition0(CompositeNode value); + + /** + * Returns the value of the '<em><b>Condition1</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Condition1</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Condition1</em>' reference. + * @see #setCondition1(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Condition1() + * @model + * @generated + */ + CompositeNode getCondition1(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Condition1</em>' reference. + * @see #getCondition1() + * @generated + */ + void setCondition1(CompositeNode value); + } // IfExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java index 97fe3594..caefefe7 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java @@ -2,11 +2,12 @@ * <copyright> * </copyright> * - * $Id: IfStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: IfStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; import org.eclipse.emf.common.util.EList; + import org.eclipse.tmf.common.node.CompositeNode; /** @@ -17,7 +18,7 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIf <em>Else If</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIfs <em>Else Ifs</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}</li> @@ -29,32 +30,21 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface IfStatementNode extends CompositeNode { - /** - * Returns the value of the '<em><b>Else</b></em>' reference. + * Returns the value of the '<em><b>Else Ifs</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>Else</em>' reference isn't clear, + * If the meaning of the '<em>Else Ifs</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>Else</em>' reference. - * @see #setElse(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Else() + * @return the value of the '<em>Else Ifs</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_ElseIfs() * @model * @generated */ - CompositeNode getElse(); - - /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Else</em>' reference. - * @see #getElse() - * @generated - */ - void setElse(CompositeNode value); + EList<CompositeNode> getElseIfs(); /** * Returns the value of the '<em><b>Expression</b></em>' reference. @@ -83,20 +73,30 @@ public interface IfStatementNode extends CompositeNode { void setExpression(CompositeNode value); /** - * Returns the value of the '<em><b>Else If</b></em>' reference list. - * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}. + * Returns the value of the '<em><b>Else</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Else If</em>' reference isn't clear, + * If the meaning of the '<em>Else</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Else If</em>' reference list. - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_ElseIf() + * @return the value of the '<em>Else</em>' reference. + * @see #setElse(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Else() * @model * @generated */ - EList<CompositeNode> getElseIf(); + CompositeNode getElse(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Else</em>' reference. + * @see #getElse() + * @generated + */ + void setElse(CompositeNode value); /** * Returns the value of the '<em><b>Sequence</b></em>' reference. @@ -123,4 +123,5 @@ public interface IfStatementNode extends CompositeNode { * @generated */ void setSequence(CompositeNode value); + } // IfStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java index c1f8bef5..8bfde46e 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: ImpliesExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ImpliesExpressionNode.java,v 1.3 2008/03/13 08:40:01 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 +15,59 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>Implies Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode() * @model * @generated */ public interface ImpliesExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Nexts</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>Nexts</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>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode_Nexts() + * @model + * @generated + */ + EList<CompositeNode> getNexts(); + + /** + * Returns the value of the '<em><b>First</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>First</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode_First() + * @model + * @generated + */ + CompositeNode getFirst(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() + * @generated + */ + void setFirst(CompositeNode value); + } // ImpliesExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImportNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImportNode.java index f964f97b..c829e71d 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImportNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImportNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ImportNode.java,v 1.1 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ImportNode.java,v 1.2 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; 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 17b12167..2b3b0e42 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: InfixExpressionNode.java,v 1.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: InfixExpressionNode.java,v 1.6 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java index 9f2e6a2b..0d8ddeec 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: JavaTypeNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: JavaTypeNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java index 6ab46bc4..914698b4 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LetExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: LetExpressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java index 2fbad434..96ff1036 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LetStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: LetStatementNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -27,7 +27,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface LetStatementNode extends CompositeNode { - /** * Returns the value of the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> @@ -105,4 +104,5 @@ public interface LetStatementNode extends CompositeNode { * @generated */ void setSequence(CompositeNode value); + } // LetStatementNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java index 9a34e91f..0a57455f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: ListLiteralNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ListLiteralNode.java,v 1.3 2008/03/13 08:40:00 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 +15,32 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>List Literal Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode#getElements <em>Elements</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getListLiteralNode() * @model * @generated */ public interface ListLiteralNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Elements</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>Elements</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>Elements</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getListLiteralNode_Elements() + * @model + * @generated + */ + EList<CompositeNode> getElements(); + } // ListLiteralNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java index b99b1208..32029eed 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: MultiplicativeExpressionNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: MultiplicativeExpressionNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; +import org.eclipse.emf.common.util.EList; + import org.eclipse.tmf.common.node.CompositeNode; /** @@ -16,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getLeft <em>Left</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getRight <em>Right</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -26,56 +28,46 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface MultiplicativeExpressionNode extends CompositeNode { - /** - * Returns the value of the '<em><b>Left</b></em>' reference. + * Returns the value of the '<em><b>Nexts</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>Left</em>' reference isn't clear, + * If the meaning of the '<em>Nexts</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>Left</em>' reference. - * @see #setLeft(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_Left() + * @return the value of the '<em>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_Nexts() * @model * @generated */ - CompositeNode getLeft(); + EList<CompositeNode> getNexts(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getLeft <em>Left</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Left</em>' reference. - * @see #getLeft() - * @generated - */ - void setLeft(CompositeNode value); - - /** - * Returns the value of the '<em><b>Right</b></em>' reference. + * Returns the value of the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Right</em>' reference isn't clear, + * If the meaning of the '<em>First</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</em>' reference. - * @see #setRight(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_Right() + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_First() * @model * @generated */ - CompositeNode getRight(); + CompositeNode getFirst(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getRight <em>Right</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Right</em>' reference. - * @see #getRight() + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() * @generated */ - void setRight(CompositeNode value); + void setFirst(CompositeNode value); + } // MultiplicativeExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java deleted file mode 100644 index c92606ca..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: NsImportNode.java,v 1.3 2008/03/12 09:54:12 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>Ns Import Node</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getNsImportNode() - * @model - * @generated - */ -public interface NsImportNode extends CompositeNode { - -} // NsImportNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java index 2a36439e..2cd682e8 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NullLiteralNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: NullLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java index 88450a55..1492514b 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NumberLiteralNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: NumberLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java index 7403c36b..e7e7f0d0 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: OrExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: OrExpressionNode.java,v 1.3 2008/03/13 08:40:00 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 +15,59 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>Or Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode() * @model * @generated */ public interface OrExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Nexts</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>Nexts</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>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode_Nexts() + * @model + * @generated + */ + EList<CompositeNode> getNexts(); + + /** + * Returns the value of the '<em><b>First</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>First</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode_First() + * @model + * @generated + */ + CompositeNode getFirst(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() + * @generated + */ + void setFirst(CompositeNode value); + } // OrExpressionNode 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 e6de76af..55cf96eb 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ParameterListNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: ParameterListNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java index 31213910..da6b0fb0 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ParanthesizedExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ParanthesizedExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -13,10 +13,42 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>Paranthesized Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParanthesizedExpressionNode() * @model * @generated */ public interface ParanthesizedExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Expression</em>' reference. + * @see #setExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParanthesizedExpressionNode_Expression() + * @model + * @generated + */ + CompositeNode getExpression(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Expression</em>' reference. + * @see #getExpression() + * @generated + */ + void setExpression(CompositeNode value); + } // ParanthesizedExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java index db2f863e..060c20b1 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PointcutNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: PointcutNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java index a215109b..210ca8de 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ProtectStatementNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ProtectStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -28,32 +28,31 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface ProtectStatementNode extends CompositeNode { - /** - * Returns the value of the '<em><b>Cstart</b></em>' reference. + * Returns the value of the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Cstart</em>' reference isn't clear, + * If the meaning of the '<em>Sequence</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Cstart</em>' reference. - * @see #setCstart(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Cstart() + * @return the value of the '<em>Sequence</em>' reference. + * @see #setSequence(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Sequence() * @model * @generated */ - CompositeNode getCstart(); + CompositeNode getSequence(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Cstart</em>' reference. - * @see #getCstart() + * @param value the new value of the '<em>Sequence</em>' reference. + * @see #getSequence() * @generated */ - void setCstart(CompositeNode value); + void setSequence(CompositeNode value); /** * Returns the value of the '<em><b>Cend</b></em>' reference. @@ -108,28 +107,29 @@ public interface ProtectStatementNode extends CompositeNode { void setId(CompositeNode value); /** - * Returns the value of the '<em><b>Sequence</b></em>' reference. + * Returns the value of the '<em><b>Cstart</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Sequence</em>' reference isn't clear, + * If the meaning of the '<em>Cstart</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Sequence</em>' reference. - * @see #setSequence(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Sequence() + * @return the value of the '<em>Cstart</em>' reference. + * @see #setCstart(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Cstart() * @model * @generated */ - CompositeNode getSequence(); + CompositeNode getCstart(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Sequence</em>' reference. - * @see #getSequence() + * @param value the new value of the '<em>Cstart</em>' reference. + * @see #getCstart() * @generated */ - void setSequence(CompositeNode value); + void setCstart(CompositeNode value); + } // ProtectStatementNode 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 169aa43e..73a59c67 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,12 +2,13 @@ * <copyright> * </copyright> * - * $Id: RelationalExpressionNode.java,v 1.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: RelationalExpressionNode.java,v 1.6 2008/03/13 08:40:01 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 --> @@ -17,9 +18,8 @@ import org.eclipse.tmf.common.node.LeafNode; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -29,81 +29,45 @@ import org.eclipse.tmf.common.node.LeafNode; */ public interface RelationalExpressionNode extends CompositeNode { /** - * Returns the value of the '<em><b>Operator</b></em>' reference. + * Returns the value of the '<em><b>Nexts</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>Operator</em>' reference isn't clear, + * If the meaning of the '<em>Nexts</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>Operator</em>' reference. - * @see #setOperator(CompositeNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Operator() + * @return the value of the '<em>Nexts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Nexts() * @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>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); + EList<CompositeNode> getNexts(); /** - * Returns the value of the '<em><b>Left Operand</b></em>' reference. + * Returns the value of the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Left Operand</em>' reference isn't clear, + * If the meaning of the '<em>First</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() + * @return the value of the '<em>First</em>' reference. + * @see #setFirst(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_First() * @model * @generated */ - CompositeNode getLeftOperand(); + CompositeNode getFirst(); /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}' reference. + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Left Operand</em>' reference. - * @see #getLeftOperand() + * @param value the new value of the '<em>First</em>' reference. + * @see #getFirst() * @generated */ - void setLeftOperand(CompositeNode value); + void setFirst(CompositeNode value); } // RelationalExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalOperatorNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalOperatorNode.java deleted file mode 100644 index 75db6380..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalOperatorNode.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: RelationalOperatorNode.java,v 1.1 2008/03/07 11:11:13 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>Relational Operator Node</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalOperatorNode() - * @model - * @generated - */ -public interface RelationalOperatorNode extends CompositeNode { -} // RelationalOperatorNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java index 42de16d4..002f555f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java @@ -2,11 +2,12 @@ * <copyright> * </copyright> * - * $Id: SequenceNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: SequenceNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; import org.eclipse.emf.common.util.EList; + import org.eclipse.tmf.common.node.CompositeNode; /** @@ -27,7 +28,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface SequenceNode extends CompositeNode { - /** * Returns the value of the '<em><b>Text Sequences</b></em>' reference list. * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}. @@ -59,4 +59,5 @@ public interface SequenceNode extends CompositeNode { * @generated */ EList<CompositeNode> getStatements(); + } // SequenceNode 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 882a8a31..7bca12f4 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleTypeNode.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: SimpleTypeNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java index 7a227991..ec436f97 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: StringLiteralNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: StringLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java index e6026a2c..c829f272 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: SwitchExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: SwitchExpressionNode.java,v 1.3 2008/03/13 08:40:00 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 +15,86 @@ import org.eclipse.tmf.common.node.CompositeNode; * A representation of the model object '<em><b>Switch Expression Node</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getCases <em>Cases</em>}</li> + * </ul> + * </p> * * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode() * @model * @generated */ public interface SwitchExpressionNode extends CompositeNode { + /** + * Returns the value of the '<em><b>Default</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Default</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Default</em>' reference. + * @see #setDefault(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Default() + * @model + * @generated + */ + CompositeNode getDefault(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Default</em>' reference. + * @see #getDefault() + * @generated + */ + void setDefault(CompositeNode value); + + /** + * Returns the value of the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Expression</em>' reference. + * @see #setExpression(CompositeNode) + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Expression() + * @model + * @generated + */ + CompositeNode getExpression(); + + /** + * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Expression</em>' reference. + * @see #getExpression() + * @generated + */ + void setExpression(CompositeNode value); + + /** + * Returns the value of the '<em><b>Cases</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>Cases</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>Cases</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Cases() + * @model + * @generated + */ + EList<CompositeNode> getCases(); + } // SwitchExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java index 853f1499..5fd559a5 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Test_expressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: Test_expressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java index 90bac8a9..7774df59 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TextNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: TextNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java index 39b01dee..df821000 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java @@ -2,11 +2,12 @@ * <copyright> * </copyright> * - * $Id: TextSequenceNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: TextSequenceNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; import org.eclipse.emf.common.util.EList; + import org.eclipse.tmf.common.node.CompositeNode; /** @@ -17,7 +18,7 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getText <em>Text</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getTexts <em>Texts</em>}</li> * </ul> * </p> * @@ -26,20 +27,20 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface TextSequenceNode extends CompositeNode { - /** - * Returns the value of the '<em><b>Text</b></em>' reference list. + * Returns the value of the '<em><b>Texts</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>Text</em>' reference list isn't clear, + * If the meaning of the '<em>Texts</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>Text</em>' reference list. - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getTextSequenceNode_Text() + * @return the value of the '<em>Texts</em>' reference list. + * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getTextSequenceNode_Texts() * @model * @generated */ - EList<CompositeNode> getText(); + EList<CompositeNode> getTexts(); + } // TextSequenceNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java index 9ef2fcdb..b9594172 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: UnaryExpressionNode.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: UnaryExpressionNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -25,7 +25,6 @@ import org.eclipse.tmf.common.node.CompositeNode; * @generated */ public interface UnaryExpressionNode extends CompositeNode { - /** * Returns the value of the '<em><b>Operand</b></em>' reference. * <!-- begin-user-doc --> @@ -51,4 +50,5 @@ public interface UnaryExpressionNode extends CompositeNode { * @generated */ void setOperand(CompositeNode value); + } // UnaryExpressionNode diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/XNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/XNode.java deleted file mode 100644 index 529c40af..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/XNode.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: XNode.java,v 1.1 2008/03/07 11:11:14 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>XNode</b></em>'. - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.XNode#getL <em>L</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getXNode() - * @model - * @generated - */ -public interface XNode extends CompositeNode { - /** - * Returns the value of the '<em><b>L</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>L</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>L</em>' reference. - * @see #setL(LeafNode) - * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getXNode_L() - * @model - * @generated - */ - LeafNode getL(); - - /** - * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.XNode#getL <em>L</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>L</em>' reference. - * @see #getL() - * @generated - */ - void setL(LeafNode value); - -} // XNode 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 81810bf6..2094c752 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.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: Xpand3nodeFactory.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -242,15 +242,6 @@ public interface Xpand3nodeFactory extends EFactory { Test_expressionNode createTest_expressionNode(); /** - * Returns a new object of class '<em>Expression Node</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Expression Node</em>'. - * @generated - */ - ExpressionNode createExpressionNode(); - - /** * Returns a new object of class '<em>Let Expression Node</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -341,15 +332,6 @@ public interface Xpand3nodeFactory extends EFactory { RelationalExpressionNode createRelationalExpressionNode(); /** - * Returns a new object of class '<em>Relational Operator Node</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Relational Operator Node</em>'. - * @generated - */ - RelationalOperatorNode createRelationalOperatorNode(); - - /** * 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 6a7f2d93..179614e2 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.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: Xpand3nodePackage.java,v 1.6 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -455,13 +455,13 @@ public interface Xpand3nodePackage extends EPackage { int TEXT_SEQUENCE_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Text</b></em>' reference list. + * The feature id for the '<em><b>Texts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TEXT_SEQUENCE_NODE__TEXT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int TEXT_SEQUENCE_NODE__TEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Text Sequence Node</em>' class. @@ -602,13 +602,22 @@ public interface Xpand3nodePackage extends EPackage { int EXPAND_STATEMENT_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** + * The feature id for the '<em><b>For Each Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + + /** * The feature id for the '<em><b>For Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXPAND_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int EXPAND_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Name</b></em>' reference. @@ -617,7 +626,7 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int EXPAND_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int EXPAND_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Expand Statement Node</em>' class. @@ -626,7 +635,7 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int EXPAND_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; + int EXPAND_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionStmtNodeImpl <em>Expression Stmt Node</em>}' class. @@ -849,13 +858,13 @@ public interface Xpand3nodePackage extends EPackage { int IF_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Else If</b></em>' reference list. + * The feature id for the '<em><b>Else Ifs</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_STATEMENT_NODE__ELSE_IF = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IF_STATEMENT_NODE__ELSE_IFS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Expression</b></em>' reference. @@ -1160,13 +1169,67 @@ public interface Xpand3nodePackage extends EPackage { int CHECK_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Type</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHECK_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Error</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHECK_NODE__ERROR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Message</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHECK_NODE__MESSAGE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>If Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHECK_NODE__IF_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + + /** + * The feature id for the '<em><b>Warning</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHECK_NODE__WARNING = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; + + /** + * The feature id for the '<em><b>Constraint</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHECK_NODE__CONSTRAINT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5; + + /** * The number of structural features of the '<em>Check Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CHECK_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AroundNodeImpl <em>Around Node</em>}' class. @@ -1435,14 +1498,14 @@ public interface Xpand3nodePackage extends EPackage { int TEST_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionNodeImpl <em>Expression Node</em>}' class. + * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpressionNode() + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetExpressionNode() * @generated */ - int EXPRESSION_NODE = 24; + int LET_EXPRESSION_NODE = 24; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1451,7 +1514,7 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int LET_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; /** * The feature id for the '<em><b>Children</b></em>' containment reference list. @@ -1460,26 +1523,26 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int LET_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The number of structural features of the '<em>Expression Node</em>' class. + * The number of structural features of the '<em>Let Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int LET_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class. + * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl <em>Casted Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetExpressionNode() + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCastedExpressionNode() * @generated */ - int LET_EXPRESSION_NODE = 25; + int CASTED_EXPRESSION_NODE = 25; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1488,7 +1551,7 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int LET_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int CASTED_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; /** * The feature id for the '<em><b>Children</b></em>' containment reference list. @@ -1497,81 +1560,80 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int LET_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int CASTED_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The number of structural features of the '<em>Let Expression Node</em>' class. + * The feature id for the '<em><b>Target</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LET_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CASTED_EXPRESSION_NODE__TARGET = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl <em>Casted Expression Node</em>}' class. + * The feature id for the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCastedExpressionNode() * @generated + * @ordered */ - int CASTED_EXPRESSION_NODE = 26; + int CASTED_EXPRESSION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Alias</b></em>' attribute. + * The number of structural features of the '<em>Casted Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CASTED_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int CASTED_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. + * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getChainExpressionNode() * @generated - * @ordered */ - int CASTED_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int CHAIN_EXPRESSION_NODE = 26; /** - * The number of structural features of the '<em>Casted Expression Node</em>' class. + * The feature id for the '<em><b>Alias</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CASTED_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CHAIN_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class. + * The feature id for the '<em><b>Children</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getChainExpressionNode() * @generated + * @ordered */ - int CHAIN_EXPRESSION_NODE = 27; + int CHAIN_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Alias</b></em>' attribute. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHAIN_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int CHAIN_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHAIN_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int CHAIN_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Chain Expression Node</em>' class. @@ -1580,7 +1642,7 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int CHAIN_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CHAIN_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl <em>If Expression Node</em>}' class. @@ -1590,7 +1652,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfExpressionNode() * @generated */ - int IF_EXPRESSION_NODE = 28; + int IF_EXPRESSION_NODE = 27; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1611,13 +1673,49 @@ public interface Xpand3nodePackage extends EPackage { int IF_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Then</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int IF_EXPRESSION_NODE__THEN = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Else</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int IF_EXPRESSION_NODE__ELSE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Condition0</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int IF_EXPRESSION_NODE__CONDITION0 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Condition1</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int IF_EXPRESSION_NODE__CONDITION1 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + + /** * The number of structural features of the '<em>If Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IF_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl <em>Switch Expression Node</em>}' class. @@ -1627,7 +1725,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSwitchExpressionNode() * @generated */ - int SWITCH_EXPRESSION_NODE = 29; + int SWITCH_EXPRESSION_NODE = 28; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1648,13 +1746,40 @@ public interface Xpand3nodePackage extends EPackage { int SWITCH_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Default</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SWITCH_EXPRESSION_NODE__DEFAULT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SWITCH_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Cases</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SWITCH_EXPRESSION_NODE__CASES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Switch Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SWITCH_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int SWITCH_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl <em>Case Part Node</em>}' class. @@ -1664,7 +1789,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCasePartNode() * @generated */ - int CASE_PART_NODE = 30; + int CASE_PART_NODE = 29; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1685,13 +1810,31 @@ public interface Xpand3nodePackage extends EPackage { int CASE_PART_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Condition</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CASE_PART_NODE__CONDITION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CASE_PART_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + + /** * The number of structural features of the '<em>Case Part Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CASE_PART_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CASE_PART_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl <em>Or Expression Node</em>}' class. @@ -1701,7 +1844,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getOrExpressionNode() * @generated */ - int OR_EXPRESSION_NODE = 31; + int OR_EXPRESSION_NODE = 30; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1722,97 +1865,96 @@ public interface Xpand3nodePackage extends EPackage { int OR_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The number of structural features of the '<em>Or Expression Node</em>' class. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int OR_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int OR_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAndExpressionNode() * @generated + * @ordered */ - int AND_EXPRESSION_NODE = 32; + int OR_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Alias</b></em>' attribute. + * The number of structural features of the '<em>Or Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int AND_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int OR_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. + * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAndExpressionNode() * @generated - * @ordered */ - int AND_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int AND_EXPRESSION_NODE = 31; /** - * The number of structural features of the '<em>And Expression Node</em>' class. + * The feature id for the '<em><b>Alias</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int AND_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int AND_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class. + * The feature id for the '<em><b>Children</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getImpliesExpressionNode() * @generated + * @ordered */ - int IMPLIES_EXPRESSION_NODE = 33; + int AND_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Alias</b></em>' attribute. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPLIES_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int AND_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPLIES_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int AND_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Implies Expression Node</em>' class. + * The number of structural features of the '<em>And Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPLIES_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int AND_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class. + * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode() + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getImpliesExpressionNode() * @generated */ - int RELATIONAL_EXPRESSION_NODE = 34; + int IMPLIES_EXPRESSION_NODE = 32; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1821,7 +1963,7 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int RELATIONAL_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int IMPLIES_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; /** * The feature id for the '<em><b>Children</b></em>' containment reference list. @@ -1830,80 +1972,89 @@ public interface Xpand3nodePackage extends EPackage { * @generated * @ordered */ - int RELATIONAL_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int IMPLIES_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Operator</b></em>' reference. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_EXPRESSION_NODE__OPERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IMPLIES_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Left Operand</b></em>' reference. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int IMPLIES_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Right Operand</b></em>' reference. + * The number of structural features of the '<em>Implies Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int IMPLIES_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The number of structural features of the '<em>Relational Expression Node</em>' class. + * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode() + * @generated + */ + int RELATIONAL_EXPRESSION_NODE = 33; + + /** + * The feature id for the '<em><b>Alias</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int RELATIONAL_EXPRESSION_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; /** - * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalOperatorNodeImpl <em>Relational Operator Node</em>}' class. + * The feature id for the '<em><b>Children</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalOperatorNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalOperatorNode() * @generated + * @ordered */ - int RELATIONAL_OPERATOR_NODE = 35; + int RELATIONAL_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Alias</b></em>' attribute. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_OPERATOR_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS; + int RELATIONAL_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_OPERATOR_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; + int RELATIONAL_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Relational Operator Node</em>' class. + * The number of structural features of the '<em>Relational Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATIONAL_OPERATOR_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int RELATIONAL_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class. @@ -1913,7 +2064,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode() * @generated */ - int ADDITIVE_EXPRESSION_NODE = 36; + int ADDITIVE_EXPRESSION_NODE = 34; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1934,22 +2085,22 @@ public interface Xpand3nodePackage extends EPackage { int ADDITIVE_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Left</b></em>' reference. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ADDITIVE_EXPRESSION_NODE__LEFT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int ADDITIVE_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Right</b></em>' reference. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ADDITIVE_EXPRESSION_NODE__RIGHT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int ADDITIVE_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Additive Expression Node</em>' class. @@ -1968,7 +2119,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode() * @generated */ - int MULTIPLICATIVE_EXPRESSION_NODE = 37; + int MULTIPLICATIVE_EXPRESSION_NODE = 35; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -1989,22 +2140,22 @@ public interface Xpand3nodePackage extends EPackage { int MULTIPLICATIVE_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Left</b></em>' reference. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MULTIPLICATIVE_EXPRESSION_NODE__LEFT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int MULTIPLICATIVE_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Right</b></em>' reference. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MULTIPLICATIVE_EXPRESSION_NODE__RIGHT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int MULTIPLICATIVE_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Multiplicative Expression Node</em>' class. @@ -2023,7 +2174,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode() * @generated */ - int UNARY_EXPRESSION_NODE = 38; + int UNARY_EXPRESSION_NODE = 36; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2069,7 +2220,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode() * @generated */ - int INFIX_EXPRESSION_NODE = 39; + int INFIX_EXPRESSION_NODE = 37; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2124,7 +2275,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode() * @generated */ - int STRING_LITERAL_NODE = 40; + int STRING_LITERAL_NODE = 38; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2161,7 +2312,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode() * @generated */ - int PARANTHESIZED_EXPRESSION_NODE = 41; + int PARANTHESIZED_EXPRESSION_NODE = 39; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2182,13 +2333,22 @@ public interface Xpand3nodePackage extends EPackage { int PARANTHESIZED_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PARANTHESIZED_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** * The number of structural features of the '<em>Paranthesized Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PARANTHESIZED_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int PARANTHESIZED_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.GlobalVarExpressionNodeImpl <em>Global Var Expression Node</em>}' class. @@ -2198,7 +2358,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode() * @generated */ - int GLOBAL_VAR_EXPRESSION_NODE = 42; + int GLOBAL_VAR_EXPRESSION_NODE = 40; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2235,7 +2395,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode() * @generated */ - int FEATURE_CALL_NODE = 43; + int FEATURE_CALL_NODE = 41; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2256,31 +2416,31 @@ public interface Xpand3nodePackage extends EPackage { int FEATURE_CALL_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Type</b></em>' reference. + * The feature id for the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FEATURE_CALL_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Param List</b></em>' reference. + * The feature id for the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int FEATURE_CALL_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Name</b></em>' reference. + * The feature id for the '<em><b>Param List</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Feature Call Node</em>' class. @@ -2299,7 +2459,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode() * @generated */ - int LIST_LITERAL_NODE = 44; + int LIST_LITERAL_NODE = 42; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2320,13 +2480,22 @@ public interface Xpand3nodePackage extends EPackage { int LIST_LITERAL_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Elements</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int LIST_LITERAL_NODE__ELEMENTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** * The number of structural features of the '<em>List Literal Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LIST_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int LIST_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ConstructorCallNodeImpl <em>Constructor Call Node</em>}' class. @@ -2336,7 +2505,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode() * @generated */ - int CONSTRUCTOR_CALL_NODE = 45; + int CONSTRUCTOR_CALL_NODE = 43; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2373,7 +2542,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode() * @generated */ - int BOOLEAN_LITERAL_NODE = 46; + int BOOLEAN_LITERAL_NODE = 44; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2410,7 +2579,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode() * @generated */ - int NULL_LITERAL_NODE = 47; + int NULL_LITERAL_NODE = 45; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2447,7 +2616,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode() * @generated */ - int NUMBER_LITERAL_NODE = 48; + int NUMBER_LITERAL_NODE = 46; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2484,7 +2653,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode() * @generated */ - int COLLECTION_EXPRESSION_NODE = 49; + int COLLECTION_EXPRESSION_NODE = 47; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2505,13 +2674,40 @@ public interface Xpand3nodePackage extends EPackage { int COLLECTION_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Variable</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COLLECTION_EXPRESSION_NODE__VARIABLE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COLLECTION_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Type</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COLLECTION_EXPRESSION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Collection Expression Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COLLECTION_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int COLLECTION_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl <em>Declared Parameter List Node</em>}' class. @@ -2521,7 +2717,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode() * @generated */ - int DECLARED_PARAMETER_LIST_NODE = 50; + int DECLARED_PARAMETER_LIST_NODE = 48; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2567,7 +2763,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode() * @generated */ - int DECLARED_PARAMETER_NODE = 51; + int DECLARED_PARAMETER_NODE = 49; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2588,22 +2784,22 @@ public interface Xpand3nodePackage extends EPackage { int DECLARED_PARAMETER_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Name</b></em>' reference. + * The feature id for the '<em><b>Ptype</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Ptype</b></em>' reference. + * The feature id for the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Declared Parameter Node</em>' class. @@ -2622,7 +2818,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode() * @generated */ - int PARAMETER_LIST_NODE = 52; + int PARAMETER_LIST_NODE = 50; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2668,7 +2864,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode() * @generated */ - int COLLECTION_TYPE_NODE = 53; + int COLLECTION_TYPE_NODE = 51; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2689,13 +2885,31 @@ public interface Xpand3nodePackage extends EPackage { int COLLECTION_TYPE_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** + * The feature id for the '<em><b>Collection Type</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COLLECTION_TYPE_NODE__COLLECTION_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Element Type</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COLLECTION_TYPE_NODE__ELEMENT_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + + /** * The number of structural features of the '<em>Collection Type Node</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COLLECTION_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int COLLECTION_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl <em>Simple Type Node</em>}' class. @@ -2705,7 +2919,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode() * @generated */ - int SIMPLE_TYPE_NODE = 54; + int SIMPLE_TYPE_NODE = 52; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2751,7 +2965,7 @@ public interface Xpand3nodePackage extends EPackage { * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode() * @generated */ - int IDENTIFIER_NODE = 55; + int IDENTIFIER_NODE = 53; /** * The feature id for the '<em><b>Alias</b></em>' attribute. @@ -2888,6 +3102,17 @@ public interface Xpand3nodePackage extends EPackage { EClass getDefinitionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#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.DefinitionNode#getName() + * @see #getDefinitionNode() + * @generated + */ + EReference getDefinitionNode_Name(); + + /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2910,17 +3135,6 @@ public interface Xpand3nodePackage extends EPackage { EReference getDefinitionNode_Sequence(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#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.DefinitionNode#getName() - * @see #getDefinitionNode() - * @generated - */ - EReference getDefinitionNode_Name(); - - /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3028,15 +3242,15 @@ public interface Xpand3nodePackage extends EPackage { EClass getTextSequenceNode(); /** - * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getText <em>Text</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getTexts <em>Texts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Text</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getText() + * @return the meta object for the reference list '<em>Texts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getTexts() * @see #getTextSequenceNode() * @generated */ - EReference getTextSequenceNode_Text(); + EReference getTextSequenceNode_Texts(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextNode <em>Text Node</em>}'. @@ -3102,6 +3316,17 @@ public interface Xpand3nodePackage extends EPackage { EReference getExpandStatementNode_ParamList(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>For Each Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression() + * @see #getExpandStatementNode() + * @generated + */ + EReference getExpandStatementNode_ForEachExpression(); + + /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3155,15 +3380,15 @@ public interface Xpand3nodePackage extends EPackage { EClass getFileStatementNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Name Expression</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression() + * @return the meta object for the reference '<em>Sequence</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence() * @see #getFileStatementNode() * @generated */ - EReference getFileStatementNode_NameExpression(); + EReference getFileStatementNode_Sequence(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}'. @@ -3177,15 +3402,15 @@ public interface Xpand3nodePackage extends EPackage { EReference getFileStatementNode_Identifier(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Sequence</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence() + * @return the meta object for the reference '<em>Name Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression() * @see #getFileStatementNode() * @generated */ - EReference getFileStatementNode_Sequence(); + EReference getFileStatementNode_NameExpression(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode <em>Foreach Statement Node</em>}'. @@ -3209,26 +3434,26 @@ public interface Xpand3nodePackage extends EPackage { EReference getForeachStatementNode_Iterator(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Separator Expression</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression() + * @return the meta object for the reference '<em>Identifier</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier() * @see #getForeachStatementNode() * @generated */ - EReference getForeachStatementNode_SeparatorExpression(); + EReference getForeachStatementNode_Identifier(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Identifier</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier() + * @return the meta object for the reference '<em>Sequence</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence() * @see #getForeachStatementNode() * @generated */ - EReference getForeachStatementNode_Identifier(); + EReference getForeachStatementNode_Sequence(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}'. @@ -3242,15 +3467,15 @@ public interface Xpand3nodePackage extends EPackage { EReference getForeachStatementNode_ForExpression(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Sequence</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence() + * @return the meta object for the reference '<em>Separator Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression() * @see #getForeachStatementNode() * @generated */ - EReference getForeachStatementNode_Sequence(); + EReference getForeachStatementNode_SeparatorExpression(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode <em>If Statement Node</em>}'. @@ -3263,15 +3488,15 @@ public interface Xpand3nodePackage extends EPackage { EClass getIfStatementNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIfs <em>Else Ifs</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Else</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse() + * @return the meta object for the reference list '<em>Else Ifs</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIfs() * @see #getIfStatementNode() * @generated */ - EReference getIfStatementNode_Else(); + EReference getIfStatementNode_ElseIfs(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}'. @@ -3285,15 +3510,15 @@ public interface Xpand3nodePackage extends EPackage { EReference getIfStatementNode_Expression(); /** - * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIf <em>Else If</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Else If</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIf() + * @return the meta object for the reference '<em>Else</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse() * @see #getIfStatementNode() * @generated */ - EReference getIfStatementNode_ElseIf(); + EReference getIfStatementNode_Else(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}'. @@ -3413,15 +3638,15 @@ public interface Xpand3nodePackage extends EPackage { EClass getProtectStatementNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Cstart</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart() + * @return the meta object for the reference '<em>Sequence</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence() * @see #getProtectStatementNode() * @generated */ - EReference getProtectStatementNode_Cstart(); + EReference getProtectStatementNode_Sequence(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}'. @@ -3446,15 +3671,15 @@ public interface Xpand3nodePackage extends EPackage { EReference getProtectStatementNode_Id(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Sequence</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence() + * @return the meta object for the reference '<em>Cstart</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart() * @see #getProtectStatementNode() * @generated */ - EReference getProtectStatementNode_Sequence(); + EReference getProtectStatementNode_Cstart(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode <em>Check Node</em>}'. @@ -3467,6 +3692,72 @@ public interface Xpand3nodePackage extends EPackage { EClass getCheckNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType <em>Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Type</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType() + * @see #getCheckNode() + * @generated + */ + EReference getCheckNode_Type(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError <em>Error</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Error</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError() + * @see #getCheckNode() + * @generated + */ + EReference getCheckNode_Error(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage <em>Message</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Message</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage() + * @see #getCheckNode() + * @generated + */ + EReference getCheckNode_Message(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>If Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression() + * @see #getCheckNode() + * @generated + */ + EReference getCheckNode_IfExpression(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Warning</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning() + * @see #getCheckNode() + * @generated + */ + EReference getCheckNode_Warning(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Constraint</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint() + * @see #getCheckNode() + * @generated + */ + EReference getCheckNode_Constraint(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AroundNode <em>Around Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3497,15 +3788,15 @@ 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>}'. + * 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>Create</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate() + * @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_Create(); + EReference getExtensionNode_ParamList(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}'. @@ -3519,48 +3810,48 @@ public interface Xpand3nodePackage extends EPackage { EReference getExtensionNode_Private(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}'. + * 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>Param List</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList() + * @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_ParamList(); + EReference getExtensionNode_ReturnType(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}'. + * 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>Extend Body</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody() + * @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_ExtendBody(); + EReference getExtensionNode_JavaReturnType(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}'. + * 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>Cached</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached() + * @return the meta object for the reference '<em>Create</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate() * @see #getExtensionNode() * @generated */ - EReference getExtensionNode_Cached(); + EReference getExtensionNode_Create(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}'. + * 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>Java Return Type</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType() + * @return the meta object for the reference '<em>Name</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName() * @see #getExtensionNode() * @generated */ - EReference getExtensionNode_JavaReturnType(); + EReference getExtensionNode_Name(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}'. @@ -3574,26 +3865,26 @@ public interface Xpand3nodePackage extends EPackage { EReference getExtensionNode_JavaName(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}'. + * 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>Return Type</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType() + * @return the meta object for the reference '<em>Cached</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached() * @see #getExtensionNode() * @generated */ - EReference getExtensionNode_ReturnType(); + EReference getExtensionNode_Cached(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}'. + * 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>Name</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName() + * @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_Name(); + EReference getExtensionNode_ExtendBody(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode <em>Java Type Node</em>}'. @@ -3616,16 +3907,6 @@ public interface Xpand3nodePackage extends EPackage { EClass getTest_expressionNode(); /** - * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionNode <em>Expression Node</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Expression Node</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpressionNode - * @generated - */ - EClass getExpressionNode(); - - /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode <em>Let Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3646,6 +3927,28 @@ public interface Xpand3nodePackage extends EPackage { EClass getCastedExpressionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#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.CastedExpressionNode#getTarget() + * @see #getCastedExpressionNode() + * @generated + */ + EReference getCastedExpressionNode_Target(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Type</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType() + * @see #getCastedExpressionNode() + * @generated + */ + EReference getCastedExpressionNode_Type(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode <em>Chain Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3656,6 +3959,28 @@ public interface Xpand3nodePackage extends EPackage { EClass getChainExpressionNode(); /** + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts() + * @see #getChainExpressionNode() + * @generated + */ + EReference getChainExpressionNode_Nexts(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst() + * @see #getChainExpressionNode() + * @generated + */ + EReference getChainExpressionNode_First(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode <em>If Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3666,6 +3991,50 @@ public interface Xpand3nodePackage extends EPackage { EClass getIfExpressionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Then</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen() + * @see #getIfExpressionNode() + * @generated + */ + EReference getIfExpressionNode_Then(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Else</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse() + * @see #getIfExpressionNode() + * @generated + */ + EReference getIfExpressionNode_Else(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Condition0</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0() + * @see #getIfExpressionNode() + * @generated + */ + EReference getIfExpressionNode_Condition0(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Condition1</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1() + * @see #getIfExpressionNode() + * @generated + */ + EReference getIfExpressionNode_Condition1(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode <em>Switch Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3676,6 +4045,39 @@ public interface Xpand3nodePackage extends EPackage { EClass getSwitchExpressionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Default</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault() + * @see #getSwitchExpressionNode() + * @generated + */ + EReference getSwitchExpressionNode_Default(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression() + * @see #getSwitchExpressionNode() + * @generated + */ + EReference getSwitchExpressionNode_Expression(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getCases <em>Cases</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference list '<em>Cases</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getCases() + * @see #getSwitchExpressionNode() + * @generated + */ + EReference getSwitchExpressionNode_Cases(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode <em>Case Part Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3686,6 +4088,28 @@ public interface Xpand3nodePackage extends EPackage { EClass getCasePartNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Condition</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition() + * @see #getCasePartNode() + * @generated + */ + EReference getCasePartNode_Condition(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression() + * @see #getCasePartNode() + * @generated + */ + EReference getCasePartNode_Expression(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode <em>Or Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3696,6 +4120,28 @@ public interface Xpand3nodePackage extends EPackage { EClass getOrExpressionNode(); /** + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getNexts <em>Nexts</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getNexts() + * @see #getOrExpressionNode() + * @generated + */ + EReference getOrExpressionNode_Nexts(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst() + * @see #getOrExpressionNode() + * @generated + */ + EReference getOrExpressionNode_First(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode <em>And Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3706,6 +4152,28 @@ public interface Xpand3nodePackage extends EPackage { EClass getAndExpressionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst() + * @see #getAndExpressionNode() + * @generated + */ + EReference getAndExpressionNode_First(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts() + * @see #getAndExpressionNode() + * @generated + */ + EReference getAndExpressionNode_Nexts(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode <em>Implies Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3716,57 +4184,58 @@ public interface Xpand3nodePackage extends EPackage { EClass getImpliesExpressionNode(); /** - * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode <em>Relational Expression Node</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Relational Expression Node</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts() + * @see #getImpliesExpressionNode() * @generated */ - EClass getRelationalExpressionNode(); + EReference getImpliesExpressionNode_Nexts(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</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() + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst() + * @see #getImpliesExpressionNode() * @generated */ - EReference getRelationalExpressionNode_Operator(); + EReference getImpliesExpressionNode_First(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}'. + * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode <em>Relational Expression Node</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() + * @return the meta object for class '<em>Relational Expression Node</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode * @generated */ - EReference getRelationalExpressionNode_RightOperand(); + EClass getRelationalExpressionNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getNexts <em>Nexts</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() + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getNexts() * @see #getRelationalExpressionNode() * @generated */ - EReference getRelationalExpressionNode_LeftOperand(); + EReference getRelationalExpressionNode_Nexts(); /** - * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalOperatorNode <em>Relational Operator Node</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Relational Operator Node</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalOperatorNode + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst() + * @see #getRelationalExpressionNode() * @generated */ - EClass getRelationalOperatorNode(); + EReference getRelationalExpressionNode_First(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'. @@ -3779,26 +4248,26 @@ public interface Xpand3nodePackage extends EPackage { EClass getAdditiveExpressionNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getRight <em>Right</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getNexts <em>Nexts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Right</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getRight() + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getNexts() * @see #getAdditiveExpressionNode() * @generated */ - EReference getAdditiveExpressionNode_Right(); + EReference getAdditiveExpressionNode_Nexts(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getLeft <em>Left</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Left</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getLeft() + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst() * @see #getAdditiveExpressionNode() * @generated */ - EReference getAdditiveExpressionNode_Left(); + EReference getAdditiveExpressionNode_First(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode <em>Multiplicative Expression Node</em>}'. @@ -3811,26 +4280,26 @@ public interface Xpand3nodePackage extends EPackage { EClass getMultiplicativeExpressionNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getLeft <em>Left</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Left</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getLeft() + * @return the meta object for the reference list '<em>Nexts</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts() * @see #getMultiplicativeExpressionNode() * @generated */ - EReference getMultiplicativeExpressionNode_Left(); + EReference getMultiplicativeExpressionNode_Nexts(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getRight <em>Right</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Right</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getRight() + * @return the meta object for the reference '<em>First</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst() * @see #getMultiplicativeExpressionNode() * @generated */ - EReference getMultiplicativeExpressionNode_Right(); + EReference getMultiplicativeExpressionNode_First(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode <em>Unary Expression Node</em>}'. @@ -3906,6 +4375,17 @@ public interface Xpand3nodePackage extends EPackage { EClass getParanthesizedExpressionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression() + * @see #getParanthesizedExpressionNode() + * @generated + */ + EReference getParanthesizedExpressionNode_Expression(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode <em>Global Var Expression Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3926,15 +4406,15 @@ public interface Xpand3nodePackage extends EPackage { EClass getFeatureCallNode(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}'. + * 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>Type</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType() + * @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_Type(); + EReference getFeatureCallNode_ParamList(); /** * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}'. @@ -3948,15 +4428,15 @@ public interface Xpand3nodePackage extends EPackage { EReference getFeatureCallNode_Name(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</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() + * @return the meta object for the reference '<em>Type</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType() * @see #getFeatureCallNode() * @generated */ - EReference getFeatureCallNode_ParamList(); + EReference getFeatureCallNode_Type(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode <em>List Literal Node</em>}'. @@ -3969,6 +4449,17 @@ public interface Xpand3nodePackage extends EPackage { EClass getListLiteralNode(); /** + * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode#getElements <em>Elements</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference list '<em>Elements</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode#getElements() + * @see #getListLiteralNode() + * @generated + */ + EReference getListLiteralNode_Elements(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode <em>Constructor Call Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4019,6 +4510,39 @@ public interface Xpand3nodePackage extends EPackage { EClass getCollectionExpressionNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Variable</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable() + * @see #getCollectionExpressionNode() + * @generated + */ + EReference getCollectionExpressionNode_Variable(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Expression</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression() + * @see #getCollectionExpressionNode() + * @generated + */ + EReference getCollectionExpressionNode_Expression(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Type</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType() + * @see #getCollectionExpressionNode() + * @generated + */ + EReference getCollectionExpressionNode_Type(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode <em>Declared Parameter List Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4050,26 +4574,26 @@ 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>}'. + * 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>Name</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName() + * @return the meta object for the reference '<em>Ptype</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype() * @see #getDeclaredParameterNode() * @generated */ - EReference getDeclaredParameterNode_Name(); + EReference getDeclaredParameterNode_Ptype(); /** - * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}'. + * 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>Ptype</em>'. - * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype() + * @return the meta object for the reference '<em>Name</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName() * @see #getDeclaredParameterNode() * @generated */ - EReference getDeclaredParameterNode_Ptype(); + EReference getDeclaredParameterNode_Name(); /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode <em>Parameter List Node</em>}'. @@ -4103,6 +4627,28 @@ public interface Xpand3nodePackage extends EPackage { EClass getCollectionTypeNode(); /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Collection Type</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType() + * @see #getCollectionTypeNode() + * @generated + */ + EReference getCollectionTypeNode_CollectionType(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Element Type</em>'. + * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType() + * @see #getCollectionTypeNode() + * @generated + */ + EReference getCollectionTypeNode_ElementType(); + + /** * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode <em>Simple Type Node</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4244,28 +4790,28 @@ public interface Xpand3nodePackage extends EPackage { EClass DEFINITION_NODE = eINSTANCE.getDefinitionNode(); /** - * The meta object literal for the '<em><b>Type</b></em>' reference feature. + * The meta object literal for the '<em><b>Name</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DEFINITION_NODE__TYPE = eINSTANCE.getDefinitionNode_Type(); + EReference DEFINITION_NODE__NAME = eINSTANCE.getDefinitionNode_Name(); /** - * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. + * The meta object literal for the '<em><b>Type</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DEFINITION_NODE__SEQUENCE = eINSTANCE.getDefinitionNode_Sequence(); + EReference DEFINITION_NODE__TYPE = eINSTANCE.getDefinitionNode_Type(); /** - * The meta object literal for the '<em><b>Name</b></em>' reference feature. + * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DEFINITION_NODE__NAME = eINSTANCE.getDefinitionNode_Name(); + EReference DEFINITION_NODE__SEQUENCE = eINSTANCE.getDefinitionNode_Sequence(); /** * The meta object literal for the '<em><b>Param List</b></em>' reference feature. @@ -4354,12 +4900,12 @@ public interface Xpand3nodePackage extends EPackage { EClass TEXT_SEQUENCE_NODE = eINSTANCE.getTextSequenceNode(); /** - * The meta object literal for the '<em><b>Text</b></em>' reference list feature. + * The meta object literal for the '<em><b>Texts</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference TEXT_SEQUENCE_NODE__TEXT = eINSTANCE.getTextSequenceNode_Text(); + EReference TEXT_SEQUENCE_NODE__TEXTS = eINSTANCE.getTextSequenceNode_Texts(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextNodeImpl <em>Text Node</em>}' class. @@ -4416,6 +4962,14 @@ public interface Xpand3nodePackage extends EPackage { EReference EXPAND_STATEMENT_NODE__PARAM_LIST = eINSTANCE.getExpandStatementNode_ParamList(); /** + * The meta object literal for the '<em><b>For Each Expression</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION = eINSTANCE.getExpandStatementNode_ForEachExpression(); + + /** * The meta object literal for the '<em><b>For Expression</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4460,12 +5014,12 @@ public interface Xpand3nodePackage extends EPackage { EClass FILE_STATEMENT_NODE = eINSTANCE.getFileStatementNode(); /** - * The meta object literal for the '<em><b>Name Expression</b></em>' reference feature. + * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference FILE_STATEMENT_NODE__NAME_EXPRESSION = eINSTANCE.getFileStatementNode_NameExpression(); + EReference FILE_STATEMENT_NODE__SEQUENCE = eINSTANCE.getFileStatementNode_Sequence(); /** * The meta object literal for the '<em><b>Identifier</b></em>' reference feature. @@ -4476,12 +5030,12 @@ public interface Xpand3nodePackage extends EPackage { EReference FILE_STATEMENT_NODE__IDENTIFIER = eINSTANCE.getFileStatementNode_Identifier(); /** - * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. + * The meta object literal for the '<em><b>Name Expression</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference FILE_STATEMENT_NODE__SEQUENCE = eINSTANCE.getFileStatementNode_Sequence(); + EReference FILE_STATEMENT_NODE__NAME_EXPRESSION = eINSTANCE.getFileStatementNode_NameExpression(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl <em>Foreach Statement Node</em>}' class. @@ -4502,20 +5056,20 @@ public interface Xpand3nodePackage extends EPackage { EReference FOREACH_STATEMENT_NODE__ITERATOR = eINSTANCE.getForeachStatementNode_Iterator(); /** - * The meta object literal for the '<em><b>Separator Expression</b></em>' reference feature. + * The meta object literal for the '<em><b>Identifier</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = eINSTANCE.getForeachStatementNode_SeparatorExpression(); + EReference FOREACH_STATEMENT_NODE__IDENTIFIER = eINSTANCE.getForeachStatementNode_Identifier(); /** - * The meta object literal for the '<em><b>Identifier</b></em>' reference feature. + * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference FOREACH_STATEMENT_NODE__IDENTIFIER = eINSTANCE.getForeachStatementNode_Identifier(); + EReference FOREACH_STATEMENT_NODE__SEQUENCE = eINSTANCE.getForeachStatementNode_Sequence(); /** * The meta object literal for the '<em><b>For Expression</b></em>' reference feature. @@ -4526,12 +5080,12 @@ public interface Xpand3nodePackage extends EPackage { EReference FOREACH_STATEMENT_NODE__FOR_EXPRESSION = eINSTANCE.getForeachStatementNode_ForExpression(); /** - * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. + * The meta object literal for the '<em><b>Separator Expression</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference FOREACH_STATEMENT_NODE__SEQUENCE = eINSTANCE.getForeachStatementNode_Sequence(); + EReference FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = eINSTANCE.getForeachStatementNode_SeparatorExpression(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl <em>If Statement Node</em>}' class. @@ -4544,12 +5098,12 @@ public interface Xpand3nodePackage extends EPackage { EClass IF_STATEMENT_NODE = eINSTANCE.getIfStatementNode(); /** - * The meta object literal for the '<em><b>Else</b></em>' reference feature. + * The meta object literal for the '<em><b>Else Ifs</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference IF_STATEMENT_NODE__ELSE = eINSTANCE.getIfStatementNode_Else(); + EReference IF_STATEMENT_NODE__ELSE_IFS = eINSTANCE.getIfStatementNode_ElseIfs(); /** * The meta object literal for the '<em><b>Expression</b></em>' reference feature. @@ -4560,12 +5114,12 @@ public interface Xpand3nodePackage extends EPackage { EReference IF_STATEMENT_NODE__EXPRESSION = eINSTANCE.getIfStatementNode_Expression(); /** - * The meta object literal for the '<em><b>Else If</b></em>' reference list feature. + * The meta object literal for the '<em><b>Else</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference IF_STATEMENT_NODE__ELSE_IF = eINSTANCE.getIfStatementNode_ElseIf(); + EReference IF_STATEMENT_NODE__ELSE = eINSTANCE.getIfStatementNode_Else(); /** * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. @@ -4664,12 +5218,12 @@ public interface Xpand3nodePackage extends EPackage { EClass PROTECT_STATEMENT_NODE = eINSTANCE.getProtectStatementNode(); /** - * The meta object literal for the '<em><b>Cstart</b></em>' reference feature. + * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference PROTECT_STATEMENT_NODE__CSTART = eINSTANCE.getProtectStatementNode_Cstart(); + EReference PROTECT_STATEMENT_NODE__SEQUENCE = eINSTANCE.getProtectStatementNode_Sequence(); /** * The meta object literal for the '<em><b>Cend</b></em>' reference feature. @@ -4688,12 +5242,12 @@ public interface Xpand3nodePackage extends EPackage { EReference PROTECT_STATEMENT_NODE__ID = eINSTANCE.getProtectStatementNode_Id(); /** - * The meta object literal for the '<em><b>Sequence</b></em>' reference feature. + * The meta object literal for the '<em><b>Cstart</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference PROTECT_STATEMENT_NODE__SEQUENCE = eINSTANCE.getProtectStatementNode_Sequence(); + EReference PROTECT_STATEMENT_NODE__CSTART = eINSTANCE.getProtectStatementNode_Cstart(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl <em>Check Node</em>}' class. @@ -4706,6 +5260,54 @@ public interface Xpand3nodePackage extends EPackage { EClass CHECK_NODE = eINSTANCE.getCheckNode(); /** + * The meta object literal for the '<em><b>Type</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHECK_NODE__TYPE = eINSTANCE.getCheckNode_Type(); + + /** + * The meta object literal for the '<em><b>Error</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHECK_NODE__ERROR = eINSTANCE.getCheckNode_Error(); + + /** + * The meta object literal for the '<em><b>Message</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHECK_NODE__MESSAGE = eINSTANCE.getCheckNode_Message(); + + /** + * The meta object literal for the '<em><b>If Expression</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHECK_NODE__IF_EXPRESSION = eINSTANCE.getCheckNode_IfExpression(); + + /** + * The meta object literal for the '<em><b>Warning</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHECK_NODE__WARNING = eINSTANCE.getCheckNode_Warning(); + + /** + * The meta object literal for the '<em><b>Constraint</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHECK_NODE__CONSTRAINT = eINSTANCE.getCheckNode_Constraint(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AroundNodeImpl <em>Around Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4736,12 +5338,12 @@ public interface Xpand3nodePackage extends EPackage { EClass EXTENSION_NODE = eINSTANCE.getExtensionNode(); /** - * The meta object literal for the '<em><b>Create</b></em>' reference feature. + * The meta object literal for the '<em><b>Param List</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference EXTENSION_NODE__CREATE = eINSTANCE.getExtensionNode_Create(); + EReference EXTENSION_NODE__PARAM_LIST = eINSTANCE.getExtensionNode_ParamList(); /** * The meta object literal for the '<em><b>Private</b></em>' reference feature. @@ -4752,36 +5354,36 @@ public interface Xpand3nodePackage extends EPackage { EReference EXTENSION_NODE__PRIVATE = eINSTANCE.getExtensionNode_Private(); /** - * The meta object literal for the '<em><b>Param List</b></em>' reference feature. + * The meta object literal for the '<em><b>Return Type</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference EXTENSION_NODE__PARAM_LIST = eINSTANCE.getExtensionNode_ParamList(); + EReference EXTENSION_NODE__RETURN_TYPE = eINSTANCE.getExtensionNode_ReturnType(); /** - * The meta object literal for the '<em><b>Extend Body</b></em>' reference feature. + * 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__EXTEND_BODY = eINSTANCE.getExtensionNode_ExtendBody(); + EReference EXTENSION_NODE__JAVA_RETURN_TYPE = eINSTANCE.getExtensionNode_JavaReturnType(); /** - * The meta object literal for the '<em><b>Cached</b></em>' reference feature. + * The meta object literal for the '<em><b>Create</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference EXTENSION_NODE__CACHED = eINSTANCE.getExtensionNode_Cached(); + EReference EXTENSION_NODE__CREATE = eINSTANCE.getExtensionNode_Create(); /** - * The meta object literal for the '<em><b>Java Return Type</b></em>' reference feature. + * The meta object literal for the '<em><b>Name</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference EXTENSION_NODE__JAVA_RETURN_TYPE = eINSTANCE.getExtensionNode_JavaReturnType(); + EReference EXTENSION_NODE__NAME = eINSTANCE.getExtensionNode_Name(); /** * The meta object literal for the '<em><b>Java Name</b></em>' reference feature. @@ -4792,20 +5394,20 @@ public interface Xpand3nodePackage extends EPackage { EReference EXTENSION_NODE__JAVA_NAME = eINSTANCE.getExtensionNode_JavaName(); /** - * The meta object literal for the '<em><b>Return Type</b></em>' reference feature. + * The meta object literal for the '<em><b>Cached</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference EXTENSION_NODE__RETURN_TYPE = eINSTANCE.getExtensionNode_ReturnType(); + EReference EXTENSION_NODE__CACHED = eINSTANCE.getExtensionNode_Cached(); /** - * The meta object literal for the '<em><b>Name</b></em>' reference feature. + * The meta object literal for the '<em><b>Extend Body</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference EXTENSION_NODE__NAME = eINSTANCE.getExtensionNode_Name(); + EReference EXTENSION_NODE__EXTEND_BODY = eINSTANCE.getExtensionNode_ExtendBody(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class. @@ -4828,16 +5430,6 @@ public interface Xpand3nodePackage extends EPackage { EClass TEST_EXPRESSION_NODE = eINSTANCE.getTest_expressionNode(); /** - * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionNodeImpl <em>Expression Node</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpressionNode() - * @generated - */ - EClass EXPRESSION_NODE = eINSTANCE.getExpressionNode(); - - /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4858,6 +5450,22 @@ public interface Xpand3nodePackage extends EPackage { EClass CASTED_EXPRESSION_NODE = eINSTANCE.getCastedExpressionNode(); /** + * The meta object literal for the '<em><b>Target</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CASTED_EXPRESSION_NODE__TARGET = eINSTANCE.getCastedExpressionNode_Target(); + + /** + * The meta object literal for the '<em><b>Type</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CASTED_EXPRESSION_NODE__TYPE = eINSTANCE.getCastedExpressionNode_Type(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4868,6 +5476,22 @@ public interface Xpand3nodePackage extends EPackage { EClass CHAIN_EXPRESSION_NODE = eINSTANCE.getChainExpressionNode(); /** + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHAIN_EXPRESSION_NODE__NEXTS = eINSTANCE.getChainExpressionNode_Nexts(); + + /** + * The meta object literal for the '<em><b>First</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CHAIN_EXPRESSION_NODE__FIRST = eINSTANCE.getChainExpressionNode_First(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl <em>If Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4878,6 +5502,38 @@ public interface Xpand3nodePackage extends EPackage { EClass IF_EXPRESSION_NODE = eINSTANCE.getIfExpressionNode(); /** + * The meta object literal for the '<em><b>Then</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference IF_EXPRESSION_NODE__THEN = eINSTANCE.getIfExpressionNode_Then(); + + /** + * The meta object literal for the '<em><b>Else</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference IF_EXPRESSION_NODE__ELSE = eINSTANCE.getIfExpressionNode_Else(); + + /** + * The meta object literal for the '<em><b>Condition0</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference IF_EXPRESSION_NODE__CONDITION0 = eINSTANCE.getIfExpressionNode_Condition0(); + + /** + * The meta object literal for the '<em><b>Condition1</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference IF_EXPRESSION_NODE__CONDITION1 = eINSTANCE.getIfExpressionNode_Condition1(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl <em>Switch Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4888,6 +5544,30 @@ public interface Xpand3nodePackage extends EPackage { EClass SWITCH_EXPRESSION_NODE = eINSTANCE.getSwitchExpressionNode(); /** + * The meta object literal for the '<em><b>Default</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference SWITCH_EXPRESSION_NODE__DEFAULT = eINSTANCE.getSwitchExpressionNode_Default(); + + /** + * The meta object literal for the '<em><b>Expression</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference SWITCH_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getSwitchExpressionNode_Expression(); + + /** + * The meta object literal for the '<em><b>Cases</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference SWITCH_EXPRESSION_NODE__CASES = eINSTANCE.getSwitchExpressionNode_Cases(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl <em>Case Part Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4898,6 +5578,22 @@ public interface Xpand3nodePackage extends EPackage { EClass CASE_PART_NODE = eINSTANCE.getCasePartNode(); /** + * The meta object literal for the '<em><b>Condition</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CASE_PART_NODE__CONDITION = eINSTANCE.getCasePartNode_Condition(); + + /** + * The meta object literal for the '<em><b>Expression</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference CASE_PART_NODE__EXPRESSION = eINSTANCE.getCasePartNode_Expression(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl <em>Or Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4908,6 +5604,22 @@ public interface Xpand3nodePackage extends EPackage { EClass OR_EXPRESSION_NODE = eINSTANCE.getOrExpressionNode(); /** + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference OR_EXPRESSION_NODE__NEXTS = eINSTANCE.getOrExpressionNode_Nexts(); + + /** + * The meta object literal for the '<em><b>First</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference OR_EXPRESSION_NODE__FIRST = eINSTANCE.getOrExpressionNode_First(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4918,6 +5630,22 @@ public interface Xpand3nodePackage extends EPackage { EClass AND_EXPRESSION_NODE = eINSTANCE.getAndExpressionNode(); /** + * The meta object literal for the '<em><b>First</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference AND_EXPRESSION_NODE__FIRST = eINSTANCE.getAndExpressionNode_First(); + + /** + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference AND_EXPRESSION_NODE__NEXTS = eINSTANCE.getAndExpressionNode_Nexts(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4928,48 +5656,46 @@ public interface Xpand3nodePackage extends EPackage { EClass IMPLIES_EXPRESSION_NODE = eINSTANCE.getImpliesExpressionNode(); /** - * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class. + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode() * @generated */ - EClass RELATIONAL_EXPRESSION_NODE = eINSTANCE.getRelationalExpressionNode(); + EReference IMPLIES_EXPRESSION_NODE__NEXTS = eINSTANCE.getImpliesExpressionNode_Nexts(); /** - * The meta object literal for the '<em><b>Operator</b></em>' reference feature. + * The meta object literal for the '<em><b>First</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference RELATIONAL_EXPRESSION_NODE__OPERATOR = eINSTANCE.getRelationalExpressionNode_Operator(); + EReference IMPLIES_EXPRESSION_NODE__FIRST = eINSTANCE.getImpliesExpressionNode_First(); /** - * The meta object literal for the '<em><b>Right Operand</b></em>' reference feature. + * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl + * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode() * @generated */ - EReference RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = eINSTANCE.getRelationalExpressionNode_RightOperand(); + EClass RELATIONAL_EXPRESSION_NODE = eINSTANCE.getRelationalExpressionNode(); /** - * The meta object literal for the '<em><b>Left Operand</b></em>' reference feature. + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND = eINSTANCE.getRelationalExpressionNode_LeftOperand(); + EReference RELATIONAL_EXPRESSION_NODE__NEXTS = eINSTANCE.getRelationalExpressionNode_Nexts(); /** - * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalOperatorNodeImpl <em>Relational Operator Node</em>}' class. + * The meta object literal for the '<em><b>First</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalOperatorNodeImpl - * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalOperatorNode() * @generated */ - EClass RELATIONAL_OPERATOR_NODE = eINSTANCE.getRelationalOperatorNode(); + EReference RELATIONAL_EXPRESSION_NODE__FIRST = eINSTANCE.getRelationalExpressionNode_First(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class. @@ -4982,20 +5708,20 @@ public interface Xpand3nodePackage extends EPackage { EClass ADDITIVE_EXPRESSION_NODE = eINSTANCE.getAdditiveExpressionNode(); /** - * The meta object literal for the '<em><b>Right</b></em>' reference feature. + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ADDITIVE_EXPRESSION_NODE__RIGHT = eINSTANCE.getAdditiveExpressionNode_Right(); + EReference ADDITIVE_EXPRESSION_NODE__NEXTS = eINSTANCE.getAdditiveExpressionNode_Nexts(); /** - * The meta object literal for the '<em><b>Left</b></em>' reference feature. + * The meta object literal for the '<em><b>First</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ADDITIVE_EXPRESSION_NODE__LEFT = eINSTANCE.getAdditiveExpressionNode_Left(); + EReference ADDITIVE_EXPRESSION_NODE__FIRST = eINSTANCE.getAdditiveExpressionNode_First(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl <em>Multiplicative Expression Node</em>}' class. @@ -5008,20 +5734,20 @@ public interface Xpand3nodePackage extends EPackage { EClass MULTIPLICATIVE_EXPRESSION_NODE = eINSTANCE.getMultiplicativeExpressionNode(); /** - * The meta object literal for the '<em><b>Left</b></em>' reference feature. + * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference MULTIPLICATIVE_EXPRESSION_NODE__LEFT = eINSTANCE.getMultiplicativeExpressionNode_Left(); + EReference MULTIPLICATIVE_EXPRESSION_NODE__NEXTS = eINSTANCE.getMultiplicativeExpressionNode_Nexts(); /** - * The meta object literal for the '<em><b>Right</b></em>' reference feature. + * The meta object literal for the '<em><b>First</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference MULTIPLICATIVE_EXPRESSION_NODE__RIGHT = eINSTANCE.getMultiplicativeExpressionNode_Right(); + EReference MULTIPLICATIVE_EXPRESSION_NODE__FIRST = eINSTANCE.getMultiplicativeExpressionNode_First(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.UnaryExpressionNodeImpl <em>Unary Expression Node</em>}' class. @@ -5088,6 +5814,14 @@ public interface Xpand3nodePackage extends EPackage { EClass PARANTHESIZED_EXPRESSION_NODE = eINSTANCE.getParanthesizedExpressionNode(); /** + * The meta object literal for the '<em><b>Expression</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference PARANTHESIZED_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getParanthesizedExpressionNode_Expression(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.GlobalVarExpressionNodeImpl <em>Global Var Expression Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5108,12 +5842,12 @@ public interface Xpand3nodePackage extends EPackage { EClass FEATURE_CALL_NODE = eINSTANCE.getFeatureCallNode(); /** - * The meta object literal for the '<em><b>Type</b></em>' reference feature. + * 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__TYPE = eINSTANCE.getFeatureCallNode_Type(); + EReference FEATURE_CALL_NODE__PARAM_LIST = eINSTANCE.getFeatureCallNode_ParamList(); /** * The meta object literal for the '<em><b>Name</b></em>' reference feature. @@ -5124,12 +5858,12 @@ public interface Xpand3nodePackage extends EPackage { EReference FEATURE_CALL_NODE__NAME = eINSTANCE.getFeatureCallNode_Name(); /** - * The meta object literal for the '<em><b>Param List</b></em>' reference feature. + * The meta object literal for the '<em><b>Type</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference FEATURE_CALL_NODE__PARAM_LIST = eINSTANCE.getFeatureCallNode_ParamList(); + EReference FEATURE_CALL_NODE__TYPE = eINSTANCE.getFeatureCallNode_Type(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class. @@ -5142,6 +5876,14 @@ public interface Xpand3nodePackage extends EPackage { EClass LIST_LITERAL_NODE = eINSTANCE.getListLiteralNode(); /** + * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference LIST_LITERAL_NODE__ELEMENTS = eINSTANCE.getListLiteralNode_Elements(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ConstructorCallNodeImpl <em>Constructor Call Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5192,6 +5934,30 @@ public interface Xpand3nodePackage extends EPackage { EClass COLLECTION_EXPRESSION_NODE = eINSTANCE.getCollectionExpressionNode(); /** + * The meta object literal for the '<em><b>Variable</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference COLLECTION_EXPRESSION_NODE__VARIABLE = eINSTANCE.getCollectionExpressionNode_Variable(); + + /** + * The meta object literal for the '<em><b>Expression</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference COLLECTION_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getCollectionExpressionNode_Expression(); + + /** + * The meta object literal for the '<em><b>Type</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference COLLECTION_EXPRESSION_NODE__TYPE = eINSTANCE.getCollectionExpressionNode_Type(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl <em>Declared Parameter List Node</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5220,20 +5986,20 @@ public interface Xpand3nodePackage extends EPackage { EClass DECLARED_PARAMETER_NODE = eINSTANCE.getDeclaredParameterNode(); /** - * The meta object literal for the '<em><b>Name</b></em>' reference feature. + * The meta object literal for the '<em><b>Ptype</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DECLARED_PARAMETER_NODE__NAME = eINSTANCE.getDeclaredParameterNode_Name(); + EReference DECLARED_PARAMETER_NODE__PTYPE = eINSTANCE.getDeclaredParameterNode_Ptype(); /** - * The meta object literal for the '<em><b>Ptype</b></em>' reference feature. + * The meta object literal for the '<em><b>Name</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference DECLARED_PARAMETER_NODE__PTYPE = eINSTANCE.getDeclaredParameterNode_Ptype(); + EReference DECLARED_PARAMETER_NODE__NAME = eINSTANCE.getDeclaredParameterNode_Name(); /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class. @@ -5264,6 +6030,22 @@ public interface Xpand3nodePackage extends EPackage { EClass COLLECTION_TYPE_NODE = eINSTANCE.getCollectionTypeNode(); /** + * The meta object literal for the '<em><b>Collection Type</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference COLLECTION_TYPE_NODE__COLLECTION_TYPE = eINSTANCE.getCollectionTypeNode_CollectionType(); + + /** + * The meta object literal for the '<em><b>Element Type</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference COLLECTION_TYPE_NODE__ELEMENT_TYPE = eINSTANCE.getCollectionTypeNode_ElementType(); + + /** * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl <em>Simple Type 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/AdditiveExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java index 347629ad..4060ed94 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java @@ -2,16 +2,25 @@ * <copyright> * </copyright> * - * $Id: AdditiveExpressionNodeImpl.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: AdditiveExpressionNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.ecore.EClass; +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.AdditiveExpressionNode; @@ -24,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getLeft <em>Left</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getRight <em>Right</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -33,23 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements AdditiveExpressionNode { /** - * The cached value of the '{@link #getLeft() <em>Left</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getLeft() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode left; + protected EList<CompositeNode> nexts; + /** - * The cached value of the '{@link #getRight() <em>Right</em>}' reference. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getRight() + * @see #getFirst() * @generated * @ordered */ - protected CompositeNode right; + protected CompositeNode first; /** * <!-- begin-user-doc --> @@ -75,37 +85,11 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add * <!-- end-user-doc --> * @generated */ - public CompositeNode getRight() { - if (right != null && right.eIsProxy()) { - InternalEObject oldRight = (InternalEObject)right; - right = (CompositeNode)eResolveProxy(oldRight); - if (right != oldRight) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__RIGHT, oldRight, right)); - } + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__NEXTS); } - return right; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public CompositeNode basicGetRight() { - return right; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setRight(CompositeNode newRight) { - CompositeNode oldRight = right; - right = newRight; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__RIGHT, oldRight, right)); + return nexts; } /** @@ -113,16 +97,16 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add * <!-- end-user-doc --> * @generated */ - public CompositeNode getLeft() { - if (left != null && left.eIsProxy()) { - InternalEObject oldLeft = (InternalEObject)left; - left = (CompositeNode)eResolveProxy(oldLeft); - if (left != oldLeft) { + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__LEFT, oldLeft, left)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__FIRST, oldFirst, first)); } } - return left; + return first; } /** @@ -130,8 +114,8 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetLeft() { - return left; + public CompositeNode basicGetFirst() { + return first; } /** @@ -139,11 +123,11 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add * <!-- end-user-doc --> * @generated */ - public void setLeft(CompositeNode newLeft) { - CompositeNode oldLeft = left; - left = newLeft; + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__LEFT, oldLeft, left)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__FIRST, oldFirst, first)); } /** @@ -154,12 +138,11 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__LEFT: - if (resolve) return getLeft(); - return basicGetLeft(); - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__RIGHT: - if (resolve) return getRight(); - return basicGetRight(); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__NEXTS: + return getNexts(); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); } return super.eGet(featureID, resolve, coreType); } @@ -169,14 +152,16 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__LEFT: - setLeft((CompositeNode)newValue); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().addAll((Collection<? extends CompositeNode>)newValue); return; - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__RIGHT: - setRight((CompositeNode)newValue); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); return; } super.eSet(featureID, newValue); @@ -190,11 +175,11 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__LEFT: - setLeft((CompositeNode)null); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__NEXTS: + getNexts().clear(); return; - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__RIGHT: - setRight((CompositeNode)null); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); return; } super.eUnset(featureID); @@ -208,10 +193,10 @@ public class AdditiveExpressionNodeImpl extends CompositeNodeImpl implements Add @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__LEFT: - return left != null; - case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__RIGHT: - return right != null; + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE__FIRST: + return first != null; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java index b1729afa..7717cfd7 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java @@ -2,11 +2,24 @@ * <copyright> * </copyright> * - * $Id: AndExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: AndExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +31,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>And Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * </ul> * </p> * * @generated */ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpressionNode { /** + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFirst() + * @generated + * @ordered + */ + protected CompositeNode first; + + /** + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getNexts() + * @generated + * @ordered + */ + protected EList<CompositeNode> nexts; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +80,125 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre return Xpand3nodePackage.Literals.AND_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + } + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetFirst() { + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS); + } + return nexts; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); + case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS: + return getNexts(); + } + 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.AND_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; + case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().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.AND_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); + return; + case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST: + return first != null; + case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + } + return super.eIsSet(featureID); + } + } //AndExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java index 6d1eb59b..65ae9c28 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AroundNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: AroundNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java index f34fa8ab..930b5158 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: BooleanLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: BooleanLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java index 2e372981..1bf29d21 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java @@ -2,11 +2,18 @@ * <copyright> * </copyright> * - * $Id: CasePartNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: CasePartNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +25,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Case Part Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl#getCondition <em>Condition</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl#getExpression <em>Expression</em>}</li> + * </ul> * </p> * * @generated */ public class CasePartNodeImpl extends CompositeNodeImpl implements CasePartNode { /** + * The cached value of the '{@link #getCondition() <em>Condition</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCondition() + * @generated + * @ordered + */ + protected CompositeNode condition; + + /** + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getExpression() + * @generated + * @ordered + */ + protected CompositeNode expression; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +74,150 @@ public class CasePartNodeImpl extends CompositeNodeImpl implements CasePartNode return Xpand3nodePackage.Literals.CASE_PART_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getCondition() { + if (condition != null && condition.eIsProxy()) { + InternalEObject oldCondition = (InternalEObject)condition; + condition = (CompositeNode)eResolveProxy(oldCondition); + if (condition != oldCondition) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASE_PART_NODE__CONDITION, oldCondition, condition)); + } + } + return condition; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetCondition() { + return condition; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setCondition(CompositeNode newCondition) { + CompositeNode oldCondition = condition; + condition = newCondition; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASE_PART_NODE__CONDITION, oldCondition, condition)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getExpression() { + if (expression != null && expression.eIsProxy()) { + InternalEObject oldExpression = (InternalEObject)expression; + expression = (CompositeNode)eResolveProxy(oldExpression); + if (expression != oldExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASE_PART_NODE__EXPRESSION, oldExpression, expression)); + } + } + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetExpression() { + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setExpression(CompositeNode newExpression) { + CompositeNode oldExpression = expression; + expression = newExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASE_PART_NODE__EXPRESSION, oldExpression, expression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.CASE_PART_NODE__CONDITION: + if (resolve) return getCondition(); + return basicGetCondition(); + case Xpand3nodePackage.CASE_PART_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); + } + 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.CASE_PART_NODE__CONDITION: + setCondition((CompositeNode)newValue); + return; + case Xpand3nodePackage.CASE_PART_NODE__EXPRESSION: + setExpression((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CASE_PART_NODE__CONDITION: + setCondition((CompositeNode)null); + return; + case Xpand3nodePackage.CASE_PART_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CASE_PART_NODE__CONDITION: + return condition != null; + case Xpand3nodePackage.CASE_PART_NODE__EXPRESSION: + return expression != null; + } + return super.eIsSet(featureID); + } + } //CasePartNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java index 3edfc41b..fc2e2c3c 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java @@ -2,11 +2,18 @@ * <copyright> * </copyright> * - * $Id: CastedExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: CastedExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +25,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Casted Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl#getTarget <em>Target</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl#getType <em>Type</em>}</li> + * </ul> * </p> * * @generated */ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements CastedExpressionNode { /** + * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTarget() + * @generated + * @ordered + */ + protected CompositeNode target; + + /** + * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getType() + * @generated + * @ordered + */ + protected CompositeNode type; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +74,150 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste return Xpand3nodePackage.Literals.CASTED_EXPRESSION_NODE; } + /** + * <!-- 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.CASTED_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.CASTED_EXPRESSION_NODE__TARGET, oldTarget, target)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getType() { + if (type != null && type.eIsProxy()) { + InternalEObject oldType = (InternalEObject)type; + type = (CompositeNode)eResolveProxy(oldType); + if (type != oldType) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE, oldType, type)); + } + } + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetType() { + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setType(CompositeNode newType) { + CompositeNode oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE, oldType, type)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + if (resolve) return getTarget(); + return basicGetTarget(); + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE: + if (resolve) return getType(); + return basicGetType(); + } + 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.CASTED_EXPRESSION_NODE__TARGET: + setTarget((CompositeNode)newValue); + return; + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE: + setType((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + setTarget((CompositeNode)null); + return; + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE: + setType((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + return target != null; + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE: + return type != null; + } + return super.eIsSet(featureID); + } + } //CastedExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java index 473c2af0..89e34692 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java @@ -2,11 +2,24 @@ * <copyright> * </copyright> * - * $Id: ChainExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ChainExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +31,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Chain Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl#getFirst <em>First</em>}</li> + * </ul> * </p> * * @generated */ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainExpressionNode { /** + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getNexts() + * @generated + * @ordered + */ + protected EList<CompositeNode> nexts; + + /** + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFirst() + * @generated + * @ordered + */ + protected CompositeNode first; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +80,125 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE return Xpand3nodePackage.Literals.CHAIN_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS); + } + return nexts; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + } + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetFirst() { + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS: + return getNexts(); + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); + } + 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.CHAIN_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().addAll((Collection<? extends CompositeNode>)newValue); + return; + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST: + return first != null; + } + return super.eIsSet(featureID); + } + } //ChainExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java index 2f947281..7696076a 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java @@ -2,11 +2,19 @@ * <copyright> * </copyright> * - * $Id: CheckNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: CheckNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +26,81 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Check Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getError <em>Error</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getMessage <em>Message</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getIfExpression <em>If Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getWarning <em>Warning</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getConstraint <em>Constraint</em>}</li> + * </ul> * </p> * * @generated */ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { /** + * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getType() + * @generated + * @ordered + */ + protected CompositeNode type; + + /** + * The cached value of the '{@link #getError() <em>Error</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getError() + * @generated + * @ordered + */ + protected LeafNode error; + + /** + * The cached value of the '{@link #getMessage() <em>Message</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMessage() + * @generated + * @ordered + */ + protected CompositeNode message; + + /** + * The cached value of the '{@link #getIfExpression() <em>If Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getIfExpression() + * @generated + * @ordered + */ + protected CompositeNode ifExpression; + + /** + * The cached value of the '{@link #getWarning() <em>Warning</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getWarning() + * @generated + * @ordered + */ + protected LeafNode warning; + + /** + * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getConstraint() + * @generated + * @ordered + */ + protected CompositeNode constraint; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +119,346 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { return Xpand3nodePackage.Literals.CHECK_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getType() { + if (type != null && type.eIsProxy()) { + InternalEObject oldType = (InternalEObject)type; + type = (CompositeNode)eResolveProxy(oldType); + if (type != oldType) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHECK_NODE__TYPE, oldType, type)); + } + } + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetType() { + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setType(CompositeNode newType) { + CompositeNode oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHECK_NODE__TYPE, oldType, type)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public LeafNode getError() { + if (error != null && error.eIsProxy()) { + InternalEObject oldError = (InternalEObject)error; + error = (LeafNode)eResolveProxy(oldError); + if (error != oldError) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHECK_NODE__ERROR, oldError, error)); + } + } + return error; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public LeafNode basicGetError() { + return error; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setError(LeafNode newError) { + LeafNode oldError = error; + error = newError; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHECK_NODE__ERROR, oldError, error)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getMessage() { + if (message != null && message.eIsProxy()) { + InternalEObject oldMessage = (InternalEObject)message; + message = (CompositeNode)eResolveProxy(oldMessage); + if (message != oldMessage) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHECK_NODE__MESSAGE, oldMessage, message)); + } + } + return message; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetMessage() { + return message; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setMessage(CompositeNode newMessage) { + CompositeNode oldMessage = message; + message = newMessage; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHECK_NODE__MESSAGE, oldMessage, message)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getIfExpression() { + if (ifExpression != null && ifExpression.eIsProxy()) { + InternalEObject oldIfExpression = (InternalEObject)ifExpression; + ifExpression = (CompositeNode)eResolveProxy(oldIfExpression); + if (ifExpression != oldIfExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION, oldIfExpression, ifExpression)); + } + } + return ifExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetIfExpression() { + return ifExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setIfExpression(CompositeNode newIfExpression) { + CompositeNode oldIfExpression = ifExpression; + ifExpression = newIfExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION, oldIfExpression, ifExpression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public LeafNode getWarning() { + if (warning != null && warning.eIsProxy()) { + InternalEObject oldWarning = (InternalEObject)warning; + warning = (LeafNode)eResolveProxy(oldWarning); + if (warning != oldWarning) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHECK_NODE__WARNING, oldWarning, warning)); + } + } + return warning; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public LeafNode basicGetWarning() { + return warning; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setWarning(LeafNode newWarning) { + LeafNode oldWarning = warning; + warning = newWarning; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHECK_NODE__WARNING, oldWarning, warning)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getConstraint() { + if (constraint != null && constraint.eIsProxy()) { + InternalEObject oldConstraint = (InternalEObject)constraint; + constraint = (CompositeNode)eResolveProxy(oldConstraint); + if (constraint != oldConstraint) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CHECK_NODE__CONSTRAINT, oldConstraint, constraint)); + } + } + return constraint; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetConstraint() { + return constraint; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setConstraint(CompositeNode newConstraint) { + CompositeNode oldConstraint = constraint; + constraint = newConstraint; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CHECK_NODE__CONSTRAINT, oldConstraint, constraint)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.CHECK_NODE__TYPE: + if (resolve) return getType(); + return basicGetType(); + case Xpand3nodePackage.CHECK_NODE__ERROR: + if (resolve) return getError(); + return basicGetError(); + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + if (resolve) return getMessage(); + return basicGetMessage(); + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + if (resolve) return getIfExpression(); + return basicGetIfExpression(); + case Xpand3nodePackage.CHECK_NODE__WARNING: + if (resolve) return getWarning(); + return basicGetWarning(); + case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: + if (resolve) return getConstraint(); + return basicGetConstraint(); + } + 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.CHECK_NODE__TYPE: + setType((CompositeNode)newValue); + return; + case Xpand3nodePackage.CHECK_NODE__ERROR: + setError((LeafNode)newValue); + return; + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + setMessage((CompositeNode)newValue); + return; + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + setIfExpression((CompositeNode)newValue); + return; + case Xpand3nodePackage.CHECK_NODE__WARNING: + setWarning((LeafNode)newValue); + return; + case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: + setConstraint((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CHECK_NODE__TYPE: + setType((CompositeNode)null); + return; + case Xpand3nodePackage.CHECK_NODE__ERROR: + setError((LeafNode)null); + return; + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + setMessage((CompositeNode)null); + return; + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + setIfExpression((CompositeNode)null); + return; + case Xpand3nodePackage.CHECK_NODE__WARNING: + setWarning((LeafNode)null); + return; + case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: + setConstraint((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.CHECK_NODE__TYPE: + return type != null; + case Xpand3nodePackage.CHECK_NODE__ERROR: + return error != null; + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + return message != null; + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + return ifExpression != null; + case Xpand3nodePackage.CHECK_NODE__WARNING: + return warning != null; + case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: + return constraint != null; + } + return super.eIsSet(featureID); + } + } //CheckNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java index 54cacf92..de5c57a1 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java @@ -2,12 +2,16 @@ * <copyright> * </copyright> * - * $Id: CollectionExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: CollectionExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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.CollectionExpressionNode; @@ -18,12 +22,46 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Collection Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getVariable <em>Variable</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getType <em>Type</em>}</li> + * </ul> * </p> * * @generated */ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements CollectionExpressionNode { /** + * The cached value of the '{@link #getVariable() <em>Variable</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getVariable() + * @generated + * @ordered + */ + protected CompositeNode variable; + /** + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getExpression() + * @generated + * @ordered + */ + protected CompositeNode expression; + /** + * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getType() + * @generated + * @ordered + */ + protected CompositeNode type; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +80,199 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C return Xpand3nodePackage.Literals.COLLECTION_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getVariable() { + if (variable != null && variable.eIsProxy()) { + InternalEObject oldVariable = (InternalEObject)variable; + variable = (CompositeNode)eResolveProxy(oldVariable); + if (variable != oldVariable) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__VARIABLE, oldVariable, variable)); + } + } + return variable; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetVariable() { + return variable; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setVariable(CompositeNode newVariable) { + CompositeNode oldVariable = variable; + variable = newVariable; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__VARIABLE, oldVariable, variable)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getExpression() { + if (expression != null && expression.eIsProxy()) { + InternalEObject oldExpression = (InternalEObject)expression; + expression = (CompositeNode)eResolveProxy(oldExpression); + if (expression != oldExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION, oldExpression, expression)); + } + } + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetExpression() { + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setExpression(CompositeNode newExpression) { + CompositeNode oldExpression = expression; + expression = newExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION, oldExpression, expression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getType() { + if (type != null && type.eIsProxy()) { + InternalEObject oldType = (InternalEObject)type; + type = (CompositeNode)eResolveProxy(oldType); + if (type != oldType) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE, oldType, type)); + } + } + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetType() { + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setType(CompositeNode newType) { + CompositeNode oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE, oldType, type)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__VARIABLE: + if (resolve) return getVariable(); + return basicGetVariable(); + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE: + if (resolve) return getType(); + return basicGetType(); + } + 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.COLLECTION_EXPRESSION_NODE__VARIABLE: + setVariable((CompositeNode)newValue); + return; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)newValue); + return; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE: + setType((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__VARIABLE: + setVariable((CompositeNode)null); + return; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE: + setType((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__VARIABLE: + return variable != null; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + return expression != null; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE: + return type != null; + } + return super.eIsSet(featureID); + } + } //CollectionExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java index b962b438..a38ed548 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java @@ -2,11 +2,19 @@ * <copyright> * </copyright> * - * $Id: CollectionTypeNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: CollectionTypeNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +26,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Collection Type Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl#getCollectionType <em>Collection Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl#getElementType <em>Element Type</em>}</li> + * </ul> * </p> * * @generated */ public class CollectionTypeNodeImpl extends CompositeNodeImpl implements CollectionTypeNode { /** + * The cached value of the '{@link #getCollectionType() <em>Collection Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCollectionType() + * @generated + * @ordered + */ + protected LeafNode collectionType; + + /** + * The cached value of the '{@link #getElementType() <em>Element Type</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getElementType() + * @generated + * @ordered + */ + protected CompositeNode elementType; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +75,150 @@ public class CollectionTypeNodeImpl extends CompositeNodeImpl implements Collect return Xpand3nodePackage.Literals.COLLECTION_TYPE_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public LeafNode getCollectionType() { + if (collectionType != null && collectionType.eIsProxy()) { + InternalEObject oldCollectionType = (InternalEObject)collectionType; + collectionType = (LeafNode)eResolveProxy(oldCollectionType); + if (collectionType != oldCollectionType) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_TYPE_NODE__COLLECTION_TYPE, oldCollectionType, collectionType)); + } + } + return collectionType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public LeafNode basicGetCollectionType() { + return collectionType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setCollectionType(LeafNode newCollectionType) { + LeafNode oldCollectionType = collectionType; + collectionType = newCollectionType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_TYPE_NODE__COLLECTION_TYPE, oldCollectionType, collectionType)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getElementType() { + if (elementType != null && elementType.eIsProxy()) { + InternalEObject oldElementType = (InternalEObject)elementType; + elementType = (CompositeNode)eResolveProxy(oldElementType); + if (elementType != oldElementType) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_TYPE_NODE__ELEMENT_TYPE, oldElementType, elementType)); + } + } + return elementType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetElementType() { + return elementType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setElementType(CompositeNode newElementType) { + CompositeNode oldElementType = elementType; + elementType = newElementType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_TYPE_NODE__ELEMENT_TYPE, oldElementType, elementType)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.COLLECTION_TYPE_NODE__COLLECTION_TYPE: + if (resolve) return getCollectionType(); + return basicGetCollectionType(); + case Xpand3nodePackage.COLLECTION_TYPE_NODE__ELEMENT_TYPE: + if (resolve) return getElementType(); + return basicGetElementType(); + } + 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.COLLECTION_TYPE_NODE__COLLECTION_TYPE: + setCollectionType((LeafNode)newValue); + return; + case Xpand3nodePackage.COLLECTION_TYPE_NODE__ELEMENT_TYPE: + setElementType((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.COLLECTION_TYPE_NODE__COLLECTION_TYPE: + setCollectionType((LeafNode)null); + return; + case Xpand3nodePackage.COLLECTION_TYPE_NODE__ELEMENT_TYPE: + setElementType((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.COLLECTION_TYPE_NODE__COLLECTION_TYPE: + return collectionType != null; + case Xpand3nodePackage.COLLECTION_TYPE_NODE__ELEMENT_TYPE: + return elementType != null; + } + return super.eIsSet(featureID); + } + } //CollectionTypeNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java index d05b699f..24fc5570 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstructorCallNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ConstructorCallNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; 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 0251aa59..5acff42a 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclaredParameterListNodeImpl.java,v 1.3 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: DeclaredParameterListNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; 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 db60870e..7451ee59 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclaredParameterNodeImpl.java,v 1.4 2008/03/07 11:11:15 jkohnlein Exp $ + * $Id: DeclaredParameterNodeImpl.java,v 1.5 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <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> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getName <em>Name</em>}</li> * </ul> * </p> * @@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements DeclaredParameterNode { /** - * The cached value of the '{@link #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getPtype() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode ptype; /** - * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getPtype() + * @see #getName() * @generated * @ordered */ - protected CompositeNode ptype; + protected CompositeNode name; /** * <!-- begin-user-doc --> @@ -79,16 +79,16 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl * <!-- end-user-doc --> * @generated */ - public CompositeNode getName() { - if (name != null && name.eIsProxy()) { - InternalEObject oldName = (InternalEObject)name; - name = (CompositeNode)eResolveProxy(oldName); - if (name != oldName) { + 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__NAME, oldName, name)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype)); } } - return name; + return ptype; } /** @@ -96,8 +96,8 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetName() { - return name; + public CompositeNode basicGetPtype() { + return ptype; } /** @@ -105,11 +105,11 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl * <!-- end-user-doc --> * @generated */ - public void setName(CompositeNode newName) { - CompositeNode oldName = name; - name = newName; + public void setPtype(CompositeNode newPtype) { + CompositeNode oldPtype = ptype; + ptype = newPtype; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype)); } /** @@ -117,16 +117,16 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl * <!-- end-user-doc --> * @generated */ - public CompositeNode getPtype() { - if (ptype != null && ptype.eIsProxy()) { - InternalEObject oldPtype = (InternalEObject)ptype; - ptype = (CompositeNode)eResolveProxy(oldPtype); - if (ptype != oldPtype) { + 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__PTYPE, oldPtype, ptype)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name)); } } - return ptype; + return name; } /** @@ -134,8 +134,8 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetPtype() { - return ptype; + public CompositeNode basicGetName() { + return name; } /** @@ -143,11 +143,11 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl * <!-- end-user-doc --> * @generated */ - public void setPtype(CompositeNode newPtype) { - CompositeNode oldPtype = ptype; - ptype = newPtype; + public void setName(CompositeNode newName) { + CompositeNode oldName = name; + name = newName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name)); } /** @@ -158,12 +158,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl @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(); + case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME: + if (resolve) return getName(); + return basicGetName(); } return super.eGet(featureID, resolve, coreType); } @@ -176,12 +176,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl @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; + case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME: + setName((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -194,12 +194,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl @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; + case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME: + setName((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -212,10 +212,10 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl @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; + case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME: + return name != null; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java index 66e53e96..7e10e7e6 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: DefinitionAroundNodeImpl.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: DefinitionAroundNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.DefinitionAroundNode; @@ -43,6 +46,7 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin * @ordered */ protected CompositeNode type; + /** * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' reference. * <!-- begin-user-doc --> @@ -52,6 +56,7 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin * @ordered */ protected CompositeNode pointcut; + /** * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. * <!-- begin-user-doc --> @@ -61,6 +66,7 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin * @ordered */ protected CompositeNode paramList; + /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java index 845feaac..4b2400e4 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DefinitionNodeImpl.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: DefinitionNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -46,6 +46,7 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN * @ordered */ protected CompositeNode name; + /** * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> @@ -55,6 +56,7 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN * @ordered */ protected CompositeNode type; + /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> @@ -99,6 +101,44 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN * <!-- 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.DEFINITION_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.DEFINITION_NODE__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public CompositeNode getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -175,44 +215,6 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN * <!-- 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.DEFINITION_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.DEFINITION_NODE__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public CompositeNode getParamList() { if (paramList != null && paramList.eIsProxy()) { InternalEObject oldParamList = (InternalEObject)paramList; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java index 20b5f9a1..42d5c727 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ElseIfStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ElseIfStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ElseIfStatementNode; @@ -41,6 +44,7 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf * @ordered */ protected CompositeNode sequence; + /** * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java index b46e9e88..34df00e4 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ElseStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ElseStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ElseStatementNode; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java index 43902137..00a315f0 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ErrorStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ErrorStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ErrorStatementNode; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java index 01615503..630f5013 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ExpandStatementNodeImpl.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: ExpandStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ExpandStatementNode; @@ -26,6 +29,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <ul> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getSeparator <em>Separator</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getParamList <em>Param List</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getForEachExpression <em>For Each Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getForExpression <em>For Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getName <em>Name</em>}</li> * </ul> @@ -43,6 +47,7 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand * @ordered */ protected CompositeNode separator; + /** * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. * <!-- begin-user-doc --> @@ -52,6 +57,17 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand * @ordered */ protected CompositeNode paramList; + + /** + * The cached value of the '{@link #getForEachExpression() <em>For Each Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getForEachExpression() + * @generated + * @ordered + */ + protected CompositeNode forEachExpression; + /** * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference. * <!-- begin-user-doc --> @@ -61,6 +77,7 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand * @ordered */ protected CompositeNode forExpression; + /** * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> @@ -171,6 +188,44 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand * <!-- end-user-doc --> * @generated */ + public CompositeNode getForEachExpression() { + if (forEachExpression != null && forEachExpression.eIsProxy()) { + InternalEObject oldForEachExpression = (InternalEObject)forEachExpression; + forEachExpression = (CompositeNode)eResolveProxy(oldForEachExpression); + if (forEachExpression != oldForEachExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION, oldForEachExpression, forEachExpression)); + } + } + return forEachExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetForEachExpression() { + return forEachExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setForEachExpression(CompositeNode newForEachExpression) { + CompositeNode oldForEachExpression = forEachExpression; + forEachExpression = newForEachExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION, oldForEachExpression, forEachExpression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public CompositeNode getForExpression() { if (forExpression != null && forExpression.eIsProxy()) { InternalEObject oldForExpression = (InternalEObject)forExpression; @@ -256,6 +311,9 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST: if (resolve) return getParamList(); return basicGetParamList(); + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION: + if (resolve) return getForEachExpression(); + return basicGetForEachExpression(); case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: if (resolve) return getForExpression(); return basicGetForExpression(); @@ -280,6 +338,9 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST: setParamList((CompositeNode)newValue); return; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION: + setForEachExpression((CompositeNode)newValue); + return; case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: setForExpression((CompositeNode)newValue); return; @@ -304,6 +365,9 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST: setParamList((CompositeNode)null); return; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION: + setForEachExpression((CompositeNode)null); + return; case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: setForExpression((CompositeNode)null); return; @@ -326,6 +390,8 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand return separator != null; case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST: return paramList != null; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION: + return forEachExpression != null; case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: return forExpression != null; case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java deleted file mode 100644 index 73a927e4..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: ExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 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.ExpressionNode; -import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Expression Node</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -public class ExpressionNodeImpl extends CompositeNodeImpl implements ExpressionNode { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ExpressionNodeImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() { - return Xpand3nodePackage.Literals.EXPRESSION_NODE; - } - -} //ExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java index 567fc040..4f3e5951 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ExpressionStmtNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ExpressionStmtNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ExpressionStmtNode; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionImportNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionImportNodeImpl.java index 42366f0a..b5f70822 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionImportNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionImportNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExtensionImportNodeImpl.java,v 1.1 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ExtensionImportNodeImpl.java,v 1.2 2008/03/13 08:40:02 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; 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 d8e97882..a2f4d3cc 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExtensionNodeImpl.java,v 1.5 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ExtensionNodeImpl.java,v 1.6 2008/03/13 08:40:02 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -157,16 +157,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public LeafNode getCreate() { - if (create != null && create.eIsProxy()) { - InternalEObject oldCreate = (InternalEObject)create; - create = (LeafNode)eResolveProxy(oldCreate); - if (create != oldCreate) { + 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__CREATE, oldCreate, create)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList)); } } - return create; + return paramList; } /** @@ -174,8 +174,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public LeafNode basicGetCreate() { - return create; + public CompositeNode basicGetParamList() { + return paramList; } /** @@ -183,11 +183,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setCreate(LeafNode newCreate) { - LeafNode oldCreate = create; - create = newCreate; + public void setParamList(CompositeNode newParamList) { + CompositeNode oldParamList = paramList; + paramList = newParamList; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList)); } /** @@ -233,16 +233,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode getParamList() { - if (paramList != null && paramList.eIsProxy()) { - InternalEObject oldParamList = (InternalEObject)paramList; - paramList = (CompositeNode)eResolveProxy(oldParamList); - if (paramList != oldParamList) { + 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__PARAM_LIST, oldParamList, paramList)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType)); } } - return paramList; + return returnType; } /** @@ -250,8 +250,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetParamList() { - return paramList; + public CompositeNode basicGetReturnType() { + return returnType; } /** @@ -259,11 +259,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setParamList(CompositeNode newParamList) { - CompositeNode oldParamList = paramList; - paramList = newParamList; + public void setReturnType(CompositeNode newReturnType) { + CompositeNode oldReturnType = returnType; + returnType = newReturnType; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType)); } /** @@ -271,16 +271,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode getExtendBody() { - if (extendBody != null && extendBody.eIsProxy()) { - InternalEObject oldExtendBody = (InternalEObject)extendBody; - extendBody = (CompositeNode)eResolveProxy(oldExtendBody); - if (extendBody != oldExtendBody) { + 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__EXTEND_BODY, oldExtendBody, extendBody)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType)); } } - return extendBody; + return javaReturnType; } /** @@ -288,8 +288,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetExtendBody() { - return extendBody; + public CompositeNode basicGetJavaReturnType() { + return javaReturnType; } /** @@ -297,11 +297,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setExtendBody(CompositeNode newExtendBody) { - CompositeNode oldExtendBody = extendBody; - extendBody = newExtendBody; + public void setJavaReturnType(CompositeNode newJavaReturnType) { + CompositeNode oldJavaReturnType = javaReturnType; + javaReturnType = newJavaReturnType; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType)); } /** @@ -309,16 +309,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public LeafNode getCached() { - if (cached != null && cached.eIsProxy()) { - InternalEObject oldCached = (InternalEObject)cached; - cached = (LeafNode)eResolveProxy(oldCached); - if (cached != oldCached) { + 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__CACHED, oldCached, cached)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create)); } } - return cached; + return create; } /** @@ -326,8 +326,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public LeafNode basicGetCached() { - return cached; + public LeafNode basicGetCreate() { + return create; } /** @@ -335,11 +335,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setCached(LeafNode newCached) { - LeafNode oldCached = cached; - cached = newCached; + public void setCreate(LeafNode newCreate) { + LeafNode oldCreate = create; + create = newCreate; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CACHED, oldCached, cached)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create)); } /** @@ -347,16 +347,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode getJavaReturnType() { - if (javaReturnType != null && javaReturnType.eIsProxy()) { - InternalEObject oldJavaReturnType = (InternalEObject)javaReturnType; - javaReturnType = (CompositeNode)eResolveProxy(oldJavaReturnType); - if (javaReturnType != oldJavaReturnType) { + 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__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__NAME, oldName, name)); } } - return javaReturnType; + return name; } /** @@ -364,8 +364,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetJavaReturnType() { - return javaReturnType; + public CompositeNode basicGetName() { + return name; } /** @@ -373,11 +373,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setJavaReturnType(CompositeNode newJavaReturnType) { - CompositeNode oldJavaReturnType = javaReturnType; - javaReturnType = newJavaReturnType; + public void setName(CompositeNode newName) { + CompositeNode oldName = name; + name = newName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__NAME, oldName, name)); } /** @@ -423,16 +423,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode getReturnType() { - if (returnType != null && returnType.eIsProxy()) { - InternalEObject oldReturnType = (InternalEObject)returnType; - returnType = (CompositeNode)eResolveProxy(oldReturnType); - if (returnType != oldReturnType) { + 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__RETURN_TYPE, oldReturnType, returnType)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CACHED, oldCached, cached)); } } - return returnType; + return cached; } /** @@ -440,8 +440,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetReturnType() { - return returnType; + public LeafNode basicGetCached() { + return cached; } /** @@ -449,11 +449,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setReturnType(CompositeNode newReturnType) { - CompositeNode oldReturnType = returnType; - returnType = newReturnType; + public void setCached(LeafNode newCached) { + LeafNode oldCached = cached; + cached = newCached; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CACHED, oldCached, cached)); } /** @@ -461,16 +461,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode getName() { - if (name != null && name.eIsProxy()) { - InternalEObject oldName = (InternalEObject)name; - name = (CompositeNode)eResolveProxy(oldName); - if (name != oldName) { + 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__NAME, oldName, name)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody)); } } - return name; + return extendBody; } /** @@ -478,8 +478,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetName() { - return name; + public CompositeNode basicGetExtendBody() { + return extendBody; } /** @@ -487,11 +487,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod * <!-- end-user-doc --> * @generated */ - public void setName(CompositeNode newName) { - CompositeNode oldName = name; - name = newName; + public void setExtendBody(CompositeNode newExtendBody) { + CompositeNode oldExtendBody = extendBody; + extendBody = newExtendBody; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__NAME, oldName, name)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody)); } /** 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 3d1438cd..b9fad10d 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FeatureCallNodeImpl.java,v 1.5 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: FeatureCallNodeImpl.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -27,9 +27,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <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#getType <em>Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getParamList <em>Param List</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getName <em>Name</em>}</li> * </ul> * </p> * @@ -37,34 +37,34 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCallNode { /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getType() + * @see #getName() * @generated * @ordered */ - protected CompositeNode type; + protected CompositeNode name; /** - * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. + * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getParamList() + * @see #getType() * @generated * @ordered */ - protected CompositeNode paramList; + protected CompositeNode type; /** - * The cached value of the '{@link #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getParamList() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode paramList; /** * <!-- begin-user-doc --> @@ -90,16 +90,16 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal * <!-- end-user-doc --> * @generated */ - public CompositeNode getType() { - if (type != null && type.eIsProxy()) { - InternalEObject oldType = (InternalEObject)type; - type = (CompositeNode)eResolveProxy(oldType); - if (type != oldType) { + 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__TYPE, oldType, type)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST, oldParamList, paramList)); } } - return type; + return paramList; } /** @@ -107,8 +107,8 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetType() { - return type; + public CompositeNode basicGetParamList() { + return paramList; } /** @@ -116,11 +116,11 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal * <!-- end-user-doc --> * @generated */ - public void setType(CompositeNode newType) { - CompositeNode oldType = type; - type = newType; + public void setParamList(CompositeNode newParamList) { + CompositeNode oldParamList = paramList; + paramList = newParamList; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FEATURE_CALL_NODE__TYPE, oldType, type)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST, oldParamList, paramList)); } /** @@ -166,16 +166,16 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal * <!-- end-user-doc --> * @generated */ - public CompositeNode getParamList() { - if (paramList != null && paramList.eIsProxy()) { - InternalEObject oldParamList = (InternalEObject)paramList; - paramList = (CompositeNode)eResolveProxy(oldParamList); - if (paramList != oldParamList) { + public CompositeNode getType() { + if (type != null && type.eIsProxy()) { + InternalEObject oldType = (InternalEObject)type; + type = (CompositeNode)eResolveProxy(oldType); + if (type != oldType) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST, oldParamList, paramList)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FEATURE_CALL_NODE__TYPE, oldType, type)); } } - return paramList; + return type; } /** @@ -183,8 +183,8 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetParamList() { - return paramList; + public CompositeNode basicGetType() { + return type; } /** @@ -192,11 +192,11 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal * <!-- end-user-doc --> * @generated */ - public void setParamList(CompositeNode newParamList) { - CompositeNode oldParamList = paramList; - paramList = newParamList; + public void setType(CompositeNode newType) { + CompositeNode oldType = type; + type = newType; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST, oldParamList, paramList)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FEATURE_CALL_NODE__TYPE, oldType, type)); } /** @@ -207,15 +207,15 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal @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__TYPE: if (resolve) return getType(); return basicGetType(); case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST: if (resolve) return getParamList(); return basicGetParamList(); - case Xpand3nodePackage.FEATURE_CALL_NODE__NAME: - if (resolve) return getName(); - return basicGetName(); } return super.eGet(featureID, resolve, coreType); } @@ -228,15 +228,15 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal @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__TYPE: setType((CompositeNode)newValue); return; case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST: setParamList((CompositeNode)newValue); return; - case Xpand3nodePackage.FEATURE_CALL_NODE__NAME: - setName((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -249,15 +249,15 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal @Override public void eUnset(int featureID) { switch (featureID) { + case Xpand3nodePackage.FEATURE_CALL_NODE__NAME: + setName((CompositeNode)null); + return; case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE: setType((CompositeNode)null); return; case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST: setParamList((CompositeNode)null); return; - case Xpand3nodePackage.FEATURE_CALL_NODE__NAME: - setName((CompositeNode)null); - return; } super.eUnset(featureID); } @@ -270,12 +270,12 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal @Override public boolean eIsSet(int featureID) { switch (featureID) { + case Xpand3nodePackage.FEATURE_CALL_NODE__NAME: + return name != null; case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE: return type != null; case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST: return paramList != null; - case Xpand3nodePackage.FEATURE_CALL_NODE__NAME: - return name != null; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java index 5a99a038..ac6c8e61 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FileNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: FileNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java index 4bea0c98..cd698a9b 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: FileStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: FileStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.FileStatementNode; @@ -42,6 +45,7 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * @ordered */ protected CompositeNode sequence; + /** * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' reference. * <!-- begin-user-doc --> @@ -51,6 +55,7 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * @ordered */ protected CompositeNode identifier; + /** * The cached value of the '{@link #getNameExpression() <em>Name Expression</em>}' reference. * <!-- begin-user-doc --> @@ -85,16 +90,16 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * <!-- end-user-doc --> * @generated */ - public CompositeNode getNameExpression() { - if (nameExpression != null && nameExpression.eIsProxy()) { - InternalEObject oldNameExpression = (InternalEObject)nameExpression; - nameExpression = (CompositeNode)eResolveProxy(oldNameExpression); - if (nameExpression != oldNameExpression) { + public CompositeNode getSequence() { + if (sequence != null && sequence.eIsProxy()) { + InternalEObject oldSequence = (InternalEObject)sequence; + sequence = (CompositeNode)eResolveProxy(oldSequence); + if (sequence != oldSequence) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FILE_STATEMENT_NODE__NAME_EXPRESSION, oldNameExpression, nameExpression)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FILE_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); } } - return nameExpression; + return sequence; } /** @@ -102,8 +107,8 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetNameExpression() { - return nameExpression; + public CompositeNode basicGetSequence() { + return sequence; } /** @@ -111,11 +116,11 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * <!-- end-user-doc --> * @generated */ - public void setNameExpression(CompositeNode newNameExpression) { - CompositeNode oldNameExpression = nameExpression; - nameExpression = newNameExpression; + public void setSequence(CompositeNode newSequence) { + CompositeNode oldSequence = sequence; + sequence = newSequence; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FILE_STATEMENT_NODE__NAME_EXPRESSION, oldNameExpression, nameExpression)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FILE_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); } /** @@ -161,16 +166,16 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * <!-- end-user-doc --> * @generated */ - public CompositeNode getSequence() { - if (sequence != null && sequence.eIsProxy()) { - InternalEObject oldSequence = (InternalEObject)sequence; - sequence = (CompositeNode)eResolveProxy(oldSequence); - if (sequence != oldSequence) { + public CompositeNode getNameExpression() { + if (nameExpression != null && nameExpression.eIsProxy()) { + InternalEObject oldNameExpression = (InternalEObject)nameExpression; + nameExpression = (CompositeNode)eResolveProxy(oldNameExpression); + if (nameExpression != oldNameExpression) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FILE_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FILE_STATEMENT_NODE__NAME_EXPRESSION, oldNameExpression, nameExpression)); } } - return sequence; + return nameExpression; } /** @@ -178,8 +183,8 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetSequence() { - return sequence; + public CompositeNode basicGetNameExpression() { + return nameExpression; } /** @@ -187,11 +192,11 @@ public class FileStatementNodeImpl extends CompositeNodeImpl implements FileStat * <!-- end-user-doc --> * @generated */ - public void setSequence(CompositeNode newSequence) { - CompositeNode oldSequence = sequence; - sequence = newSequence; + public void setNameExpression(CompositeNode newNameExpression) { + CompositeNode oldNameExpression = nameExpression; + nameExpression = newNameExpression; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FILE_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FILE_STATEMENT_NODE__NAME_EXPRESSION, oldNameExpression, nameExpression)); } /** diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java index 6d011756..83b8bca7 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ForeachStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ForeachStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ForeachStatementNode; @@ -44,6 +47,7 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * @ordered */ protected CompositeNode iterator; + /** * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' reference. * <!-- begin-user-doc --> @@ -53,6 +57,7 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * @ordered */ protected CompositeNode identifier; + /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> @@ -62,6 +67,7 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * @ordered */ protected CompositeNode sequence; + /** * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference. * <!-- begin-user-doc --> @@ -71,6 +77,7 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * @ordered */ protected CompositeNode forExpression; + /** * The cached value of the '{@link #getSeparatorExpression() <em>Separator Expression</em>}' reference. * <!-- begin-user-doc --> @@ -143,16 +150,16 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public CompositeNode getSeparatorExpression() { - if (separatorExpression != null && separatorExpression.eIsProxy()) { - InternalEObject oldSeparatorExpression = (InternalEObject)separatorExpression; - separatorExpression = (CompositeNode)eResolveProxy(oldSeparatorExpression); - if (separatorExpression != oldSeparatorExpression) { + public CompositeNode getIdentifier() { + if (identifier != null && identifier.eIsProxy()) { + InternalEObject oldIdentifier = (InternalEObject)identifier; + identifier = (CompositeNode)eResolveProxy(oldIdentifier); + if (identifier != oldIdentifier) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION, oldSeparatorExpression, separatorExpression)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER, oldIdentifier, identifier)); } } - return separatorExpression; + return identifier; } /** @@ -160,8 +167,8 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetSeparatorExpression() { - return separatorExpression; + public CompositeNode basicGetIdentifier() { + return identifier; } /** @@ -169,11 +176,11 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public void setSeparatorExpression(CompositeNode newSeparatorExpression) { - CompositeNode oldSeparatorExpression = separatorExpression; - separatorExpression = newSeparatorExpression; + public void setIdentifier(CompositeNode newIdentifier) { + CompositeNode oldIdentifier = identifier; + identifier = newIdentifier; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION, oldSeparatorExpression, separatorExpression)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER, oldIdentifier, identifier)); } /** @@ -181,16 +188,16 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public CompositeNode getIdentifier() { - if (identifier != null && identifier.eIsProxy()) { - InternalEObject oldIdentifier = (InternalEObject)identifier; - identifier = (CompositeNode)eResolveProxy(oldIdentifier); - if (identifier != oldIdentifier) { + public CompositeNode getSequence() { + if (sequence != null && sequence.eIsProxy()) { + InternalEObject oldSequence = (InternalEObject)sequence; + sequence = (CompositeNode)eResolveProxy(oldSequence); + if (sequence != oldSequence) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER, oldIdentifier, identifier)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); } } - return identifier; + return sequence; } /** @@ -198,8 +205,8 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetIdentifier() { - return identifier; + public CompositeNode basicGetSequence() { + return sequence; } /** @@ -207,11 +214,11 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public void setIdentifier(CompositeNode newIdentifier) { - CompositeNode oldIdentifier = identifier; - identifier = newIdentifier; + public void setSequence(CompositeNode newSequence) { + CompositeNode oldSequence = sequence; + sequence = newSequence; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER, oldIdentifier, identifier)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); } /** @@ -257,16 +264,16 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public CompositeNode getSequence() { - if (sequence != null && sequence.eIsProxy()) { - InternalEObject oldSequence = (InternalEObject)sequence; - sequence = (CompositeNode)eResolveProxy(oldSequence); - if (sequence != oldSequence) { + public CompositeNode getSeparatorExpression() { + if (separatorExpression != null && separatorExpression.eIsProxy()) { + InternalEObject oldSeparatorExpression = (InternalEObject)separatorExpression; + separatorExpression = (CompositeNode)eResolveProxy(oldSeparatorExpression); + if (separatorExpression != oldSeparatorExpression) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION, oldSeparatorExpression, separatorExpression)); } } - return sequence; + return separatorExpression; } /** @@ -274,8 +281,8 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetSequence() { - return sequence; + public CompositeNode basicGetSeparatorExpression() { + return separatorExpression; } /** @@ -283,11 +290,11 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea * <!-- end-user-doc --> * @generated */ - public void setSequence(CompositeNode newSequence) { - CompositeNode oldSequence = sequence; - sequence = newSequence; + public void setSeparatorExpression(CompositeNode newSeparatorExpression) { + CompositeNode oldSeparatorExpression = separatorExpression; + separatorExpression = newSeparatorExpression; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION, oldSeparatorExpression, separatorExpression)); } /** diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java index 7e6cba01..71346164 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: GlobalVarExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: GlobalVarExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java index 275fb473..cc39a7da 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IdentifierNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: IdentifierNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java index 46efcaa0..255e622b 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java @@ -2,11 +2,18 @@ * <copyright> * </copyright> * - * $Id: IfExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: IfExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +25,59 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>If Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getThen <em>Then</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getElse <em>Else</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getCondition0 <em>Condition0</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getCondition1 <em>Condition1</em>}</li> + * </ul> * </p> * * @generated */ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpressionNode { /** + * The cached value of the '{@link #getThen() <em>Then</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getThen() + * @generated + * @ordered + */ + protected CompositeNode then; + + /** + * The cached value of the '{@link #getElse() <em>Else</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getElse() + * @generated + * @ordered + */ + protected CompositeNode else_; + + /** + * The cached value of the '{@link #getCondition0() <em>Condition0</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCondition0() + * @generated + * @ordered + */ + protected CompositeNode condition0; + + /** + * The cached value of the '{@link #getCondition1() <em>Condition1</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCondition1() + * @generated + * @ordered + */ + protected CompositeNode condition1; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +96,248 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress return Xpand3nodePackage.Literals.IF_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getThen() { + if (then != null && then.eIsProxy()) { + InternalEObject oldThen = (InternalEObject)then; + then = (CompositeNode)eResolveProxy(oldThen); + if (then != oldThen) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__THEN, oldThen, then)); + } + } + return then; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetThen() { + return then; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setThen(CompositeNode newThen) { + CompositeNode oldThen = then; + then = newThen; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__THEN, oldThen, then)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getElse() { + if (else_ != null && else_.eIsProxy()) { + InternalEObject oldElse = (InternalEObject)else_; + else_ = (CompositeNode)eResolveProxy(oldElse); + if (else_ != oldElse) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE, oldElse, else_)); + } + } + return else_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetElse() { + return else_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setElse(CompositeNode newElse) { + CompositeNode oldElse = else_; + else_ = newElse; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE, oldElse, else_)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getCondition0() { + if (condition0 != null && condition0.eIsProxy()) { + InternalEObject oldCondition0 = (InternalEObject)condition0; + condition0 = (CompositeNode)eResolveProxy(oldCondition0); + if (condition0 != oldCondition0) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0, oldCondition0, condition0)); + } + } + return condition0; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetCondition0() { + return condition0; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setCondition0(CompositeNode newCondition0) { + CompositeNode oldCondition0 = condition0; + condition0 = newCondition0; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0, oldCondition0, condition0)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getCondition1() { + if (condition1 != null && condition1.eIsProxy()) { + InternalEObject oldCondition1 = (InternalEObject)condition1; + condition1 = (CompositeNode)eResolveProxy(oldCondition1); + if (condition1 != oldCondition1) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1, oldCondition1, condition1)); + } + } + return condition1; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetCondition1() { + return condition1; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setCondition1(CompositeNode newCondition1) { + CompositeNode oldCondition1 = condition1; + condition1 = newCondition1; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1, oldCondition1, condition1)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + if (resolve) return getThen(); + return basicGetThen(); + case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: + if (resolve) return getElse(); + return basicGetElse(); + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0: + if (resolve) return getCondition0(); + return basicGetCondition0(); + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + if (resolve) return getCondition1(); + return basicGetCondition1(); + } + 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.IF_EXPRESSION_NODE__THEN: + setThen((CompositeNode)newValue); + return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: + setElse((CompositeNode)newValue); + return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0: + setCondition0((CompositeNode)newValue); + return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + setCondition1((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + setThen((CompositeNode)null); + return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: + setElse((CompositeNode)null); + return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0: + setCondition0((CompositeNode)null); + return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + setCondition1((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + return then != null; + case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: + return else_ != null; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0: + return condition0 != null; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + return condition1 != null; + } + return super.eIsSet(featureID); + } + } //IfExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java index b6ebd0ab..d332c056 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java @@ -2,19 +2,25 @@ * <copyright> * </copyright> * - * $Id: IfStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: IfStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.IfStatementNode; @@ -27,7 +33,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getElseIf <em>Else If</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getElseIfs <em>Else Ifs</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getExpression <em>Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getElse <em>Else</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getSequence <em>Sequence</em>}</li> @@ -38,14 +44,15 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatementNode { /** - * The cached value of the '{@link #getElseIf() <em>Else If</em>}' reference list. + * The cached value of the '{@link #getElseIfs() <em>Else Ifs</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getElseIf() + * @see #getElseIfs() * @generated * @ordered */ - protected EList<CompositeNode> elseIf; + protected EList<CompositeNode> elseIfs; + /** * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. * <!-- begin-user-doc --> @@ -55,6 +62,7 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen * @ordered */ protected CompositeNode expression; + /** * The cached value of the '{@link #getElse() <em>Else</em>}' reference. * <!-- begin-user-doc --> @@ -64,6 +72,7 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen * @ordered */ protected CompositeNode else_; + /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> @@ -98,37 +107,11 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen * <!-- end-user-doc --> * @generated */ - public CompositeNode getElse() { - if (else_ != null && else_.eIsProxy()) { - InternalEObject oldElse = (InternalEObject)else_; - else_ = (CompositeNode)eResolveProxy(oldElse); - if (else_ != oldElse) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_STATEMENT_NODE__ELSE, oldElse, else_)); - } + public EList<CompositeNode> getElseIfs() { + if (elseIfs == null) { + elseIfs = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS); } - return else_; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public CompositeNode basicGetElse() { - return else_; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setElse(CompositeNode newElse) { - CompositeNode oldElse = else_; - else_ = newElse; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_STATEMENT_NODE__ELSE, oldElse, else_)); + return elseIfs; } /** @@ -174,11 +157,37 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen * <!-- end-user-doc --> * @generated */ - public EList<CompositeNode> getElseIf() { - if (elseIf == null) { - elseIf = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IF); + public CompositeNode getElse() { + if (else_ != null && else_.eIsProxy()) { + InternalEObject oldElse = (InternalEObject)else_; + else_ = (CompositeNode)eResolveProxy(oldElse); + if (else_ != oldElse) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_STATEMENT_NODE__ELSE, oldElse, else_)); + } } - return elseIf; + return else_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetElse() { + return else_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setElse(CompositeNode newElse) { + CompositeNode oldElse = else_; + else_ = newElse; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_STATEMENT_NODE__ELSE, oldElse, else_)); } /** @@ -227,8 +236,8 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IF: - return getElseIf(); + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + return getElseIfs(); case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: if (resolve) return getExpression(); return basicGetExpression(); @@ -251,9 +260,9 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IF: - getElseIf().clear(); - getElseIf().addAll((Collection<? extends CompositeNode>)newValue); + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + getElseIfs().clear(); + getElseIfs().addAll((Collection<? extends CompositeNode>)newValue); return; case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: setExpression((CompositeNode)newValue); @@ -276,8 +285,8 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IF: - getElseIf().clear(); + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + getElseIfs().clear(); return; case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: setExpression((CompositeNode)null); @@ -300,8 +309,8 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IF: - return elseIf != null && !elseIf.isEmpty(); + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + return elseIfs != null && !elseIfs.isEmpty(); case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: return expression != null; case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE: diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java index 047f216e..35943cb3 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java @@ -2,11 +2,24 @@ * <copyright> * </copyright> * - * $Id: ImpliesExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: ImpliesExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:02 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; @@ -18,12 +31,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Implies Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getFirst <em>First</em>}</li> + * </ul> * </p> * * @generated */ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements ImpliesExpressionNode { /** + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getNexts() + * @generated + * @ordered + */ + protected EList<CompositeNode> nexts; + + /** + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFirst() + * @generated + * @ordered + */ + protected CompositeNode first; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +80,125 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl return Xpand3nodePackage.Literals.IMPLIES_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS); + } + return nexts; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + } + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetFirst() { + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS: + return getNexts(); + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); + } + 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.IMPLIES_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().addAll((Collection<? extends CompositeNode>)newValue); + return; + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST: + return first != null; + } + return super.eIsSet(featureID); + } + } //ImpliesExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImportNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImportNodeImpl.java index 44791a4f..c87a42d8 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImportNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImportNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ImportNodeImpl.java,v 1.1 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ImportNodeImpl.java,v 1.2 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; 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 266790bd..1d174d7f 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: InfixExpressionNodeImpl.java,v 1.5 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: InfixExpressionNodeImpl.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java index 64b389ed..9c95dfb5 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: JavaTypeNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: JavaTypeNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java index 371c234d..130e9545 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LetExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: LetExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:02 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java index 5a9e2a50..9e36777c 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: LetStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: LetStatementNodeImpl.java,v 1.4 2008/03/13 08:40:02 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.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.LetStatementNode; @@ -42,6 +45,7 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem * @ordered */ protected CompositeNode expression; + /** * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> @@ -51,6 +55,7 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem * @ordered */ protected CompositeNode name; + /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java index ecc007cf..e4617ff2 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java @@ -2,12 +2,20 @@ * <copyright> * </copyright> * - * $Id: ListLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ListLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 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.ListLiteralNode; @@ -18,12 +26,26 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>List Literal Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl#getElements <em>Elements</em>}</li> + * </ul> * </p> * * @generated */ public class ListLiteralNodeImpl extends CompositeNodeImpl implements ListLiteralNode { /** + * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getElements() + * @generated + * @ordered + */ + protected EList<CompositeNode> elements; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +64,76 @@ public class ListLiteralNodeImpl extends CompositeNodeImpl implements ListLitera return Xpand3nodePackage.Literals.LIST_LITERAL_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CompositeNode> getElements() { + if (elements == null) { + elements = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.LIST_LITERAL_NODE__ELEMENTS); + } + return elements; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.LIST_LITERAL_NODE__ELEMENTS: + return getElements(); + } + 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.LIST_LITERAL_NODE__ELEMENTS: + getElements().clear(); + getElements().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.LIST_LITERAL_NODE__ELEMENTS: + getElements().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.LIST_LITERAL_NODE__ELEMENTS: + return elements != null && !elements.isEmpty(); + } + return super.eIsSet(featureID); + } + } //ListLiteralNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java index 41cb6cb8..08a0b208 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java @@ -2,16 +2,25 @@ * <copyright> * </copyright> * - * $Id: MultiplicativeExpressionNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: MultiplicativeExpressionNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.ecore.EClass; +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.MultiplicativeExpressionNode; @@ -24,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getLeft <em>Left</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getRight <em>Right</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -33,23 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implements MultiplicativeExpressionNode { /** - * The cached value of the '{@link #getLeft() <em>Left</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getLeft() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode left; + protected EList<CompositeNode> nexts; + /** - * The cached value of the '{@link #getRight() <em>Right</em>}' reference. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getRight() + * @see #getFirst() * @generated * @ordered */ - protected CompositeNode right; + protected CompositeNode first; /** * <!-- begin-user-doc --> @@ -75,37 +85,11 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen * <!-- end-user-doc --> * @generated */ - public CompositeNode getLeft() { - if (left != null && left.eIsProxy()) { - InternalEObject oldLeft = (InternalEObject)left; - left = (CompositeNode)eResolveProxy(oldLeft); - if (left != oldLeft) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__LEFT, oldLeft, left)); - } + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS); } - return left; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public CompositeNode basicGetLeft() { - return left; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setLeft(CompositeNode newLeft) { - CompositeNode oldLeft = left; - left = newLeft; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__LEFT, oldLeft, left)); + return nexts; } /** @@ -113,16 +97,16 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen * <!-- end-user-doc --> * @generated */ - public CompositeNode getRight() { - if (right != null && right.eIsProxy()) { - InternalEObject oldRight = (InternalEObject)right; - right = (CompositeNode)eResolveProxy(oldRight); - if (right != oldRight) { + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__RIGHT, oldRight, right)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST, oldFirst, first)); } } - return right; + return first; } /** @@ -130,8 +114,8 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetRight() { - return right; + public CompositeNode basicGetFirst() { + return first; } /** @@ -139,11 +123,11 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen * <!-- end-user-doc --> * @generated */ - public void setRight(CompositeNode newRight) { - CompositeNode oldRight = right; - right = newRight; + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__RIGHT, oldRight, right)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST, oldFirst, first)); } /** @@ -154,12 +138,11 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__LEFT: - if (resolve) return getLeft(); - return basicGetLeft(); - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__RIGHT: - if (resolve) return getRight(); - return basicGetRight(); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + return getNexts(); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); } return super.eGet(featureID, resolve, coreType); } @@ -169,14 +152,16 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__LEFT: - setLeft((CompositeNode)newValue); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().addAll((Collection<? extends CompositeNode>)newValue); return; - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__RIGHT: - setRight((CompositeNode)newValue); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); return; } super.eSet(featureID, newValue); @@ -190,11 +175,11 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__LEFT: - setLeft((CompositeNode)null); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + getNexts().clear(); return; - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__RIGHT: - setRight((CompositeNode)null); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); return; } super.eUnset(featureID); @@ -208,10 +193,10 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__LEFT: - return left != null; - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__RIGHT: - return right != null; + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: + return first != null; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java index 8fae487d..8fce5809 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NullLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: NullLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java index 54c10238..87b05c88 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NumberLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: NumberLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java index a18dd2d2..850406ed 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java @@ -2,11 +2,24 @@ * <copyright> * </copyright> * - * $Id: OrExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: OrExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +31,37 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Or Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl#getFirst <em>First</em>}</li> + * </ul> * </p> * * @generated */ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpressionNode { /** + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getNexts() + * @generated + * @ordered + */ + protected EList<CompositeNode> nexts; + + /** + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFirst() + * @generated + * @ordered + */ + protected CompositeNode first; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +80,125 @@ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpress return Xpand3nodePackage.Literals.OR_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS); + } + return nexts; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + } + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetFirst() { + return first; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST, oldFirst, first)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS: + return getNexts(); + case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); + } + 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.OR_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().addAll((Collection<? extends CompositeNode>)newValue); + return; + case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; + case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST: + return first != null; + } + return super.eIsSet(featureID); + } + } //OrExpressionNodeImpl 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 7bb193e5..b41b7b4a 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ParameterListNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ParameterListNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java index e6624a74..e0b6ef6c 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java @@ -2,11 +2,18 @@ * <copyright> * </copyright> * - * $Id: ParanthesizedExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: ParanthesizedExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +25,26 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Paranthesized Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl#getExpression <em>Expression</em>}</li> + * </ul> * </p> * * @generated */ public class ParanthesizedExpressionNodeImpl extends CompositeNodeImpl implements ParanthesizedExpressionNode { /** + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getExpression() + * @generated + * @ordered + */ + protected CompositeNode expression; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +63,101 @@ public class ParanthesizedExpressionNodeImpl extends CompositeNodeImpl implement return Xpand3nodePackage.Literals.PARANTHESIZED_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getExpression() { + if (expression != null && expression.eIsProxy()) { + InternalEObject oldExpression = (InternalEObject)expression; + expression = (CompositeNode)eResolveProxy(oldExpression); + if (expression != oldExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.PARANTHESIZED_EXPRESSION_NODE__EXPRESSION, oldExpression, expression)); + } + } + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetExpression() { + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setExpression(CompositeNode newExpression) { + CompositeNode oldExpression = expression; + expression = newExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.PARANTHESIZED_EXPRESSION_NODE__EXPRESSION, oldExpression, expression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.PARANTHESIZED_EXPRESSION_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); + } + 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.PARANTHESIZED_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3nodePackage.PARANTHESIZED_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.PARANTHESIZED_EXPRESSION_NODE__EXPRESSION: + return expression != null; + } + return super.eIsSet(featureID); + } + } //ParanthesizedExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java index cdab8c11..7c641510 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PointcutNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: PointcutNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java index bd0db355..0701e949 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: ProtectStatementNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ProtectStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.ProtectStatementNode; @@ -43,6 +46,7 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * @ordered */ protected CompositeNode sequence; + /** * The cached value of the '{@link #getCend() <em>Cend</em>}' reference. * <!-- begin-user-doc --> @@ -52,6 +56,7 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * @ordered */ protected CompositeNode cend; + /** * The cached value of the '{@link #getId() <em>Id</em>}' reference. * <!-- begin-user-doc --> @@ -61,6 +66,7 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * @ordered */ protected CompositeNode id; + /** * The cached value of the '{@link #getCstart() <em>Cstart</em>}' reference. * <!-- begin-user-doc --> @@ -95,16 +101,16 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * <!-- end-user-doc --> * @generated */ - public CompositeNode getCstart() { - if (cstart != null && cstart.eIsProxy()) { - InternalEObject oldCstart = (InternalEObject)cstart; - cstart = (CompositeNode)eResolveProxy(oldCstart); - if (cstart != oldCstart) { + public CompositeNode getSequence() { + if (sequence != null && sequence.eIsProxy()) { + InternalEObject oldSequence = (InternalEObject)sequence; + sequence = (CompositeNode)eResolveProxy(oldSequence); + if (sequence != oldSequence) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART, oldCstart, cstart)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); } } - return cstart; + return sequence; } /** @@ -112,8 +118,8 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetCstart() { - return cstart; + public CompositeNode basicGetSequence() { + return sequence; } /** @@ -121,11 +127,11 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * <!-- end-user-doc --> * @generated */ - public void setCstart(CompositeNode newCstart) { - CompositeNode oldCstart = cstart; - cstart = newCstart; + public void setSequence(CompositeNode newSequence) { + CompositeNode oldSequence = sequence; + sequence = newSequence; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART, oldCstart, cstart)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); } /** @@ -209,16 +215,16 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * <!-- end-user-doc --> * @generated */ - public CompositeNode getSequence() { - if (sequence != null && sequence.eIsProxy()) { - InternalEObject oldSequence = (InternalEObject)sequence; - sequence = (CompositeNode)eResolveProxy(oldSequence); - if (sequence != oldSequence) { + public CompositeNode getCstart() { + if (cstart != null && cstart.eIsProxy()) { + InternalEObject oldCstart = (InternalEObject)cstart; + cstart = (CompositeNode)eResolveProxy(oldCstart); + if (cstart != oldCstart) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART, oldCstart, cstart)); } } - return sequence; + return cstart; } /** @@ -226,8 +232,8 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetSequence() { - return sequence; + public CompositeNode basicGetCstart() { + return cstart; } /** @@ -235,11 +241,11 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote * <!-- end-user-doc --> * @generated */ - public void setSequence(CompositeNode newSequence) { - CompositeNode oldSequence = sequence; - sequence = newSequence; + public void setCstart(CompositeNode newCstart) { + CompositeNode oldCstart = cstart; + cstart = newCstart; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE, oldSequence, sequence)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART, oldCstart, cstart)); } /** 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 3d116813..68018fbf 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,19 +2,24 @@ * <copyright> * </copyright> * - * $Id: RelationalExpressionNodeImpl.java,v 1.5 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: RelationalExpressionNodeImpl.java,v 1.6 2008/03/13 08:40:01 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; @@ -28,9 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> - * <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#getLeftOperand <em>Left Operand</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getRightOperand <em>Right Operand</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -38,34 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements RelationalExpressionNode { /** - * 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 #getLeftOperand() <em>Left Operand</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getLeftOperand() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode leftOperand; + protected EList<CompositeNode> nexts; /** - * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' reference. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getRightOperand() + * @see #getFirst() * @generated * @ordered */ - protected CompositeNode rightOperand; + protected CompositeNode first; /** * <!-- begin-user-doc --> @@ -91,54 +85,11 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R * <!-- 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 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)); - } + public EList<CompositeNode> getNexts() { + if (nexts == null) { + nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__NEXTS); } - return rightOperand; + return nexts; } /** @@ -146,37 +97,16 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R * <!-- 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 getLeftOperand() { - if (leftOperand != null && leftOperand.eIsProxy()) { - InternalEObject oldLeftOperand = (InternalEObject)leftOperand; - leftOperand = (CompositeNode)eResolveProxy(oldLeftOperand); - if (leftOperand != oldLeftOperand) { + public CompositeNode getFirst() { + if (first != null && first.eIsProxy()) { + InternalEObject oldFirst = (InternalEObject)first; + first = (CompositeNode)eResolveProxy(oldFirst); + if (first != oldFirst) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND, oldLeftOperand, leftOperand)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__FIRST, oldFirst, first)); } } - return leftOperand; + return first; } /** @@ -184,8 +114,8 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R * <!-- end-user-doc --> * @generated */ - public CompositeNode basicGetLeftOperand() { - return leftOperand; + public CompositeNode basicGetFirst() { + return first; } /** @@ -193,11 +123,11 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R * <!-- end-user-doc --> * @generated */ - public void setLeftOperand(CompositeNode newLeftOperand) { - CompositeNode oldLeftOperand = leftOperand; - leftOperand = newLeftOperand; + public void setFirst(CompositeNode newFirst) { + CompositeNode oldFirst = first; + first = newFirst; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND, oldLeftOperand, leftOperand)); + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__FIRST, oldFirst, first)); } /** @@ -208,15 +138,11 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR: - if (resolve) return getOperator(); - return basicGetOperator(); - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND: - if (resolve) return getLeftOperand(); - return basicGetLeftOperand(); - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND: - if (resolve) return getRightOperand(); - return basicGetRightOperand(); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__NEXTS: + return getNexts(); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__FIRST: + if (resolve) return getFirst(); + return basicGetFirst(); } return super.eGet(featureID, resolve, coreType); } @@ -226,17 +152,16 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR: - setOperator((CompositeNode)newValue); - return; - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND: - setLeftOperand((CompositeNode)newValue); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + getNexts().addAll((Collection<? extends CompositeNode>)newValue); return; - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND: - setRightOperand((CompositeNode)newValue); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); return; } super.eSet(featureID, newValue); @@ -250,14 +175,11 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR: - setOperator((CompositeNode)null); - return; - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND: - setLeftOperand((CompositeNode)null); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__NEXTS: + getNexts().clear(); return; - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND: - setRightOperand((CompositeNode)null); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); return; } super.eUnset(featureID); @@ -271,12 +193,10 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR: - return operator != null; - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND: - return leftOperand != null; - case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND: - return rightOperand != null; + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); + case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__FIRST: + return first != null; } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalOperatorNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalOperatorNodeImpl.java deleted file mode 100644 index b1b79e3b..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalOperatorNodeImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: RelationalOperatorNodeImpl.java,v 1.1 2008/03/07 11:11:16 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.RelationalOperatorNode; -import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Relational Operator Node</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -public class RelationalOperatorNodeImpl extends CompositeNodeImpl implements RelationalOperatorNode { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected RelationalOperatorNodeImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() { - return Xpand3nodePackage.Literals.RELATIONAL_OPERATOR_NODE; - } - -} //RelationalOperatorNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java index 24891866..cfab847b 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java @@ -2,16 +2,20 @@ * <copyright> * </copyright> * - * $Id: SequenceNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: SequenceNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.SequenceNode; @@ -41,6 +45,7 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode * @ordered */ protected EList<CompositeNode> textSequences; + /** * The cached value of the '{@link #getStatements() <em>Statements</em>}' reference list. * <!-- begin-user-doc --> 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 60481dd1..eb156953 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleTypeNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: SimpleTypeNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java index 3cd5ba06..cea48628 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: StringLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: StringLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java index b2216db7..47d8684b 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java @@ -2,11 +2,24 @@ * <copyright> * </copyright> * - * $Id: SwitchExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: SwitchExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 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; @@ -18,12 +31,48 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * An implementation of the model object '<em><b>Switch Expression Node</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl#getDefault <em>Default</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl#getCases <em>Cases</em>}</li> + * </ul> * </p> * * @generated */ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements SwitchExpressionNode { /** + * The cached value of the '{@link #getDefault() <em>Default</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDefault() + * @generated + * @ordered + */ + protected CompositeNode default_; + + /** + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getExpression() + * @generated + * @ordered + */ + protected CompositeNode expression; + + /** + * The cached value of the '{@link #getCases() <em>Cases</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCases() + * @generated + * @ordered + */ + protected EList<CompositeNode> cases; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -42,4 +91,174 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc return Xpand3nodePackage.Literals.SWITCH_EXPRESSION_NODE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getDefault() { + if (default_ != null && default_.eIsProxy()) { + InternalEObject oldDefault = (InternalEObject)default_; + default_ = (CompositeNode)eResolveProxy(oldDefault); + if (default_ != oldDefault) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT, oldDefault, default_)); + } + } + return default_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetDefault() { + return default_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setDefault(CompositeNode newDefault) { + CompositeNode oldDefault = default_; + default_ = newDefault; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT, oldDefault, default_)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode getExpression() { + if (expression != null && expression.eIsProxy()) { + InternalEObject oldExpression = (InternalEObject)expression; + expression = (CompositeNode)eResolveProxy(oldExpression); + if (expression != oldExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION, oldExpression, expression)); + } + } + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompositeNode basicGetExpression() { + return expression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setExpression(CompositeNode newExpression) { + CompositeNode oldExpression = expression; + expression = newExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION, oldExpression, expression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CompositeNode> getCases() { + if (cases == null) { + cases = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES); + } + return cases; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: + if (resolve) return getDefault(); + return basicGetDefault(); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: + return getCases(); + } + 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.SWITCH_EXPRESSION_NODE__DEFAULT: + setDefault((CompositeNode)newValue); + return; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)newValue); + return; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: + getCases().clear(); + getCases().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.SWITCH_EXPRESSION_NODE__DEFAULT: + setDefault((CompositeNode)null); + return; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: + getCases().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: + return default_ != null; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: + return expression != null; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: + return cases != null && !cases.isEmpty(); + } + return super.eIsSet(featureID); + } + } //SwitchExpressionNodeImpl diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java index fba440eb..538c98e3 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Test_expressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $ + * $Id: Test_expressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java index 6ef98bcd..6059f7f8 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TextNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $ + * $Id: TextNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java index 7c672f88..eecb39a6 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java @@ -2,16 +2,20 @@ * <copyright> * </copyright> * - * $Id: TextSequenceNodeImpl.java,v 1.3 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: TextSequenceNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.TextSequenceNode; @@ -24,7 +28,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl#getText <em>Text</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl#getTexts <em>Texts</em>}</li> * </ul> * </p> * @@ -32,14 +36,14 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class TextSequenceNodeImpl extends CompositeNodeImpl implements TextSequenceNode { /** - * The cached value of the '{@link #getText() <em>Text</em>}' reference list. + * The cached value of the '{@link #getTexts() <em>Texts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getText() + * @see #getTexts() * @generated * @ordered */ - protected EList<CompositeNode> text; + protected EList<CompositeNode> texts; /** * <!-- begin-user-doc --> @@ -65,11 +69,11 @@ public class TextSequenceNodeImpl extends CompositeNodeImpl implements TextSeque * <!-- end-user-doc --> * @generated */ - public EList<CompositeNode> getText() { - if (text == null) { - text = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXT); + public EList<CompositeNode> getTexts() { + if (texts == null) { + texts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXTS); } - return text; + return texts; } /** @@ -80,8 +84,8 @@ public class TextSequenceNodeImpl extends CompositeNodeImpl implements TextSeque @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXT: - return getText(); + case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXTS: + return getTexts(); } return super.eGet(featureID, resolve, coreType); } @@ -95,9 +99,9 @@ public class TextSequenceNodeImpl extends CompositeNodeImpl implements TextSeque @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXT: - getText().clear(); - getText().addAll((Collection<? extends CompositeNode>)newValue); + case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXTS: + getTexts().clear(); + getTexts().addAll((Collection<? extends CompositeNode>)newValue); return; } super.eSet(featureID, newValue); @@ -111,8 +115,8 @@ public class TextSequenceNodeImpl extends CompositeNodeImpl implements TextSeque @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXT: - getText().clear(); + case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXTS: + getTexts().clear(); return; } super.eUnset(featureID); @@ -126,8 +130,8 @@ public class TextSequenceNodeImpl extends CompositeNodeImpl implements TextSeque @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXT: - return text != null && !text.isEmpty(); + case Xpand3nodePackage.TEXT_SEQUENCE_NODE__TEXTS: + return texts != null && !texts.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java index 4f325db3..699b94ff 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java @@ -2,16 +2,19 @@ * <copyright> * </copyright> * - * $Id: UnaryExpressionNodeImpl.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: UnaryExpressionNodeImpl.java,v 1.4 2008/03/13 08:40:01 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.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.UnaryExpressionNode; 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 b656d793..14a4d549 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.5 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: Xpand3nodeFactoryImpl.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -84,7 +84,6 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac case Xpand3nodePackage.EXTENSION_NODE: return createExtensionNode(); case Xpand3nodePackage.JAVA_TYPE_NODE: return createJavaTypeNode(); case Xpand3nodePackage.TEST_EXPRESSION_NODE: return createTest_expressionNode(); - case Xpand3nodePackage.EXPRESSION_NODE: return createExpressionNode(); case Xpand3nodePackage.LET_EXPRESSION_NODE: return createLetExpressionNode(); case Xpand3nodePackage.CASTED_EXPRESSION_NODE: return createCastedExpressionNode(); case Xpand3nodePackage.CHAIN_EXPRESSION_NODE: return createChainExpressionNode(); @@ -95,7 +94,6 @@ 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.RELATIONAL_OPERATOR_NODE: return createRelationalOperatorNode(); case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: return createAdditiveExpressionNode(); case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE: return createMultiplicativeExpressionNode(); case Xpand3nodePackage.UNARY_EXPRESSION_NODE: return createUnaryExpressionNode(); @@ -366,16 +364,6 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac * <!-- end-user-doc --> * @generated */ - public ExpressionNode createExpressionNode() { - ExpressionNodeImpl expressionNode = new ExpressionNodeImpl(); - return expressionNode; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public LetExpressionNode createLetExpressionNode() { LetExpressionNodeImpl letExpressionNode = new LetExpressionNodeImpl(); return letExpressionNode; @@ -476,16 +464,6 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac * <!-- end-user-doc --> * @generated */ - public RelationalOperatorNode createRelationalOperatorNode() { - RelationalOperatorNodeImpl relationalOperatorNode = new RelationalOperatorNodeImpl(); - return relationalOperatorNode; - } - - /** - * <!-- 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 9bb88871..f1cab16c 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.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: Xpand3nodePackageImpl.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,7 +33,6 @@ import org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode; -import org.eclipse.xpand3.internal.parser.xpand3node.ExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode; @@ -53,7 +52,6 @@ import org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode; import org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode; -import org.eclipse.xpand3.internal.parser.xpand3node.NsImportNode; import org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode; import org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode; import org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode; @@ -62,7 +60,6 @@ import org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode import org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode; import org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode; -import org.eclipse.xpand3.internal.parser.xpand3node.RelationalOperatorNode; import org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode; import org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode; import org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode; @@ -71,7 +68,6 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.TextNode; import org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode; import org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode; -import org.eclipse.xpand3.internal.parser.xpand3node.XNode; import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodeFactory; import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; @@ -255,13 +251,6 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - private EClass expressionNodeEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass letExpressionNodeEClass = null; /** @@ -332,13 +321,6 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - private EClass relationalOperatorNodeEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass additiveExpressionNodeEClass = null; /** @@ -640,8 +622,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getDefinitionNode_Type() { - return (EReference)definitionNodeEClass.getEStructuralFeatures().get(1); + public EReference getDefinitionNode_Name() { + return (EReference)definitionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -649,8 +631,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getDefinitionNode_Sequence() { - return (EReference)definitionNodeEClass.getEStructuralFeatures().get(2); + public EReference getDefinitionNode_Type() { + return (EReference)definitionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -658,8 +640,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getDefinitionNode_Name() { - return (EReference)definitionNodeEClass.getEStructuralFeatures().get(0); + public EReference getDefinitionNode_Sequence() { + return (EReference)definitionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -757,7 +739,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getTextSequenceNode_Text() { + public EReference getTextSequenceNode_Texts() { return (EReference)textSequenceNodeEClass.getEStructuralFeatures().get(0); } @@ -820,7 +802,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExpandStatementNode_ForExpression() { + public EReference getExpandStatementNode_ForEachExpression() { return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(2); } @@ -829,7 +811,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExpandStatementNode_Name() { + public EReference getExpandStatementNode_ForExpression() { return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(3); } @@ -838,6 +820,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getExpandStatementNode_Name() { + return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getExpressionStmtNode() { return expressionStmtNodeEClass; } @@ -865,8 +856,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getFileStatementNode_NameExpression() { - return (EReference)fileStatementNodeEClass.getEStructuralFeatures().get(2); + public EReference getFileStatementNode_Sequence() { + return (EReference)fileStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -883,8 +874,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getFileStatementNode_Sequence() { - return (EReference)fileStatementNodeEClass.getEStructuralFeatures().get(0); + public EReference getFileStatementNode_NameExpression() { + return (EReference)fileStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -910,8 +901,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getForeachStatementNode_SeparatorExpression() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(4); + public EReference getForeachStatementNode_Identifier() { + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -919,8 +910,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getForeachStatementNode_Identifier() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(1); + public EReference getForeachStatementNode_Sequence() { + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -937,8 +928,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getForeachStatementNode_Sequence() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(2); + public EReference getForeachStatementNode_SeparatorExpression() { + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(4); } /** @@ -955,8 +946,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getIfStatementNode_Else() { - return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(2); + public EReference getIfStatementNode_ElseIfs() { + return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -973,8 +964,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getIfStatementNode_ElseIf() { - return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(0); + public EReference getIfStatementNode_Else() { + return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1081,8 +1072,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getProtectStatementNode_Cstart() { - return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(3); + public EReference getProtectStatementNode_Sequence() { + return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1108,8 +1099,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getProtectStatementNode_Sequence() { - return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(0); + public EReference getProtectStatementNode_Cstart() { + return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(3); } /** @@ -1126,6 +1117,60 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getCheckNode_Type() { + return (EReference)checkNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCheckNode_Error() { + return (EReference)checkNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCheckNode_Message() { + return (EReference)checkNodeEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCheckNode_IfExpression() { + return (EReference)checkNodeEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCheckNode_Warning() { + return (EReference)checkNodeEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCheckNode_Constraint() { + return (EReference)checkNodeEClass.getEStructuralFeatures().get(5); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getAroundNode() { return aroundNodeEClass; } @@ -1153,8 +1198,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_Create() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4); + public EReference getExtensionNode_ParamList() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1171,8 +1216,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_ParamList() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0); + public EReference getExtensionNode_ReturnType() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1180,8 +1225,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_ExtendBody() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8); + public EReference getExtensionNode_JavaReturnType() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3); } /** @@ -1189,8 +1234,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_Cached() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7); + public EReference getExtensionNode_Create() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4); } /** @@ -1198,8 +1243,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_JavaReturnType() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3); + public EReference getExtensionNode_Name() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5); } /** @@ -1216,8 +1261,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_ReturnType() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2); + public EReference getExtensionNode_Cached() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7); } /** @@ -1225,8 +1270,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getExtensionNode_Name() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5); + public EReference getExtensionNode_ExtendBody() { + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8); } /** @@ -1252,8 +1297,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EClass getExpressionNode() { - return expressionNodeEClass; + public EClass getLetExpressionNode() { + return letExpressionNodeEClass; } /** @@ -1261,8 +1306,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EClass getLetExpressionNode() { - return letExpressionNodeEClass; + public EClass getCastedExpressionNode() { + return castedExpressionNodeEClass; } /** @@ -1270,8 +1315,17 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EClass getCastedExpressionNode() { - return castedExpressionNodeEClass; + public EReference getCastedExpressionNode_Target() { + return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCastedExpressionNode_Type() { + return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1288,6 +1342,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getChainExpressionNode_Nexts() { + return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getChainExpressionNode_First() { + return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getIfExpressionNode() { return ifExpressionNodeEClass; } @@ -1297,6 +1369,42 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getIfExpressionNode_Then() { + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getIfExpressionNode_Else() { + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getIfExpressionNode_Condition0() { + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getIfExpressionNode_Condition1() { + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getSwitchExpressionNode() { return switchExpressionNodeEClass; } @@ -1306,6 +1414,33 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getSwitchExpressionNode_Default() { + return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getSwitchExpressionNode_Expression() { + return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getSwitchExpressionNode_Cases() { + return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getCasePartNode() { return casePartNodeEClass; } @@ -1315,6 +1450,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getCasePartNode_Condition() { + return (EReference)casePartNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCasePartNode_Expression() { + return (EReference)casePartNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getOrExpressionNode() { return orExpressionNodeEClass; } @@ -1324,6 +1477,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getOrExpressionNode_Nexts() { + return (EReference)orExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getOrExpressionNode_First() { + return (EReference)orExpressionNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getAndExpressionNode() { return andExpressionNodeEClass; } @@ -1333,6 +1504,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getAndExpressionNode_First() { + return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getAndExpressionNode_Nexts() { + return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getImpliesExpressionNode() { return impliesExpressionNodeEClass; } @@ -1342,8 +1531,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EClass getRelationalExpressionNode() { - return relationalExpressionNodeEClass; + public EReference getImpliesExpressionNode_Nexts() { + return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1351,8 +1540,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getRelationalExpressionNode_Operator() { - return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(0); + public EReference getImpliesExpressionNode_First() { + return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1360,8 +1549,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getRelationalExpressionNode_RightOperand() { - return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(2); + public EClass getRelationalExpressionNode() { + return relationalExpressionNodeEClass; } /** @@ -1369,8 +1558,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getRelationalExpressionNode_LeftOperand() { - return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(1); + public EReference getRelationalExpressionNode_Nexts() { + return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1378,8 +1567,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EClass getRelationalOperatorNode() { - return relationalOperatorNodeEClass; + public EReference getRelationalExpressionNode_First() { + return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1396,8 +1585,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getAdditiveExpressionNode_Right() { - return (EReference)additiveExpressionNodeEClass.getEStructuralFeatures().get(1); + public EReference getAdditiveExpressionNode_Nexts() { + return (EReference)additiveExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1405,8 +1594,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getAdditiveExpressionNode_Left() { - return (EReference)additiveExpressionNodeEClass.getEStructuralFeatures().get(0); + public EReference getAdditiveExpressionNode_First() { + return (EReference)additiveExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1423,7 +1612,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getMultiplicativeExpressionNode_Left() { + public EReference getMultiplicativeExpressionNode_Nexts() { return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(0); } @@ -1432,7 +1621,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getMultiplicativeExpressionNode_Right() { + public EReference getMultiplicativeExpressionNode_First() { return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(1); } @@ -1504,6 +1693,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getParanthesizedExpressionNode_Expression() { + return (EReference)paranthesizedExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getGlobalVarExpressionNode() { return globalVarExpressionNodeEClass; } @@ -1522,8 +1720,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getFeatureCallNode_Type() { - return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0); + public EReference getFeatureCallNode_ParamList() { + return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1532,7 +1730,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getFeatureCallNode_Name() { - return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(2); + return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1540,7 +1738,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getFeatureCallNode_ParamList() { + public EReference getFeatureCallNode_Type() { return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1); } @@ -1558,6 +1756,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getListLiteralNode_Elements() { + return (EReference)listLiteralNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getConstructorCallNode() { return constructorCallNodeEClass; } @@ -1603,6 +1810,33 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getCollectionExpressionNode_Variable() { + return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCollectionExpressionNode_Expression() { + return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCollectionExpressionNode_Type() { + return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getDeclaredParameterListNode() { return declaredParameterListNodeEClass; } @@ -1630,7 +1864,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getDeclaredParameterNode_Name() { + public EReference getDeclaredParameterNode_Ptype() { return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(0); } @@ -1639,7 +1873,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ - public EReference getDeclaredParameterNode_Ptype() { + public EReference getDeclaredParameterNode_Name() { return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(1); } @@ -1675,6 +1909,24 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * <!-- end-user-doc --> * @generated */ + public EReference getCollectionTypeNode_CollectionType() { + return (EReference)collectionTypeNodeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getCollectionTypeNode_ElementType() { + return (EReference)collectionTypeNodeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getSimpleTypeNode() { return simpleTypeNodeEClass; } @@ -1754,7 +2006,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac createEReference(sequenceNodeEClass, SEQUENCE_NODE__STATEMENTS); textSequenceNodeEClass = createEClass(TEXT_SEQUENCE_NODE); - createEReference(textSequenceNodeEClass, TEXT_SEQUENCE_NODE__TEXT); + createEReference(textSequenceNodeEClass, TEXT_SEQUENCE_NODE__TEXTS); textNodeEClass = createEClass(TEXT_NODE); @@ -1764,6 +2016,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac expandStatementNodeEClass = createEClass(EXPAND_STATEMENT_NODE); createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__SEPARATOR); createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__PARAM_LIST); + createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION); createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__FOR_EXPRESSION); createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__NAME); @@ -1783,7 +2036,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION); ifStatementNodeEClass = createEClass(IF_STATEMENT_NODE); - createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE_IF); + createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE_IFS); createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__EXPRESSION); createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE); createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__SEQUENCE); @@ -1807,6 +2060,12 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__CSTART); checkNodeEClass = createEClass(CHECK_NODE); + createEReference(checkNodeEClass, CHECK_NODE__TYPE); + createEReference(checkNodeEClass, CHECK_NODE__ERROR); + createEReference(checkNodeEClass, CHECK_NODE__MESSAGE); + createEReference(checkNodeEClass, CHECK_NODE__IF_EXPRESSION); + createEReference(checkNodeEClass, CHECK_NODE__WARNING); + createEReference(checkNodeEClass, CHECK_NODE__CONSTRAINT); aroundNodeEClass = createEClass(AROUND_NODE); @@ -1827,40 +2086,54 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac test_expressionNodeEClass = createEClass(TEST_EXPRESSION_NODE); - expressionNodeEClass = createEClass(EXPRESSION_NODE); - letExpressionNodeEClass = createEClass(LET_EXPRESSION_NODE); castedExpressionNodeEClass = createEClass(CASTED_EXPRESSION_NODE); + createEReference(castedExpressionNodeEClass, CASTED_EXPRESSION_NODE__TARGET); + createEReference(castedExpressionNodeEClass, CASTED_EXPRESSION_NODE__TYPE); chainExpressionNodeEClass = createEClass(CHAIN_EXPRESSION_NODE); + createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__NEXTS); + createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__FIRST); ifExpressionNodeEClass = createEClass(IF_EXPRESSION_NODE); + createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__THEN); + createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__ELSE); + createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION0); + createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION1); switchExpressionNodeEClass = createEClass(SWITCH_EXPRESSION_NODE); + createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__DEFAULT); + createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__EXPRESSION); + createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__CASES); casePartNodeEClass = createEClass(CASE_PART_NODE); + createEReference(casePartNodeEClass, CASE_PART_NODE__CONDITION); + createEReference(casePartNodeEClass, CASE_PART_NODE__EXPRESSION); orExpressionNodeEClass = createEClass(OR_EXPRESSION_NODE); + createEReference(orExpressionNodeEClass, OR_EXPRESSION_NODE__NEXTS); + createEReference(orExpressionNodeEClass, OR_EXPRESSION_NODE__FIRST); andExpressionNodeEClass = createEClass(AND_EXPRESSION_NODE); + createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__FIRST); + createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__NEXTS); impliesExpressionNodeEClass = createEClass(IMPLIES_EXPRESSION_NODE); + createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__NEXTS); + createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__FIRST); relationalExpressionNodeEClass = createEClass(RELATIONAL_EXPRESSION_NODE); - createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__OPERATOR); - createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND); - createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND); - - relationalOperatorNodeEClass = createEClass(RELATIONAL_OPERATOR_NODE); + createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__NEXTS); + createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__FIRST); additiveExpressionNodeEClass = createEClass(ADDITIVE_EXPRESSION_NODE); - createEReference(additiveExpressionNodeEClass, ADDITIVE_EXPRESSION_NODE__LEFT); - createEReference(additiveExpressionNodeEClass, ADDITIVE_EXPRESSION_NODE__RIGHT); + createEReference(additiveExpressionNodeEClass, ADDITIVE_EXPRESSION_NODE__NEXTS); + createEReference(additiveExpressionNodeEClass, ADDITIVE_EXPRESSION_NODE__FIRST); multiplicativeExpressionNodeEClass = createEClass(MULTIPLICATIVE_EXPRESSION_NODE); - createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__LEFT); - createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__RIGHT); + createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__NEXTS); + createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__FIRST); unaryExpressionNodeEClass = createEClass(UNARY_EXPRESSION_NODE); createEReference(unaryExpressionNodeEClass, UNARY_EXPRESSION_NODE__OPERAND); @@ -1872,15 +2145,17 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac stringLiteralNodeEClass = createEClass(STRING_LITERAL_NODE); paranthesizedExpressionNodeEClass = createEClass(PARANTHESIZED_EXPRESSION_NODE); + createEReference(paranthesizedExpressionNodeEClass, PARANTHESIZED_EXPRESSION_NODE__EXPRESSION); globalVarExpressionNodeEClass = createEClass(GLOBAL_VAR_EXPRESSION_NODE); featureCallNodeEClass = createEClass(FEATURE_CALL_NODE); + createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME); createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__TYPE); createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__PARAM_LIST); - createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME); listLiteralNodeEClass = createEClass(LIST_LITERAL_NODE); + createEReference(listLiteralNodeEClass, LIST_LITERAL_NODE__ELEMENTS); constructorCallNodeEClass = createEClass(CONSTRUCTOR_CALL_NODE); @@ -1891,18 +2166,23 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac numberLiteralNodeEClass = createEClass(NUMBER_LITERAL_NODE); collectionExpressionNodeEClass = createEClass(COLLECTION_EXPRESSION_NODE); + createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__VARIABLE); + createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__EXPRESSION); + createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__TYPE); 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); + createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__NAME); parameterListNodeEClass = createEClass(PARAMETER_LIST_NODE); createEReference(parameterListNodeEClass, PARAMETER_LIST_NODE__PARAMS); collectionTypeNodeEClass = createEClass(COLLECTION_TYPE_NODE); + createEReference(collectionTypeNodeEClass, COLLECTION_TYPE_NODE__COLLECTION_TYPE); + createEReference(collectionTypeNodeEClass, COLLECTION_TYPE_NODE__ELEMENT_TYPE); simpleTypeNodeEClass = createEClass(SIMPLE_TYPE_NODE); createEReference(simpleTypeNodeEClass, SIMPLE_TYPE_NODE__NAMES); @@ -1965,7 +2245,6 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac extensionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); javaTypeNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); test_expressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); - expressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); letExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); castedExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); chainExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); @@ -1976,7 +2255,6 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac andExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); impliesExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); relationalExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); - relationalOperatorNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); additiveExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); multiplicativeExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); unaryExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode()); @@ -2028,7 +2306,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEReference(getSequenceNode_Statements(), theNodePackage.getCompositeNode(), null, "statements", null, 0, -1, SequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(textSequenceNodeEClass, TextSequenceNode.class, "TextSequenceNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTextSequenceNode_Text(), theNodePackage.getCompositeNode(), null, "text", null, 0, -1, TextSequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTextSequenceNode_Texts(), theNodePackage.getCompositeNode(), null, "texts", null, 0, -1, TextSequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(textNodeEClass, TextNode.class, "TextNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2038,6 +2316,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEClass(expandStatementNodeEClass, ExpandStatementNode.class, "ExpandStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getExpandStatementNode_Separator(), theNodePackage.getCompositeNode(), null, "separator", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExpandStatementNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getExpandStatementNode_ForEachExpression(), theNodePackage.getCompositeNode(), null, "forEachExpression", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExpandStatementNode_ForExpression(), theNodePackage.getCompositeNode(), null, "forExpression", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExpandStatementNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2057,7 +2336,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEReference(getForeachStatementNode_SeparatorExpression(), theNodePackage.getCompositeNode(), null, "separatorExpression", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(ifStatementNodeEClass, IfStatementNode.class, "IfStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIfStatementNode_ElseIf(), theNodePackage.getCompositeNode(), null, "elseIf", null, 0, -1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIfStatementNode_ElseIfs(), theNodePackage.getCompositeNode(), null, "elseIfs", null, 0, -1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getIfStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getIfStatementNode_Else(), theNodePackage.getCompositeNode(), null, "else", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getIfStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2081,6 +2360,12 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEReference(getProtectStatementNode_Cstart(), theNodePackage.getCompositeNode(), null, "cstart", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(checkNodeEClass, CheckNode.class, "CheckNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getCheckNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCheckNode_Error(), theNodePackage.getLeafNode(), null, "error", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCheckNode_Message(), theNodePackage.getCompositeNode(), null, "message", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCheckNode_IfExpression(), theNodePackage.getCompositeNode(), null, "ifExpression", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCheckNode_Warning(), theNodePackage.getLeafNode(), null, "warning", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCheckNode_Constraint(), theNodePackage.getCompositeNode(), null, "constraint", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(aroundNodeEClass, AroundNode.class, "AroundNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2101,40 +2386,54 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEClass(test_expressionNodeEClass, Test_expressionNode.class, "Test_expressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(expressionNodeEClass, ExpressionNode.class, "ExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(letExpressionNodeEClass, LetExpressionNode.class, "LetExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(castedExpressionNodeEClass, CastedExpressionNode.class, "CastedExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getCastedExpressionNode_Target(), theNodePackage.getCompositeNode(), null, "target", null, 0, 1, CastedExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCastedExpressionNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, CastedExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(chainExpressionNodeEClass, ChainExpressionNode.class, "ChainExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getChainExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, ChainExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getChainExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, ChainExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(ifExpressionNodeEClass, IfExpressionNode.class, "IfExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getIfExpressionNode_Then(), theNodePackage.getCompositeNode(), null, "then", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIfExpressionNode_Else(), theNodePackage.getCompositeNode(), null, "else", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIfExpressionNode_Condition0(), theNodePackage.getCompositeNode(), null, "condition0", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIfExpressionNode_Condition1(), theNodePackage.getCompositeNode(), null, "condition1", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(switchExpressionNodeEClass, SwitchExpressionNode.class, "SwitchExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSwitchExpressionNode_Default(), theNodePackage.getCompositeNode(), null, "default", null, 0, 1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSwitchExpressionNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSwitchExpressionNode_Cases(), theNodePackage.getCompositeNode(), null, "cases", null, 0, -1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(casePartNodeEClass, CasePartNode.class, "CasePartNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getCasePartNode_Condition(), theNodePackage.getCompositeNode(), null, "condition", null, 0, 1, CasePartNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCasePartNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, CasePartNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orExpressionNodeEClass, OrExpressionNode.class, "OrExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getOrExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, OrExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOrExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, OrExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(andExpressionNodeEClass, AndExpressionNode.class, "AndExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getAndExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, AndExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getAndExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, AndExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(impliesExpressionNodeEClass, ImpliesExpressionNode.class, "ImpliesExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getImpliesExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, ImpliesExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getImpliesExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, ImpliesExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(relationalExpressionNodeEClass, RelationalExpressionNode.class, "RelationalExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - 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_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_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(relationalOperatorNodeEClass, RelationalOperatorNode.class, "RelationalOperatorNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getRelationalExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", 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_First(), theNodePackage.getCompositeNode(), null, "first", 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(additiveExpressionNodeEClass, AdditiveExpressionNode.class, "AdditiveExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getAdditiveExpressionNode_Left(), theNodePackage.getCompositeNode(), null, "left", null, 0, 1, AdditiveExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getAdditiveExpressionNode_Right(), theNodePackage.getCompositeNode(), null, "right", null, 0, 1, AdditiveExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getAdditiveExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, AdditiveExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getAdditiveExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, AdditiveExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiplicativeExpressionNodeEClass, MultiplicativeExpressionNode.class, "MultiplicativeExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMultiplicativeExpressionNode_Left(), theNodePackage.getCompositeNode(), null, "left", null, 0, 1, MultiplicativeExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiplicativeExpressionNode_Right(), theNodePackage.getCompositeNode(), null, "right", null, 0, 1, MultiplicativeExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiplicativeExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, MultiplicativeExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiplicativeExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, MultiplicativeExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(unaryExpressionNodeEClass, UnaryExpressionNode.class, "UnaryExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getUnaryExpressionNode_Operand(), theNodePackage.getCompositeNode(), null, "operand", null, 0, 1, UnaryExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2146,15 +2445,17 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEClass(stringLiteralNodeEClass, StringLiteralNode.class, "StringLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(paranthesizedExpressionNodeEClass, ParanthesizedExpressionNode.class, "ParanthesizedExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getParanthesizedExpressionNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, ParanthesizedExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 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_Type(), theNodePackage.getCompositeNode(), null, "type", 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); - 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); initEClass(listLiteralNodeEClass, ListLiteralNode.class, "ListLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getListLiteralNode_Elements(), theNodePackage.getCompositeNode(), null, "elements", null, 0, -1, ListLiteralNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(constructorCallNodeEClass, ConstructorCallNode.class, "ConstructorCallNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2165,18 +2466,23 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEClass(numberLiteralNodeEClass, NumberLiteralNode.class, "NumberLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(collectionExpressionNodeEClass, CollectionExpressionNode.class, "CollectionExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getCollectionExpressionNode_Variable(), theNodePackage.getCompositeNode(), null, "variable", null, 0, 1, CollectionExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCollectionExpressionNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, CollectionExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCollectionExpressionNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, CollectionExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 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); + 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); 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); + initEReference(getCollectionTypeNode_CollectionType(), theNodePackage.getLeafNode(), null, "collectionType", null, 0, 1, CollectionTypeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCollectionTypeNode_ElementType(), theNodePackage.getCompositeNode(), null, "elementType", null, 0, 1, CollectionTypeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 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); 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 93d7f2bc..e1bf8478 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.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: Xpand3nodeAdapterFactory.java,v 1.6 2008/03/13 08:40:02 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.util; @@ -171,10 +171,6 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl { return createTest_expressionNodeAdapter(); } @Override - public Adapter caseExpressionNode(ExpressionNode object) { - return createExpressionNodeAdapter(); - } - @Override public Adapter caseLetExpressionNode(LetExpressionNode object) { return createLetExpressionNodeAdapter(); } @@ -215,10 +211,6 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl { return createRelationalExpressionNodeAdapter(); } @Override - public Adapter caseRelationalOperatorNode(RelationalOperatorNode object) { - return createRelationalOperatorNodeAdapter(); - } - @Override public Adapter caseAdditiveExpressionNode(AdditiveExpressionNode object) { return createAdditiveExpressionNodeAdapter(); } @@ -663,20 +655,6 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionNode <em>Expression 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.ExpressionNode - * @generated - */ - public Adapter createExpressionNodeAdapter() { - return null; - } - - /** * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode <em>Let Expression Node</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; @@ -817,20 +795,6 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalOperatorNode <em>Relational 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.RelationalOperatorNode - * @generated - */ - public Adapter createRelationalOperatorNodeAdapter() { - 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 4251f07c..25805951 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.5 2008/03/12 09:54:12 jkohnlein Exp $ + * $Id: Xpand3nodeSwitch.java,v 1.6 2008/03/13 08:40:02 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.util; @@ -282,14 +282,6 @@ public class Xpand3nodeSwitch<T> { if (result == null) result = defaultCase(theEObject); return result; } - case Xpand3nodePackage.EXPRESSION_NODE: { - ExpressionNode expressionNode = (ExpressionNode)theEObject; - T result = caseExpressionNode(expressionNode); - if (result == null) result = caseCompositeNode(expressionNode); - if (result == null) result = caseNode(expressionNode); - if (result == null) result = defaultCase(theEObject); - return result; - } case Xpand3nodePackage.LET_EXPRESSION_NODE: { LetExpressionNode letExpressionNode = (LetExpressionNode)theEObject; T result = caseLetExpressionNode(letExpressionNode); @@ -370,14 +362,6 @@ public class Xpand3nodeSwitch<T> { if (result == null) result = defaultCase(theEObject); return result; } - case Xpand3nodePackage.RELATIONAL_OPERATOR_NODE: { - RelationalOperatorNode relationalOperatorNode = (RelationalOperatorNode)theEObject; - T result = caseRelationalOperatorNode(relationalOperatorNode); - if (result == null) result = caseCompositeNode(relationalOperatorNode); - if (result == null) result = caseNode(relationalOperatorNode); - if (result == null) result = defaultCase(theEObject); - return result; - } case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: { AdditiveExpressionNode additiveExpressionNode = (AdditiveExpressionNode)theEObject; T result = caseAdditiveExpressionNode(additiveExpressionNode); @@ -903,21 +887,6 @@ public class Xpand3nodeSwitch<T> { } /** - * Returns the result of interpreting the object as an instance of '<em>Expression 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>Expression Node</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseExpressionNode(ExpressionNode object) { - return null; - } - - /** * Returns the result of interpreting the object as an instance of '<em>Let Expression Node</em>'. * <!-- begin-user-doc --> * This implementation returns null; @@ -1068,21 +1037,6 @@ public class Xpand3nodeSwitch<T> { } /** - * Returns the result of interpreting the object as an instance of '<em>Relational 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>Relational Operator Node</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseRelationalOperatorNode(RelationalOperatorNode 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/AdditiveExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java index 50e1d0df..39de4c4d 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java @@ -2,12 +2,13 @@ * <copyright> * </copyright> * - * $Id: AdditiveExpressionNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: AdditiveExpressionNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; -import org.eclipse.tmf.common.node.CompositeNode; +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.AdditiveExpressionNode}. @@ -18,8 +19,6 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface AdditiveExpressionNodeValidator { boolean validate(); - boolean validateRight(CompositeNode value); - - boolean validateLeft(CompositeNode value); - + boolean validateNexts(EList<CompositeNode> value); + boolean validateFirst(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java index 7c3592c9..e7fca90f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java @@ -2,10 +2,13 @@ * <copyright> * </copyright> * - * $Id: AndExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: AndExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 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.AndExpressionNode}. @@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface AndExpressionNodeValidator { boolean validate(); + boolean validateFirst(CompositeNode value); + boolean validateNexts(EList<CompositeNode> value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java index 705d5f01..de0a985c 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AroundNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: AroundNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java index 23d26e8e..1931d792 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: BooleanLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: BooleanLiteralNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java index b35fd780..d30e19fc 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java @@ -2,10 +2,11 @@ * <copyright> * </copyright> * - * $Id: CasePartNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: CasePartNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.CasePartNode}. @@ -16,4 +17,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface CasePartNodeValidator { boolean validate(); + boolean validateCondition(CompositeNode value); + boolean validateExpression(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java index d7b55915..9d384a20 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java @@ -2,10 +2,11 @@ * <copyright> * </copyright> * - * $Id: CastedExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: CastedExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.CastedExpressionNode}. @@ -16,4 +17,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface CastedExpressionNodeValidator { boolean validate(); + boolean validateTarget(CompositeNode value); + boolean validateType(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java index 6c548463..f90fd8dc 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java @@ -2,10 +2,13 @@ * <copyright> * </copyright> * - * $Id: ChainExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: ChainExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 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.ChainExpressionNode}. @@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface ChainExpressionNodeValidator { boolean validate(); + boolean validateNexts(EList<CompositeNode> value); + boolean validateFirst(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java index 89df576d..5301b522 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: CheckNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: CheckNodeValidator.java,v 1.3 2008/03/13 08:39:59 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.CheckNode}. @@ -16,4 +18,16 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface CheckNodeValidator { boolean validate(); + boolean validateType(CompositeNode value); + + boolean validateError(LeafNode value); + boolean validateMessage(CompositeNode value); + + boolean validateIfExpression(CompositeNode value); + + boolean validateWarning(LeafNode value); + + boolean validateConstraint(CompositeNode value); + + boolean validateCheckExpression(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java index a57e10fe..0683c2b1 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: CollectionExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: CollectionExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.CollectionExpressionNode}. @@ -16,4 +18,10 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface CollectionExpressionNodeValidator { boolean validate(); + boolean validateVariable(CompositeNode value); + + boolean validateExpression(CompositeNode value); + + boolean validateType(CompositeNode value); + } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java index df4d9737..643e89c3 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: CollectionTypeNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: CollectionTypeNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.CollectionTypeNode}. @@ -16,4 +18,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface CollectionTypeNodeValidator { boolean validate(); + boolean validateCollectionType(LeafNode value); + boolean validateElementType(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java index 5488b5a4..c02d58a7 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstructorCallNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: ConstructorCallNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; 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 c8968294..c4e9a61f 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclaredParameterListNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: DeclaredParameterListNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; 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 7c7053a4..795281e2 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclaredParameterNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: DeclaredParameterNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; @@ -17,6 +17,6 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface DeclaredParameterNodeValidator { boolean validate(); - boolean validateName(CompositeNode value); boolean validatePtype(CompositeNode value); + boolean validateName(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java index 7485dd40..5229fb72 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: DefinitionAroundNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: DefinitionAroundNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.DefinitionAroundNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,11 +18,7 @@ public interface DefinitionAroundNodeValidator { boolean validate(); boolean validateType(CompositeNode value); - boolean validatePointcut(CompositeNode value); - boolean validateParamList(CompositeNode value); - boolean validateSequence(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java index 9f9ee4ef..9c9f103d 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DefinitionNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: DefinitionNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; @@ -17,11 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface DefinitionNodeValidator { boolean validate(); + boolean validateName(CompositeNode value); boolean validateType(CompositeNode value); - boolean validateSequence(CompositeNode value); - - 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/ElseIfStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java index aef57922..57fc9345 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ElseIfStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ElseIfStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.ElseIfStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,7 +18,5 @@ public interface ElseIfStatementNodeValidator { boolean validate(); boolean validateSequence(CompositeNode value); - boolean validateExpression(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java index fdeb1c3a..0db55fd3 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ElseStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ElseStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.ElseStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,5 +18,4 @@ public interface ElseStatementNodeValidator { boolean validate(); boolean validateSequence(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java index 57ca447d..d4aebc25 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ErrorStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ErrorStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.ErrorStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,5 +18,4 @@ public interface ErrorStatementNodeValidator { boolean validate(); boolean validateExpression(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java index 6ecba916..5286b943 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ExpandStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ExpandStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.ExpandStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,11 +18,8 @@ public interface ExpandStatementNodeValidator { boolean validate(); boolean validateSeparator(CompositeNode value); - boolean validateParamList(CompositeNode value); - + boolean validateForEachExpression(CompositeNode value); boolean validateForExpression(CompositeNode value); - boolean validateName(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java deleted file mode 100644 index 98db70df..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: ExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ - */ -package org.eclipse.xpand3.internal.parser.xpand3node.validation; - - -/** - * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionNode}. - * 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 ExpressionNodeValidator { - boolean validate(); - -} diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java index 40102777..77ebbe94 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ExpressionStmtNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ExpressionStmtNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.ExpressionStmtNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,5 +18,4 @@ public interface ExpressionStmtNodeValidator { boolean validate(); boolean validateExpression(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionImportNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionImportNodeValidator.java index f386cea6..8a6e2083 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionImportNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionImportNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExtensionImportNodeValidator.java,v 1.1 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ExtensionImportNodeValidator.java,v 1.2 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; 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 c3b721d7..2aa8ad14 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExtensionNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: ExtensionNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; @@ -18,13 +18,13 @@ import org.eclipse.tmf.common.node.LeafNode; public interface ExtensionNodeValidator { boolean validate(); - boolean validateCreate(LeafNode value); - boolean validatePrivate(LeafNode value); boolean validateParamList(CompositeNode value); - boolean validateExtendBody(CompositeNode value); - boolean validateCached(LeafNode value); - boolean validateJavaReturnType(CompositeNode value); - boolean validateJavaName(CompositeNode value); + boolean validatePrivate(LeafNode value); boolean validateReturnType(CompositeNode value); + boolean validateJavaReturnType(CompositeNode value); + boolean validateCreate(LeafNode value); boolean validateName(CompositeNode value); + boolean validateJavaName(CompositeNode value); + boolean validateCached(LeafNode value); + boolean validateExtendBody(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 e4e0052a..2ab6c102 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FeatureCallNodeValidator.java,v 1.4 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: FeatureCallNodeValidator.java,v 1.5 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; @@ -17,8 +17,7 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface FeatureCallNodeValidator { boolean validate(); - boolean validateType(CompositeNode value); - - boolean validateName(CompositeNode value); boolean validateParamList(CompositeNode value); + boolean validateName(CompositeNode value); + boolean validateType(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java index 87f32c29..2ea08178 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FileNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: FileNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; @@ -20,9 +20,5 @@ public interface FileNodeValidator { boolean validate(); boolean validateDeclarations(EList<CompositeNode> value); - boolean validateImports(EList<CompositeNode> value); - - boolean validateDecl(EList<CompositeNode> value); - boolean validateImp(EList<CompositeNode> value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java index 8d9c0663..10e78bb3 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: FileStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: FileStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.FileStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -18,10 +17,7 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface FileStatementNodeValidator { boolean validate(); - boolean validateNameExpression(CompositeNode value); - - boolean validateIdentifier(CompositeNode value); - boolean validateSequence(CompositeNode value); - + boolean validateIdentifier(CompositeNode value); + boolean validateNameExpression(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java index 12159898..c772f716 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ForeachStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ForeachStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.ForeachStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,13 +18,8 @@ public interface ForeachStatementNodeValidator { boolean validate(); boolean validateIterator(CompositeNode value); - - boolean validateSeparatorExpression(CompositeNode value); - boolean validateIdentifier(CompositeNode value); - - boolean validateForExpression(CompositeNode value); - boolean validateSequence(CompositeNode value); - + boolean validateForExpression(CompositeNode value); + boolean validateSeparatorExpression(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java index 719370bc..4fb06723 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: GlobalVarExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: GlobalVarExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java index a9222e77..809a27ec 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IdentifierNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: IdentifierNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java index f184d147..f2c65c6e 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java @@ -2,10 +2,11 @@ * <copyright> * </copyright> * - * $Id: IfExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: IfExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 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.IfExpressionNode}. @@ -16,4 +17,8 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface IfExpressionNodeValidator { boolean validate(); + boolean validateThen(CompositeNode value); + boolean validateElse(CompositeNode value); + boolean validateCondition0(CompositeNode value); + boolean validateCondition1(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java index d9764884..c1bed314 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: IfStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: IfStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.CompositeNode; /** * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode}. @@ -19,14 +19,8 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface IfStatementNodeValidator { boolean validate(); - boolean validateElseIf(EList<CompositeNode> value); - - boolean validateElse(CompositeNode value); - + boolean validateElseIfs(EList<CompositeNode> value); boolean validateExpression(CompositeNode value); - - boolean validateElseIf(CompositeNode value); - + boolean validateElse(CompositeNode value); boolean validateSequence(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java index 4da45b27..3556b2ea 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java @@ -2,10 +2,13 @@ * <copyright> * </copyright> * - * $Id: ImpliesExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: ImpliesExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.ImpliesExpressionNode}. @@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface ImpliesExpressionNodeValidator { boolean validate(); + boolean validateNexts(EList<CompositeNode> value); + boolean validateFirst(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImportNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImportNodeValidator.java index 3be48358..093e3205 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImportNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImportNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ImportNodeValidator.java,v 1.1 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ImportNodeValidator.java,v 1.2 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; 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 e768675d..3cf2fe4f 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: InfixExpressionNodeValidator.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: InfixExpressionNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java index a65aad98..2719a3c0 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: JavaTypeNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: JavaTypeNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java index a897666f..0a49e4d2 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LetExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: LetExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java index 56b4fb87..e32c3432 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: LetStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: LetStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.LetStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,9 +18,6 @@ public interface LetStatementNodeValidator { boolean validate(); boolean validateExpression(CompositeNode value); - boolean validateName(CompositeNode value); - boolean validateSequence(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java index ec1757e9..70d12daf 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java @@ -2,10 +2,13 @@ * <copyright> * </copyright> * - * $Id: ListLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: ListLiteralNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.ListLiteralNode}. @@ -16,4 +19,5 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface ListLiteralNodeValidator { boolean validate(); + boolean validateElements(EList<CompositeNode> value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java index fcf1af3e..9345e604 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java @@ -2,12 +2,13 @@ * <copyright> * </copyright> * - * $Id: MultiplicativeExpressionNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: MultiplicativeExpressionNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; -import org.eclipse.tmf.common.node.CompositeNode; +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.MultiplicativeExpressionNode}. @@ -18,8 +19,6 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface MultiplicativeExpressionNodeValidator { boolean validate(); - boolean validateLeft(CompositeNode value); - - boolean validateRight(CompositeNode value); - + boolean validateNexts(EList<CompositeNode> value); + boolean validateFirst(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java deleted file mode 100644 index 93ef5ea5..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: NsImportNodeValidator.java,v 1.2 2008/03/07 09:39:40 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.NsImportNode}. - * 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 NsImportNodeValidator { - boolean validate(); - - boolean validateNs(CompositeNode value); -} diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java index 84048fb3..5deff19d 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NullLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: NullLiteralNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java index f91aefcf..c867babf 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NumberLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: NumberLiteralNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java index aa810028..6a3f3faa 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java @@ -2,10 +2,13 @@ * <copyright> * </copyright> * - * $Id: OrExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: OrExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 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.OrExpressionNode}. @@ -16,4 +19,6 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface OrExpressionNodeValidator { boolean validate(); + boolean validateNexts(EList<CompositeNode> value); + boolean validateFirst(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 dc1b5afd..918e5f9c 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ParameterListNodeValidator.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: ParameterListNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java index a87b6f7f..c3de6924 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java @@ -2,10 +2,11 @@ * <copyright> * </copyright> * - * $Id: ParanthesizedExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: ParanthesizedExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.ParanthesizedExpressionNode}. @@ -16,4 +17,5 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface ParanthesizedExpressionNodeValidator { boolean validate(); + boolean validateExpression(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java index ba822ef5..88a9397e 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PointcutNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: PointcutNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java index 956fecb6..8f797386 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: ProtectStatementNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: ProtectStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.ProtectStatementNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -18,12 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface ProtectStatementNodeValidator { boolean validate(); - boolean validateCstart(CompositeNode value); - + boolean validateSequence(CompositeNode value); boolean validateCend(CompositeNode value); - boolean validateId(CompositeNode value); - - boolean validateSequence(CompositeNode value); - + boolean validateCstart(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 b11ba4dc..4ffab3bb 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,12 +2,13 @@ * <copyright> * </copyright> * - * $Id: RelationalExpressionNodeValidator.java,v 1.4 2008/03/07 11:11:14 jkohnlein Exp $ + * $Id: RelationalExpressionNodeValidator.java,v 1.5 2008/03/13 08:39:59 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.RelationalExpressionNode}. @@ -18,9 +19,6 @@ import org.eclipse.tmf.common.node.LeafNode; public interface RelationalExpressionNodeValidator { boolean validate(); - boolean validateOperator(CompositeNode value); - - boolean validateOperator(LeafNode value); - boolean validateRightOperand(CompositeNode value); - boolean validateLeftOperand(CompositeNode value); + boolean validateNexts(EList<CompositeNode> value); + boolean validateFirst(CompositeNode value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalOperatorNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalOperatorNodeValidator.java deleted file mode 100644 index eb937b2b..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalOperatorNodeValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: RelationalOperatorNodeValidator.java,v 1.1 2008/03/07 11:11:15 jkohnlein Exp $ - */ -package org.eclipse.xpand3.internal.parser.xpand3node.validation; - - -/** - * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalOperatorNode}. - * 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 RelationalOperatorNodeValidator { - boolean validate(); - -} diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java index b87d33bf..448c527f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: SequenceNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: SequenceNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.CompositeNode; /** * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode}. @@ -20,7 +20,5 @@ public interface SequenceNodeValidator { boolean validate(); boolean validateTextSequences(EList<CompositeNode> value); - boolean validateStatements(EList<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 1ca48d79..ef7d468a 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleTypeNodeValidator.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: SimpleTypeNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java index 564772fa..df22ddc6 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: StringLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: StringLiteralNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java index 88b19b7c..a3857bb5 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java @@ -2,10 +2,13 @@ * <copyright> * </copyright> * - * $Id: SwitchExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $ + * $Id: SwitchExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 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.SwitchExpressionNode}. @@ -16,4 +19,7 @@ package org.eclipse.xpand3.internal.parser.xpand3node.validation; public interface SwitchExpressionNodeValidator { boolean validate(); + boolean validateDefault(CompositeNode value); + boolean validateExpression(CompositeNode value); + boolean validateCases(EList<CompositeNode> value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java index 7e94093b..d52fa81f 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Test_expressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: Test_expressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java index 94599711..6bf51af5 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TextNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $ + * $Id: TextNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.validation; diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java index 4b1292d1..a89807cd 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: TextSequenceNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: TextSequenceNodeValidator.java,v 1.4 2008/03/13 08:40:00 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.CompositeNode; /** * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode}. @@ -19,6 +19,5 @@ import org.eclipse.tmf.common.node.CompositeNode; public interface TextSequenceNodeValidator { boolean validate(); - boolean validateText(EList<CompositeNode> value); - + boolean validateTexts(EList<CompositeNode> value); } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java index b2839cee..4ffc7d11 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java @@ -2,13 +2,12 @@ * <copyright> * </copyright> * - * $Id: UnaryExpressionNodeValidator.java,v 1.3 2008/03/12 09:54:13 jkohnlein Exp $ + * $Id: UnaryExpressionNodeValidator.java,v 1.4 2008/03/13 08:39:59 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.UnaryExpressionNode}. * This doesn't really do anything, and it's not a real EMF artifact. @@ -19,5 +18,4 @@ public interface UnaryExpressionNodeValidator { boolean validate(); boolean validateOperand(CompositeNode value); - } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/XNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/XNodeValidator.java deleted file mode 100644 index 8cf0f970..00000000 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/XNodeValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: XNodeValidator.java,v 1.1 2008/03/07 11:11:14 jkohnlein Exp $ - */ -package org.eclipse.xpand3.internal.parser.xpand3node.validation; - -import org.eclipse.tmf.common.node.LeafNode; - -/** - * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.XNode}. - * 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 XNodeValidator { - boolean validate(); - - boolean validateL(LeafNode value); -} diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore index a347889b..1848d010 100644 --- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore +++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore @@ -68,7 +68,7 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TextSequenceNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="text" upperBound="-1"> + <eStructuralFeatures xsi:type="ecore:EReference" name="texts" upperBound="-1"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> @@ -89,6 +89,9 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="forEachExpression"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="forExpression"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> @@ -134,7 +137,7 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IfStatementNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="elseIf" upperBound="-1"> + <eStructuralFeatures xsi:type="ecore:EReference" name="elseIfs" upperBound="-1"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="expression"> @@ -191,6 +194,24 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CheckNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="type"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="error"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="message"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="ifExpression"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="warning"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="constraint"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AroundNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> @@ -234,66 +255,114 @@ <eClassifiers xsi:type="ecore:EClass" name="Test_expressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ExpressionNode"> - <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="LetExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CastedExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="target"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="type"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ChainExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IfExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="then"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="else"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="condition0"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="condition1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="SwitchExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="default"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="expression"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="cases" upperBound="-1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CasePartNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="condition"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="expression"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OrExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AndExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ImpliesExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RelationalExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="operator"> - <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand"> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand"> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RelationalOperatorNode"> - <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/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.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="left"> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="right"> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="MultiplicativeExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="left"> + <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="right"> + <eStructuralFeatures xsi:type="ecore:EReference" name="first"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> @@ -317,24 +386,30 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ParanthesizedExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="expression"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="GlobalVarExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="FeatureCallNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="type"> + <eStructuralFeatures xsi:type="ecore:EReference" name="name"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="paramList"> + <eStructuralFeatures xsi:type="ecore:EReference" name="type"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="name"> + <eStructuralFeatures xsi:type="ecore:EReference" name="paramList"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/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.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ConstructorCallNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> @@ -350,6 +425,15 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CollectionExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="variable"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="expression"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="type"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterListNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> @@ -359,10 +443,10 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="name"> + <eStructuralFeatures xsi:type="ecore:EReference" name="ptype"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="ptype"> + <eStructuralFeatures xsi:type="ecore:EReference" name="name"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> @@ -374,6 +458,12 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CollectionTypeNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="collectionType"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="elementType"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="SimpleTypeNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/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 3e7fa121..de491e6b 100644 --- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf +++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf @@ -2,7 +2,7 @@ grammar Xpand3Node; normalizable file : (imports+=nsImport)* - (declarations+=abstractDeclaration )* + (declarations+=abstractDeclaration)* EOF ; @@ -58,7 +58,7 @@ abstract normalizable statement : ; normalizable textSequence : - text+=text (text+=text)* + texts+=text (texts+=text)* ; text : @@ -77,7 +77,7 @@ errorStatement : expandStatement : 'EXPAND' name=simpleType ('(' paramList=parameterList ')')? (('FOR' forExpression=expression) - | ('FOREACH' forExpression=expression ('SEPARATOR' separator=expression)?))? + | ('FOREACH' forEachExpression=expression ('SEPARATOR' separator=expression)?))? ; expressionStmt : @@ -99,7 +99,7 @@ foreachStatement : ifStatement : 'IF' expression=expression sequence=sequence - elseIf+=elseIfStatement* + elseIfs+=elseIfStatement* else=elseStatement? 'ENDIF' ; @@ -132,8 +132,8 @@ protectStatement : // Xtend start check : - 'context' type ('if' expression)? ('ERROR'|'WARNING') expression ':' - expression ';' + 'context' type=type ('if' ifExpression=expression)? ('ERROR'|'WARNING') message=expression ':' + constraint=expression ';' ; around : @@ -150,7 +150,8 @@ pointcut : ; extension : // TODO create <identifier> <name< (...) - (private='private'|cached='cached'|create='create')* returnType=type? name=identifier '(' paramList=declaredParameterList? ')' ':' + (private='private'|cached='cached'|create='create')* + returnType=type? name=identifier '(' paramList=declaredParameterList? ')' ':' ('JAVA' javaReturnType=javaType '.' javaName=identifier '('(javaType (',' javaType )*)? ')'| extendBody=expression )';' ; @@ -169,7 +170,7 @@ normalizable test_expression: expression EOF ; -normalizable expression : +abstract normalizable expression : letExpression ; @@ -180,64 +181,55 @@ normalizable letExpression : normalizable castedExpression : =>('(' type ')' chainExpression) - '(' type ')' chainExpression + '(' type=type ')' target=chainExpression | chainExpression ; normalizable chainExpression : - ifExpression ( '->' ifExpression )* + first=ifExpression ( '->' nexts+=ifExpression )* ; normalizable ifExpression : - switchExpression ('?' expression ':' switchExpression )? -| 'if' expression 'then' switchExpression ('else' switchExpression)? + condition0=switchExpression ('?' then=expression ':' else=switchExpression )? +| 'if' condition1=expression 'then' then=switchExpression ('else' else=switchExpression)? ; normalizable switchExpression : - 'switch' ('(' orExpression ')')? '{' - casePart* - 'default' ':' orExpression + 'switch' ('(' expression=orExpression ')')? '{' + cases+=casePart* + 'default' ':' default=orExpression '}' | orExpression ; casePart : - 'case' expression ':' expression; + 'case' condition=expression ':' expression=expression; normalizable orExpression : - andExpression ('||' andExpression )* + first=andExpression ('||' nexts+=andExpression )* ; normalizable andExpression : - impliesExpression ('&&' impliesExpression )* + first=impliesExpression ('&&' nexts+=impliesExpression)* ; normalizable impliesExpression : - relationalExpression ('implies' relationalExpression )* + first=relationalExpression ('implies' nexts+=relationalExpression)* ; normalizable relationalExpression : - leftOperand=additiveExpression - ( operator=relationalOperator rightOperand=additiveExpression )* -; - -relationalOperator: - '==' - | '!=' - | '>=' - | '<=' - | '>' - | '<' + first=additiveExpression + ( ('==' | '!=' | '>=' | '<=' | '>' | '<' ) nexts+=additiveExpression )* ; normalizable additiveExpression : - left=multiplicativeExpression - (('+'| '-') right=multiplicativeExpression )* + first=multiplicativeExpression + (('+'| '-') nexts+=multiplicativeExpression )* ; normalizable multiplicativeExpression : - left=unaryExpression - (('*' | '/') right=unaryExpression )* + first=unaryExpression + (('*' | '/') nexts+=unaryExpression )* ; @@ -268,20 +260,21 @@ stringLiteral : ; paranthesizedExpression : - '(' expression ')' + '(' expression=expression ')' ; globalVarExpression : 'GLOBALVAR' identifier ; featureCall : - name=identifier '(' (paramList=parameterList)? ')' + collectionExpression +| name=identifier '(' (paramList=parameterList)? ')' | type=type -| collectionExpression + ; listLiteral : - '{'(expression (',' expression)*)?'}' + '{'(elements+=expression (',' elements+=expression)*)?'}' ; constructorCall : @@ -303,9 +296,7 @@ numberLiteral : ; collectionExpression : - 'typeSelect' - '(' type ')' - + 'typeSelect' '(' type=type ')' |('collect' | 'select' | 'selectFirst' @@ -313,8 +304,7 @@ collectionExpression : | 'exists' | 'notExists' | 'sortBy' - | 'forAll') '(' (identifier '|')? expression ')' - + | 'forAll') '(' (variable=identifier '|')? expression=expression ')' ; // helper @@ -339,8 +329,8 @@ abstract normalizable type : ; collectionType : - ( 'Collection' | 'List' | 'Set' ) - ('[' simpleType ']' )? + ( collectionType='Collection' | collectionType='List' | collectionType='Set' ) + ('[' elementType=simpleType ']' )? ; simpleType : diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/AbstractXpand3NodeSwitch.java b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/AbstractXpand3NodeSwitch.java index cb7c1876..5c45f092 100644 --- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/AbstractXpand3NodeSwitch.java +++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/AbstractXpand3NodeSwitch.java @@ -57,8 +57,6 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return caseJavaTypeNode(node); case Xpand3nodePackage.TEST_EXPRESSION_NODE: return caseTest_expressionNode(node); - case Xpand3nodePackage.EXPRESSION_NODE: - return caseExpressionNode(node); case Xpand3nodePackage.LET_EXPRESSION_NODE: return caseLetExpressionNode(node); case Xpand3nodePackage.CASTED_EXPRESSION_NODE: @@ -79,8 +77,6 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return caseImpliesExpressionNode(node); case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE: return caseRelationalExpressionNode(node); - case Xpand3nodePackage.RELATIONAL_OPERATOR_NODE: - return caseRelationalOperatorNode(node); case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: return caseAdditiveExpressionNode(node); case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE: @@ -126,7 +122,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseFileNode(Node node) throws E { + public final T caseFileNode(Node node) throws E { if(!(node instanceof FileNode)) { classCastError(node, "FileNode"); } @@ -138,7 +134,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseImportNode(Node node) throws E { + public final T caseImportNode(Node node) throws E { if(!(node instanceof ImportNode)) { classCastError(node, "ImportNode"); } @@ -150,7 +146,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseExtensionImportNode(Node node) throws E { + public final T caseExtensionImportNode(Node node) throws E { if(!(node instanceof ExtensionImportNode)) { classCastError(node, "ExtensionImportNode"); } @@ -162,7 +158,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseDefinitionNode(Node node) throws E { + public final T caseDefinitionNode(Node node) throws E { if(!(node instanceof DefinitionNode)) { classCastError(node, "DefinitionNode"); } @@ -174,7 +170,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseDefinitionAroundNode(Node node) throws E { + public final T caseDefinitionAroundNode(Node node) throws E { if(!(node instanceof DefinitionAroundNode)) { classCastError(node, "DefinitionAroundNode"); } @@ -186,7 +182,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseSequenceNode(Node node) throws E { + public final T caseSequenceNode(Node node) throws E { if(!(node instanceof SequenceNode)) { classCastError(node, "SequenceNode"); } @@ -198,7 +194,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseTextSequenceNode(Node node) throws E { + public final T caseTextSequenceNode(Node node) throws E { if(!(node instanceof TextSequenceNode)) { classCastError(node, "TextSequenceNode"); } @@ -210,7 +206,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseTextNode(Node node) throws E { + public final T caseTextNode(Node node) throws E { if(!(node instanceof TextNode)) { classCastError(node, "TextNode"); } @@ -222,7 +218,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseErrorStatementNode(Node node) throws E { + public final T caseErrorStatementNode(Node node) throws E { if(!(node instanceof ErrorStatementNode)) { classCastError(node, "ErrorStatementNode"); } @@ -234,7 +230,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseExpandStatementNode(Node node) throws E { + public final T caseExpandStatementNode(Node node) throws E { if(!(node instanceof ExpandStatementNode)) { classCastError(node, "ExpandStatementNode"); } @@ -246,7 +242,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseExpressionStmtNode(Node node) throws E { + public final T caseExpressionStmtNode(Node node) throws E { if(!(node instanceof ExpressionStmtNode)) { classCastError(node, "ExpressionStmtNode"); } @@ -258,7 +254,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseFileStatementNode(Node node) throws E { + public final T caseFileStatementNode(Node node) throws E { if(!(node instanceof FileStatementNode)) { classCastError(node, "FileStatementNode"); } @@ -270,7 +266,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseForeachStatementNode(Node node) throws E { + public final T caseForeachStatementNode(Node node) throws E { if(!(node instanceof ForeachStatementNode)) { classCastError(node, "ForeachStatementNode"); } @@ -282,7 +278,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseIfStatementNode(Node node) throws E { + public final T caseIfStatementNode(Node node) throws E { if(!(node instanceof IfStatementNode)) { classCastError(node, "IfStatementNode"); } @@ -294,7 +290,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseElseIfStatementNode(Node node) throws E { + public final T caseElseIfStatementNode(Node node) throws E { if(!(node instanceof ElseIfStatementNode)) { classCastError(node, "ElseIfStatementNode"); } @@ -306,7 +302,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseElseStatementNode(Node node) throws E { + public final T caseElseStatementNode(Node node) throws E { if(!(node instanceof ElseStatementNode)) { classCastError(node, "ElseStatementNode"); } @@ -318,7 +314,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseLetStatementNode(Node node) throws E { + public final T caseLetStatementNode(Node node) throws E { if(!(node instanceof LetStatementNode)) { classCastError(node, "LetStatementNode"); } @@ -330,7 +326,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseProtectStatementNode(Node node) throws E { + public final T caseProtectStatementNode(Node node) throws E { if(!(node instanceof ProtectStatementNode)) { classCastError(node, "ProtectStatementNode"); } @@ -342,7 +338,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseCheckNode(Node node) throws E { + public final T caseCheckNode(Node node) throws E { if(!(node instanceof CheckNode)) { classCastError(node, "CheckNode"); } @@ -354,7 +350,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseAroundNode(Node node) throws E { + public final T caseAroundNode(Node node) throws E { if(!(node instanceof AroundNode)) { classCastError(node, "AroundNode"); } @@ -366,7 +362,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T casePointcutNode(Node node) throws E { + public final T casePointcutNode(Node node) throws E { if(!(node instanceof PointcutNode)) { classCastError(node, "PointcutNode"); } @@ -378,7 +374,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseExtensionNode(Node node) throws E { + public final T caseExtensionNode(Node node) throws E { if(!(node instanceof ExtensionNode)) { classCastError(node, "ExtensionNode"); } @@ -390,7 +386,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseJavaTypeNode(Node node) throws E { + public final T caseJavaTypeNode(Node node) throws E { if(!(node instanceof JavaTypeNode)) { classCastError(node, "JavaTypeNode"); } @@ -402,7 +398,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseTest_expressionNode(Node node) throws E { + public final T caseTest_expressionNode(Node node) throws E { if(!(node instanceof Test_expressionNode)) { classCastError(node, "Test_expressionNode"); } @@ -414,19 +410,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseExpressionNode(Node node) throws E { - if(!(node instanceof ExpressionNode)) { - classCastError(node, "ExpressionNode"); - } - return caseExpressionNode((ExpressionNode) node); - } - - public T caseExpressionNode(ExpressionNode node) throws E { - error("Not implemented yet", node); - return null; - } - - public T caseLetExpressionNode(Node node) throws E { + public final T caseLetExpressionNode(Node node) throws E { if(!(node instanceof LetExpressionNode)) { classCastError(node, "LetExpressionNode"); } @@ -438,7 +422,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseCastedExpressionNode(Node node) throws E { + public final T caseCastedExpressionNode(Node node) throws E { if(!(node instanceof CastedExpressionNode)) { classCastError(node, "CastedExpressionNode"); } @@ -450,7 +434,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseChainExpressionNode(Node node) throws E { + public final T caseChainExpressionNode(Node node) throws E { if(!(node instanceof ChainExpressionNode)) { classCastError(node, "ChainExpressionNode"); } @@ -462,7 +446,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseIfExpressionNode(Node node) throws E { + public final T caseIfExpressionNode(Node node) throws E { if(!(node instanceof IfExpressionNode)) { classCastError(node, "IfExpressionNode"); } @@ -474,7 +458,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseSwitchExpressionNode(Node node) throws E { + public final T caseSwitchExpressionNode(Node node) throws E { if(!(node instanceof SwitchExpressionNode)) { classCastError(node, "SwitchExpressionNode"); } @@ -486,7 +470,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseCasePartNode(Node node) throws E { + public final T caseCasePartNode(Node node) throws E { if(!(node instanceof CasePartNode)) { classCastError(node, "CasePartNode"); } @@ -498,7 +482,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseOrExpressionNode(Node node) throws E { + public final T caseOrExpressionNode(Node node) throws E { if(!(node instanceof OrExpressionNode)) { classCastError(node, "OrExpressionNode"); } @@ -510,7 +494,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseAndExpressionNode(Node node) throws E { + public final T caseAndExpressionNode(Node node) throws E { if(!(node instanceof AndExpressionNode)) { classCastError(node, "AndExpressionNode"); } @@ -522,7 +506,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseImpliesExpressionNode(Node node) throws E { + public final T caseImpliesExpressionNode(Node node) throws E { if(!(node instanceof ImpliesExpressionNode)) { classCastError(node, "ImpliesExpressionNode"); } @@ -534,7 +518,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseRelationalExpressionNode(Node node) throws E { + public final T caseRelationalExpressionNode(Node node) throws E { if(!(node instanceof RelationalExpressionNode)) { classCastError(node, "RelationalExpressionNode"); } @@ -546,19 +530,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseRelationalOperatorNode(Node node) throws E { - if(!(node instanceof RelationalOperatorNode)) { - classCastError(node, "RelationalOperatorNode"); - } - return caseRelationalOperatorNode((RelationalOperatorNode) node); - } - - public T caseRelationalOperatorNode(RelationalOperatorNode node) throws E { - error("Not implemented yet", node); - return null; - } - - public T caseAdditiveExpressionNode(Node node) throws E { + public final T caseAdditiveExpressionNode(Node node) throws E { if(!(node instanceof AdditiveExpressionNode)) { classCastError(node, "AdditiveExpressionNode"); } @@ -570,7 +542,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseMultiplicativeExpressionNode(Node node) throws E { + public final T caseMultiplicativeExpressionNode(Node node) throws E { if(!(node instanceof MultiplicativeExpressionNode)) { classCastError(node, "MultiplicativeExpressionNode"); } @@ -582,7 +554,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseUnaryExpressionNode(Node node) throws E { + public final T caseUnaryExpressionNode(Node node) throws E { if(!(node instanceof UnaryExpressionNode)) { classCastError(node, "UnaryExpressionNode"); } @@ -594,7 +566,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseInfixExpressionNode(Node node) throws E { + public final T caseInfixExpressionNode(Node node) throws E { if(!(node instanceof InfixExpressionNode)) { classCastError(node, "InfixExpressionNode"); } @@ -606,7 +578,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseStringLiteralNode(Node node) throws E { + public final T caseStringLiteralNode(Node node) throws E { if(!(node instanceof StringLiteralNode)) { classCastError(node, "StringLiteralNode"); } @@ -618,7 +590,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseParanthesizedExpressionNode(Node node) throws E { + public final T caseParanthesizedExpressionNode(Node node) throws E { if(!(node instanceof ParanthesizedExpressionNode)) { classCastError(node, "ParanthesizedExpressionNode"); } @@ -630,7 +602,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseGlobalVarExpressionNode(Node node) throws E { + public final T caseGlobalVarExpressionNode(Node node) throws E { if(!(node instanceof GlobalVarExpressionNode)) { classCastError(node, "GlobalVarExpressionNode"); } @@ -642,7 +614,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseFeatureCallNode(Node node) throws E { + public final T caseFeatureCallNode(Node node) throws E { if(!(node instanceof FeatureCallNode)) { classCastError(node, "FeatureCallNode"); } @@ -654,7 +626,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseListLiteralNode(Node node) throws E { + public final T caseListLiteralNode(Node node) throws E { if(!(node instanceof ListLiteralNode)) { classCastError(node, "ListLiteralNode"); } @@ -666,7 +638,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseConstructorCallNode(Node node) throws E { + public final T caseConstructorCallNode(Node node) throws E { if(!(node instanceof ConstructorCallNode)) { classCastError(node, "ConstructorCallNode"); } @@ -678,7 +650,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseBooleanLiteralNode(Node node) throws E { + public final T caseBooleanLiteralNode(Node node) throws E { if(!(node instanceof BooleanLiteralNode)) { classCastError(node, "BooleanLiteralNode"); } @@ -690,7 +662,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseNullLiteralNode(Node node) throws E { + public final T caseNullLiteralNode(Node node) throws E { if(!(node instanceof NullLiteralNode)) { classCastError(node, "NullLiteralNode"); } @@ -702,7 +674,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseNumberLiteralNode(Node node) throws E { + public final T caseNumberLiteralNode(Node node) throws E { if(!(node instanceof NumberLiteralNode)) { classCastError(node, "NumberLiteralNode"); } @@ -714,7 +686,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseCollectionExpressionNode(Node node) throws E { + public final T caseCollectionExpressionNode(Node node) throws E { if(!(node instanceof CollectionExpressionNode)) { classCastError(node, "CollectionExpressionNode"); } @@ -726,7 +698,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseDeclaredParameterListNode(Node node) throws E { + public final T caseDeclaredParameterListNode(Node node) throws E { if(!(node instanceof DeclaredParameterListNode)) { classCastError(node, "DeclaredParameterListNode"); } @@ -738,7 +710,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseDeclaredParameterNode(Node node) throws E { + public final T caseDeclaredParameterNode(Node node) throws E { if(!(node instanceof DeclaredParameterNode)) { classCastError(node, "DeclaredParameterNode"); } @@ -750,7 +722,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseParameterListNode(Node node) throws E { + public final T caseParameterListNode(Node node) throws E { if(!(node instanceof ParameterListNode)) { classCastError(node, "ParameterListNode"); } @@ -762,7 +734,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseCollectionTypeNode(Node node) throws E { + public final T caseCollectionTypeNode(Node node) throws E { if(!(node instanceof CollectionTypeNode)) { classCastError(node, "CollectionTypeNode"); } @@ -774,7 +746,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseSimpleTypeNode(Node node) throws E { + public final T caseSimpleTypeNode(Node node) throws E { if(!(node instanceof SimpleTypeNode)) { classCastError(node, "SimpleTypeNode"); } @@ -786,7 +758,7 @@ public abstract class AbstractXpand3NodeSwitch<T,E extends Exception> { return null; } - public T caseIdentifierNode(Node node) throws E { + public final T caseIdentifierNode(Node node) throws E { if(!(node instanceof IdentifierNode)) { classCastError(node, "IdentifierNode"); } 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 a1347ce8..d6bc6fc8 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 @@ -93,7 +93,7 @@ r_textSequence returns [CompositeNode cn] @init{ cn = factory.createTextSequenceNode(); } @after{ cn = normalize(cn); } : - (f_text=r_text { addToChildren(cn, f_text); ((TextSequenceNode) cn).getText().add(f_text); }) (((f_text=r_text { addToChildren(cn, f_text); ((TextSequenceNode) cn).getText().add(f_text); })))* + (f_texts=r_text { addToChildren(cn, f_texts); ((TextSequenceNode) cn).getTexts().add(f_texts); }) (((f_texts=r_text { addToChildren(cn, f_texts); ((TextSequenceNode) cn).getTexts().add(f_texts); })))* ; r_text returns [CompositeNode cn] @@ -118,7 +118,7 @@ r_expandStatement returns [CompositeNode cn] @init{ cn = factory.createExpandStatementNode(); } : ('EXPAND' { addLeafNodeForToken($cn, null); }) (f_name=r_simpleType { addToChildren(cn, f_name); ((ExpandStatementNode) cn).setName(f_name); }) ((('(' { addLeafNodeForToken($cn, null); }) (f_paramList=r_parameterList { addToChildren(cn, f_paramList); ((ExpandStatementNode) cn).setParamList(f_paramList); }) (')' { addLeafNodeForToken($cn, null); })))? ((((('FOR' { addLeafNodeForToken($cn, null); }) (f_forExpression=r_expression { addToChildren(cn, f_forExpression); ((ExpandStatementNode) cn).setForExpression(f_forExpression); }))) - | ((('FOREACH' { addLeafNodeForToken($cn, null); }) (f_forExpression=r_expression { addToChildren(cn, f_forExpression); ((ExpandStatementNode) cn).setForExpression(f_forExpression); }) ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (f_separator=r_expression { addToChildren(cn, f_separator); ((ExpandStatementNode) cn).setSeparator(f_separator); })))?))))? + | ((('FOREACH' { addLeafNodeForToken($cn, null); }) (f_forEachExpression=r_expression { addToChildren(cn, f_forEachExpression); ((ExpandStatementNode) cn).setForEachExpression(f_forEachExpression); }) ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (f_separator=r_expression { addToChildren(cn, f_separator); ((ExpandStatementNode) cn).setSeparator(f_separator); })))?))))? ; r_expressionStmt returns [CompositeNode cn] @@ -142,7 +142,7 @@ r_foreachStatement returns [CompositeNode cn] r_ifStatement returns [CompositeNode cn] @init{ cn = factory.createIfStatementNode(); } : - ('IF' { addLeafNodeForToken($cn, null); }) (f_expression=r_expression { addToChildren(cn, f_expression); ((IfStatementNode) cn).setExpression(f_expression); }) (f_sequence=r_sequence { addToChildren(cn, f_sequence); ((IfStatementNode) cn).setSequence(f_sequence); }) (f_elseIf=r_elseIfStatement { addToChildren(cn, f_elseIf); ((IfStatementNode) cn).getElseIf().add(f_elseIf); })* (f_else=r_elseStatement { addToChildren(cn, f_else); ((IfStatementNode) cn).setElse(f_else); })? ('ENDIF' { addLeafNodeForToken($cn, null); }) + ('IF' { addLeafNodeForToken($cn, null); }) (f_expression=r_expression { addToChildren(cn, f_expression); ((IfStatementNode) cn).setExpression(f_expression); }) (f_sequence=r_sequence { addToChildren(cn, f_sequence); ((IfStatementNode) cn).setSequence(f_sequence); }) (f_elseIfs=r_elseIfStatement { addToChildren(cn, f_elseIfs); ((IfStatementNode) cn).getElseIfs().add(f_elseIfs); })* (f_else=r_elseStatement { addToChildren(cn, f_else); ((IfStatementNode) cn).setElse(f_else); })? ('ENDIF' { addLeafNodeForToken($cn, null); }) ; r_elseIfStatement returns [CompositeNode cn] @@ -172,23 +172,23 @@ r_protectStatement returns [CompositeNode cn] r_check returns [CompositeNode cn] @init{ cn = factory.createCheckNode(); } : - ('context' { addLeafNodeForToken($cn, null); }) (f_unnamed0=r_type { addToChildren(cn, f_unnamed0); }) ((('if' { addLeafNodeForToken($cn, null); }) (f_unnamed1=r_expression { addToChildren(cn, f_unnamed1); })))? ((('ERROR' { addLeafNodeForToken($cn, null); }) - | ('WARNING' { addLeafNodeForToken($cn, null); }))) (f_unnamed2=r_expression { addToChildren(cn, f_unnamed2); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed3=r_expression { addToChildren(cn, f_unnamed3); }) (';' { addLeafNodeForToken($cn, null); }) + ('context' { addLeafNodeForToken($cn, null); }) (f_type=r_type { addToChildren(cn, f_type); ((CheckNode) cn).setType(f_type); }) ((('if' { addLeafNodeForToken($cn, null); }) (f_ifExpression=r_expression { addToChildren(cn, f_ifExpression); ((CheckNode) cn).setIfExpression(f_ifExpression); })))? ((('ERROR' { addLeafNodeForToken($cn, "error"); }) + | ('WARNING' { addLeafNodeForToken($cn, "warning"); }))) (f_message=r_expression { addToChildren(cn, f_message); ((CheckNode) cn).setMessage(f_message); }) (':' { addLeafNodeForToken($cn, null); }) (f_constraint=r_expression { addToChildren(cn, f_constraint); ((CheckNode) cn).setConstraint(f_constraint); }) (';' { addLeafNodeForToken($cn, null); }) ; r_around returns [CompositeNode cn] @init{ cn = factory.createAroundNode(); } : - ('around' { addLeafNodeForToken($cn, null); }) (f_unnamed4=r_pointcut { addToChildren(cn, f_unnamed4); }) ('(' { addLeafNodeForToken($cn, null); }) (((f_unnamed5=r_declaredParameterList { addToChildren(cn, f_unnamed5); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))? - | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed6=r_expression { addToChildren(cn, f_unnamed6); }) (';' { addLeafNodeForToken($cn, null); }) + ('around' { addLeafNodeForToken($cn, null); }) (f_unnamed0=r_pointcut { addToChildren(cn, f_unnamed0); }) ('(' { addLeafNodeForToken($cn, null); }) (((f_unnamed1=r_declaredParameterList { addToChildren(cn, f_unnamed1); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))? + | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed2=r_expression { addToChildren(cn, f_unnamed2); }) (';' { addLeafNodeForToken($cn, null); }) ; r_pointcut returns [CompositeNode cn] @init{ cn = factory.createPointcutNode(); } : ((('*' { addLeafNodeForToken($cn, null); }) - | (f_unnamed7=r_identifier { addToChildren(cn, f_unnamed7); }))) ((('*' { addLeafNodeForToken($cn, null); }) - | (f_unnamed8=r_identifier { addToChildren(cn, f_unnamed8); }) + | (f_unnamed3=r_identifier { addToChildren(cn, f_unnamed3); }))) ((('*' { addLeafNodeForToken($cn, null); }) + | (f_unnamed4=r_identifier { addToChildren(cn, f_unnamed4); }) | ('::' { addLeafNodeForToken($cn, null); })))* ; @@ -197,14 +197,14 @@ r_extension returns [CompositeNode cn] } : ((('private' { addLeafNodeForToken($cn, "private"); }) | ('cached' { addLeafNodeForToken($cn, "cached"); }) - | ('create' { addLeafNodeForToken($cn, "create"); })))* (f_returnType=r_type { addToChildren(cn, f_returnType); ((ExtensionNode) cn).setReturnType(f_returnType); })? (f_name=r_identifier { addToChildren(cn, f_name); ((ExtensionNode) cn).setName(f_name); }) ('(' { addLeafNodeForToken($cn, null); }) (f_paramList=r_declaredParameterList { addToChildren(cn, f_paramList); ((ExtensionNode) cn).setParamList(f_paramList); })? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) ((('JAVA' { addLeafNodeForToken($cn, null); }) (f_javaReturnType=r_javaType { addToChildren(cn, f_javaReturnType); ((ExtensionNode) cn).setJavaReturnType(f_javaReturnType); }) ('.' { addLeafNodeForToken($cn, null); }) (f_javaName=r_identifier { addToChildren(cn, f_javaName); ((ExtensionNode) cn).setJavaName(f_javaName); }) ('(' { addLeafNodeForToken($cn, null); }) (((f_unnamed9=r_javaType { addToChildren(cn, f_unnamed9); }) (((',' { addLeafNodeForToken($cn, null); }) (f_unnamed10=r_javaType { addToChildren(cn, f_unnamed10); })))*))? (')' { addLeafNodeForToken($cn, null); }) + | ('create' { addLeafNodeForToken($cn, "create"); })))* (f_returnType=r_type { addToChildren(cn, f_returnType); ((ExtensionNode) cn).setReturnType(f_returnType); })? (f_name=r_identifier { addToChildren(cn, f_name); ((ExtensionNode) cn).setName(f_name); }) ('(' { addLeafNodeForToken($cn, null); }) (f_paramList=r_declaredParameterList { addToChildren(cn, f_paramList); ((ExtensionNode) cn).setParamList(f_paramList); })? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) ((('JAVA' { addLeafNodeForToken($cn, null); }) (f_javaReturnType=r_javaType { addToChildren(cn, f_javaReturnType); ((ExtensionNode) cn).setJavaReturnType(f_javaReturnType); }) ('.' { addLeafNodeForToken($cn, null); }) (f_javaName=r_identifier { addToChildren(cn, f_javaName); ((ExtensionNode) cn).setJavaName(f_javaName); }) ('(' { addLeafNodeForToken($cn, null); }) (((f_unnamed5=r_javaType { addToChildren(cn, f_unnamed5); }) (((',' { addLeafNodeForToken($cn, null); }) (f_unnamed6=r_javaType { addToChildren(cn, f_unnamed6); })))*))? (')' { addLeafNodeForToken($cn, null); }) | (f_extendBody=r_expression { addToChildren(cn, f_extendBody); ((ExtensionNode) cn).setExtendBody(f_extendBody); }))) (';' { addLeafNodeForToken($cn, null); }) ; r_javaType returns [CompositeNode cn] @init{ cn = factory.createJavaTypeNode(); } : - (f_unnamed11=r_identifier { addToChildren(cn, f_unnamed11); }) ((('.' { addLeafNodeForToken($cn, null); }) (((f_unnamed12=r_identifier { addToChildren(cn, f_unnamed12); }) + (f_unnamed7=r_identifier { addToChildren(cn, f_unnamed7); }) ((('.' { addLeafNodeForToken($cn, null); }) (((f_unnamed8=r_identifier { addToChildren(cn, f_unnamed8); }) | ('Collection' { addLeafNodeForToken($cn, null); }) | ('List' { addLeafNodeForToken($cn, null); }) | ('Set' { addLeafNodeForToken($cn, null); })))))* @@ -214,121 +214,112 @@ r_test_expression returns [CompositeNode cn] @init{ cn = factory.createTest_expressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed13=r_expression { addToChildren(cn, f_unnamed13); }) (EOF) + (f_unnamed9=r_expression { addToChildren(cn, f_unnamed9); }) (EOF) ; -r_expression returns [CompositeNode cn] - @init{ cn = factory.createExpressionNode(); - } - @after{ cn = normalize(cn); } : - (f_unnamed14=r_letExpression { addToChildren(cn, f_unnamed14); }) +r_expression returns [CompositeNode cn] : + (r_letExpression { $cn = $r_letExpression.cn; }) ; r_letExpression returns [CompositeNode cn] @init{ cn = factory.createLetExpressionNode(); } @after{ cn = normalize(cn); } : - ('let' { addLeafNodeForToken($cn, null); }) (f_unnamed15=r_identifier { addToChildren(cn, f_unnamed15); }) ('=' { addLeafNodeForToken($cn, null); }) (f_unnamed16=r_castedExpression { addToChildren(cn, f_unnamed16); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed17=r_expression { addToChildren(cn, f_unnamed17); }) - | (f_unnamed18=r_castedExpression { addToChildren(cn, f_unnamed18); }) + ('let' { addLeafNodeForToken($cn, null); }) (f_unnamed10=r_identifier { addToChildren(cn, f_unnamed10); }) ('=' { addLeafNodeForToken($cn, null); }) (f_unnamed11=r_castedExpression { addToChildren(cn, f_unnamed11); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed12=r_expression { addToChildren(cn, f_unnamed12); }) + | (f_unnamed13=r_castedExpression { addToChildren(cn, f_unnamed13); }) ; r_castedExpression returns [CompositeNode cn] @init{ cn = factory.createCastedExpressionNode(); } @after{ cn = normalize(cn); } : - ('(' r_type ')' r_chainExpression)=>(('(' { addLeafNodeForToken($cn, null); }) (f_unnamed19=r_type { addToChildren(cn, f_unnamed19); }) (')' { addLeafNodeForToken($cn, null); }) (f_unnamed20=r_chainExpression { addToChildren(cn, f_unnamed20); })) - | (f_unnamed21=r_chainExpression { addToChildren(cn, f_unnamed21); }) + ('(' r_type ')' r_chainExpression)=>(('(' { addLeafNodeForToken($cn, null); }) (f_type=r_type { addToChildren(cn, f_type); ((CastedExpressionNode) cn).setType(f_type); }) (')' { addLeafNodeForToken($cn, null); }) (f_target=r_chainExpression { addToChildren(cn, f_target); ((CastedExpressionNode) cn).setTarget(f_target); })) + | (f_unnamed14=r_chainExpression { addToChildren(cn, f_unnamed14); }) ; r_chainExpression returns [CompositeNode cn] @init{ cn = factory.createChainExpressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed22=r_ifExpression { addToChildren(cn, f_unnamed22); }) ((('->' { addLeafNodeForToken($cn, null); }) (f_unnamed23=r_ifExpression { addToChildren(cn, f_unnamed23); })))* + (f_first=r_ifExpression { addToChildren(cn, f_first); ((ChainExpressionNode) cn).setFirst(f_first); }) ((('->' { addLeafNodeForToken($cn, null); }) (f_nexts=r_ifExpression { addToChildren(cn, f_nexts); ((ChainExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_ifExpression returns [CompositeNode cn] @init{ cn = factory.createIfExpressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed24=r_switchExpression { addToChildren(cn, f_unnamed24); }) ((('?' { addLeafNodeForToken($cn, null); }) (f_unnamed25=r_expression { addToChildren(cn, f_unnamed25); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed26=r_switchExpression { addToChildren(cn, f_unnamed26); })))? - | ('if' { addLeafNodeForToken($cn, null); }) (f_unnamed27=r_expression { addToChildren(cn, f_unnamed27); }) ('then' { addLeafNodeForToken($cn, null); }) (f_unnamed28=r_switchExpression { addToChildren(cn, f_unnamed28); }) ((('else' { addLeafNodeForToken($cn, null); }) (f_unnamed29=r_switchExpression { addToChildren(cn, f_unnamed29); })))? + (f_condition0=r_switchExpression { addToChildren(cn, f_condition0); ((IfExpressionNode) cn).setCondition0(f_condition0); }) ((('?' { addLeafNodeForToken($cn, null); }) (f_then=r_expression { addToChildren(cn, f_then); ((IfExpressionNode) cn).setThen(f_then); }) (':' { addLeafNodeForToken($cn, null); }) (f_else=r_switchExpression { addToChildren(cn, f_else); ((IfExpressionNode) cn).setElse(f_else); })))? + | ('if' { addLeafNodeForToken($cn, null); }) (f_condition1=r_expression { addToChildren(cn, f_condition1); ((IfExpressionNode) cn).setCondition1(f_condition1); }) ('then' { addLeafNodeForToken($cn, null); }) (f_then=r_switchExpression { addToChildren(cn, f_then); ((IfExpressionNode) cn).setThen(f_then); }) ((('else' { addLeafNodeForToken($cn, null); }) (f_else=r_switchExpression { addToChildren(cn, f_else); ((IfExpressionNode) cn).setElse(f_else); })))? ; r_switchExpression returns [CompositeNode cn] @init{ cn = factory.createSwitchExpressionNode(); } @after{ cn = normalize(cn); } : - ('switch' { addLeafNodeForToken($cn, null); }) ((('(' { addLeafNodeForToken($cn, null); }) (f_unnamed30=r_orExpression { addToChildren(cn, f_unnamed30); }) (')' { addLeafNodeForToken($cn, null); })))? ('{' { addLeafNodeForToken($cn, null); }) (f_unnamed31=r_casePart { addToChildren(cn, f_unnamed31); })* ('default' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed32=r_orExpression { addToChildren(cn, f_unnamed32); }) ('}' { addLeafNodeForToken($cn, null); }) - | (f_unnamed33=r_orExpression { addToChildren(cn, f_unnamed33); }) + ('switch' { addLeafNodeForToken($cn, null); }) ((('(' { addLeafNodeForToken($cn, null); }) (f_expression=r_orExpression { addToChildren(cn, f_expression); ((SwitchExpressionNode) cn).setExpression(f_expression); }) (')' { addLeafNodeForToken($cn, null); })))? ('{' { addLeafNodeForToken($cn, null); }) (f_cases=r_casePart { addToChildren(cn, f_cases); ((SwitchExpressionNode) cn).getCases().add(f_cases); })* ('default' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (f_default=r_orExpression { addToChildren(cn, f_default); ((SwitchExpressionNode) cn).setDefault(f_default); }) ('}' { addLeafNodeForToken($cn, null); }) + | (f_unnamed15=r_orExpression { addToChildren(cn, f_unnamed15); }) ; r_casePart returns [CompositeNode cn] @init{ cn = factory.createCasePartNode(); } : - ('case' { addLeafNodeForToken($cn, null); }) (f_unnamed34=r_expression { addToChildren(cn, f_unnamed34); }) (':' { addLeafNodeForToken($cn, null); }) (f_unnamed35=r_expression { addToChildren(cn, f_unnamed35); }) + ('case' { addLeafNodeForToken($cn, null); }) (f_condition=r_expression { addToChildren(cn, f_condition); ((CasePartNode) cn).setCondition(f_condition); }) (':' { addLeafNodeForToken($cn, null); }) (f_expression=r_expression { addToChildren(cn, f_expression); ((CasePartNode) cn).setExpression(f_expression); }) ; r_orExpression returns [CompositeNode cn] @init{ cn = factory.createOrExpressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed36=r_andExpression { addToChildren(cn, f_unnamed36); }) ((('||' { addLeafNodeForToken($cn, null); }) (f_unnamed37=r_andExpression { addToChildren(cn, f_unnamed37); })))* + (f_first=r_andExpression { addToChildren(cn, f_first); ((OrExpressionNode) cn).setFirst(f_first); }) ((('||' { addLeafNodeForToken($cn, null); }) (f_nexts=r_andExpression { addToChildren(cn, f_nexts); ((OrExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_andExpression returns [CompositeNode cn] @init{ cn = factory.createAndExpressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed38=r_impliesExpression { addToChildren(cn, f_unnamed38); }) ((('&&' { addLeafNodeForToken($cn, null); }) (f_unnamed39=r_impliesExpression { addToChildren(cn, f_unnamed39); })))* + (f_first=r_impliesExpression { addToChildren(cn, f_first); ((AndExpressionNode) cn).setFirst(f_first); }) ((('&&' { addLeafNodeForToken($cn, null); }) (f_nexts=r_impliesExpression { addToChildren(cn, f_nexts); ((AndExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_impliesExpression returns [CompositeNode cn] @init{ cn = factory.createImpliesExpressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed40=r_relationalExpression { addToChildren(cn, f_unnamed40); }) ((('implies' { addLeafNodeForToken($cn, null); }) (f_unnamed41=r_relationalExpression { addToChildren(cn, f_unnamed41); })))* + (f_first=r_relationalExpression { addToChildren(cn, f_first); ((ImpliesExpressionNode) cn).setFirst(f_first); }) ((('implies' { addLeafNodeForToken($cn, null); }) (f_nexts=r_relationalExpression { addToChildren(cn, f_nexts); ((ImpliesExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_relationalExpression returns [CompositeNode cn] @init{ cn = factory.createRelationalExpressionNode(); } @after{ cn = normalize(cn); } : - (f_leftOperand=r_additiveExpression { addToChildren(cn, f_leftOperand); ((RelationalExpressionNode) cn).setLeftOperand(f_leftOperand); }) (((f_operator=r_relationalOperator { addToChildren(cn, f_operator); ((RelationalExpressionNode) cn).setOperator(f_operator); }) (f_rightOperand=r_additiveExpression { addToChildren(cn, f_rightOperand); ((RelationalExpressionNode) cn).setRightOperand(f_rightOperand); })))* -; - -r_relationalOperator returns [CompositeNode cn] - @init{ cn = factory.createRelationalOperatorNode(); - } : - ('==' { addLeafNodeForToken($cn, null); }) + (f_first=r_additiveExpression { addToChildren(cn, f_first); ((RelationalExpressionNode) cn).setFirst(f_first); }) ((((('==' { addLeafNodeForToken($cn, null); }) | ('!=' { addLeafNodeForToken($cn, null); }) | ('>=' { addLeafNodeForToken($cn, null); }) | ('<=' { addLeafNodeForToken($cn, null); }) | ('>' { addLeafNodeForToken($cn, null); }) - | ('<' { addLeafNodeForToken($cn, null); }) + | ('<' { addLeafNodeForToken($cn, null); }))) (f_nexts=r_additiveExpression { addToChildren(cn, f_nexts); ((RelationalExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_additiveExpression returns [CompositeNode cn] @init{ cn = factory.createAdditiveExpressionNode(); } @after{ cn = normalize(cn); } : - (f_left=r_multiplicativeExpression { addToChildren(cn, f_left); ((AdditiveExpressionNode) cn).setLeft(f_left); }) ((((('+' { addLeafNodeForToken($cn, null); }) - | ('-' { addLeafNodeForToken($cn, null); }))) (f_right=r_multiplicativeExpression { addToChildren(cn, f_right); ((AdditiveExpressionNode) cn).setRight(f_right); })))* + (f_first=r_multiplicativeExpression { addToChildren(cn, f_first); ((AdditiveExpressionNode) cn).setFirst(f_first); }) ((((('+' { addLeafNodeForToken($cn, null); }) + | ('-' { addLeafNodeForToken($cn, null); }))) (f_nexts=r_multiplicativeExpression { addToChildren(cn, f_nexts); ((AdditiveExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_multiplicativeExpression returns [CompositeNode cn] @init{ cn = factory.createMultiplicativeExpressionNode(); } @after{ cn = normalize(cn); } : - (f_left=r_unaryExpression { addToChildren(cn, f_left); ((MultiplicativeExpressionNode) cn).setLeft(f_left); }) ((((('*' { addLeafNodeForToken($cn, null); }) - | ('/' { addLeafNodeForToken($cn, null); }))) (f_right=r_unaryExpression { addToChildren(cn, f_right); ((MultiplicativeExpressionNode) cn).setRight(f_right); })))* + (f_first=r_unaryExpression { addToChildren(cn, f_first); ((MultiplicativeExpressionNode) cn).setFirst(f_first); }) ((((('*' { addLeafNodeForToken($cn, null); }) + | ('/' { addLeafNodeForToken($cn, null); }))) (f_nexts=r_unaryExpression { addToChildren(cn, f_nexts); ((MultiplicativeExpressionNode) cn).getNexts().add(f_nexts); })))* ; r_unaryExpression returns [CompositeNode cn] @init{ cn = factory.createUnaryExpressionNode(); } @after{ cn = normalize(cn); } : - (f_unnamed42=r_infixExpression { addToChildren(cn, f_unnamed42); }) + (f_unnamed16=r_infixExpression { addToChildren(cn, f_unnamed16); }) | ('!' { addLeafNodeForToken($cn, null); }) (f_operand=r_infixExpression { addToChildren(cn, f_operand); ((UnaryExpressionNode) cn).setOperand(f_operand); }) | ('-' { addLeafNodeForToken($cn, null); }) (f_operand=r_infixExpression { addToChildren(cn, f_operand); ((UnaryExpressionNode) cn).setOperand(f_operand); }) ; @@ -361,33 +352,33 @@ r_stringLiteral returns [CompositeNode cn] r_paranthesizedExpression returns [CompositeNode cn] @init{ cn = factory.createParanthesizedExpressionNode(); } : - ('(' { addLeafNodeForToken($cn, null); }) (f_unnamed43=r_expression { addToChildren(cn, f_unnamed43); }) (')' { addLeafNodeForToken($cn, null); }) + ('(' { addLeafNodeForToken($cn, null); }) (f_expression=r_expression { addToChildren(cn, f_expression); ((ParanthesizedExpressionNode) cn).setExpression(f_expression); }) (')' { addLeafNodeForToken($cn, null); }) ; r_globalVarExpression returns [CompositeNode cn] @init{ cn = factory.createGlobalVarExpressionNode(); } : - ('GLOBALVAR' { addLeafNodeForToken($cn, null); }) (f_unnamed44=r_identifier { addToChildren(cn, f_unnamed44); }) + ('GLOBALVAR' { addLeafNodeForToken($cn, null); }) (f_unnamed17=r_identifier { addToChildren(cn, f_unnamed17); }) ; r_featureCall returns [CompositeNode cn] @init{ cn = factory.createFeatureCallNode(); } : - (f_name=r_identifier { addToChildren(cn, f_name); ((FeatureCallNode) cn).setName(f_name); }) ('(' { addLeafNodeForToken($cn, null); }) (((f_paramList=r_parameterList { addToChildren(cn, f_paramList); ((FeatureCallNode) cn).setParamList(f_paramList); })))? (')' { addLeafNodeForToken($cn, null); }) + (f_unnamed18=r_collectionExpression { addToChildren(cn, f_unnamed18); }) + | (f_name=r_identifier { addToChildren(cn, f_name); ((FeatureCallNode) cn).setName(f_name); }) ('(' { addLeafNodeForToken($cn, null); }) (((f_paramList=r_parameterList { addToChildren(cn, f_paramList); ((FeatureCallNode) cn).setParamList(f_paramList); })))? (')' { addLeafNodeForToken($cn, null); }) | (f_type=r_type { addToChildren(cn, f_type); ((FeatureCallNode) cn).setType(f_type); }) - | (f_unnamed45=r_collectionExpression { addToChildren(cn, f_unnamed45); }) ; r_listLiteral returns [CompositeNode cn] @init{ cn = factory.createListLiteralNode(); } : - ('{' { addLeafNodeForToken($cn, null); }) (((f_unnamed46=r_expression { addToChildren(cn, f_unnamed46); }) (((',' { addLeafNodeForToken($cn, null); }) (f_unnamed47=r_expression { addToChildren(cn, f_unnamed47); })))*))? ('}' { addLeafNodeForToken($cn, null); }) + ('{' { addLeafNodeForToken($cn, null); }) (((f_elements=r_expression { addToChildren(cn, f_elements); ((ListLiteralNode) cn).getElements().add(f_elements); }) (((',' { addLeafNodeForToken($cn, null); }) (f_elements=r_expression { addToChildren(cn, f_elements); ((ListLiteralNode) cn).getElements().add(f_elements); })))*))? ('}' { addLeafNodeForToken($cn, null); }) ; r_constructorCall returns [CompositeNode cn] @init{ cn = factory.createConstructorCallNode(); } : - ('new' { addLeafNodeForToken($cn, null); }) (f_unnamed48=r_simpleType { addToChildren(cn, f_unnamed48); }) + ('new' { addLeafNodeForToken($cn, null); }) (f_unnamed19=r_simpleType { addToChildren(cn, f_unnamed19); }) ; r_booleanLiteral returns [CompositeNode cn] @@ -413,7 +404,7 @@ r_numberLiteral returns [CompositeNode cn] r_collectionExpression returns [CompositeNode cn] @init{ cn = factory.createCollectionExpressionNode(); } : - ('typeSelect' { addLeafNodeForToken($cn, null); }) ('(' { addLeafNodeForToken($cn, null); }) (f_unnamed49=r_type { addToChildren(cn, f_unnamed49); }) (')' { addLeafNodeForToken($cn, null); }) + ('typeSelect' { addLeafNodeForToken($cn, null); }) ('(' { addLeafNodeForToken($cn, null); }) (f_type=r_type { addToChildren(cn, f_type); ((CollectionExpressionNode) cn).setType(f_type); }) (')' { addLeafNodeForToken($cn, null); }) | ((('collect' { addLeafNodeForToken($cn, null); }) | ('select' { addLeafNodeForToken($cn, null); }) | ('selectFirst' { addLeafNodeForToken($cn, null); }) @@ -421,7 +412,7 @@ r_collectionExpression returns [CompositeNode cn] | ('exists' { addLeafNodeForToken($cn, null); }) | ('notExists' { addLeafNodeForToken($cn, null); }) | ('sortBy' { addLeafNodeForToken($cn, null); }) - | ('forAll' { addLeafNodeForToken($cn, null); }))) ('(' { addLeafNodeForToken($cn, null); }) (((f_unnamed50=r_identifier { addToChildren(cn, f_unnamed50); }) ('|' { addLeafNodeForToken($cn, null); })))? (f_unnamed51=r_expression { addToChildren(cn, f_unnamed51); }) (')' { addLeafNodeForToken($cn, null); }) + | ('forAll' { addLeafNodeForToken($cn, null); }))) ('(' { addLeafNodeForToken($cn, null); }) (((f_variable=r_identifier { addToChildren(cn, f_variable); ((CollectionExpressionNode) cn).setVariable(f_variable); }) ('|' { addLeafNodeForToken($cn, null); })))? (f_expression=r_expression { addToChildren(cn, f_expression); ((CollectionExpressionNode) cn).setExpression(f_expression); }) (')' { addLeafNodeForToken($cn, null); }) ; r_declaredParameterList returns [CompositeNode cn] @@ -450,9 +441,9 @@ r_type returns [CompositeNode cn] : r_collectionType returns [CompositeNode cn] @init{ cn = factory.createCollectionTypeNode(); } : - ((('Collection' { addLeafNodeForToken($cn, null); }) - | ('List' { addLeafNodeForToken($cn, null); }) - | ('Set' { addLeafNodeForToken($cn, null); }))) ((('[' { addLeafNodeForToken($cn, null); }) (f_unnamed52=r_simpleType { addToChildren(cn, f_unnamed52); }) (']' { addLeafNodeForToken($cn, null); })))? + ((('Collection' { addLeafNodeForToken($cn, "collectionType"); }) + | ('List' { addLeafNodeForToken($cn, "collectionType"); }) + | ('Set' { addLeafNodeForToken($cn, "collectionType"); }))) ((('[' { addLeafNodeForToken($cn, null); }) (f_elementType=r_simpleType { addToChildren(cn, f_elementType); ((CollectionTypeNode) cn).setElementType(f_elementType); }) (']' { addLeafNodeForToken($cn, null); })))? ; r_simpleType returns [CompositeNode cn] 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 4bc857ac..15821ec5 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-12 10:28:25 +// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-13 07:58:07 package org.eclipse.xpand3.parser; @@ -1785,10 +1785,10 @@ public class Xpand3NodeLexer extends Lexer { public void mIntLiteral() throws RecognitionException { try { int _type = IntLiteral; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:3: ( '0' | '1' .. '9' ( '0' .. '9' )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:3: ( '0' | '1' .. '9' ( '0' .. '9' )* ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:3: ( '0' | '1' .. '9' ( '0' .. '9' )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:3: ( '0' | '1' .. '9' ( '0' .. '9' )* ) int alt2=2; int LA2_0 = input.LA(1); @@ -1800,23 +1800,23 @@ public class Xpand3NodeLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("472:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input); + new NoViableAltException("463:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input); throw nvae; } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:4: '0' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:4: '0' { match('0'); } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:10: '1' .. '9' ( '0' .. '9' )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:10: '1' .. '9' ( '0' .. '9' )* { matchRange('1','9'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:19: ( '0' .. '9' )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:19: ( '0' .. '9' )* loop1: do { int alt1=2; @@ -1829,7 +1829,7 @@ public class Xpand3NodeLexer extends Lexer { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:472:19: '0' .. '9' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:19: '0' .. '9' { matchRange('0','9'); @@ -1861,7 +1861,7 @@ public class Xpand3NodeLexer extends Lexer { public void mStringLiteral() throws RecognitionException { try { int _type = StringLiteral; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:477:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' ) int alt5=2; int LA5_0 = input.LA(1); @@ -1873,16 +1873,16 @@ public class Xpand3NodeLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("476:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input); + new NoViableAltException("467:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input); throw nvae; } switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:477:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' { match('\"'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:477:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* loop3: do { int alt3=3; @@ -1898,14 +1898,14 @@ public class Xpand3NodeLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:477:10: EscapeSequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:10: EscapeSequence { mEscapeSequence(); } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:477:27: ~ ( '\\\\' | '\\\"' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:27: ~ ( '\\\\' | '\\\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1931,10 +1931,10 @@ public class Xpand3NodeLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:478:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:478:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* loop4: do { int alt4=3; @@ -1950,14 +1950,14 @@ public class Xpand3NodeLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:478:15: EscapeSequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:15: EscapeSequence { mEscapeSequence(); } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:478:32: ~ ( '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:32: ~ ( '\\'' | '\\\\' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1994,7 +1994,7 @@ public class Xpand3NodeLexer extends Lexer { // $ANTLR start EscapeSequence public void mEscapeSequence() throws RecognitionException { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:474:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape ) int alt6=3; int LA6_0 = input.LA(1); @@ -2031,7 +2031,7 @@ public class Xpand3NodeLexer extends Lexer { break; default: NoViableAltException nvae = - new NoViableAltException("482:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input); + new NoViableAltException("473:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input); throw nvae; } @@ -2039,13 +2039,13 @@ public class Xpand3NodeLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("482:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input); + new NoViableAltException("473: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:483:3: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:474: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' ) { @@ -2062,14 +2062,14 @@ public class Xpand3NodeLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:484:9: UnicodeEscape + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:475:9: UnicodeEscape { mUnicodeEscape(); } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:485:9: OctalEscape + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:476:9: OctalEscape { mOctalEscape(); @@ -2086,7 +2086,7 @@ public class Xpand3NodeLexer extends Lexer { // $ANTLR start OctalEscape public void mOctalEscape() throws RecognitionException { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ) int alt7=3; int LA7_0 = input.LA(1); @@ -2119,38 +2119,38 @@ public class Xpand3NodeLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("489:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input); + new NoViableAltException("480: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("489:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input); + new NoViableAltException("480: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:490:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) { match('\\'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:8: ( '0' .. '3' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:9: '0' .. '3' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:8: ( '0' .. '3' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:9: '0' .. '3' { matchRange('0','3'); } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:19: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:20: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:19: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:20: '0' .. '7' { matchRange('0','7'); } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:30: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:490:31: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:30: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:31: '0' .. '7' { matchRange('0','7'); @@ -2160,18 +2160,18 @@ public class Xpand3NodeLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) { match('\\'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:14: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:15: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:14: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:15: '0' .. '7' { matchRange('0','7'); } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:25: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:26: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:25: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:26: '0' .. '7' { matchRange('0','7'); @@ -2181,11 +2181,11 @@ public class Xpand3NodeLexer extends Lexer { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:9: '\\\\' ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:9: '\\\\' ( '0' .. '7' ) { match('\\'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:14: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:15: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:14: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:15: '0' .. '7' { matchRange('0','7'); @@ -2205,8 +2205,8 @@ public class Xpand3NodeLexer extends Lexer { // $ANTLR start UnicodeEscape public void mUnicodeEscape() throws RecognitionException { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:497:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:497:3: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:488:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:488:3: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit { match('\\'); match('u'); @@ -2226,8 +2226,8 @@ public class Xpand3NodeLexer extends Lexer { // $ANTLR start HexDigit public void mHexDigit() throws RecognitionException { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:502:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:502:3: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:493:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:493: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(); @@ -2252,8 +2252,8 @@ public class Xpand3NodeLexer extends Lexer { public void mDEFINE() throws RecognitionException { try { int _type = DEFINE; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:507:3: ( 'DEFINE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:507:3: 'DEFINE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:498:3: ( 'DEFINE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:498:3: 'DEFINE' { xpandMode=true; match("DEFINE"); @@ -2272,8 +2272,8 @@ public class Xpand3NodeLexer extends Lexer { public void mENDDEFINE() throws RecognitionException { try { int _type = ENDDEFINE; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: ( 'ENDDEFINE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: 'ENDDEFINE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:3: ( 'ENDDEFINE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:3: 'ENDDEFINE' { match("ENDDEFINE"); @@ -2292,8 +2292,8 @@ public class Xpand3NodeLexer extends Lexer { public void mAROUND() throws RecognitionException { try { int _type = AROUND; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:517:3: ( 'AROUND' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:517:3: 'AROUND' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: ( 'AROUND' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: 'AROUND' { xpandMode=true; match("AROUND"); @@ -2312,8 +2312,8 @@ public class Xpand3NodeLexer extends Lexer { public void mENDAROUND() throws RecognitionException { try { int _type = ENDAROUND; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:522:3: ( 'ENDAROUND' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:522:3: 'ENDAROUND' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:513:3: ( 'ENDAROUND' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:513:3: 'ENDAROUND' { match("ENDAROUND"); @@ -2332,10 +2332,10 @@ public class Xpand3NodeLexer extends Lexer { public void mIdentifier() throws RecognitionException { try { int _type = Identifier; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:527:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:527:3: ( '^' )? Letter ( Letter | JavaIDDigit )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:3: ( '^' )? Letter ( Letter | JavaIDDigit )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:527:3: ( '^' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:3: ( '^' )? int alt8=2; int LA8_0 = input.LA(1); @@ -2344,7 +2344,7 @@ public class Xpand3NodeLexer extends Lexer { } switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:527:4: '^' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:4: '^' { match('^'); @@ -2354,7 +2354,7 @@ public class Xpand3NodeLexer extends Lexer { } mLetter(); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:527:17: ( Letter | JavaIDDigit )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:17: ( Letter | JavaIDDigit )* loop9: do { int alt9=2; @@ -2401,7 +2401,7 @@ public class Xpand3NodeLexer extends Lexer { // $ANTLR start Letter public void mLetter() throws RecognitionException { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:532: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:523: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') ) { @@ -2426,7 +2426,7 @@ public class Xpand3NodeLexer extends Lexer { // $ANTLR start JavaIDDigit public void mJavaIDDigit() throws RecognitionException { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:550: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:541: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') ) { @@ -2452,8 +2452,8 @@ public class Xpand3NodeLexer extends Lexer { public void mWS() throws RecognitionException { try { int _type = WS; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570:3: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:561:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:561: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(); @@ -2480,12 +2480,12 @@ public class Xpand3NodeLexer extends Lexer { public void mCOMMENT() throws RecognitionException { try { int _type = COMMENT; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575:3: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575:3: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:566:3: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:566:3: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575:8: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:566:8: ( options {greedy=false; } : . )* loop10: do { int alt10=2; @@ -2510,7 +2510,7 @@ public class Xpand3NodeLexer extends Lexer { switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575:36: . + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:566:36: . { matchAny(); @@ -2539,12 +2539,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:580:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) { match("//"); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:8: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:8: (~ ( '\\n' | '\\r' ) )* loop11: do { int alt11=2; @@ -2557,7 +2557,7 @@ public class Xpand3NodeLexer extends Lexer { switch (alt11) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:8: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571: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(); @@ -2578,7 +2578,7 @@ public class Xpand3NodeLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:22: ( ( '\\r' )? '\\n' | EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:22: ( ( '\\r' )? '\\n' | EOF ) int alt13=2; int LA13_0 = input.LA(1); @@ -2589,9 +2589,9 @@ public class Xpand3NodeLexer extends Lexer { alt13=2;} switch (alt13) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:23: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:23: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:23: ( '\\r' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:23: ( '\\r' )? int alt12=2; int LA12_0 = input.LA(1); @@ -2600,7 +2600,7 @@ public class Xpand3NodeLexer extends Lexer { } switch (alt12) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:23: '\\r' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:23: '\\r' { match('\r'); @@ -2614,7 +2614,7 @@ public class Xpand3NodeLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580:34: EOF + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:34: EOF { match(EOF); @@ -2638,8 +2638,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:585:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585:3: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:576:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:576:3: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG { if ( !(!xpandMode) ) { throw new FailedPredicateException(input, "REM_COMMENT_OUT", "!xpandMode"); @@ -2648,7 +2648,7 @@ public class Xpand3NodeLexer extends Lexer { match("REM"); mRG(); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585:31: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:576:31: ( options {greedy=false; } : . )* loop14: do { int alt14=2; @@ -2727,7 +2727,7 @@ public class Xpand3NodeLexer extends Lexer { switch (alt14) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585:59: . + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:576:59: . { matchAny(); @@ -2757,8 +2757,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:590:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:590:3: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:581:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:581:3: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' { if ( !(xpandMode) ) { throw new FailedPredicateException(input, "REM_COMMENT", "xpandMode"); @@ -2766,7 +2766,7 @@ public class Xpand3NodeLexer extends Lexer { match("REM"); mRG(); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:590:27: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:581:27: ( options {greedy=false; } : . )* loop15: do { int alt15=2; @@ -2836,7 +2836,7 @@ public class Xpand3NodeLexer extends Lexer { switch (alt15) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:590:55: . + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:581:55: . { matchAny(); @@ -2865,14 +2865,14 @@ public class Xpand3NodeLexer extends Lexer { public void mTEXT() throws RecognitionException { try { int _type = TEXT; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:3: ({...}? => RG (~ ( LG ) )* ( LG )? ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:3: {...}? => RG (~ ( LG ) )* ( LG )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:3: ({...}? => RG (~ ( LG ) )* ( LG )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:3: {...}? => RG (~ ( LG ) )* ( LG )? { if ( !(xpandMode) ) { throw new FailedPredicateException(input, "TEXT", "xpandMode"); } mRG(); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:21: (~ ( LG ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:21: (~ ( LG ) )* loop16: do { int alt16=2; @@ -2885,7 +2885,7 @@ public class Xpand3NodeLexer extends Lexer { switch (alt16) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:21: ~ ( LG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:21: ~ ( LG ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -2906,7 +2906,7 @@ public class Xpand3NodeLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:28: ( LG )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:28: ( LG )? int alt17=2; int LA17_0 = input.LA(1); @@ -2915,7 +2915,7 @@ public class Xpand3NodeLexer extends Lexer { } switch (alt17) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:29: LG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:29: LG { mLG(); @@ -2938,8 +2938,8 @@ public class Xpand3NodeLexer extends Lexer { public void mLG() throws RecognitionException { try { int _type = LG; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:600:3: ( '\\u00AB' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:600:3: '\\u00AB' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:591:3: ( '\\u00AB' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:591:3: '\\u00AB' { match('\u00AB'); @@ -2956,8 +2956,8 @@ public class Xpand3NodeLexer extends Lexer { public void mRG() throws RecognitionException { try { int _type = RG; - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:605:3: ( '\\u00BB' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:605:3: '\\u00BB' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:596:3: ( '\\u00BB' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:596: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 9a512dac..6fb7f58d 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-12 10:28:24 +// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-13 07:58:06 package org.eclipse.xpand3.parser; @@ -42,7 +42,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { public Xpand3NodeParser(TokenStream input) { super(input); - ruleMemo = new HashMap[63+1]; + ruleMemo = new HashMap[62+1]; } @@ -208,12 +208,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { { int LA3_1 = input.LA(2); - if ( (LA3_1==25) ) { - alt3=1; - } - else if ( (LA3_1==28) ) { + if ( (LA3_1==28) ) { alt3=2; } + else if ( (LA3_1==25) ) { + alt3=1; + } else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = @@ -1689,33 +1689,33 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_textSequence - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:92:1: r_textSequence returns [CompositeNode cn] : (f_text= r_text ) ( ( (f_text= r_text ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:92:1: r_textSequence returns [CompositeNode cn] : (f_texts= r_text ) ( ( (f_texts= r_text ) ) )* ; public CompositeNode r_textSequence() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_text = null; + CompositeNode f_texts = null; cn = factory.createTextSequenceNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:2: ( (f_text= r_text ) ( ( (f_text= r_text ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:2: (f_text= r_text ) ( ( (f_text= r_text ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:2: ( (f_texts= r_text ) ( ( (f_texts= r_text ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:2: (f_texts= r_text ) ( ( (f_texts= r_text ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:2: (f_text= r_text ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:3: f_text= r_text + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:2: (f_texts= r_text ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:3: f_texts= r_text { pushFollow(FOLLOW_r_text_in_r_textSequence732); - f_text=r_text(); + f_texts=r_text(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_text); ((TextSequenceNode) cn).getText().add(f_text); + addToChildren(cn, f_texts); ((TextSequenceNode) cn).getTexts().add(f_texts); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:96: ( ( (f_text= r_text ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:100: ( ( (f_texts= r_text ) ) )* loop20: do { int alt20=2; @@ -1737,20 +1737,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt20) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:97: ( (f_text= r_text ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:101: ( (f_texts= r_text ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:97: ( (f_text= r_text ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:98: (f_text= r_text ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:101: ( (f_texts= r_text ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:102: (f_texts= r_text ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:98: (f_text= r_text ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:99: f_text= r_text + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:102: (f_texts= r_text ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:103: f_texts= r_text { pushFollow(FOLLOW_r_text_in_r_textSequence742); - f_text=r_text(); + f_texts=r_text(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_text); ((TextSequenceNode) cn).getText().add(f_text); + addToChildren(cn, f_texts); ((TextSequenceNode) cn).getTexts().add(f_texts); } } @@ -2032,7 +2032,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_expandStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:117:1: r_expandStatement returns [CompositeNode cn] : ( 'EXPAND' ) (f_name= r_simpleType ) ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:117:1: r_expandStatement returns [CompositeNode cn] : ( 'EXPAND' ) (f_name= r_simpleType ) ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? ; public CompositeNode r_expandStatement() throws RecognitionException { CompositeNode cn = null; @@ -2042,14 +2042,16 @@ public class Xpand3NodeParser extends AbstractNodeParser { CompositeNode f_forExpression = null; + CompositeNode f_forEachExpression = null; + CompositeNode f_separator = null; cn = factory.createExpandStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( ( 'EXPAND' ) (f_name= r_simpleType ) ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'EXPAND' ) (f_name= r_simpleType ) ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( ( 'EXPAND' ) (f_name= r_simpleType ) ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'EXPAND' ) (f_name= r_simpleType ) ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'EXPAND' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:3: 'EXPAND' @@ -2130,7 +2132,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:355: ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:355: ( ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? int alt26=2; int LA26_0 = input.LA(1); @@ -2139,9 +2141,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt26) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) int alt25=2; int LA25_0 = input.LA(1); @@ -2154,7 +2156,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("120:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) )", 25, 0, input); + new NoViableAltException("120:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) )", 25, 0, input); throw nvae; } @@ -2201,13 +2203,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:4: ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:4: ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:4: ( ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:5: ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:4: ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:5: ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:5: ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:6: ( 'FOREACH' ) (f_forExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:5: ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:6: ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:6: ( 'FOREACH' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:7: 'FOREACH' @@ -2219,20 +2221,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:54: (f_forExpression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:55: f_forExpression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:54: (f_forEachExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:55: f_forEachExpression= r_expression { pushFollow(FOLLOW_r_expression_in_r_expandStatement941); - f_forExpression=r_expression(); + f_forEachExpression=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_forExpression); ((ExpandStatementNode) cn).setForExpression(f_forExpression); + addToChildren(cn, f_forEachExpression); ((ExpandStatementNode) cn).setForEachExpression(f_forEachExpression); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:187: ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:203: ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? int alt24=2; int LA24_0 = input.LA(1); @@ -2241,13 +2243,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt24) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:188: ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:204: ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:188: ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:189: ( 'SEPARATOR' ) (f_separator= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:204: ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:205: ( 'SEPARATOR' ) (f_separator= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:189: ( 'SEPARATOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:190: 'SEPARATOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:205: ( 'SEPARATOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:206: 'SEPARATOR' { match(input,40,FOLLOW_40_in_r_expandStatement949); if (failed) return cn; if ( backtracking==0 ) { @@ -2256,8 +2258,8 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:239: (f_separator= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:240: f_separator= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:255: (f_separator= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:256: f_separator= r_expression { pushFollow(FOLLOW_r_expression_in_r_expandStatement957); f_separator=r_expression(); @@ -2700,7 +2702,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_ifStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:142:1: r_ifStatement returns [CompositeNode cn] : ( 'IF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) (f_elseIf= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:142:1: r_ifStatement returns [CompositeNode cn] : ( 'IF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) (f_elseIfs= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) ; public CompositeNode r_ifStatement() throws RecognitionException { CompositeNode cn = null; @@ -2708,7 +2710,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { CompositeNode f_sequence = null; - CompositeNode f_elseIf = null; + CompositeNode f_elseIfs = null; CompositeNode f_else = null; @@ -2716,8 +2718,8 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createIfStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( ( 'IF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) (f_elseIf= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'IF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) (f_elseIf= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( ( 'IF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) (f_elseIfs= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'IF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) (f_elseIfs= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'IF' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:3: 'IF' @@ -2755,7 +2757,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:269: (f_elseIf= r_elseIfStatement )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:269: (f_elseIfs= r_elseIfStatement )* loop31: do { int alt31=2; @@ -2768,14 +2770,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt31) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:270: f_elseIf= r_elseIfStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:270: f_elseIfs= r_elseIfStatement { pushFollow(FOLLOW_r_elseIfStatement_in_r_ifStatement1207); - f_elseIf=r_elseIfStatement(); + f_elseIfs=r_elseIfStatement(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_elseIf); ((IfStatementNode) cn).getElseIf().add(f_elseIf); + addToChildren(cn, f_elseIfs); ((IfStatementNode) cn).getElseIfs().add(f_elseIfs); } } @@ -2786,7 +2788,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:382: (f_else= r_elseStatement )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:386: (f_else= r_elseStatement )? int alt32=2; int LA32_0 = input.LA(1); @@ -2795,7 +2797,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt32) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:383: f_else= r_elseStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:387: f_else= r_elseStatement { pushFollow(FOLLOW_r_elseStatement_in_r_ifStatement1216); f_else=r_elseStatement(); @@ -2810,8 +2812,8 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:479: ( 'ENDIF' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:480: 'ENDIF' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:483: ( 'ENDIF' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:484: 'ENDIF' { match(input,48,FOLLOW_48_in_r_ifStatement1223); if (failed) return cn; if ( backtracking==0 ) { @@ -3215,24 +3217,24 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_check - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:172:1: r_check returns [CompositeNode cn] : ( 'context' ) (f_unnamed0= r_type ) ( ( ( 'if' ) (f_unnamed1= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (f_unnamed2= r_expression ) ( ':' ) (f_unnamed3= r_expression ) ( ';' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:172:1: r_check returns [CompositeNode cn] : ( 'context' ) (f_type= r_type ) ( ( ( 'if' ) (f_ifExpression= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (f_message= r_expression ) ( ':' ) (f_constraint= r_expression ) ( ';' ) ; public CompositeNode r_check() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed0 = null; + CompositeNode f_type = null; - CompositeNode f_unnamed1 = null; + CompositeNode f_ifExpression = null; - CompositeNode f_unnamed2 = null; + CompositeNode f_message = null; - CompositeNode f_unnamed3 = null; + CompositeNode f_constraint = null; cn = factory.createCheckNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( ( 'context' ) (f_unnamed0= r_type ) ( ( ( 'if' ) (f_unnamed1= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (f_unnamed2= r_expression ) ( ':' ) (f_unnamed3= r_expression ) ( ';' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( 'context' ) (f_unnamed0= r_type ) ( ( ( 'if' ) (f_unnamed1= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (f_unnamed2= r_expression ) ( ':' ) (f_unnamed3= r_expression ) ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( ( 'context' ) (f_type= r_type ) ( ( ( 'if' ) (f_ifExpression= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (f_message= r_expression ) ( ':' ) (f_constraint= r_expression ) ( ';' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( 'context' ) (f_type= r_type ) ( ( ( 'if' ) (f_ifExpression= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (f_message= r_expression ) ( ':' ) (f_constraint= r_expression ) ( ';' ) { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:2: ( 'context' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:3: 'context' @@ -3244,20 +3246,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:50: (f_unnamed0= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:51: f_unnamed0= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:50: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:51: f_type= r_type { pushFollow(FOLLOW_r_type_in_r_check1474); - f_unnamed0=r_type(); + f_type=r_type(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed0); + addToChildren(cn, f_type); ((CheckNode) cn).setType(f_type); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:105: ( ( ( 'if' ) (f_unnamed1= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:131: ( ( ( 'if' ) (f_ifExpression= r_expression ) ) )? int alt34=2; int LA34_0 = input.LA(1); @@ -3266,13 +3268,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt34) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:106: ( ( 'if' ) (f_unnamed1= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:132: ( ( 'if' ) (f_ifExpression= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:106: ( ( 'if' ) (f_unnamed1= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:107: ( 'if' ) (f_unnamed1= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:132: ( ( 'if' ) (f_ifExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:133: ( 'if' ) (f_ifExpression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:107: ( 'if' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:108: 'if' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:133: ( 'if' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:134: 'if' { match(input,60,FOLLOW_60_in_r_check1482); if (failed) return cn; if ( backtracking==0 ) { @@ -3281,15 +3283,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:150: (f_unnamed1= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:151: f_unnamed1= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:176: (f_ifExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:177: f_ifExpression= r_expression { pushFollow(FOLLOW_r_expression_in_r_check1490); - f_unnamed1=r_expression(); + f_ifExpression=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed1); + addToChildren(cn, f_ifExpression); ((CheckNode) cn).setIfExpression(f_ifExpression); } } @@ -3303,10 +3305,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:214: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:215: ( ( 'ERROR' ) | ( 'WARNING' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:298: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:299: ( ( 'ERROR' ) | ( 'WARNING' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:215: ( ( 'ERROR' ) | ( 'WARNING' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:299: ( ( 'ERROR' ) | ( 'WARNING' ) ) int alt35=2; int LA35_0 = input.LA(1); @@ -3319,20 +3321,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("175:215: ( ( 'ERROR' ) | ( 'WARNING' ) )", 35, 0, input); + new NoViableAltException("175:299: ( ( 'ERROR' ) | ( 'WARNING' ) )", 35, 0, input); throw nvae; } switch (alt35) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:216: ( 'ERROR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:300: ( 'ERROR' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:216: ( 'ERROR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:217: 'ERROR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:300: ( 'ERROR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:301: 'ERROR' { match(input,37,FOLLOW_37_in_r_check1501); if (failed) return cn; if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); + addLeafNodeForToken(cn, "error"); } } @@ -3348,7 +3350,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { { match(input,61,FOLLOW_61_in_r_check1510); if (failed) return cn; if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); + addLeafNodeForToken(cn, "warning"); } } @@ -3362,21 +3364,21 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:54: (f_unnamed2= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:55: f_unnamed2= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:59: (f_message= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:60: f_message= r_expression { pushFollow(FOLLOW_r_expression_in_r_check1520); - f_unnamed2=r_expression(); + f_message=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed2); + addToChildren(cn, f_message); ((CheckNode) cn).setMessage(f_message); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:115: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:116: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:158: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:159: ':' { match(input,62,FOLLOW_62_in_r_check1526); if (failed) return cn; if ( backtracking==0 ) { @@ -3385,21 +3387,21 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:157: (f_unnamed3= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:158: f_unnamed3= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:200: (f_constraint= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:201: f_constraint= r_expression { pushFollow(FOLLOW_r_expression_in_r_check1534); - f_unnamed3=r_expression(); + f_constraint=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed3); + addToChildren(cn, f_constraint); ((CheckNode) cn).setConstraint(f_constraint); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:218: ( ';' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:219: ';' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:311: ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:312: ';' { match(input,27,FOLLOW_27_in_r_check1540); if (failed) return cn; if ( backtracking==0 ) { @@ -3424,22 +3426,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_around - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:179:1: r_around returns [CompositeNode cn] : ( 'around' ) (f_unnamed4= r_pointcut ) ( '(' ) ( ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed6= r_expression ) ( ';' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:179:1: r_around returns [CompositeNode cn] : ( 'around' ) (f_unnamed0= r_pointcut ) ( '(' ) ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed2= r_expression ) ( ';' ) ; public CompositeNode r_around() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed4 = null; + CompositeNode f_unnamed0 = null; - CompositeNode f_unnamed5 = null; + CompositeNode f_unnamed1 = null; - CompositeNode f_unnamed6 = null; + CompositeNode f_unnamed2 = null; cn = factory.createAroundNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( ( 'around' ) (f_unnamed4= r_pointcut ) ( '(' ) ( ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed6= r_expression ) ( ';' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( 'around' ) (f_unnamed4= r_pointcut ) ( '(' ) ( ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed6= r_expression ) ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( ( 'around' ) (f_unnamed0= r_pointcut ) ( '(' ) ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed2= r_expression ) ( ';' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( 'around' ) (f_unnamed0= r_pointcut ) ( '(' ) ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed2= r_expression ) ( ';' ) { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( 'around' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:3: 'around' @@ -3451,15 +3453,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:49: (f_unnamed4= r_pointcut ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:50: f_unnamed4= r_pointcut + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:49: (f_unnamed0= r_pointcut ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:50: f_unnamed0= r_pointcut { pushFollow(FOLLOW_r_pointcut_in_r_around1572); - f_unnamed4=r_pointcut(); + f_unnamed0=r_pointcut(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed4); + addToChildren(cn, f_unnamed0); } } @@ -3474,7 +3476,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:150: ( ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:150: ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? int alt39=2; int LA39_0 = input.LA(1); @@ -3483,9 +3485,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt39) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:151: ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:151: ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) int alt38=2; int LA38_0 = input.LA(1); @@ -3498,23 +3500,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("182:151: ( (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 38, 0, input); + new NoViableAltException("182:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 38, 0, input); throw nvae; } switch (alt38) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:152: (f_unnamed5= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:152: (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:152: (f_unnamed5= r_declaredParameterList ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:153: f_unnamed5= r_declaredParameterList + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:152: (f_unnamed1= r_declaredParameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:153: f_unnamed1= r_declaredParameterList { pushFollow(FOLLOW_r_declaredParameterList_in_r_around1588); - f_unnamed5=r_declaredParameterList(); + f_unnamed1=r_declaredParameterList(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed5); + addToChildren(cn, f_unnamed1); } } @@ -3621,15 +3623,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:133: (f_unnamed6= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:134: f_unnamed6= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:133: (f_unnamed2= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:134: f_unnamed2= r_expression { pushFollow(FOLLOW_r_expression_in_r_around1638); - f_unnamed6=r_expression(); + f_unnamed2=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed6); + addToChildren(cn, f_unnamed2); } } @@ -3660,25 +3662,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_pointcut - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:1: r_pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (f_unnamed7= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:186:1: r_pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* ; public CompositeNode r_pointcut() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed7 = null; + CompositeNode f_unnamed3 = null; - CompositeNode f_unnamed8 = null; + CompositeNode f_unnamed4 = null; cn = factory.createPointcutNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:2: ( ( ( ( '*' ) | (f_unnamed7= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:2: ( ( ( '*' ) | (f_unnamed7= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:2: ( ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:2: ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:2: ( ( ( '*' ) | (f_unnamed7= r_identifier ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:3: ( ( '*' ) | (f_unnamed7= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:2: ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:3: ( ( '*' ) | (f_unnamed3= r_identifier ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:3: ( ( '*' ) | (f_unnamed7= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:3: ( ( '*' ) | (f_unnamed3= r_identifier ) ) int alt40=2; int LA40_0 = input.LA(1); @@ -3691,7 +3693,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("189:3: ( ( '*' ) | (f_unnamed7= r_identifier ) )", 40, 0, input); + new NoViableAltException("189:3: ( ( '*' ) | (f_unnamed3= r_identifier ) )", 40, 0, input); throw nvae; } @@ -3713,17 +3715,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed7= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed3= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed7= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:5: f_unnamed7= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed3= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:5: f_unnamed3= r_identifier { pushFollow(FOLLOW_r_identifier_in_r_pointcut1681); - f_unnamed7=r_identifier(); + f_unnamed3=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed7); + addToChildren(cn, f_unnamed3); } } @@ -3737,7 +3739,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:67: ( ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:67: ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* loop42: do { int alt42=2; @@ -3750,9 +3752,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt42) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:68: ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:68: ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) int alt41=3; switch ( input.LA(1) ) { case 33: @@ -3773,7 +3775,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("190:68: ( ( '*' ) | (f_unnamed8= r_identifier ) | ( '::' ) )", 41, 0, input); + new NoViableAltException("190:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) )", 41, 0, input); throw nvae; } @@ -3796,17 +3798,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: (f_unnamed8= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: (f_unnamed4= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: (f_unnamed8= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:5: f_unnamed8= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: (f_unnamed4= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:5: f_unnamed4= r_identifier { pushFollow(FOLLOW_r_identifier_in_r_pointcut1702); - f_unnamed8=r_identifier(); + f_unnamed4=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed8); + addToChildren(cn, f_unnamed4); } } @@ -3858,7 +3860,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_extension - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:1: r_extension returns [CompositeNode cn] : ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (f_returnType= r_type )? (f_name= r_identifier ) ( '(' ) (f_paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:1: r_extension returns [CompositeNode cn] : ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (f_returnType= r_type )? (f_name= r_identifier ) ( '(' ) (f_paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) ; public CompositeNode r_extension() throws RecognitionException { CompositeNode cn = null; @@ -3872,9 +3874,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { CompositeNode f_javaName = null; - CompositeNode f_unnamed9 = null; + CompositeNode f_unnamed5 = null; - CompositeNode f_unnamed10 = null; + CompositeNode f_unnamed6 = null; CompositeNode f_extendBody = null; @@ -3882,8 +3884,8 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createExtensionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:2: ( ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (f_returnType= r_type )? (f_name= r_identifier ) ( '(' ) (f_paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (f_returnType= r_type )? (f_name= r_identifier ) ( '(' ) (f_paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:2: ( ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (f_returnType= r_type )? (f_name= r_identifier ) ( '(' ) (f_paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (f_returnType= r_type )? (f_name= r_identifier ) ( '(' ) (f_paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* loop44: @@ -4085,10 +4087,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:508: ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:509: ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:508: ( ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:509: ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:509: ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:509: ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) int alt49=2; int LA49_0 = input.LA(1); @@ -4101,13 +4103,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("200:509: ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) )", 49, 0, input); + new NoViableAltException("200:509: ( ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) )", 49, 0, input); throw nvae; } switch (alt49) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:510: ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:510: ( 'JAVA' ) (f_javaReturnType= r_javaType ) ( '.' ) (f_javaName= r_identifier ) ( '(' ) ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:510: ( 'JAVA' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:511: 'JAVA' @@ -4165,7 +4167,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:875: ( ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:875: ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? int alt48=2; int LA48_0 = input.LA(1); @@ -4174,25 +4176,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt48) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:876: ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:876: ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:876: ( (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:877: (f_unnamed9= r_javaType ) ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:876: ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:877: (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:877: (f_unnamed9= r_javaType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:878: f_unnamed9= r_javaType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:877: (f_unnamed5= r_javaType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:878: f_unnamed5= r_javaType { pushFollow(FOLLOW_r_javaType_in_r_extension1851); - f_unnamed9=r_javaType(); + f_unnamed5=r_javaType(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed9); + addToChildren(cn, f_unnamed5); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:936: ( ( ( ',' ) (f_unnamed10= r_javaType ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:936: ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* loop47: do { int alt47=2; @@ -4205,10 +4207,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt47) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:937: ( ( ',' ) (f_unnamed10= r_javaType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:937: ( ( ',' ) (f_unnamed6= r_javaType ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:937: ( ( ',' ) (f_unnamed10= r_javaType ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:938: ( ',' ) (f_unnamed10= r_javaType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:937: ( ( ',' ) (f_unnamed6= r_javaType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:938: ( ',' ) (f_unnamed6= r_javaType ) { // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:938: ( ',' ) // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:939: ',' @@ -4220,15 +4222,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:980: (f_unnamed10= r_javaType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:981: f_unnamed10= r_javaType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:980: (f_unnamed6= r_javaType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:981: f_unnamed6= r_javaType { pushFollow(FOLLOW_r_javaType_in_r_extension1867); - f_unnamed10=r_javaType(); + f_unnamed6=r_javaType(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed10); + addToChildren(cn, f_unnamed6); } } @@ -4254,8 +4256,8 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:1047: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:1048: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:1045: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:1046: ')' { match(input,34,FOLLOW_34_in_r_extension1879); if (failed) return cn; if ( backtracking==0 ) { @@ -4318,35 +4320,35 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_javaType - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:204:1: r_javaType returns [CompositeNode cn] : (f_unnamed11= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:204:1: r_javaType returns [CompositeNode cn] : (f_unnamed7= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ; public CompositeNode r_javaType() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed11 = null; + CompositeNode f_unnamed7 = null; - CompositeNode f_unnamed12 = null; + CompositeNode f_unnamed8 = null; cn = factory.createJavaTypeNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: ( (f_unnamed11= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: (f_unnamed11= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: ( (f_unnamed7= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: (f_unnamed7= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: (f_unnamed11= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:3: f_unnamed11= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:2: (f_unnamed7= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:3: f_unnamed7= r_identifier { pushFollow(FOLLOW_r_identifier_in_r_javaType1924); - f_unnamed11=r_identifier(); + f_unnamed7=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed11); + addToChildren(cn, f_unnamed7); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:65: ( ( ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:63: ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* loop51: do { int alt51=2; @@ -4374,13 +4376,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt51) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:66: ( ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:64: ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:66: ( ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:67: ( '.' ) ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:64: ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:65: ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:67: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:68: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:65: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:66: '.' { match(input,69,FOLLOW_69_in_r_javaType1932); if (failed) return cn; if ( backtracking==0 ) { @@ -4389,10 +4391,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:109: ( ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:110: ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:107: ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:108: ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:110: ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:108: ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) int alt50=4; switch ( input.LA(1) ) { case Identifier: @@ -4418,24 +4420,24 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("207:110: ( (f_unnamed12= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 50, 0, input); + new NoViableAltException("207:108: ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 50, 0, input); throw nvae; } switch (alt50) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:111: (f_unnamed12= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:109: (f_unnamed8= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:111: (f_unnamed12= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:112: f_unnamed12= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:109: (f_unnamed8= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:110: f_unnamed8= r_identifier { pushFollow(FOLLOW_r_identifier_in_r_javaType1942); - f_unnamed12=r_identifier(); + f_unnamed8=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed12); + addToChildren(cn, f_unnamed8); } } @@ -4525,34 +4527,34 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_test_expression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:213:1: r_test_expression returns [CompositeNode cn] : (f_unnamed13= r_expression ) ( EOF ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:213:1: r_test_expression returns [CompositeNode cn] : (f_unnamed9= r_expression ) ( EOF ) ; public CompositeNode r_test_expression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed13 = null; + CompositeNode f_unnamed9 = null; cn = factory.createTest_expressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: ( (f_unnamed13= r_expression ) ( EOF ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: (f_unnamed13= r_expression ) ( EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: ( (f_unnamed9= r_expression ) ( EOF ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: (f_unnamed9= r_expression ) ( EOF ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: (f_unnamed13= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:3: f_unnamed13= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:2: (f_unnamed9= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:3: f_unnamed9= r_expression { pushFollow(FOLLOW_r_expression_in_r_test_expression2005); - f_unnamed13=r_expression(); + f_unnamed9=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed13); + addToChildren(cn, f_unnamed9); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:65: ( EOF ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:66: EOF + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:63: ( EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:64: EOF { match(input,EOF,FOLLOW_EOF_in_r_test_expression2011); if (failed) return cn; @@ -4577,28 +4579,26 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_expression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:1: r_expression returns [CompositeNode cn] : (f_unnamed14= r_letExpression ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:1: r_expression returns [CompositeNode cn] : ( r_letExpression ) ; public CompositeNode r_expression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed14 = null; + CompositeNode r_letExpression17 = null; - cn = factory.createExpressionNode(); - try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:2: ( (f_unnamed14= r_letExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:2: (f_unnamed14= r_letExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:2: ( ( r_letExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:2: ( r_letExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:2: (f_unnamed14= r_letExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:3: f_unnamed14= r_letExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:2: ( r_letExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:221:3: r_letExpression { - pushFollow(FOLLOW_r_letExpression_in_r_expression2040); - f_unnamed14=r_letExpression(); + pushFollow(FOLLOW_r_letExpression_in_r_expression2028); + r_letExpression17=r_letExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed14); + cn = r_letExpression17; } } @@ -4606,9 +4606,6 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - if ( backtracking==0 ) { - cn = normalize(cn); - } } catch (RecognitionException re) { reportError(re); @@ -4622,23 +4619,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_letExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:1: r_letExpression returns [CompositeNode cn] : ( ( 'let' ) (f_unnamed15= r_identifier ) ( '=' ) (f_unnamed16= r_castedExpression ) ( ':' ) (f_unnamed17= r_expression ) | (f_unnamed18= r_castedExpression ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:224:1: r_letExpression returns [CompositeNode cn] : ( ( 'let' ) (f_unnamed10= r_identifier ) ( '=' ) (f_unnamed11= r_castedExpression ) ( ':' ) (f_unnamed12= r_expression ) | (f_unnamed13= r_castedExpression ) ); public CompositeNode r_letExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed15 = null; + CompositeNode f_unnamed10 = null; - CompositeNode f_unnamed16 = null; + CompositeNode f_unnamed11 = null; - CompositeNode f_unnamed17 = null; + CompositeNode f_unnamed12 = null; - CompositeNode f_unnamed18 = null; + CompositeNode f_unnamed13 = null; cn = factory.createLetExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:2: ( ( 'let' ) (f_unnamed15= r_identifier ) ( '=' ) (f_unnamed16= r_castedExpression ) ( ':' ) (f_unnamed17= r_expression ) | (f_unnamed18= r_castedExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:2: ( ( 'let' ) (f_unnamed10= r_identifier ) ( '=' ) (f_unnamed11= r_castedExpression ) ( ':' ) (f_unnamed12= r_expression ) | (f_unnamed13= r_castedExpression ) ) int alt52=2; int LA52_0 = input.LA(1); @@ -4651,79 +4648,79 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("227:1: r_letExpression returns [CompositeNode cn] : ( ( 'let' ) (f_unnamed15= r_identifier ) ( '=' ) (f_unnamed16= r_castedExpression ) ( ':' ) (f_unnamed17= r_expression ) | (f_unnamed18= r_castedExpression ) );", 52, 0, input); + new NoViableAltException("224:1: r_letExpression returns [CompositeNode cn] : ( ( 'let' ) (f_unnamed10= r_identifier ) ( '=' ) (f_unnamed11= r_castedExpression ) ( ':' ) (f_unnamed12= r_expression ) | (f_unnamed13= r_castedExpression ) );", 52, 0, input); throw nvae; } switch (alt52) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:2: ( 'let' ) (f_unnamed15= r_identifier ) ( '=' ) (f_unnamed16= r_castedExpression ) ( ':' ) (f_unnamed17= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:2: ( 'let' ) (f_unnamed10= r_identifier ) ( '=' ) (f_unnamed11= r_castedExpression ) ( ':' ) (f_unnamed12= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:2: ( 'let' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:3: 'let' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:2: ( 'let' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:3: 'let' { - match(input,73,FOLLOW_73_in_r_letExpression2069); if (failed) return cn; + match(input,73,FOLLOW_73_in_r_letExpression2057); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:46: (f_unnamed15= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:47: f_unnamed15= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:46: (f_unnamed10= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:47: f_unnamed10= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_letExpression2077); - f_unnamed15=r_identifier(); + pushFollow(FOLLOW_r_identifier_in_r_letExpression2065); + f_unnamed10=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed15); + addToChildren(cn, f_unnamed10); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:109: ( '=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:110: '=' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:109: ( '=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:110: '=' { - match(input,74,FOLLOW_74_in_r_letExpression2083); if (failed) return cn; + match(input,74,FOLLOW_74_in_r_letExpression2071); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:151: (f_unnamed16= r_castedExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:152: f_unnamed16= r_castedExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:151: (f_unnamed11= r_castedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:152: f_unnamed11= r_castedExpression { - pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2091); - f_unnamed16=r_castedExpression(); + pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2079); + f_unnamed11=r_castedExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed16); + addToChildren(cn, f_unnamed11); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:220: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:221: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:220: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:221: ':' { - match(input,62,FOLLOW_62_in_r_letExpression2097); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_letExpression2085); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:262: (f_unnamed17= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231:263: f_unnamed17= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:262: (f_unnamed12= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:263: f_unnamed12= r_expression { - pushFollow(FOLLOW_r_expression_in_r_letExpression2105); - f_unnamed17=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_letExpression2093); + f_unnamed12=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed17); + addToChildren(cn, f_unnamed12); } } @@ -4732,17 +4729,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:232:4: (f_unnamed18= r_castedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:229:4: (f_unnamed13= r_castedExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:232:4: (f_unnamed18= r_castedExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:232:5: f_unnamed18= r_castedExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:229:4: (f_unnamed13= r_castedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:229:5: f_unnamed13= r_castedExpression { - pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2116); - f_unnamed18=r_castedExpression(); + pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2104); + f_unnamed13=r_castedExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed18); + addToChildren(cn, f_unnamed13); } } @@ -4768,72 +4765,72 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_castedExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:1: r_castedExpression returns [CompositeNode cn] : ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_unnamed19= r_type ) ( ')' ) (f_unnamed20= r_chainExpression ) ) | (f_unnamed21= r_chainExpression ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:232:1: r_castedExpression returns [CompositeNode cn] : ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) | (f_unnamed14= r_chainExpression ) ); public CompositeNode r_castedExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed19 = null; + CompositeNode f_type = null; - CompositeNode f_unnamed20 = null; + CompositeNode f_target = null; - CompositeNode f_unnamed21 = null; + CompositeNode f_unnamed14 = null; cn = factory.createCastedExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_unnamed19= r_type ) ( ')' ) (f_unnamed20= r_chainExpression ) ) | (f_unnamed21= r_chainExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:2: ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) | (f_unnamed14= r_chainExpression ) ) int alt53=2; alt53 = dfa53.predict(input); switch (alt53) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_unnamed19= r_type ) ( ')' ) (f_unnamed20= r_chainExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:2: ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:38: ( ( '(' ) (f_unnamed19= r_type ) ( ')' ) (f_unnamed20= r_chainExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:39: ( '(' ) (f_unnamed19= r_type ) ( ')' ) (f_unnamed20= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:38: ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:39: ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:39: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:40: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:39: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:40: '(' { - match(input,31,FOLLOW_31_in_r_castedExpression2156); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_castedExpression2144); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:81: (f_unnamed19= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:82: f_unnamed19= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:81: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:82: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_castedExpression2164); - f_unnamed19=r_type(); + pushFollow(FOLLOW_r_type_in_r_castedExpression2152); + f_type=r_type(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed19); + addToChildren(cn, f_type); ((CastedExpressionNode) cn).setType(f_type); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:138: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:139: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:173: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:174: ')' { - match(input,34,FOLLOW_34_in_r_castedExpression2170); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_castedExpression2158); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:180: (f_unnamed20= r_chainExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:181: f_unnamed20= r_chainExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:215: (f_target= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:216: f_target= r_chainExpression { - pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2178); - f_unnamed20=r_chainExpression(); + pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2166); + f_target=r_chainExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed20); + addToChildren(cn, f_target); ((CastedExpressionNode) cn).setTarget(f_target); } } @@ -4845,17 +4842,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:4: (f_unnamed21= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:237:4: (f_unnamed14= r_chainExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:4: (f_unnamed21= r_chainExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:5: f_unnamed21= r_chainExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:237:4: (f_unnamed14= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:237:5: f_unnamed14= r_chainExpression { - pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2190); - f_unnamed21=r_chainExpression(); + pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2178); + f_unnamed14=r_chainExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed21); + addToChildren(cn, f_unnamed14); } } @@ -4881,35 +4878,35 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_chainExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:1: r_chainExpression returns [CompositeNode cn] : (f_unnamed22= r_ifExpression ) ( ( ( '->' ) (f_unnamed23= r_ifExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:1: r_chainExpression returns [CompositeNode cn] : (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* ; public CompositeNode r_chainExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed22 = null; + CompositeNode f_first = null; - CompositeNode f_unnamed23 = null; + CompositeNode f_nexts = null; cn = factory.createChainExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:2: ( (f_unnamed22= r_ifExpression ) ( ( ( '->' ) (f_unnamed23= r_ifExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:2: (f_unnamed22= r_ifExpression ) ( ( ( '->' ) (f_unnamed23= r_ifExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:2: ( (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:2: (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:2: (f_unnamed22= r_ifExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:3: f_unnamed22= r_ifExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:2: (f_first= r_ifExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:3: f_first= r_ifExpression { - pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2221); - f_unnamed22=r_ifExpression(); + pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2209); + f_first=r_ifExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed22); + addToChildren(cn, f_first); ((ChainExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:67: ( ( ( '->' ) (f_unnamed23= r_ifExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:105: ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* loop54: do { int alt54=2; @@ -4922,30 +4919,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt54) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:68: ( ( '->' ) (f_unnamed23= r_ifExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:106: ( ( '->' ) (f_nexts= r_ifExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:68: ( ( '->' ) (f_unnamed23= r_ifExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:69: ( '->' ) (f_unnamed23= r_ifExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:106: ( ( '->' ) (f_nexts= r_ifExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:107: ( '->' ) (f_nexts= r_ifExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:69: ( '->' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:70: '->' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:107: ( '->' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:108: '->' { - match(input,75,FOLLOW_75_in_r_chainExpression2229); if (failed) return cn; + match(input,75,FOLLOW_75_in_r_chainExpression2217); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:112: (f_unnamed23= r_ifExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:113: f_unnamed23= r_ifExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:150: (f_nexts= r_ifExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:151: f_nexts= r_ifExpression { - pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2237); - f_unnamed23=r_ifExpression(); + pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2225); + f_nexts=r_ifExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed23); + addToChildren(cn, f_nexts); ((ChainExpressionNode) cn).getNexts().add(f_nexts); } } @@ -4981,27 +4978,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_ifExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:1: r_ifExpression returns [CompositeNode cn] : ( (f_unnamed24= r_switchExpression ) ( ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) )? | ( 'if' ) (f_unnamed27= r_expression ) ( 'then' ) (f_unnamed28= r_switchExpression ) ( ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) )? ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:247:1: r_ifExpression returns [CompositeNode cn] : ( (f_condition0= r_switchExpression ) ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? | ( 'if' ) (f_condition1= r_expression ) ( 'then' ) (f_then= r_switchExpression ) ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? ); public CompositeNode r_ifExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed24 = null; - - CompositeNode f_unnamed25 = null; - - CompositeNode f_unnamed26 = null; + CompositeNode f_condition0 = null; - CompositeNode f_unnamed27 = null; + CompositeNode f_then = null; - CompositeNode f_unnamed28 = null; + CompositeNode f_else = null; - CompositeNode f_unnamed29 = null; + CompositeNode f_condition1 = null; cn = factory.createIfExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:2: ( (f_unnamed24= r_switchExpression ) ( ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) )? | ( 'if' ) (f_unnamed27= r_expression ) ( 'then' ) (f_unnamed28= r_switchExpression ) ( ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:2: ( (f_condition0= r_switchExpression ) ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? | ( 'if' ) (f_condition1= r_expression ) ( 'then' ) (f_then= r_switchExpression ) ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? ) int alt57=2; int LA57_0 = input.LA(1); @@ -5014,28 +5007,28 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("250:1: r_ifExpression returns [CompositeNode cn] : ( (f_unnamed24= r_switchExpression ) ( ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) )? | ( 'if' ) (f_unnamed27= r_expression ) ( 'then' ) (f_unnamed28= r_switchExpression ) ( ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) )? );", 57, 0, input); + new NoViableAltException("247:1: r_ifExpression returns [CompositeNode cn] : ( (f_condition0= r_switchExpression ) ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? | ( 'if' ) (f_condition1= r_expression ) ( 'then' ) (f_then= r_switchExpression ) ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? );", 57, 0, input); throw nvae; } switch (alt57) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:2: (f_unnamed24= r_switchExpression ) ( ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:2: (f_condition0= r_switchExpression ) ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:2: (f_unnamed24= r_switchExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:3: f_unnamed24= r_switchExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:2: (f_condition0= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:3: f_condition0= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2271); - f_unnamed24=r_switchExpression(); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2259); + f_condition0=r_switchExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed24); + addToChildren(cn, f_condition0); ((IfExpressionNode) cn).setCondition0(f_condition0); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:71: ( ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:126: ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? int alt55=2; int LA55_0 = input.LA(1); @@ -5044,53 +5037,53 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt55) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:72: ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:127: ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:72: ( ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:73: ( '?' ) (f_unnamed25= r_expression ) ( ':' ) (f_unnamed26= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:127: ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:128: ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:73: ( '?' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:74: '?' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:128: ( '?' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:129: '?' { - match(input,76,FOLLOW_76_in_r_ifExpression2279); if (failed) return cn; + match(input,76,FOLLOW_76_in_r_ifExpression2267); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:115: (f_unnamed25= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:116: f_unnamed25= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:170: (f_then= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:171: f_then= r_expression { - pushFollow(FOLLOW_r_expression_in_r_ifExpression2287); - f_unnamed25=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_ifExpression2275); + f_then=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed25); + addToChildren(cn, f_then); ((IfExpressionNode) cn).setThen(f_then); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:178: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:179: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:264: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:265: ':' { - match(input,62,FOLLOW_62_in_r_ifExpression2293); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_ifExpression2281); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:220: (f_unnamed26= r_switchExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254:221: f_unnamed26= r_switchExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:306: (f_else= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:307: f_else= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2301); - f_unnamed26=r_switchExpression(); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2289); + f_else=r_switchExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed26); + addToChildren(cn, f_else); ((IfExpressionNode) cn).setElse(f_else); } } @@ -5108,55 +5101,55 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:4: ( 'if' ) (f_unnamed27= r_expression ) ( 'then' ) (f_unnamed28= r_switchExpression ) ( ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:4: ( 'if' ) (f_condition1= r_expression ) ( 'then' ) (f_then= r_switchExpression ) ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:4: ( 'if' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:5: 'if' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:4: ( 'if' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:5: 'if' { - match(input,60,FOLLOW_60_in_r_ifExpression2313); if (failed) return cn; + match(input,60,FOLLOW_60_in_r_ifExpression2301); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:47: (f_unnamed27= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:48: f_unnamed27= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:47: (f_condition1= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:48: f_condition1= r_expression { - pushFollow(FOLLOW_r_expression_in_r_ifExpression2321); - f_unnamed27=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_ifExpression2309); + f_condition1=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed27); + addToChildren(cn, f_condition1); ((IfExpressionNode) cn).setCondition1(f_condition1); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:110: ( 'then' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:111: 'then' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:165: ( 'then' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:166: 'then' { - match(input,77,FOLLOW_77_in_r_ifExpression2327); if (failed) return cn; + match(input,77,FOLLOW_77_in_r_ifExpression2315); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:155: (f_unnamed28= r_switchExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:156: f_unnamed28= r_switchExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:210: (f_then= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:211: f_then= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2335); - f_unnamed28=r_switchExpression(); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2323); + f_then=r_switchExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed28); + addToChildren(cn, f_then); ((IfExpressionNode) cn).setThen(f_then); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:224: ( ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:310: ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? int alt56=2; int LA56_0 = input.LA(1); @@ -5165,30 +5158,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt56) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:225: ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:311: ( ( 'else' ) (f_else= r_switchExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:225: ( ( 'else' ) (f_unnamed29= r_switchExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:226: ( 'else' ) (f_unnamed29= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:311: ( ( 'else' ) (f_else= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:312: ( 'else' ) (f_else= r_switchExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:226: ( 'else' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:227: 'else' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:312: ( 'else' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:313: 'else' { - match(input,78,FOLLOW_78_in_r_ifExpression2343); if (failed) return cn; + match(input,78,FOLLOW_78_in_r_ifExpression2331); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:271: (f_unnamed29= r_switchExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:272: f_unnamed29= r_switchExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:357: (f_else= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:358: f_else= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2351); - f_unnamed29=r_switchExpression(); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2339); + f_else=r_switchExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed29); + addToChildren(cn, f_else); ((IfExpressionNode) cn).setElse(f_else); } } @@ -5223,23 +5216,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_switchExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:1: r_switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_unnamed31= r_casePart )* ( 'default' ) ( ':' ) (f_unnamed32= r_orExpression ) ( '}' ) | (f_unnamed33= r_orExpression ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:255:1: r_switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_cases= r_casePart )* ( 'default' ) ( ':' ) (f_default= r_orExpression ) ( '}' ) | (f_unnamed15= r_orExpression ) ); public CompositeNode r_switchExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed30 = null; + CompositeNode f_expression = null; - CompositeNode f_unnamed31 = null; + CompositeNode f_cases = null; - CompositeNode f_unnamed32 = null; + CompositeNode f_default = null; - CompositeNode f_unnamed33 = null; + CompositeNode f_unnamed15 = null; cn = factory.createSwitchExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:2: ( ( 'switch' ) ( ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_unnamed31= r_casePart )* ( 'default' ) ( ':' ) (f_unnamed32= r_orExpression ) ( '}' ) | (f_unnamed33= r_orExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:2: ( ( 'switch' ) ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_cases= r_casePart )* ( 'default' ) ( ':' ) (f_default= r_orExpression ) ( '}' ) | (f_unnamed15= r_orExpression ) ) int alt60=2; int LA60_0 = input.LA(1); @@ -5252,25 +5245,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("258:1: r_switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_unnamed31= r_casePart )* ( 'default' ) ( ':' ) (f_unnamed32= r_orExpression ) ( '}' ) | (f_unnamed33= r_orExpression ) );", 60, 0, input); + new NoViableAltException("255:1: r_switchExpression returns [CompositeNode cn] : ( ( 'switch' ) ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_cases= r_casePart )* ( 'default' ) ( ':' ) (f_default= r_orExpression ) ( '}' ) | (f_unnamed15= r_orExpression ) );", 60, 0, input); throw nvae; } switch (alt60) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:2: ( 'switch' ) ( ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_unnamed31= r_casePart )* ( 'default' ) ( ':' ) (f_unnamed32= r_orExpression ) ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:2: ( 'switch' ) ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_cases= r_casePart )* ( 'default' ) ( ':' ) (f_default= r_orExpression ) ( '}' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:2: ( 'switch' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:3: 'switch' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:2: ( 'switch' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:3: 'switch' { - match(input,79,FOLLOW_79_in_r_switchExpression2383); if (failed) return cn; + match(input,79,FOLLOW_79_in_r_switchExpression2371); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:49: ( ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:49: ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? int alt58=2; int LA58_0 = input.LA(1); @@ -5279,38 +5272,38 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt58) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:50: ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:50: ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:50: ( ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:51: ( '(' ) (f_unnamed30= r_orExpression ) ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:50: ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:51: ( '(' ) (f_expression= r_orExpression ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:51: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:52: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:51: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:52: '(' { - match(input,31,FOLLOW_31_in_r_switchExpression2391); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_switchExpression2379); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:93: (f_unnamed30= r_orExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:94: f_unnamed30= r_orExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:93: (f_expression= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:94: f_expression= r_orExpression { - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2399); - f_unnamed30=r_orExpression(); + pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2387); + f_expression=r_orExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed30); + addToChildren(cn, f_expression); ((SwitchExpressionNode) cn).setExpression(f_expression); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:158: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:159: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:217: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:218: ')' { - match(input,34,FOLLOW_34_in_r_switchExpression2405); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_switchExpression2393); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5326,17 +5319,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:203: ( '{' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:204: '{' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:262: ( '{' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:263: '{' { - match(input,80,FOLLOW_80_in_r_switchExpression2414); if (failed) return cn; + match(input,80,FOLLOW_80_in_r_switchExpression2402); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:245: (f_unnamed31= r_casePart )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:304: (f_cases= r_casePart )* loop59: do { int alt59=2; @@ -5349,14 +5342,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt59) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:246: f_unnamed31= r_casePart + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:305: f_cases= r_casePart { - pushFollow(FOLLOW_r_casePart_in_r_switchExpression2422); - f_unnamed31=r_casePart(); + pushFollow(FOLLOW_r_casePart_in_r_switchExpression2410); + f_cases=r_casePart(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed31); + addToChildren(cn, f_cases); ((SwitchExpressionNode) cn).getCases().add(f_cases); } } @@ -5367,43 +5360,43 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:307: ( 'default' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:308: 'default' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:411: ( 'default' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:412: 'default' { - match(input,81,FOLLOW_81_in_r_switchExpression2429); if (failed) return cn; + match(input,81,FOLLOW_81_in_r_switchExpression2417); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:355: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:356: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:459: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:460: ':' { - match(input,62,FOLLOW_62_in_r_switchExpression2435); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_switchExpression2423); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:397: (f_unnamed32= r_orExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:398: f_unnamed32= r_orExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:501: (f_default= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:502: f_default= r_orExpression { - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2443); - f_unnamed32=r_orExpression(); + pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2431); + f_default=r_orExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed32); + addToChildren(cn, f_default); ((SwitchExpressionNode) cn).setDefault(f_default); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:462: ( '}' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:463: '}' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:613: ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:614: '}' { - match(input,82,FOLLOW_82_in_r_switchExpression2449); if (failed) return cn; + match(input,82,FOLLOW_82_in_r_switchExpression2437); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5414,17 +5407,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:4: (f_unnamed33= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:4: (f_unnamed15= r_orExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:4: (f_unnamed33= r_orExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:5: f_unnamed33= r_orExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:4: (f_unnamed15= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:5: f_unnamed15= r_orExpression { - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2460); - f_unnamed33=r_orExpression(); + pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2448); + f_unnamed15=r_orExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed33); + addToChildren(cn, f_unnamed15); } } @@ -5450,63 +5443,63 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_casePart - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:1: r_casePart returns [CompositeNode cn] : ( 'case' ) (f_unnamed34= r_expression ) ( ':' ) (f_unnamed35= r_expression ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:1: r_casePart returns [CompositeNode cn] : ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) ; public CompositeNode r_casePart() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed34 = null; + CompositeNode f_condition = null; - CompositeNode f_unnamed35 = null; + CompositeNode f_expression = null; cn = factory.createCasePartNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:2: ( ( 'case' ) (f_unnamed34= r_expression ) ( ':' ) (f_unnamed35= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:2: ( 'case' ) (f_unnamed34= r_expression ) ( ':' ) (f_unnamed35= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:2: ( ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:2: ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:2: ( 'case' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:3: 'case' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:2: ( 'case' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:3: 'case' { - match(input,83,FOLLOW_83_in_r_casePart2484); if (failed) return cn; + match(input,83,FOLLOW_83_in_r_casePart2472); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:47: (f_unnamed34= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:48: f_unnamed34= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:47: (f_condition= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:48: f_condition= r_expression { - pushFollow(FOLLOW_r_expression_in_r_casePart2492); - f_unnamed34=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_casePart2480); + f_condition=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed34); + addToChildren(cn, f_condition); ((CasePartNode) cn).setCondition(f_condition); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:110: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:111: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:157: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:158: ':' { - match(input,62,FOLLOW_62_in_r_casePart2498); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_casePart2486); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:152: (f_unnamed35= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:153: f_unnamed35= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:199: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:200: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_casePart2506); - f_unnamed35=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_casePart2494); + f_expression=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed35); + addToChildren(cn, f_expression); ((CasePartNode) cn).setExpression(f_expression); } } @@ -5527,35 +5520,35 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_orExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:1: r_orExpression returns [CompositeNode cn] : (f_unnamed36= r_andExpression ) ( ( ( '||' ) (f_unnamed37= r_andExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:1: r_orExpression returns [CompositeNode cn] : (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* ; public CompositeNode r_orExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed36 = null; + CompositeNode f_first = null; - CompositeNode f_unnamed37 = null; + CompositeNode f_nexts = null; cn = factory.createOrExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:2: ( (f_unnamed36= r_andExpression ) ( ( ( '||' ) (f_unnamed37= r_andExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:2: (f_unnamed36= r_andExpression ) ( ( ( '||' ) (f_unnamed37= r_andExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:2: ( (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:2: (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:2: (f_unnamed36= r_andExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:3: f_unnamed36= r_andExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:2: (f_first= r_andExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:3: f_first= r_andExpression { - pushFollow(FOLLOW_r_andExpression_in_r_orExpression2537); - f_unnamed36=r_andExpression(); + pushFollow(FOLLOW_r_andExpression_in_r_orExpression2525); + f_first=r_andExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed36); + addToChildren(cn, f_first); ((OrExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:68: ( ( ( '||' ) (f_unnamed37= r_andExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:103: ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* loop61: do { int alt61=2; @@ -5568,30 +5561,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt61) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:69: ( ( '||' ) (f_unnamed37= r_andExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:104: ( ( '||' ) (f_nexts= r_andExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:69: ( ( '||' ) (f_unnamed37= r_andExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:70: ( '||' ) (f_unnamed37= r_andExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:104: ( ( '||' ) (f_nexts= r_andExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:105: ( '||' ) (f_nexts= r_andExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:70: ( '||' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:71: '||' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:105: ( '||' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:106: '||' { - match(input,84,FOLLOW_84_in_r_orExpression2545); if (failed) return cn; + match(input,84,FOLLOW_84_in_r_orExpression2533); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:113: (f_unnamed37= r_andExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:114: f_unnamed37= r_andExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:148: (f_nexts= r_andExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:149: f_nexts= r_andExpression { - pushFollow(FOLLOW_r_andExpression_in_r_orExpression2553); - f_unnamed37=r_andExpression(); + pushFollow(FOLLOW_r_andExpression_in_r_orExpression2541); + f_nexts=r_andExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed37); + addToChildren(cn, f_nexts); ((OrExpressionNode) cn).getNexts().add(f_nexts); } } @@ -5627,35 +5620,35 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_andExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:1: r_andExpression returns [CompositeNode cn] : (f_unnamed38= r_impliesExpression ) ( ( ( '&&' ) (f_unnamed39= r_impliesExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:1: r_andExpression returns [CompositeNode cn] : (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* ; public CompositeNode r_andExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed38 = null; + CompositeNode f_first = null; - CompositeNode f_unnamed39 = null; + CompositeNode f_nexts = null; cn = factory.createAndExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:2: ( (f_unnamed38= r_impliesExpression ) ( ( ( '&&' ) (f_unnamed39= r_impliesExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:2: (f_unnamed38= r_impliesExpression ) ( ( ( '&&' ) (f_unnamed39= r_impliesExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:2: ( (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:2: (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:2: (f_unnamed38= r_impliesExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:3: f_unnamed38= r_impliesExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:2: (f_first= r_impliesExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:3: f_first= r_impliesExpression { - pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2587); - f_unnamed38=r_impliesExpression(); + pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2575); + f_first=r_impliesExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed38); + addToChildren(cn, f_first); ((AndExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:72: ( ( ( '&&' ) (f_unnamed39= r_impliesExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:108: ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* loop62: do { int alt62=2; @@ -5668,30 +5661,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt62) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:73: ( ( '&&' ) (f_unnamed39= r_impliesExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:109: ( ( '&&' ) (f_nexts= r_impliesExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:73: ( ( '&&' ) (f_unnamed39= r_impliesExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:74: ( '&&' ) (f_unnamed39= r_impliesExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:109: ( ( '&&' ) (f_nexts= r_impliesExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:110: ( '&&' ) (f_nexts= r_impliesExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:74: ( '&&' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:75: '&&' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:110: ( '&&' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:111: '&&' { - match(input,85,FOLLOW_85_in_r_andExpression2595); if (failed) return cn; + match(input,85,FOLLOW_85_in_r_andExpression2583); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:117: (f_unnamed39= r_impliesExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:118: f_unnamed39= r_impliesExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:153: (f_nexts= r_impliesExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:154: f_nexts= r_impliesExpression { - pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2603); - f_unnamed39=r_impliesExpression(); + pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2591); + f_nexts=r_impliesExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed39); + addToChildren(cn, f_nexts); ((AndExpressionNode) cn).getNexts().add(f_nexts); } } @@ -5727,35 +5720,35 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_impliesExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:1: r_impliesExpression returns [CompositeNode cn] : (f_unnamed40= r_relationalExpression ) ( ( ( 'implies' ) (f_unnamed41= r_relationalExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:1: r_impliesExpression returns [CompositeNode cn] : (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* ; public CompositeNode r_impliesExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed40 = null; + CompositeNode f_first = null; - CompositeNode f_unnamed41 = null; + CompositeNode f_nexts = null; cn = factory.createImpliesExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:2: ( (f_unnamed40= r_relationalExpression ) ( ( ( 'implies' ) (f_unnamed41= r_relationalExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:2: (f_unnamed40= r_relationalExpression ) ( ( ( 'implies' ) (f_unnamed41= r_relationalExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:2: ( (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:2: (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:2: (f_unnamed40= r_relationalExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:3: f_unnamed40= r_relationalExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:2: (f_first= r_relationalExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:3: f_first= r_relationalExpression { - pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2637); - f_unnamed40=r_relationalExpression(); + pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2625); + f_first=r_relationalExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed40); + addToChildren(cn, f_first); ((ImpliesExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:75: ( ( ( 'implies' ) (f_unnamed41= r_relationalExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:115: ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* loop63: do { int alt63=2; @@ -5768,30 +5761,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt63) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:76: ( ( 'implies' ) (f_unnamed41= r_relationalExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:116: ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:76: ( ( 'implies' ) (f_unnamed41= r_relationalExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:77: ( 'implies' ) (f_unnamed41= r_relationalExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:116: ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:117: ( 'implies' ) (f_nexts= r_relationalExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:77: ( 'implies' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:78: 'implies' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:117: ( 'implies' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:118: 'implies' { - match(input,86,FOLLOW_86_in_r_impliesExpression2645); if (failed) return cn; + match(input,86,FOLLOW_86_in_r_impliesExpression2633); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:125: (f_unnamed41= r_relationalExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:126: f_unnamed41= r_relationalExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:165: (f_nexts= r_relationalExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:166: f_nexts= r_relationalExpression { - pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2653); - f_unnamed41=r_relationalExpression(); + pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2641); + f_nexts=r_relationalExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed41); + addToChildren(cn, f_nexts); ((ImpliesExpressionNode) cn).getNexts().add(f_nexts); } } @@ -5827,257 +5820,229 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_relationalExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:1: r_relationalExpression returns [CompositeNode cn] : (f_leftOperand= r_additiveExpression ) ( ( (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:1: r_relationalExpression returns [CompositeNode cn] : (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* ; public CompositeNode r_relationalExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_leftOperand = null; + CompositeNode f_first = null; - CompositeNode f_operator = null; - - CompositeNode f_rightOperand = null; + CompositeNode f_nexts = null; cn = factory.createRelationalExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:2: ( (f_leftOperand= r_additiveExpression ) ( ( (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:2: (f_leftOperand= r_additiveExpression ) ( ( (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:2: ( (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:2: (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:2: (f_leftOperand= r_additiveExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:3: f_leftOperand= r_additiveExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:2: (f_first= r_additiveExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:3: f_first= r_additiveExpression { - pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2687); - f_leftOperand=r_additiveExpression(); + pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2675); + f_first=r_additiveExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_leftOperand); ((RelationalExpressionNode) cn).setLeftOperand(f_leftOperand); + addToChildren(cn, f_first); ((RelationalExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:140: ( ( (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) ) )* - loop64: + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:116: ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* + loop65: do { - int alt64=2; - int LA64_0 = input.LA(1); + int alt65=2; + int LA65_0 = input.LA(1); - if ( ((LA64_0>=87 && LA64_0<=92)) ) { - alt64=1; + if ( ((LA65_0>=87 && LA65_0<=92)) ) { + alt65=1; } - switch (alt64) { + switch (alt65) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:141: ( (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:117: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:141: ( (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:142: (f_operator= r_relationalOperator ) (f_rightOperand= r_additiveExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:117: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:118: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:142: (f_operator= r_relationalOperator ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:143: f_operator= r_relationalOperator + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:118: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) { - pushFollow(FOLLOW_r_relationalOperator_in_r_relationalExpression2697); - f_operator=r_relationalOperator(); - _fsp--; - if (failed) return cn; - if ( backtracking==0 ) { - addToChildren(cn, f_operator); ((RelationalExpressionNode) cn).setOperator(f_operator); - } - - } - - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:268: (f_rightOperand= r_additiveExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:269: f_rightOperand= r_additiveExpression - { - pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2705); - f_rightOperand=r_additiveExpression(); - _fsp--; - if (failed) return cn; - if ( backtracking==0 ) { - addToChildren(cn, f_rightOperand); ((RelationalExpressionNode) cn).setRightOperand(f_rightOperand); - } + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) + int alt64=6; + switch ( input.LA(1) ) { + case 87: + { + alt64=1; + } + break; + case 88: + { + alt64=2; + } + break; + case 89: + { + alt64=3; + } + break; + case 90: + { + alt64=4; + } + break; + case 91: + { + alt64=5; + } + break; + case 92: + { + alt64=6; + } + break; + default: + if (backtracking>0) {failed=true; return cn;} + NoViableAltException nvae = + new NoViableAltException("294:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )", 64, 0, input); + throw nvae; } + switch (alt64) { + case 1 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:120: ( '==' ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:120: ( '==' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:121: '==' + { + match(input,87,FOLLOW_87_in_r_relationalExpression2685); if (failed) return cn; + if ( backtracking==0 ) { + addLeafNodeForToken(cn, null); + } - } + } - } - break; + } + break; + case 2 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( '!=' ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( '!=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:5: '!=' + { + match(input,88,FOLLOW_88_in_r_relationalExpression2694); if (failed) return cn; + if ( backtracking==0 ) { + addLeafNodeForToken(cn, null); + } - default : - break loop64; - } - } while (true); + } - } + } + break; + case 3 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( '>=' ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( '>=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:5: '>=' + { + match(input,89,FOLLOW_89_in_r_relationalExpression2703); 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 r_relationalExpression + } - // $ANTLR start r_relationalOperator - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:300:1: r_relationalOperator returns [CompositeNode cn] : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ); - public CompositeNode r_relationalOperator() throws RecognitionException { - CompositeNode cn = null; + } + break; + case 4 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( '<=' ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( '<=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:5: '<=' + { + match(input,90,FOLLOW_90_in_r_relationalExpression2712); if (failed) return cn; + if ( backtracking==0 ) { + addLeafNodeForToken(cn, null); + } - cn = factory.createRelationalOperatorNode(); - - try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:303:2: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) - int alt65=6; - switch ( input.LA(1) ) { - case 87: - { - alt65=1; - } - break; - case 88: - { - alt65=2; - } - break; - case 89: - { - alt65=3; - } - break; - case 90: - { - alt65=4; - } - break; - case 91: - { - alt65=5; - } - break; - case 92: - { - alt65=6; - } - break; - default: - if (backtracking>0) {failed=true; return cn;} - NoViableAltException nvae = - new NoViableAltException("300:1: r_relationalOperator returns [CompositeNode cn] : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );", 65, 0, input); + } - throw nvae; - } - switch (alt65) { - case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:303:2: ( '==' ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:303:2: ( '==' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:303:3: '==' - { - match(input,87,FOLLOW_87_in_r_relationalOperator2732); if (failed) return cn; - if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); - } + } + break; + case 5 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( '>' ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( '>' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:5: '>' + { + match(input,91,FOLLOW_91_in_r_relationalExpression2721); if (failed) return cn; + if ( backtracking==0 ) { + addLeafNodeForToken(cn, null); + } - } + } - } - break; - case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:304:4: ( '!=' ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:304:4: ( '!=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:304:5: '!=' - { - match(input,88,FOLLOW_88_in_r_relationalOperator2741); if (failed) return cn; - if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); - } + } + break; + case 6 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:4: ( '<' ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:4: ( '<' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:5: '<' + { + match(input,92,FOLLOW_92_in_r_relationalExpression2730); if (failed) return cn; + if ( backtracking==0 ) { + addLeafNodeForToken(cn, null); + } - } + } - } - break; - case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:4: ( '>=' ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:4: ( '>=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:5: '>=' - { - match(input,89,FOLLOW_89_in_r_relationalOperator2750); if (failed) return cn; - if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); - } + } + break; - } + } - } - break; - case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:4: ( '<=' ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:4: ( '<=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:5: '<=' - { - match(input,90,FOLLOW_90_in_r_relationalOperator2759); if (failed) return cn; - if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); - } + } - } + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:48: (f_nexts= r_additiveExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:49: f_nexts= r_additiveExpression + { + pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2740); + f_nexts=r_additiveExpression(); + _fsp--; + if (failed) return cn; + if ( backtracking==0 ) { + addToChildren(cn, f_nexts); ((RelationalExpressionNode) cn).getNexts().add(f_nexts); + } + } - } - break; - case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:4: ( '>' ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:4: ( '>' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:5: '>' - { - match(input,91,FOLLOW_91_in_r_relationalOperator2768); if (failed) return cn; - if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); - } - } + } - } - break; - case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:308:4: ( '<' ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:308:4: ( '<' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:308:5: '<' - { - match(input,92,FOLLOW_92_in_r_relationalOperator2777); if (failed) return cn; - if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); - } + } + break; - } + default : + break loop65; + } + } while (true); - } - break; + } + if ( backtracking==0 ) { + cn = normalize(cn); } } catch (RecognitionException re) { @@ -6088,39 +6053,39 @@ public class Xpand3NodeParser extends AbstractNodeParser { } return cn; } - // $ANTLR end r_relationalOperator + // $ANTLR end r_relationalExpression // $ANTLR start r_additiveExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:311:1: r_additiveExpression returns [CompositeNode cn] : (f_left= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:302:1: r_additiveExpression returns [CompositeNode cn] : (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* ; public CompositeNode r_additiveExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_left = null; + CompositeNode f_first = null; - CompositeNode f_right = null; + CompositeNode f_nexts = null; cn = factory.createAdditiveExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:2: ( (f_left= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:2: (f_left= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:2: ( (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:2: (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:2: (f_left= r_multiplicativeExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:3: f_left= r_multiplicativeExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:2: (f_first= r_multiplicativeExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:3: f_first= r_multiplicativeExpression { - pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2808); - f_left=r_multiplicativeExpression(); + pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2774); + f_first=r_multiplicativeExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_left); ((AdditiveExpressionNode) cn).setLeft(f_left); + addToChildren(cn, f_first); ((AdditiveExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:116: ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:120: ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* loop67: do { int alt67=2; @@ -6142,15 +6107,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt67) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:117: ( ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:121: ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:117: ( ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:118: ( ( ( '+' ) | ( '-' ) ) ) (f_right= r_multiplicativeExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:121: ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:122: ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:118: ( ( ( '+' ) | ( '-' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:119: ( ( '+' ) | ( '-' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:122: ( ( ( '+' ) | ( '-' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:123: ( ( '+' ) | ( '-' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:119: ( ( '+' ) | ( '-' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:123: ( ( '+' ) | ( '-' ) ) int alt66=2; int LA66_0 = input.LA(1); @@ -6163,18 +6128,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("315:119: ( ( '+' ) | ( '-' ) )", 66, 0, input); + new NoViableAltException("306:123: ( ( '+' ) | ( '-' ) )", 66, 0, input); throw nvae; } switch (alt66) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:120: ( '+' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:124: ( '+' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:120: ( '+' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:121: '+' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:124: ( '+' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:125: '+' { - match(input,93,FOLLOW_93_in_r_additiveExpression2818); if (failed) return cn; + match(input,93,FOLLOW_93_in_r_additiveExpression2784); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6185,12 +6150,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:316:4: ( '-' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:4: ( '-' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:316:4: ( '-' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:316:5: '-' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:4: ( '-' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:5: '-' { - match(input,36,FOLLOW_36_in_r_additiveExpression2827); if (failed) return cn; + match(input,36,FOLLOW_36_in_r_additiveExpression2793); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6206,15 +6171,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:316:48: (f_right= r_multiplicativeExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:316:49: f_right= r_multiplicativeExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:48: (f_nexts= r_multiplicativeExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:49: f_nexts= r_multiplicativeExpression { - pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2837); - f_right=r_multiplicativeExpression(); + pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2803); + f_nexts=r_multiplicativeExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_right); ((AdditiveExpressionNode) cn).setRight(f_right); + addToChildren(cn, f_nexts); ((AdditiveExpressionNode) cn).getNexts().add(f_nexts); } } @@ -6250,35 +6215,35 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_multiplicativeExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:319:1: r_multiplicativeExpression returns [CompositeNode cn] : (f_left= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:1: r_multiplicativeExpression returns [CompositeNode cn] : (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* ; public CompositeNode r_multiplicativeExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_left = null; + CompositeNode f_first = null; - CompositeNode f_right = null; + CompositeNode f_nexts = null; cn = factory.createMultiplicativeExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:2: ( (f_left= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:2: (f_left= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:2: ( (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:2: (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:2: (f_left= r_unaryExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:3: f_left= r_unaryExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:2: (f_first= r_unaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:3: f_first= r_unaryExpression { - pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2871); - f_left=r_unaryExpression(); + pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2837); + f_first=r_unaryExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_left); ((MultiplicativeExpressionNode) cn).setLeft(f_left); + addToChildren(cn, f_first); ((MultiplicativeExpressionNode) cn).setFirst(f_first); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:113: ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:117: ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* loop69: do { int alt69=2; @@ -6291,15 +6256,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt69) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:114: ( ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:118: ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:114: ( ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:115: ( ( ( '*' ) | ( '/' ) ) ) (f_right= r_unaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:118: ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:119: ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:115: ( ( ( '*' ) | ( '/' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:116: ( ( '*' ) | ( '/' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:119: ( ( ( '*' ) | ( '/' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:120: ( ( '*' ) | ( '/' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:116: ( ( '*' ) | ( '/' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:120: ( ( '*' ) | ( '/' ) ) int alt68=2; int LA68_0 = input.LA(1); @@ -6312,18 +6277,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("323:116: ( ( '*' ) | ( '/' ) )", 68, 0, input); + new NoViableAltException("314:120: ( ( '*' ) | ( '/' ) )", 68, 0, input); throw nvae; } switch (alt68) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:117: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:121: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:117: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:118: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:121: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:122: '*' { - match(input,33,FOLLOW_33_in_r_multiplicativeExpression2881); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_multiplicativeExpression2847); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6334,12 +6299,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:4: ( '/' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:4: ( '/' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:4: ( '/' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:5: '/' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:4: ( '/' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:5: '/' { - match(input,94,FOLLOW_94_in_r_multiplicativeExpression2890); if (failed) return cn; + match(input,94,FOLLOW_94_in_r_multiplicativeExpression2856); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6355,15 +6320,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:48: (f_right= r_unaryExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:49: f_right= r_unaryExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:48: (f_nexts= r_unaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:49: f_nexts= r_unaryExpression { - pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2900); - f_right=r_unaryExpression(); + pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2866); + f_nexts=r_unaryExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_right); ((MultiplicativeExpressionNode) cn).setRight(f_right); + addToChildren(cn, f_nexts); ((MultiplicativeExpressionNode) cn).getNexts().add(f_nexts); } } @@ -6399,11 +6364,11 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_unaryExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:327:1: r_unaryExpression returns [CompositeNode cn] : ( (f_unnamed42= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:318:1: r_unaryExpression returns [CompositeNode cn] : ( (f_unnamed16= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) ); public CompositeNode r_unaryExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed42 = null; + CompositeNode f_unnamed16 = null; CompositeNode f_operand = null; @@ -6411,7 +6376,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createUnaryExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:2: ( (f_unnamed42= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:2: ( (f_unnamed16= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) ) int alt70=3; switch ( input.LA(1) ) { case StringLiteral: @@ -6453,24 +6418,24 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("327:1: r_unaryExpression returns [CompositeNode cn] : ( (f_unnamed42= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) );", 70, 0, input); + new NoViableAltException("318:1: r_unaryExpression returns [CompositeNode cn] : ( (f_unnamed16= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) );", 70, 0, input); throw nvae; } switch (alt70) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:2: (f_unnamed42= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:2: (f_unnamed16= r_infixExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:2: (f_unnamed42= r_infixExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:3: f_unnamed42= r_infixExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:2: (f_unnamed16= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:3: f_unnamed16= r_infixExpression { - pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2934); - f_unnamed42=r_infixExpression(); + pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2900); + f_unnamed16=r_infixExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed42); + addToChildren(cn, f_unnamed16); } } @@ -6479,22 +6444,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:332:4: ( '!' ) (f_operand= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: ( '!' ) (f_operand= r_infixExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:332:4: ( '!' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:332:5: '!' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: ( '!' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:5: '!' { - match(input,95,FOLLOW_95_in_r_unaryExpression2943); if (failed) return cn; + match(input,95,FOLLOW_95_in_r_unaryExpression2909); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:332:46: (f_operand= r_infixExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:332:47: f_operand= r_infixExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:46: (f_operand= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:47: f_operand= r_infixExpression { - pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2951); + pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2917); f_operand=r_infixExpression(); _fsp--; if (failed) return cn; @@ -6508,22 +6473,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:4: ( '-' ) (f_operand= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:4: ( '-' ) (f_operand= r_infixExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:4: ( '-' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:5: '-' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:4: ( '-' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:5: '-' { - match(input,36,FOLLOW_36_in_r_unaryExpression2960); if (failed) return cn; + match(input,36,FOLLOW_36_in_r_unaryExpression2926); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:46: (f_operand= r_infixExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333:47: f_operand= r_infixExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:46: (f_operand= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:47: f_operand= r_infixExpression { - pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2968); + pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2934); f_operand=r_infixExpression(); _fsp--; if (failed) return cn; @@ -6554,7 +6519,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_infixExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:1: r_infixExpression returns [CompositeNode cn] : (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:327:1: r_infixExpression returns [CompositeNode cn] : (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ; public CompositeNode r_infixExpression() throws RecognitionException { CompositeNode cn = null; @@ -6566,13 +6531,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createInfixExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:2: ( (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:2: (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:2: ( (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:2: (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:2: (f_target= r_primaryExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:3: f_target= r_primaryExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:2: (f_target= r_primaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:3: f_target= r_primaryExpression { - pushFollow(FOLLOW_r_primaryExpression_in_r_infixExpression2999); + pushFollow(FOLLOW_r_primaryExpression_in_r_infixExpression2965); f_target=r_primaryExpression(); _fsp--; if (failed) return cn; @@ -6582,7 +6547,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:114: ( ( ( '.' ) (f_calls= r_featureCall ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:114: ( ( ( '.' ) (f_calls= r_featureCall ) ) )* loop71: do { int alt71=2; @@ -6595,25 +6560,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt71) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:115: ( ( '.' ) (f_calls= r_featureCall ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:115: ( ( '.' ) (f_calls= r_featureCall ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:115: ( ( '.' ) (f_calls= r_featureCall ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:116: ( '.' ) (f_calls= r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:115: ( ( '.' ) (f_calls= r_featureCall ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:116: ( '.' ) (f_calls= r_featureCall ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:116: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:117: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:116: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:117: '.' { - match(input,69,FOLLOW_69_in_r_infixExpression3007); if (failed) return cn; + match(input,69,FOLLOW_69_in_r_infixExpression2973); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:158: (f_calls= r_featureCall ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:159: f_calls= r_featureCall + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:158: (f_calls= r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:159: f_calls= r_featureCall { - pushFollow(FOLLOW_r_featureCall_in_r_infixExpression3015); + pushFollow(FOLLOW_r_featureCall_in_r_infixExpression2981); f_calls=r_featureCall(); _fsp--; if (failed) return cn; @@ -6654,31 +6619,31 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_primaryExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:343:1: r_primaryExpression returns [CompositeNode cn] : ( ( r_stringLiteral ) | ( r_featureCall ) | ( r_booleanLiteral ) | ( r_numberLiteral ) | ( r_nullLiteral ) | ( r_listLiteral ) | ( r_constructorCall ) | ( r_globalVarExpression ) | ( r_paranthesizedExpression ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:334:1: r_primaryExpression returns [CompositeNode cn] : ( ( r_stringLiteral ) | ( r_featureCall ) | ( r_booleanLiteral ) | ( r_numberLiteral ) | ( r_nullLiteral ) | ( r_listLiteral ) | ( r_constructorCall ) | ( r_globalVarExpression ) | ( r_paranthesizedExpression ) ); public CompositeNode r_primaryExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode r_stringLiteral17 = null; + CompositeNode r_stringLiteral18 = null; - CompositeNode r_featureCall18 = null; + CompositeNode r_featureCall19 = null; - CompositeNode r_booleanLiteral19 = null; + CompositeNode r_booleanLiteral20 = null; - CompositeNode r_numberLiteral20 = null; + CompositeNode r_numberLiteral21 = null; - CompositeNode r_nullLiteral21 = null; + CompositeNode r_nullLiteral22 = null; - CompositeNode r_listLiteral22 = null; + CompositeNode r_listLiteral23 = null; - CompositeNode r_constructorCall23 = null; + CompositeNode r_constructorCall24 = null; - CompositeNode r_globalVarExpression24 = null; + CompositeNode r_globalVarExpression25 = null; - CompositeNode r_paranthesizedExpression25 = null; + CompositeNode r_paranthesizedExpression26 = null; try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:2: ( ( r_stringLiteral ) | ( r_featureCall ) | ( r_booleanLiteral ) | ( r_numberLiteral ) | ( r_nullLiteral ) | ( r_listLiteral ) | ( r_constructorCall ) | ( r_globalVarExpression ) | ( r_paranthesizedExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:2: ( ( r_stringLiteral ) | ( r_featureCall ) | ( r_booleanLiteral ) | ( r_numberLiteral ) | ( r_nullLiteral ) | ( r_listLiteral ) | ( r_constructorCall ) | ( r_globalVarExpression ) | ( r_paranthesizedExpression ) ) int alt72=9; switch ( input.LA(1) ) { case StringLiteral: @@ -6742,24 +6707,24 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("343:1: r_primaryExpression returns [CompositeNode cn] : ( ( r_stringLiteral ) | ( r_featureCall ) | ( r_booleanLiteral ) | ( r_numberLiteral ) | ( r_nullLiteral ) | ( r_listLiteral ) | ( r_constructorCall ) | ( r_globalVarExpression ) | ( r_paranthesizedExpression ) );", 72, 0, input); + new NoViableAltException("334:1: r_primaryExpression returns [CompositeNode cn] : ( ( r_stringLiteral ) | ( r_featureCall ) | ( r_booleanLiteral ) | ( r_numberLiteral ) | ( r_nullLiteral ) | ( r_listLiteral ) | ( r_constructorCall ) | ( r_globalVarExpression ) | ( r_paranthesizedExpression ) );", 72, 0, input); throw nvae; } switch (alt72) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:2: ( r_stringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:2: ( r_stringLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:2: ( r_stringLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:344:3: r_stringLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:2: ( r_stringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:3: r_stringLiteral { - pushFollow(FOLLOW_r_stringLiteral_in_r_primaryExpression3037); - r_stringLiteral17=r_stringLiteral(); + pushFollow(FOLLOW_r_stringLiteral_in_r_primaryExpression3003); + r_stringLiteral18=r_stringLiteral(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_stringLiteral17; + cn = r_stringLiteral18; } } @@ -6768,17 +6733,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:345:4: ( r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:4: ( r_featureCall ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:345:4: ( r_featureCall ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:345:5: r_featureCall + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:4: ( r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:5: r_featureCall { - pushFollow(FOLLOW_r_featureCall_in_r_primaryExpression3046); - r_featureCall18=r_featureCall(); + pushFollow(FOLLOW_r_featureCall_in_r_primaryExpression3012); + r_featureCall19=r_featureCall(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_featureCall18; + cn = r_featureCall19; } } @@ -6787,17 +6752,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:346:4: ( r_booleanLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:4: ( r_booleanLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:346:4: ( r_booleanLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:346:5: r_booleanLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:4: ( r_booleanLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:5: r_booleanLiteral { - pushFollow(FOLLOW_r_booleanLiteral_in_r_primaryExpression3055); - r_booleanLiteral19=r_booleanLiteral(); + pushFollow(FOLLOW_r_booleanLiteral_in_r_primaryExpression3021); + r_booleanLiteral20=r_booleanLiteral(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_booleanLiteral19; + cn = r_booleanLiteral20; } } @@ -6806,17 +6771,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:347:4: ( r_numberLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:4: ( r_numberLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:347:4: ( r_numberLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:347:5: r_numberLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:4: ( r_numberLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:5: r_numberLiteral { - pushFollow(FOLLOW_r_numberLiteral_in_r_primaryExpression3064); - r_numberLiteral20=r_numberLiteral(); + pushFollow(FOLLOW_r_numberLiteral_in_r_primaryExpression3030); + r_numberLiteral21=r_numberLiteral(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_numberLiteral20; + cn = r_numberLiteral21; } } @@ -6825,17 +6790,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:4: ( r_nullLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( r_nullLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:4: ( r_nullLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:5: r_nullLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( r_nullLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:5: r_nullLiteral { - pushFollow(FOLLOW_r_nullLiteral_in_r_primaryExpression3073); - r_nullLiteral21=r_nullLiteral(); + pushFollow(FOLLOW_r_nullLiteral_in_r_primaryExpression3039); + r_nullLiteral22=r_nullLiteral(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_nullLiteral21; + cn = r_nullLiteral22; } } @@ -6844,17 +6809,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:4: ( r_listLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:4: ( r_listLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:4: ( r_listLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:5: r_listLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:4: ( r_listLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:5: r_listLiteral { - pushFollow(FOLLOW_r_listLiteral_in_r_primaryExpression3082); - r_listLiteral22=r_listLiteral(); + pushFollow(FOLLOW_r_listLiteral_in_r_primaryExpression3048); + r_listLiteral23=r_listLiteral(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_listLiteral22; + cn = r_listLiteral23; } } @@ -6863,17 +6828,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 7 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:350:4: ( r_constructorCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:4: ( r_constructorCall ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:350:4: ( r_constructorCall ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:350:5: r_constructorCall + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:4: ( r_constructorCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:5: r_constructorCall { - pushFollow(FOLLOW_r_constructorCall_in_r_primaryExpression3091); - r_constructorCall23=r_constructorCall(); + pushFollow(FOLLOW_r_constructorCall_in_r_primaryExpression3057); + r_constructorCall24=r_constructorCall(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_constructorCall23; + cn = r_constructorCall24; } } @@ -6882,17 +6847,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 8 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:351:4: ( r_globalVarExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:4: ( r_globalVarExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:351:4: ( r_globalVarExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:351:5: r_globalVarExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:4: ( r_globalVarExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:5: r_globalVarExpression { - pushFollow(FOLLOW_r_globalVarExpression_in_r_primaryExpression3100); - r_globalVarExpression24=r_globalVarExpression(); + pushFollow(FOLLOW_r_globalVarExpression_in_r_primaryExpression3066); + r_globalVarExpression25=r_globalVarExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_globalVarExpression24; + cn = r_globalVarExpression25; } } @@ -6901,17 +6866,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 9 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:352:4: ( r_paranthesizedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:343:4: ( r_paranthesizedExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:352:4: ( r_paranthesizedExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:352:5: r_paranthesizedExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:343:4: ( r_paranthesizedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:343:5: r_paranthesizedExpression { - pushFollow(FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3109); - r_paranthesizedExpression25=r_paranthesizedExpression(); + pushFollow(FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3075); + r_paranthesizedExpression26=r_paranthesizedExpression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_paranthesizedExpression25; + cn = r_paranthesizedExpression26; } } @@ -6934,20 +6899,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_stringLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:1: r_stringLiteral returns [CompositeNode cn] : ( StringLiteral ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:346:1: r_stringLiteral returns [CompositeNode cn] : ( StringLiteral ) ; public CompositeNode r_stringLiteral() throws RecognitionException { CompositeNode cn = null; cn = factory.createStringLiteralNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:358:2: ( ( StringLiteral ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:358:2: ( StringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:2: ( ( StringLiteral ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:2: ( StringLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:358:2: ( StringLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:358:3: StringLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:2: ( StringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:3: StringLiteral { - match(input,StringLiteral,FOLLOW_StringLiteral_in_r_stringLiteral3133); if (failed) return cn; + match(input,StringLiteral,FOLLOW_StringLiteral_in_r_stringLiteral3099); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6970,46 +6935,46 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_paranthesizedExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:1: r_paranthesizedExpression returns [CompositeNode cn] : ( '(' ) (f_unnamed43= r_expression ) ( ')' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:352:1: r_paranthesizedExpression returns [CompositeNode cn] : ( '(' ) (f_expression= r_expression ) ( ')' ) ; public CompositeNode r_paranthesizedExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed43 = null; + CompositeNode f_expression = null; cn = factory.createParanthesizedExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:2: ( ( '(' ) (f_unnamed43= r_expression ) ( ')' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:2: ( '(' ) (f_unnamed43= r_expression ) ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:2: ( ( '(' ) (f_expression= r_expression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:2: ( '(' ) (f_expression= r_expression ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:2: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:3: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:2: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:3: '(' { - match(input,31,FOLLOW_31_in_r_paranthesizedExpression3157); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_paranthesizedExpression3123); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:44: (f_unnamed43= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:45: f_unnamed43= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:44: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:45: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_paranthesizedExpression3165); - f_unnamed43=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_paranthesizedExpression3131); + f_expression=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed43); + addToChildren(cn, f_expression); ((ParanthesizedExpressionNode) cn).setExpression(f_expression); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:107: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:108: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:173: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:174: ')' { - match(input,34,FOLLOW_34_in_r_paranthesizedExpression3171); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_paranthesizedExpression3137); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7032,38 +6997,38 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_globalVarExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:1: r_globalVarExpression returns [CompositeNode cn] : ( 'GLOBALVAR' ) (f_unnamed44= r_identifier ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:358:1: r_globalVarExpression returns [CompositeNode cn] : ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) ; public CompositeNode r_globalVarExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed44 = null; + CompositeNode f_unnamed17 = null; cn = factory.createGlobalVarExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:370:2: ( ( 'GLOBALVAR' ) (f_unnamed44= r_identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:370:2: ( 'GLOBALVAR' ) (f_unnamed44= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:2: ( ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:2: ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:370:2: ( 'GLOBALVAR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:370:3: 'GLOBALVAR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:2: ( 'GLOBALVAR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:3: 'GLOBALVAR' { - match(input,96,FOLLOW_96_in_r_globalVarExpression3195); if (failed) return cn; + match(input,96,FOLLOW_96_in_r_globalVarExpression3161); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:370:52: (f_unnamed44= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:370:53: f_unnamed44= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:52: (f_unnamed17= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:53: f_unnamed17= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_globalVarExpression3203); - f_unnamed44=r_identifier(); + pushFollow(FOLLOW_r_identifier_in_r_globalVarExpression3169); + f_unnamed17=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed44); + addToChildren(cn, f_unnamed17); } } @@ -7084,39 +7049,52 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_featureCall - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:373:1: r_featureCall returns [CompositeNode cn] : ( (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) | (f_unnamed45= r_collectionExpression ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:364:1: r_featureCall returns [CompositeNode cn] : ( (f_unnamed18= r_collectionExpression ) | (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) ); public CompositeNode r_featureCall() throws RecognitionException { CompositeNode cn = null; + CompositeNode f_unnamed18 = null; + CompositeNode f_name = null; CompositeNode f_paramList = null; CompositeNode f_type = null; - CompositeNode f_unnamed45 = null; - cn = factory.createFeatureCallNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:2: ( (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) | (f_unnamed45= r_collectionExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:2: ( (f_unnamed18= r_collectionExpression ) | (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) ) int alt74=3; switch ( input.LA(1) ) { + case 101: + case 102: + case 103: + case 104: + case 105: + case 106: + case 107: + case 108: + case 109: + { + alt74=1; + } + break; case Identifier: { - int LA74_1 = input.LA(2); + int LA74_2 = input.LA(2); - if ( (LA74_1==31) ) { - alt74=1; - } - else if ( (LA74_1==EOF||LA74_1==TEXT||LA74_1==Identifier||LA74_1==27||(LA74_1>=32 && LA74_1<=34)||(LA74_1>=36 && LA74_1<=37)||LA74_1==40||LA74_1==42||LA74_1==44||(LA74_1>=55 && LA74_1<=57)||(LA74_1>=61 && LA74_1<=62)||LA74_1==64||LA74_1==69||(LA74_1>=75 && LA74_1<=78)||(LA74_1>=81 && LA74_1<=94)) ) { + if ( (LA74_2==31) ) { alt74=2; } + else if ( (LA74_2==EOF||LA74_2==TEXT||LA74_2==Identifier||LA74_2==27||(LA74_2>=32 && LA74_2<=34)||(LA74_2>=36 && LA74_2<=37)||LA74_2==40||LA74_2==42||LA74_2==44||(LA74_2>=55 && LA74_2<=57)||(LA74_2>=61 && LA74_2<=62)||LA74_2==64||LA74_2==69||(LA74_2>=75 && LA74_2<=78)||(LA74_2>=81 && LA74_2<=94)) ) { + alt74=3; + } else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("373:1: r_featureCall returns [CompositeNode cn] : ( (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) | (f_unnamed45= r_collectionExpression ) );", 74, 1, input); + new NoViableAltException("364:1: r_featureCall returns [CompositeNode cn] : ( (f_unnamed18= r_collectionExpression ) | (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) );", 74, 2, input); throw nvae; } @@ -7126,38 +7104,44 @@ public class Xpand3NodeParser extends AbstractNodeParser { case 71: case 72: { - alt74=2; - } - break; - case 101: - case 102: - case 103: - case 104: - case 105: - case 106: - case 107: - case 108: - case 109: - { alt74=3; } break; default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("373:1: r_featureCall returns [CompositeNode cn] : ( (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) | (f_unnamed45= r_collectionExpression ) );", 74, 0, input); + new NoViableAltException("364:1: r_featureCall returns [CompositeNode cn] : ( (f_unnamed18= r_collectionExpression ) | (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) | (f_type= r_type ) );", 74, 0, input); throw nvae; } switch (alt74) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:2: (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:2: (f_unnamed18= r_collectionExpression ) + { + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:2: (f_unnamed18= r_collectionExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:3: f_unnamed18= r_collectionExpression { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:2: (f_name= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:3: f_name= r_identifier + pushFollow(FOLLOW_r_collectionExpression_in_r_featureCall3195); + f_unnamed18=r_collectionExpression(); + _fsp--; + if (failed) return cn; + if ( backtracking==0 ) { + addToChildren(cn, f_unnamed18); + } + + } + + + } + break; + case 2 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:4: (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) { - pushFollow(FOLLOW_r_identifier_in_r_featureCall3229); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:4: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:5: f_name= r_identifier + { + pushFollow(FOLLOW_r_identifier_in_r_featureCall3206); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -7167,17 +7151,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:95: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:96: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:97: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:98: '(' { - match(input,31,FOLLOW_31_in_r_featureCall3235); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_featureCall3212); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:137: ( ( (f_paramList= r_parameterList ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:139: ( ( (f_paramList= r_parameterList ) ) )? int alt73=2; int LA73_0 = input.LA(1); @@ -7186,15 +7170,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt73) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:138: ( (f_paramList= r_parameterList ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:140: ( (f_paramList= r_parameterList ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:138: ( (f_paramList= r_parameterList ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:139: (f_paramList= r_parameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:140: ( (f_paramList= r_parameterList ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:141: (f_paramList= r_parameterList ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:139: (f_paramList= r_parameterList ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:140: f_paramList= r_parameterList + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:141: (f_paramList= r_parameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:142: f_paramList= r_parameterList { - pushFollow(FOLLOW_r_parameterList_in_r_featureCall3245); + pushFollow(FOLLOW_r_parameterList_in_r_featureCall3222); f_paramList=r_parameterList(); _fsp--; if (failed) return cn; @@ -7213,10 +7197,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:258: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:376:259: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:260: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:261: ')' { - match(input,34,FOLLOW_34_in_r_featureCall3254); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_featureCall3231); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7226,13 +7210,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; - case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:377:4: (f_type= r_type ) + case 3 : + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:369:4: (f_type= r_type ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:377:4: (f_type= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:377:5: f_type= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:369:4: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:369:5: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_featureCall3265); + pushFollow(FOLLOW_r_type_in_r_featureCall3242); f_type=r_type(); _fsp--; if (failed) return cn; @@ -7245,25 +7229,6 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; - case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:378:4: (f_unnamed45= r_collectionExpression ) - { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:378:4: (f_unnamed45= r_collectionExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:378:5: f_unnamed45= r_collectionExpression - { - pushFollow(FOLLOW_r_collectionExpression_in_r_featureCall3276); - f_unnamed45=r_collectionExpression(); - _fsp--; - if (failed) return cn; - if ( backtracking==0 ) { - addToChildren(cn, f_unnamed45); - } - - } - - - } - break; } } @@ -7279,32 +7244,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_listLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:1: r_listLiteral returns [CompositeNode cn] : ( '{' ) ( ( (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* ) )? ( '}' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:372:1: r_listLiteral returns [CompositeNode cn] : ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) ; public CompositeNode r_listLiteral() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed46 = null; - - CompositeNode f_unnamed47 = null; + CompositeNode f_elements = null; cn = factory.createListLiteralNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:2: ( ( '{' ) ( ( (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* ) )? ( '}' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:2: ( '{' ) ( ( (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* ) )? ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:2: ( ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:2: ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:2: ( '{' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:3: '{' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:2: ( '{' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:3: '{' { - match(input,80,FOLLOW_80_in_r_listLiteral3300); if (failed) return cn; + match(input,80,FOLLOW_80_in_r_listLiteral3266); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:44: ( ( (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:44: ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? int alt76=2; int LA76_0 = input.LA(1); @@ -7313,25 +7276,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt76) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:45: ( (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:45: ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:45: ( (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:46: (f_unnamed46= r_expression ) ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:45: ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:46: (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:46: (f_unnamed46= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:47: f_unnamed46= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:46: (f_elements= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:47: f_elements= r_expression { - pushFollow(FOLLOW_r_expression_in_r_listLiteral3310); - f_unnamed46=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_listLiteral3276); + f_elements=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed46); + addToChildren(cn, f_elements); ((ListLiteralNode) cn).getElements().add(f_elements); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:109: ( ( ( ',' ) (f_unnamed47= r_expression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:161: ( ( ( ',' ) (f_elements= r_expression ) ) )* loop75: do { int alt75=2; @@ -7344,30 +7307,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt75) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:110: ( ( ',' ) (f_unnamed47= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:162: ( ( ',' ) (f_elements= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:110: ( ( ',' ) (f_unnamed47= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:111: ( ',' ) (f_unnamed47= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:162: ( ( ',' ) (f_elements= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:163: ( ',' ) (f_elements= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:111: ( ',' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:112: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:163: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:164: ',' { - match(input,32,FOLLOW_32_in_r_listLiteral3318); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_listLiteral3284); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:153: (f_unnamed47= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:154: f_unnamed47= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:205: (f_elements= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:206: f_elements= r_expression { - pushFollow(FOLLOW_r_expression_in_r_listLiteral3326); - f_unnamed47=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_listLiteral3292); + f_elements=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed47); + addToChildren(cn, f_elements); ((ListLiteralNode) cn).getElements().add(f_elements); } } @@ -7393,10 +7356,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:222: ( '}' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:223: '}' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:326: ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:327: '}' { - match(input,82,FOLLOW_82_in_r_listLiteral3338); if (failed) return cn; + match(input,82,FOLLOW_82_in_r_listLiteral3304); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7419,38 +7382,38 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_constructorCall - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:1: r_constructorCall returns [CompositeNode cn] : ( 'new' ) (f_unnamed48= r_simpleType ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:378:1: r_constructorCall returns [CompositeNode cn] : ( 'new' ) (f_unnamed19= r_simpleType ) ; public CompositeNode r_constructorCall() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed48 = null; + CompositeNode f_unnamed19 = null; cn = factory.createConstructorCallNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390:2: ( ( 'new' ) (f_unnamed48= r_simpleType ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390:2: ( 'new' ) (f_unnamed48= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:2: ( ( 'new' ) (f_unnamed19= r_simpleType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:2: ( 'new' ) (f_unnamed19= r_simpleType ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390:2: ( 'new' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390:3: 'new' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:2: ( 'new' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:3: 'new' { - match(input,97,FOLLOW_97_in_r_constructorCall3362); if (failed) return cn; + match(input,97,FOLLOW_97_in_r_constructorCall3328); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390:46: (f_unnamed48= r_simpleType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390:47: f_unnamed48= r_simpleType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:46: (f_unnamed19= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:47: f_unnamed19= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_constructorCall3370); - f_unnamed48=r_simpleType(); + pushFollow(FOLLOW_r_simpleType_in_r_constructorCall3336); + f_unnamed19=r_simpleType(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed48); + addToChildren(cn, f_unnamed19); } } @@ -7471,14 +7434,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_booleanLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:393:1: r_booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:1: r_booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) ); public CompositeNode r_booleanLiteral() throws RecognitionException { CompositeNode cn = null; cn = factory.createBooleanLiteralNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:396:2: ( ( 'false' ) | ( 'true' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:2: ( ( 'false' ) | ( 'true' ) ) int alt77=2; int LA77_0 = input.LA(1); @@ -7491,18 +7454,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("393:1: r_booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );", 77, 0, input); + new NoViableAltException("384:1: r_booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );", 77, 0, input); throw nvae; } switch (alt77) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:396:2: ( 'false' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:2: ( 'false' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:396:2: ( 'false' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:396:3: 'false' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:2: ( 'false' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:3: 'false' { - match(input,98,FOLLOW_98_in_r_booleanLiteral3394); if (failed) return cn; + match(input,98,FOLLOW_98_in_r_booleanLiteral3360); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7513,12 +7476,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:397:4: ( 'true' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:388:4: ( 'true' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:397:4: ( 'true' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:397:5: 'true' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:388:4: ( 'true' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:388:5: 'true' { - match(input,99,FOLLOW_99_in_r_booleanLiteral3403); if (failed) return cn; + match(input,99,FOLLOW_99_in_r_booleanLiteral3369); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7543,20 +7506,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_nullLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:1: r_nullLiteral returns [CompositeNode cn] : ( 'null' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:391:1: r_nullLiteral returns [CompositeNode cn] : ( 'null' ) ; public CompositeNode r_nullLiteral() throws RecognitionException { CompositeNode cn = null; cn = factory.createNullLiteralNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:2: ( ( 'null' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:2: ( 'null' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:2: ( ( 'null' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:2: ( 'null' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:2: ( 'null' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: 'null' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:2: ( 'null' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:3: 'null' { - match(input,100,FOLLOW_100_in_r_nullLiteral3427); if (failed) return cn; + match(input,100,FOLLOW_100_in_r_nullLiteral3393); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7579,14 +7542,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_numberLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ); public CompositeNode r_numberLiteral() throws RecognitionException { CompositeNode cn = null; cn = factory.createNumberLiteralNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:2: ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:2: ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ) int alt78=2; int LA78_0 = input.LA(1); @@ -7596,16 +7559,16 @@ public class Xpand3NodeParser extends AbstractNodeParser { if ( (LA78_1==69) ) { int LA78_2 = input.LA(3); - if ( (LA78_2==IntLiteral) ) { - alt78=2; - } - else if ( (LA78_2==Identifier||(LA78_2>=70 && LA78_2<=72)||(LA78_2>=101 && LA78_2<=109)) ) { + if ( (LA78_2==Identifier||(LA78_2>=70 && LA78_2<=72)||(LA78_2>=101 && LA78_2<=109)) ) { alt78=1; } + else if ( (LA78_2==IntLiteral) ) { + alt78=2; + } else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("406:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 2, input); + new NoViableAltException("397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 2, input); throw nvae; } @@ -7616,7 +7579,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("406:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 1, input); + new NoViableAltException("397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 1, input); throw nvae; } @@ -7624,18 +7587,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("406:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 0, input); + new NoViableAltException("397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 0, input); throw nvae; } switch (alt78) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:2: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:2: ( IntLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:2: ( IntLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:3: IntLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:2: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:3: IntLiteral { - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3451); if (failed) return cn; + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3417); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7646,32 +7609,32 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( IntLiteral ) ( '.' ) ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:4: ( IntLiteral ) ( '.' ) ( IntLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( IntLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:5: IntLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:4: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:5: IntLiteral { - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3460); if (failed) return cn; + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3426); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:53: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:54: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:53: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:54: '.' { - match(input,69,FOLLOW_69_in_r_numberLiteral3466); if (failed) return cn; + match(input,69,FOLLOW_69_in_r_numberLiteral3432); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:95: ( IntLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:96: IntLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:95: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:96: IntLiteral { - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3472); if (failed) return cn; + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3438); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7696,21 +7659,21 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_collectionExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:1: r_collectionExpression returns [CompositeNode cn] : ( ( 'typeSelect' ) ( '(' ) (f_unnamed49= r_type ) ( ')' ) | ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_unnamed50= r_identifier ) ( '|' ) ) )? (f_unnamed51= r_expression ) ( ')' ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:404:1: r_collectionExpression returns [CompositeNode cn] : ( ( 'typeSelect' ) ( '(' ) (f_type= r_type ) ( ')' ) | ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_variable= r_identifier ) ( '|' ) ) )? (f_expression= r_expression ) ( ')' ) ); public CompositeNode r_collectionExpression() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed49 = null; + CompositeNode f_type = null; - CompositeNode f_unnamed50 = null; + CompositeNode f_variable = null; - CompositeNode f_unnamed51 = null; + CompositeNode f_expression = null; cn = factory.createCollectionExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:2: ( ( 'typeSelect' ) ( '(' ) (f_unnamed49= r_type ) ( ')' ) | ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_unnamed50= r_identifier ) ( '|' ) ) )? (f_unnamed51= r_expression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:2: ( ( 'typeSelect' ) ( '(' ) (f_type= r_type ) ( ')' ) | ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_variable= r_identifier ) ( '|' ) ) )? (f_expression= r_expression ) ( ')' ) ) int alt81=2; int LA81_0 = input.LA(1); @@ -7723,51 +7686,51 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("413:1: r_collectionExpression returns [CompositeNode cn] : ( ( 'typeSelect' ) ( '(' ) (f_unnamed49= r_type ) ( ')' ) | ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_unnamed50= r_identifier ) ( '|' ) ) )? (f_unnamed51= r_expression ) ( ')' ) );", 81, 0, input); + new NoViableAltException("404:1: r_collectionExpression returns [CompositeNode cn] : ( ( 'typeSelect' ) ( '(' ) (f_type= r_type ) ( ')' ) | ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_variable= r_identifier ) ( '|' ) ) )? (f_expression= r_expression ) ( ')' ) );", 81, 0, input); throw nvae; } switch (alt81) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:2: ( 'typeSelect' ) ( '(' ) (f_unnamed49= r_type ) ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:2: ( 'typeSelect' ) ( '(' ) (f_type= r_type ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:2: ( 'typeSelect' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:3: 'typeSelect' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:2: ( 'typeSelect' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: 'typeSelect' { - match(input,101,FOLLOW_101_in_r_collectionExpression3496); if (failed) return cn; + match(input,101,FOLLOW_101_in_r_collectionExpression3462); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:53: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:54: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:53: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:54: '(' { - match(input,31,FOLLOW_31_in_r_collectionExpression3502); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_collectionExpression3468); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:95: (f_unnamed49= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:96: f_unnamed49= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:95: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:96: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_collectionExpression3510); - f_unnamed49=r_type(); + pushFollow(FOLLOW_r_type_in_r_collectionExpression3476); + f_type=r_type(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed49); + addToChildren(cn, f_type); ((CollectionExpressionNode) cn).setType(f_type); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:152: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:416:153: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:191: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:192: ')' { - match(input,34,FOLLOW_34_in_r_collectionExpression3516); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_collectionExpression3482); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7778,12 +7741,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:4: ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_unnamed50= r_identifier ) ( '|' ) ) )? (f_unnamed51= r_expression ) ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:4: ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) ( '(' ) ( ( (f_variable= r_identifier ) ( '|' ) ) )? (f_expression= r_expression ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:4: ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:4: ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) int alt79=8; switch ( input.LA(1) ) { case 102: @@ -7829,19 +7792,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("417:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )", 79, 0, input); + new NoViableAltException("408:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )", 79, 0, input); throw nvae; } switch (alt79) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:6: ( 'collect' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:6: ( 'collect' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:6: ( 'collect' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:7: 'collect' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:6: ( 'collect' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:7: 'collect' { - match(input,102,FOLLOW_102_in_r_collectionExpression3527); if (failed) return cn; + match(input,102,FOLLOW_102_in_r_collectionExpression3493); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7852,12 +7815,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:4: ( 'select' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:4: ( 'select' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:4: ( 'select' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:5: 'select' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:4: ( 'select' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:5: 'select' { - match(input,103,FOLLOW_103_in_r_collectionExpression3536); if (failed) return cn; + match(input,103,FOLLOW_103_in_r_collectionExpression3502); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7868,12 +7831,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:4: ( 'selectFirst' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( 'selectFirst' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:4: ( 'selectFirst' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:5: 'selectFirst' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( 'selectFirst' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:5: 'selectFirst' { - match(input,104,FOLLOW_104_in_r_collectionExpression3545); if (failed) return cn; + match(input,104,FOLLOW_104_in_r_collectionExpression3511); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7884,12 +7847,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:4: ( 'reject' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:4: ( 'reject' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:4: ( 'reject' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:5: 'reject' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:4: ( 'reject' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:5: 'reject' { - match(input,105,FOLLOW_105_in_r_collectionExpression3554); if (failed) return cn; + match(input,105,FOLLOW_105_in_r_collectionExpression3520); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7900,12 +7863,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:4: ( 'exists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:4: ( 'exists' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:4: ( 'exists' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:5: 'exists' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:4: ( 'exists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:5: 'exists' { - match(input,106,FOLLOW_106_in_r_collectionExpression3563); if (failed) return cn; + match(input,106,FOLLOW_106_in_r_collectionExpression3529); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7916,12 +7879,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:422:4: ( 'notExists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:4: ( 'notExists' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:422:4: ( 'notExists' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:422:5: 'notExists' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:4: ( 'notExists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:5: 'notExists' { - match(input,107,FOLLOW_107_in_r_collectionExpression3572); if (failed) return cn; + match(input,107,FOLLOW_107_in_r_collectionExpression3538); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7932,12 +7895,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 7 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:423:4: ( 'sortBy' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:4: ( 'sortBy' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:423:4: ( 'sortBy' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:423:5: 'sortBy' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:4: ( 'sortBy' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:5: 'sortBy' { - match(input,108,FOLLOW_108_in_r_collectionExpression3581); if (failed) return cn; + match(input,108,FOLLOW_108_in_r_collectionExpression3547); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7948,12 +7911,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 8 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:4: ( 'forAll' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:4: ( 'forAll' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:4: ( 'forAll' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:5: 'forAll' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:4: ( 'forAll' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:5: 'forAll' { - match(input,109,FOLLOW_109_in_r_collectionExpression3590); if (failed) return cn; + match(input,109,FOLLOW_109_in_r_collectionExpression3556); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7969,17 +7932,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:53: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:54: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:53: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:54: '(' { - match(input,31,FOLLOW_31_in_r_collectionExpression3598); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_collectionExpression3564); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:95: ( ( (f_unnamed50= r_identifier ) ( '|' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:95: ( ( (f_variable= r_identifier ) ( '|' ) ) )? int alt80=2; int LA80_0 = input.LA(1); @@ -7992,28 +7955,28 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt80) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:96: ( (f_unnamed50= r_identifier ) ( '|' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:96: ( (f_variable= r_identifier ) ( '|' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:96: ( (f_unnamed50= r_identifier ) ( '|' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:97: (f_unnamed50= r_identifier ) ( '|' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:96: ( (f_variable= r_identifier ) ( '|' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:97: (f_variable= r_identifier ) ( '|' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:97: (f_unnamed50= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:98: f_unnamed50= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:97: (f_variable= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:98: f_variable= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_collectionExpression3608); - f_unnamed50=r_identifier(); + pushFollow(FOLLOW_r_identifier_in_r_collectionExpression3574); + f_variable=r_identifier(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed50); + addToChildren(cn, f_variable); ((CollectionExpressionNode) cn).setVariable(f_variable); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:160: ( '|' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:161: '|' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:215: ( '|' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:216: '|' { - match(input,110,FOLLOW_110_in_r_collectionExpression3614); if (failed) return cn; + match(input,110,FOLLOW_110_in_r_collectionExpression3580); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8029,23 +7992,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:205: (f_unnamed51= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:206: f_unnamed51= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:260: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:261: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_collectionExpression3625); - f_unnamed51=r_expression(); + pushFollow(FOLLOW_r_expression_in_r_collectionExpression3591); + f_expression=r_expression(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed51); + addToChildren(cn, f_expression); ((CollectionExpressionNode) cn).setExpression(f_expression); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:268: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:269: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:386: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:387: ')' { - match(input,34,FOLLOW_34_in_r_collectionExpression3631); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_collectionExpression3597); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8070,7 +8033,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_declaredParameterList - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:1: r_declaredParameterList returns [CompositeNode cn] : (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:1: r_declaredParameterList returns [CompositeNode cn] : (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ; public CompositeNode r_declaredParameterList() throws RecognitionException { CompositeNode cn = null; @@ -8080,13 +8043,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createDeclaredParameterListNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:2: ( (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:2: (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:2: ( (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:2: (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:2: (f_params= r_declaredParameter ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:3: f_params= r_declaredParameter + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:2: (f_params= r_declaredParameter ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:3: f_params= r_declaredParameter { - pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3657); + pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3623); f_params=r_declaredParameter(); _fsp--; if (failed) return cn; @@ -8096,7 +8059,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:126: ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:126: ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* loop82: do { int alt82=2; @@ -8115,25 +8078,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt82) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:127: ( ( ',' ) (f_params= r_declaredParameter ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:127: ( ( ',' ) (f_params= r_declaredParameter ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:127: ( ( ',' ) (f_params= r_declaredParameter ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:128: ( ',' ) (f_params= r_declaredParameter ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:127: ( ( ',' ) (f_params= r_declaredParameter ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:128: ( ',' ) (f_params= r_declaredParameter ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:128: ( ',' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:129: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:128: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:129: ',' { - match(input,32,FOLLOW_32_in_r_declaredParameterList3665); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_declaredParameterList3631); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:170: (f_params= r_declaredParameter ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:171: f_params= r_declaredParameter + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:170: (f_params= r_declaredParameter ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:171: f_params= r_declaredParameter { - pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3673); + pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3639); f_params=r_declaredParameter(); _fsp--; if (failed) return cn; @@ -8171,7 +8134,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_declaredParameter - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:1: r_declaredParameter returns [CompositeNode cn] : (f_ptype= r_type ) (f_name= r_identifier ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:1: r_declaredParameter returns [CompositeNode cn] : (f_ptype= r_type ) (f_name= r_identifier ) ; public CompositeNode r_declaredParameter() throws RecognitionException { CompositeNode cn = null; @@ -8183,13 +8146,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createDeclaredParameterNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:2: ( (f_ptype= r_type ) (f_name= r_identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:2: (f_ptype= r_type ) (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:2: ( (f_ptype= r_type ) (f_name= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:2: (f_ptype= r_type ) (f_name= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:2: (f_ptype= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:3: f_ptype= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:2: (f_ptype= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:3: f_ptype= r_type { - pushFollow(FOLLOW_r_type_in_r_declaredParameter3702); + pushFollow(FOLLOW_r_type_in_r_declaredParameter3668); f_ptype=r_type(); _fsp--; if (failed) return cn; @@ -8199,10 +8162,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:99: (f_name= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:100: f_name= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:99: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:100: f_name= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_declaredParameter3710); + pushFollow(FOLLOW_r_identifier_in_r_declaredParameter3676); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -8228,7 +8191,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_parameterList - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:439:1: r_parameterList returns [CompositeNode cn] : (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:1: r_parameterList returns [CompositeNode cn] : (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ; public CompositeNode r_parameterList() throws RecognitionException { CompositeNode cn = null; @@ -8238,13 +8201,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createParameterListNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:2: ( (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:2: (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:2: ( (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:2: (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:2: (f_params= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:3: f_params= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:2: (f_params= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:3: f_params= r_expression { - pushFollow(FOLLOW_r_expression_in_r_parameterList3736); + pushFollow(FOLLOW_r_expression_in_r_parameterList3702); f_params=r_expression(); _fsp--; if (failed) return cn; @@ -8254,7 +8217,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:111: ( ( ( ',' ) (f_params= r_expression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:111: ( ( ( ',' ) (f_params= r_expression ) ) )* loop83: do { int alt83=2; @@ -8267,25 +8230,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt83) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:112: ( ( ',' ) (f_params= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:112: ( ( ',' ) (f_params= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:112: ( ( ',' ) (f_params= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:113: ( ',' ) (f_params= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:112: ( ( ',' ) (f_params= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:113: ( ',' ) (f_params= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:113: ( ',' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:114: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:113: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:114: ',' { - match(input,32,FOLLOW_32_in_r_parameterList3744); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_parameterList3710); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:155: (f_params= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:442:156: f_params= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:155: (f_params= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:156: f_params= r_expression { - pushFollow(FOLLOW_r_expression_in_r_parameterList3752); + pushFollow(FOLLOW_r_expression_in_r_parameterList3718); f_params=r_expression(); _fsp--; if (failed) return cn; @@ -8323,17 +8286,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_type - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) ); public CompositeNode r_type() throws RecognitionException { CompositeNode cn = null; - CompositeNode r_collectionType26 = null; + CompositeNode r_collectionType27 = null; - CompositeNode r_simpleType27 = null; + CompositeNode r_simpleType28 = null; try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:2: ( ( r_collectionType ) | ( r_simpleType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:2: ( ( r_collectionType ) | ( r_simpleType ) ) int alt84=2; int LA84_0 = input.LA(1); @@ -8346,23 +8309,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("445:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) );", 84, 0, input); + new NoViableAltException("436:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) );", 84, 0, input); throw nvae; } switch (alt84) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:2: ( r_collectionType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:2: ( r_collectionType ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:2: ( r_collectionType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:3: r_collectionType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:2: ( r_collectionType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:3: r_collectionType { - pushFollow(FOLLOW_r_collectionType_in_r_type3774); - r_collectionType26=r_collectionType(); + pushFollow(FOLLOW_r_collectionType_in_r_type3740); + r_collectionType27=r_collectionType(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_collectionType26; + cn = r_collectionType27; } } @@ -8371,17 +8334,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:447:4: ( r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:438:4: ( r_simpleType ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:447:4: ( r_simpleType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:447:5: r_simpleType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:438:4: ( r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:438:5: r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_type3783); - r_simpleType27=r_simpleType(); + pushFollow(FOLLOW_r_simpleType_in_r_type3749); + r_simpleType28=r_simpleType(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - cn = r_simpleType27; + cn = r_simpleType28; } } @@ -8404,23 +8367,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_collectionType - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:450:1: r_collectionType returns [CompositeNode cn] : ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) ) )? ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:441:1: r_collectionType returns [CompositeNode cn] : ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? ; public CompositeNode r_collectionType() throws RecognitionException { CompositeNode cn = null; - CompositeNode f_unnamed52 = null; + CompositeNode f_elementType = null; cn = factory.createCollectionTypeNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:2: ( ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) ) )? ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:2: ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:2: ( ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:2: ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:2: ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:2: ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) int alt85=3; switch ( input.LA(1) ) { case 70: @@ -8441,21 +8404,21 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("453:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 85, 0, input); + new NoViableAltException("444:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 85, 0, input); throw nvae; } switch (alt85) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:4: ( 'Collection' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:4: ( 'Collection' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:4: ( 'Collection' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:453:5: 'Collection' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:4: ( 'Collection' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:5: 'Collection' { - match(input,70,FOLLOW_70_in_r_collectionType3809); if (failed) return cn; + match(input,70,FOLLOW_70_in_r_collectionType3775); if (failed) return cn; if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); + addLeafNodeForToken(cn, "collectionType"); } } @@ -8464,14 +8427,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:454:4: ( 'List' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:4: ( 'List' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:454:4: ( 'List' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:454:5: 'List' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:4: ( 'List' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:5: 'List' { - match(input,71,FOLLOW_71_in_r_collectionType3818); if (failed) return cn; + match(input,71,FOLLOW_71_in_r_collectionType3784); if (failed) return cn; if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); + addLeafNodeForToken(cn, "collectionType"); } } @@ -8480,14 +8443,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:4: ( 'Set' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:4: ( 'Set' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:4: ( 'Set' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:5: 'Set' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:4: ( 'Set' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:5: 'Set' { - match(input,72,FOLLOW_72_in_r_collectionType3827); if (failed) return cn; + match(input,72,FOLLOW_72_in_r_collectionType3793); if (failed) return cn; if ( backtracking==0 ) { - addLeafNodeForToken(cn, null); + addLeafNodeForToken(cn, "collectionType"); } } @@ -8501,7 +8464,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:50: ( ( ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:62: ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? int alt86=2; int LA86_0 = input.LA(1); @@ -8510,38 +8473,38 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt86) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:51: ( ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:63: ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:51: ( ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:52: ( '[' ) (f_unnamed52= r_simpleType ) ( ']' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:63: ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:64: ( '[' ) (f_elementType= r_simpleType ) ( ']' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:52: ( '[' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:53: '[' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:64: ( '[' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:65: '[' { - match(input,111,FOLLOW_111_in_r_collectionType3837); if (failed) return cn; + match(input,111,FOLLOW_111_in_r_collectionType3803); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:94: (f_unnamed52= r_simpleType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:95: f_unnamed52= r_simpleType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:106: (f_elementType= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:107: f_elementType= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_collectionType3845); - f_unnamed52=r_simpleType(); + pushFollow(FOLLOW_r_simpleType_in_r_collectionType3811); + f_elementType=r_simpleType(); _fsp--; if (failed) return cn; if ( backtracking==0 ) { - addToChildren(cn, f_unnamed52); + addToChildren(cn, f_elementType); ((CollectionTypeNode) cn).setElementType(f_elementType); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:157: ( ']' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:158: ']' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:230: ( ']' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:231: ']' { - match(input,112,FOLLOW_112_in_r_collectionType3851); if (failed) return cn; + match(input,112,FOLLOW_112_in_r_collectionType3817); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8573,7 +8536,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_simpleType - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:1: r_simpleType returns [CompositeNode cn] : (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:1: r_simpleType returns [CompositeNode cn] : (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ; public CompositeNode r_simpleType() throws RecognitionException { CompositeNode cn = null; @@ -8583,13 +8546,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createSimpleTypeNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:2: ( (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:2: (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:2: ( (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:2: (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:2: (f_names= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:3: f_names= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:2: (f_names= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:3: f_names= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_simpleType3880); + pushFollow(FOLLOW_r_identifier_in_r_simpleType3846); f_names=r_identifier(); _fsp--; if (failed) return cn; @@ -8599,7 +8562,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:104: ( ( ( '::' ) (f_names= r_identifier ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:104: ( ( ( '::' ) (f_names= r_identifier ) ) )* loop87: do { int alt87=2; @@ -8612,25 +8575,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt87) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:105: ( ( '::' ) (f_names= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:105: ( ( '::' ) (f_names= r_identifier ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:105: ( ( '::' ) (f_names= r_identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:106: ( '::' ) (f_names= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:105: ( ( '::' ) (f_names= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:106: ( '::' ) (f_names= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:106: ( '::' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:107: '::' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:106: ( '::' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:107: '::' { - match(input,64,FOLLOW_64_in_r_simpleType3888); if (failed) return cn; + match(input,64,FOLLOW_64_in_r_simpleType3854); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:149: (f_names= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:461:150: f_names= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:149: (f_names= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:150: f_names= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_simpleType3896); + pushFollow(FOLLOW_r_identifier_in_r_simpleType3862); f_names=r_identifier(); _fsp--; if (failed) return cn; @@ -8668,20 +8631,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_identifier - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:464:1: r_identifier returns [CompositeNode cn] : ( Identifier ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:1: r_identifier returns [CompositeNode cn] : ( Identifier ) ; public CompositeNode r_identifier() throws RecognitionException { CompositeNode cn = null; cn = factory.createIdentifierNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467:2: ( ( Identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467:2: ( Identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:2: ( ( Identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:2: ( Identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467:2: ( Identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467:3: Identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:2: ( Identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:3: Identifier { - match(input,Identifier,FOLLOW_Identifier_in_r_identifier3923); if (failed) return cn; + match(input,Identifier,FOLLOW_Identifier_in_r_identifier3889); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8704,16 +8667,16 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start synpred1 public void synpred1_fragment() throws RecognitionException { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:2: ( '(' r_type ')' r_chainExpression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:3: '(' r_type ')' r_chainExpression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:2: ( '(' r_type ')' r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:3: '(' r_type ')' r_chainExpression { - match(input,31,FOLLOW_31_in_synpred12145); if (failed) return ; - pushFollow(FOLLOW_r_type_in_synpred12147); + match(input,31,FOLLOW_31_in_synpred12133); if (failed) return ; + pushFollow(FOLLOW_r_type_in_synpred12135); r_type(); _fsp--; if (failed) return ; - match(input,34,FOLLOW_34_in_synpred12149); if (failed) return ; - pushFollow(FOLLOW_r_chainExpression_in_synpred12151); + match(input,34,FOLLOW_34_in_synpred12137); if (failed) return ; + pushFollow(FOLLOW_r_chainExpression_in_synpred12139); r_chainExpression(); _fsp--; if (failed) return ; @@ -8744,15 +8707,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { static final String DFA53_eofS = "\10\uffff\1\2\70\uffff"; static final String DFA53_minS = - "\2\13\1\uffff\3\41\1\37\1\15\1\12\1\15\1\100\2\uffff\1\0\25\uffff"+ - "\1\12\1\uffff\1\41\1\15\1\41\5\0\3\37\21\0"; + "\2\13\1\uffff\3\41\1\37\1\15\1\12\1\15\1\100\1\12\1\0\30\uffff\1"+ + "\41\1\15\1\41\1\0\3\37\25\0"; static final String DFA53_maxS = - "\2\155\1\uffff\3\157\1\136\1\15\1\155\1\15\1\160\2\uffff\1\0\25"+ - "\uffff\1\155\1\uffff\1\136\1\15\1\136\5\0\3\37\21\0"; + "\2\155\1\uffff\3\157\1\136\1\15\1\155\1\15\1\160\1\155\1\0\30\uffff"+ + "\1\136\1\15\1\136\1\0\3\37\25\0"; static final String DFA53_acceptS = - "\2\uffff\1\2\10\uffff\2\1\1\uffff\25\1\1\uffff\1\1\34\uffff"; + "\2\uffff\1\2\12\uffff\30\1\34\uffff"; static final String DFA53_specialS = - "\10\uffff\1\3\4\uffff\1\2\32\uffff\1\6\1\0\1\1\1\4\1\5\24\uffff}>"; + "\10\uffff\1\0\3\uffff\1\2\33\uffff\1\1\30\uffff}>"; static final String[] DFA53_transitionS = { "\3\2\21\uffff\1\1\4\uffff\1\2\27\uffff\1\2\11\uffff\3\2\6\uffff"+ "\2\2\16\uffff\17\2", @@ -8768,16 +8731,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { "\1\2\1\uffff\1\2\1\10\1\uffff\1\2\33\uffff\1\11\4\uffff\1\2"+ "\5\uffff\2\2\7\uffff\13\2", "\1\12", - "\1\2\1\14\1\34\1\15\15\uffff\1\2\3\uffff\1\41\3\2\1\uffff\1"+ - "\43\1\2\2\uffff\1\2\1\uffff\1\2\1\uffff\1\2\12\uffff\3\2\2\uffff"+ - "\1\44\2\2\6\uffff\1\2\1\16\1\17\1\20\2\uffff\3\2\1\uffff\1\13"+ - "\1\36\16\2\1\42\1\40\1\37\1\32\1\33\1\35\1\21\1\22\1\23\1\24"+ - "\1\25\1\26\1\27\1\30\1\31", + "\1\2\1\16\1\35\1\14\15\uffff\1\2\3\uffff\1\42\3\2\1\uffff\1"+ + "\13\1\2\2\uffff\1\2\1\uffff\1\2\1\uffff\1\2\12\uffff\3\2\2\uffff"+ + "\1\44\2\2\6\uffff\1\2\1\30\1\31\1\32\2\uffff\3\2\1\uffff\1\15"+ + "\1\37\16\2\1\43\1\41\1\40\1\33\1\34\1\36\1\17\1\20\1\21\1\22"+ + "\1\23\1\24\1\25\1\26\1\27", "\1\45", "\1\46\57\uffff\1\47", + "\1\2\1\50\1\70\1\62\21\uffff\1\75\4\uffff\1\2\41\uffff\1\63"+ + "\1\64\1\65\7\uffff\1\72\16\uffff\1\2\1\74\1\73\1\66\1\67\1\71"+ + "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61", + "\1\uffff", "", "", - "\1\uffff", "", "", "", @@ -8799,22 +8765,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { "", "", "", - "\1\2\1\50\1\70\1\51\21\uffff\1\75\4\uffff\1\2\41\uffff\1\52"+ - "\1\53\1\54\7\uffff\1\72\16\uffff\1\2\1\74\1\73\1\66\1\67\1\71"+ - "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64\1\65", "", "\1\2\1\10\1\uffff\1\2\33\uffff\1\11\4\uffff\1\2\5\uffff\2\2"+ "\7\uffff\13\2", "\1\76", "\1\2\1\10\1\uffff\1\2\40\uffff\1\2\5\uffff\2\2\7\uffff\13\2", "\1\uffff", + "\1\77", + "\1\100", + "\1\100", "\1\uffff", "\1\uffff", "\1\uffff", "\1\uffff", - "\1\77", - "\1\100", - "\1\100", "\1\uffff", "\1\uffff", "\1\uffff", @@ -8864,141 +8827,81 @@ public class Xpand3NodeParser extends AbstractNodeParser { this.transition = DFA53_transition; } public String getDescription() { - return "235:1: r_castedExpression returns [CompositeNode cn] : ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_unnamed19= r_type ) ( ')' ) (f_unnamed20= r_chainExpression ) ) | (f_unnamed21= r_chainExpression ) );"; + return "232:1: r_castedExpression returns [CompositeNode cn] : ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) | (f_unnamed14= r_chainExpression ) );"; } public int specialStateTransition(int s, IntStream input) throws NoViableAltException { int _s = s; switch ( s ) { case 0 : - int LA53_41 = input.LA(1); - - - int index53_41 = input.index(); - input.rewind(); - s = -1; - if ( (synpred1()) ) {s = 36;} - - else if ( (true) ) {s = 2;} - - - input.seek(index53_41); - if ( s>=0 ) return s; - break; - case 1 : - int LA53_42 = input.LA(1); - - - int index53_42 = input.index(); - input.rewind(); - s = -1; - if ( (synpred1()) ) {s = 36;} - - else if ( (true) ) {s = 2;} - - - input.seek(index53_42); - if ( s>=0 ) return s; - break; - case 2 : - int LA53_13 = input.LA(1); - - - int index53_13 = input.index(); - input.rewind(); - s = -1; - if ( (synpred1()) ) {s = 36;} - - else if ( (true) ) {s = 2;} - - - input.seek(index53_13); - if ( s>=0 ) return s; - break; - case 3 : int LA53_8 = input.LA(1); int index53_8 = input.index(); input.rewind(); s = -1; - if ( (LA53_8==79) && (synpred1())) {s = 11;} + if ( (LA53_8==EOF||LA53_8==TEXT||LA53_8==27||(LA53_8>=32 && LA53_8<=34)||LA53_8==37||LA53_8==40||LA53_8==42||LA53_8==44||(LA53_8>=55 && LA53_8<=57)||(LA53_8>=61 && LA53_8<=62)||LA53_8==69||(LA53_8>=75 && LA53_8<=77)||(LA53_8>=81 && LA53_8<=94)) ) {s = 2;} - else if ( (LA53_8==StringLiteral) && (synpred1())) {s = 12;} + else if ( (LA53_8==36) ) {s = 11;} - else if ( (LA53_8==Identifier) ) {s = 13;} + else if ( (LA53_8==Identifier) ) {s = 12;} - else if ( (LA53_8==70) && (synpred1())) {s = 14;} + else if ( (LA53_8==79) && (synpred1())) {s = 13;} - else if ( (LA53_8==71) && (synpred1())) {s = 15;} + else if ( (LA53_8==StringLiteral) && (synpred1())) {s = 14;} - else if ( (LA53_8==72) && (synpred1())) {s = 16;} + else if ( (LA53_8==101) && (synpred1())) {s = 15;} - else if ( (LA53_8==101) && (synpred1())) {s = 17;} + else if ( (LA53_8==102) && (synpred1())) {s = 16;} - else if ( (LA53_8==102) && (synpred1())) {s = 18;} + else if ( (LA53_8==103) && (synpred1())) {s = 17;} - else if ( (LA53_8==103) && (synpred1())) {s = 19;} + else if ( (LA53_8==104) && (synpred1())) {s = 18;} - else if ( (LA53_8==104) && (synpred1())) {s = 20;} + else if ( (LA53_8==105) && (synpred1())) {s = 19;} - else if ( (LA53_8==105) && (synpred1())) {s = 21;} + else if ( (LA53_8==106) && (synpred1())) {s = 20;} - else if ( (LA53_8==106) && (synpred1())) {s = 22;} + else if ( (LA53_8==107) && (synpred1())) {s = 21;} - else if ( (LA53_8==107) && (synpred1())) {s = 23;} + else if ( (LA53_8==108) && (synpred1())) {s = 22;} - else if ( (LA53_8==108) && (synpred1())) {s = 24;} + else if ( (LA53_8==109) && (synpred1())) {s = 23;} - else if ( (LA53_8==109) && (synpred1())) {s = 25;} + else if ( (LA53_8==70) && (synpred1())) {s = 24;} - else if ( (LA53_8==98) && (synpred1())) {s = 26;} + else if ( (LA53_8==71) && (synpred1())) {s = 25;} - else if ( (LA53_8==99) && (synpred1())) {s = 27;} + else if ( (LA53_8==72) && (synpred1())) {s = 26;} - else if ( (LA53_8==IntLiteral) && (synpred1())) {s = 28;} + else if ( (LA53_8==98) && (synpred1())) {s = 27;} - else if ( (LA53_8==100) && (synpred1())) {s = 29;} + else if ( (LA53_8==99) && (synpred1())) {s = 28;} - else if ( (LA53_8==80) && (synpred1())) {s = 30;} + else if ( (LA53_8==IntLiteral) && (synpred1())) {s = 29;} - else if ( (LA53_8==97) && (synpred1())) {s = 31;} + else if ( (LA53_8==100) && (synpred1())) {s = 30;} - else if ( (LA53_8==96) && (synpred1())) {s = 32;} + else if ( (LA53_8==80) && (synpred1())) {s = 31;} - else if ( (LA53_8==31) && (synpred1())) {s = 33;} + else if ( (LA53_8==97) && (synpred1())) {s = 32;} - else if ( (LA53_8==95) && (synpred1())) {s = 34;} + else if ( (LA53_8==96) && (synpred1())) {s = 33;} - else if ( (LA53_8==36) ) {s = 35;} + else if ( (LA53_8==31) && (synpred1())) {s = 34;} - else if ( (LA53_8==60) && (synpred1())) {s = 36;} + else if ( (LA53_8==95) && (synpred1())) {s = 35;} - else if ( (LA53_8==EOF||LA53_8==TEXT||LA53_8==27||(LA53_8>=32 && LA53_8<=34)||LA53_8==37||LA53_8==40||LA53_8==42||LA53_8==44||(LA53_8>=55 && LA53_8<=57)||(LA53_8>=61 && LA53_8<=62)||LA53_8==69||(LA53_8>=75 && LA53_8<=77)||(LA53_8>=81 && LA53_8<=94)) ) {s = 2;} + else if ( (LA53_8==60) && (synpred1())) {s = 36;} input.seek(index53_8); if ( s>=0 ) return s; break; - case 4 : - int LA53_43 = input.LA(1); - - - int index53_43 = input.index(); - input.rewind(); - s = -1; - if ( (synpred1()) ) {s = 36;} - - else if ( (true) ) {s = 2;} - - - input.seek(index53_43); - if ( s>=0 ) return s; - break; - case 5 : - int LA53_44 = input.LA(1); + case 1 : + int LA53_40 = input.LA(1); - int index53_44 = input.index(); + int index53_40 = input.index(); input.rewind(); s = -1; if ( (synpred1()) ) {s = 36;} @@ -9006,14 +8909,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { else if ( (true) ) {s = 2;} - input.seek(index53_44); + input.seek(index53_40); if ( s>=0 ) return s; break; - case 6 : - int LA53_40 = input.LA(1); + case 2 : + int LA53_12 = input.LA(1); - int index53_40 = input.index(); + int index53_12 = input.index(); input.rewind(); s = -1; if ( (synpred1()) ) {s = 36;} @@ -9021,7 +8924,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else if ( (true) ) {s = 2;} - input.seek(index53_40); + input.seek(index53_12); if ( s>=0 ) return s; break; } @@ -9214,157 +9117,156 @@ public class Xpand3NodeParser extends AbstractNodeParser { public static final BitSet FOLLOW_72_in_r_javaType1969 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); public static final BitSet FOLLOW_r_expression_in_r_test_expression2005 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_r_test_expression2011 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_letExpression_in_r_expression2040 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_73_in_r_letExpression2069 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_letExpression2077 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L}); - public static final BitSet FOLLOW_74_in_r_letExpression2083 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); - public static final BitSet FOLLOW_r_castedExpression_in_r_letExpression2091 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_letExpression2097 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_letExpression2105 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_castedExpression_in_r_letExpression2116 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_31_in_r_castedExpression2156 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_castedExpression2164 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_castedExpression2170 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_letExpression_in_r_expression2028 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_73_in_r_letExpression2057 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_letExpression2065 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L}); + public static final BitSet FOLLOW_74_in_r_letExpression2071 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_castedExpression_in_r_letExpression2079 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_letExpression2085 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_letExpression2093 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_castedExpression_in_r_letExpression2104 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_r_castedExpression2144 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_castedExpression2152 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_castedExpression2158 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_chainExpression_in_r_castedExpression2166 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_r_chainExpression_in_r_castedExpression2178 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_chainExpression_in_r_castedExpression2190 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_ifExpression_in_r_chainExpression2221 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L}); - public static final BitSet FOLLOW_75_in_r_chainExpression2229 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); - public static final BitSet FOLLOW_r_ifExpression_in_r_chainExpression2237 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L}); - public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2271 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L}); - public static final BitSet FOLLOW_76_in_r_ifExpression2279 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_ifExpression2287 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_ifExpression2293 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); - public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2301 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_60_in_r_ifExpression2313 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_ifExpression2321 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L}); - public static final BitSet FOLLOW_77_in_r_ifExpression2327 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); - public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2335 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L}); - public static final BitSet FOLLOW_78_in_r_ifExpression2343 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); - public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2351 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_79_in_r_switchExpression2383 = new BitSet(new long[]{0x0000000080000000L,0x0000000000010000L}); - public static final BitSet FOLLOW_31_in_r_switchExpression2391 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2399 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_switchExpression2405 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L}); - public static final BitSet FOLLOW_80_in_r_switchExpression2414 = new BitSet(new long[]{0x0000000000000000L,0x00000000000A0000L}); - public static final BitSet FOLLOW_r_casePart_in_r_switchExpression2422 = new BitSet(new long[]{0x0000000000000000L,0x00000000000A0000L}); - public static final BitSet FOLLOW_81_in_r_switchExpression2429 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_switchExpression2435 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2443 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L}); - public static final BitSet FOLLOW_82_in_r_switchExpression2449 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2460 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_83_in_r_casePart2484 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_casePart2492 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_casePart2498 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_casePart2506 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_andExpression_in_r_orExpression2537 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L}); - public static final BitSet FOLLOW_84_in_r_orExpression2545 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_andExpression_in_r_orExpression2553 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L}); - public static final BitSet FOLLOW_r_impliesExpression_in_r_andExpression2587 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L}); - public static final BitSet FOLLOW_85_in_r_andExpression2595 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_impliesExpression_in_r_andExpression2603 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L}); - public static final BitSet FOLLOW_r_relationalExpression_in_r_impliesExpression2637 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L}); - public static final BitSet FOLLOW_86_in_r_impliesExpression2645 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_relationalExpression_in_r_impliesExpression2653 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L}); - public static final BitSet FOLLOW_r_additiveExpression_in_r_relationalExpression2687 = new BitSet(new long[]{0x0000000000000002L,0x000000001F800000L}); - public static final BitSet FOLLOW_r_relationalOperator_in_r_relationalExpression2697 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_additiveExpression_in_r_relationalExpression2705 = new BitSet(new long[]{0x0000000000000002L,0x000000001F800000L}); - public static final BitSet FOLLOW_87_in_r_relationalOperator2732 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_88_in_r_relationalOperator2741 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_89_in_r_relationalOperator2750 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_90_in_r_relationalOperator2759 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_91_in_r_relationalOperator2768 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_92_in_r_relationalOperator2777 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2808 = new BitSet(new long[]{0x0000001000000002L,0x0000000020000000L}); - public static final BitSet FOLLOW_93_in_r_additiveExpression2818 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_36_in_r_additiveExpression2827 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2837 = new BitSet(new long[]{0x0000001000000002L,0x0000000020000000L}); - public static final BitSet FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2871 = new BitSet(new long[]{0x0000000200000002L,0x0000000040000000L}); - public static final BitSet FOLLOW_33_in_r_multiplicativeExpression2881 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_94_in_r_multiplicativeExpression2890 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); - public static final BitSet FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2900 = new BitSet(new long[]{0x0000000200000002L,0x0000000040000000L}); + public static final BitSet FOLLOW_r_ifExpression_in_r_chainExpression2209 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L}); + public static final BitSet FOLLOW_75_in_r_chainExpression2217 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_ifExpression_in_r_chainExpression2225 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2259 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L}); + public static final BitSet FOLLOW_76_in_r_ifExpression2267 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_ifExpression2275 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_ifExpression2281 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2289 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_60_in_r_ifExpression2301 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_ifExpression2309 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L}); + public static final BitSet FOLLOW_77_in_r_ifExpression2315 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2323 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L}); + public static final BitSet FOLLOW_78_in_r_ifExpression2331 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2339 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_79_in_r_switchExpression2371 = new BitSet(new long[]{0x0000000080000000L,0x0000000000010000L}); + public static final BitSet FOLLOW_31_in_r_switchExpression2379 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2387 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_switchExpression2393 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L}); + public static final BitSet FOLLOW_80_in_r_switchExpression2402 = new BitSet(new long[]{0x0000000000000000L,0x00000000000A0000L}); + public static final BitSet FOLLOW_r_casePart_in_r_switchExpression2410 = new BitSet(new long[]{0x0000000000000000L,0x00000000000A0000L}); + public static final BitSet FOLLOW_81_in_r_switchExpression2417 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_switchExpression2423 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2431 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_82_in_r_switchExpression2437 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2448 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_83_in_r_casePart2472 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_casePart2480 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_casePart2486 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_casePart2494 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_andExpression_in_r_orExpression2525 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L}); + public static final BitSet FOLLOW_84_in_r_orExpression2533 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_andExpression_in_r_orExpression2541 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L}); + public static final BitSet FOLLOW_r_impliesExpression_in_r_andExpression2575 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L}); + public static final BitSet FOLLOW_85_in_r_andExpression2583 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_impliesExpression_in_r_andExpression2591 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L}); + public static final BitSet FOLLOW_r_relationalExpression_in_r_impliesExpression2625 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L}); + public static final BitSet FOLLOW_86_in_r_impliesExpression2633 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_relationalExpression_in_r_impliesExpression2641 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L}); + public static final BitSet FOLLOW_r_additiveExpression_in_r_relationalExpression2675 = new BitSet(new long[]{0x0000000000000002L,0x000000001F800000L}); + public static final BitSet FOLLOW_87_in_r_relationalExpression2685 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_88_in_r_relationalExpression2694 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_89_in_r_relationalExpression2703 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_90_in_r_relationalExpression2712 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_91_in_r_relationalExpression2721 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_92_in_r_relationalExpression2730 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_additiveExpression_in_r_relationalExpression2740 = new BitSet(new long[]{0x0000000000000002L,0x000000001F800000L}); + public static final BitSet FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2774 = new BitSet(new long[]{0x0000001000000002L,0x0000000020000000L}); + public static final BitSet FOLLOW_93_in_r_additiveExpression2784 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_36_in_r_additiveExpression2793 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2803 = new BitSet(new long[]{0x0000001000000002L,0x0000000020000000L}); + public static final BitSet FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2837 = new BitSet(new long[]{0x0000000200000002L,0x0000000040000000L}); + public static final BitSet FOLLOW_33_in_r_multiplicativeExpression2847 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_94_in_r_multiplicativeExpression2856 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2866 = new BitSet(new long[]{0x0000000200000002L,0x0000000040000000L}); + public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2900 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_95_in_r_unaryExpression2909 = new BitSet(new long[]{0x0000000080003800L,0x00003FFF000101C0L}); + public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2917 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_36_in_r_unaryExpression2926 = new BitSet(new long[]{0x0000000080003800L,0x00003FFF000101C0L}); public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2934 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_95_in_r_unaryExpression2943 = new BitSet(new long[]{0x0000000080003800L,0x00003FFF000101C0L}); - public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2951 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_36_in_r_unaryExpression2960 = new BitSet(new long[]{0x0000000080003800L,0x00003FFF000101C0L}); - public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2968 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_primaryExpression_in_r_infixExpression2999 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - public static final BitSet FOLLOW_69_in_r_infixExpression3007 = new BitSet(new long[]{0x0000000000002000L,0x00003FE0000001C0L}); - public static final BitSet FOLLOW_r_featureCall_in_r_infixExpression3015 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - public static final BitSet FOLLOW_r_stringLiteral_in_r_primaryExpression3037 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_featureCall_in_r_primaryExpression3046 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_booleanLiteral_in_r_primaryExpression3055 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_numberLiteral_in_r_primaryExpression3064 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_nullLiteral_in_r_primaryExpression3073 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_listLiteral_in_r_primaryExpression3082 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_constructorCall_in_r_primaryExpression3091 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_globalVarExpression_in_r_primaryExpression3100 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3109 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_StringLiteral_in_r_stringLiteral3133 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_31_in_r_paranthesizedExpression3157 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_paranthesizedExpression3165 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_paranthesizedExpression3171 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_96_in_r_globalVarExpression3195 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_globalVarExpression3203 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_identifier_in_r_featureCall3229 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_r_featureCall3235 = new BitSet(new long[]{0x1000001480003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_parameterList_in_r_featureCall3245 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_featureCall3254 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_type_in_r_featureCall3265 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_collectionExpression_in_r_featureCall3276 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_80_in_r_listLiteral3300 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800583C0L}); - public static final BitSet FOLLOW_r_expression_in_r_listLiteral3310 = new BitSet(new long[]{0x0000000100000000L,0x0000000000040000L}); - public static final BitSet FOLLOW_32_in_r_listLiteral3318 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_listLiteral3326 = new BitSet(new long[]{0x0000000100000000L,0x0000000000040000L}); - public static final BitSet FOLLOW_82_in_r_listLiteral3338 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_97_in_r_constructorCall3362 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_simpleType_in_r_constructorCall3370 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_98_in_r_booleanLiteral3394 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_99_in_r_booleanLiteral3403 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_100_in_r_nullLiteral3427 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3451 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3460 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L}); - public static final BitSet FOLLOW_69_in_r_numberLiteral3466 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3472 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_101_in_r_collectionExpression3496 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_r_collectionExpression3502 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_collectionExpression3510 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_collectionExpression3516 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_102_in_r_collectionExpression3527 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_103_in_r_collectionExpression3536 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_104_in_r_collectionExpression3545 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_105_in_r_collectionExpression3554 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_106_in_r_collectionExpression3563 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_107_in_r_collectionExpression3572 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_108_in_r_collectionExpression3581 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_109_in_r_collectionExpression3590 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_r_collectionExpression3598 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_identifier_in_r_collectionExpression3608 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000000L}); - public static final BitSet FOLLOW_110_in_r_collectionExpression3614 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_collectionExpression3625 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_collectionExpression3631 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_declaredParameter_in_r_declaredParameterList3657 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_32_in_r_declaredParameterList3665 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_declaredParameter_in_r_declaredParameterList3673 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_r_type_in_r_declaredParameter3702 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_declaredParameter3710 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_expression_in_r_parameterList3736 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_32_in_r_parameterList3744 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_parameterList3752 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_r_collectionType_in_r_type3774 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_simpleType_in_r_type3783 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_70_in_r_collectionType3809 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); - public static final BitSet FOLLOW_71_in_r_collectionType3818 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); - public static final BitSet FOLLOW_72_in_r_collectionType3827 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); - public static final BitSet FOLLOW_111_in_r_collectionType3837 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_simpleType_in_r_collectionType3845 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); - public static final BitSet FOLLOW_112_in_r_collectionType3851 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_identifier_in_r_simpleType3880 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); - public static final BitSet FOLLOW_64_in_r_simpleType3888 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_simpleType3896 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); - public static final BitSet FOLLOW_Identifier_in_r_identifier3923 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_31_in_synpred12145 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_synpred12147 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_synpred12149 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); - public static final BitSet FOLLOW_r_chainExpression_in_synpred12151 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_primaryExpression_in_r_infixExpression2965 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_69_in_r_infixExpression2973 = new BitSet(new long[]{0x0000000000002000L,0x00003FE0000001C0L}); + public static final BitSet FOLLOW_r_featureCall_in_r_infixExpression2981 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_r_stringLiteral_in_r_primaryExpression3003 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_featureCall_in_r_primaryExpression3012 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_booleanLiteral_in_r_primaryExpression3021 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_numberLiteral_in_r_primaryExpression3030 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_nullLiteral_in_r_primaryExpression3039 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_listLiteral_in_r_primaryExpression3048 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_constructorCall_in_r_primaryExpression3057 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_globalVarExpression_in_r_primaryExpression3066 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3075 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_StringLiteral_in_r_stringLiteral3099 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_r_paranthesizedExpression3123 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_paranthesizedExpression3131 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_paranthesizedExpression3137 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_96_in_r_globalVarExpression3161 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_globalVarExpression3169 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_collectionExpression_in_r_featureCall3195 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_identifier_in_r_featureCall3206 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_featureCall3212 = new BitSet(new long[]{0x1000001480003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_parameterList_in_r_featureCall3222 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_featureCall3231 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_type_in_r_featureCall3242 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_80_in_r_listLiteral3266 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800583C0L}); + public static final BitSet FOLLOW_r_expression_in_r_listLiteral3276 = new BitSet(new long[]{0x0000000100000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_32_in_r_listLiteral3284 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_listLiteral3292 = new BitSet(new long[]{0x0000000100000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_82_in_r_listLiteral3304 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_97_in_r_constructorCall3328 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_constructorCall3336 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_98_in_r_booleanLiteral3360 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_99_in_r_booleanLiteral3369 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_100_in_r_nullLiteral3393 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3417 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3426 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_69_in_r_numberLiteral3432 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3438 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_101_in_r_collectionExpression3462 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_collectionExpression3468 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_collectionExpression3476 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_collectionExpression3482 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_102_in_r_collectionExpression3493 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_103_in_r_collectionExpression3502 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_104_in_r_collectionExpression3511 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_105_in_r_collectionExpression3520 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_106_in_r_collectionExpression3529 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_107_in_r_collectionExpression3538 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_108_in_r_collectionExpression3547 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_109_in_r_collectionExpression3556 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_collectionExpression3564 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_identifier_in_r_collectionExpression3574 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000000L}); + public static final BitSet FOLLOW_110_in_r_collectionExpression3580 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_collectionExpression3591 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_collectionExpression3597 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_declaredParameter_in_r_declaredParameterList3623 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_32_in_r_declaredParameterList3631 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_declaredParameter_in_r_declaredParameterList3639 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_r_type_in_r_declaredParameter3668 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_declaredParameter3676 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_expression_in_r_parameterList3702 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_32_in_r_parameterList3710 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_parameterList3718 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_r_collectionType_in_r_type3740 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_simpleType_in_r_type3749 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_70_in_r_collectionType3775 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); + public static final BitSet FOLLOW_71_in_r_collectionType3784 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); + public static final BitSet FOLLOW_72_in_r_collectionType3793 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); + public static final BitSet FOLLOW_111_in_r_collectionType3803 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_collectionType3811 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); + public static final BitSet FOLLOW_112_in_r_collectionType3817 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_identifier_in_r_simpleType3846 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); + public static final BitSet FOLLOW_64_in_r_simpleType3854 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_simpleType3862 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); + public static final BitSet FOLLOW_Identifier_in_r_identifier3889 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_synpred12133 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_synpred12135 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_synpred12137 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_chainExpression_in_synpred12139 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file 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 28a68c56..71bbbf74 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 @@ -95,20 +95,20 @@ T110 : '|' ; T111 : '[' ; T112 : ']' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 471 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 462 IntLiteral : ('0' | '1'..'9' '0'..'9'*) ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 476 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 467 StringLiteral : '\"' ( EscapeSequence | ~('\\'|'\"') )* '\"' | '\'' ( EscapeSequence | ~('\''|'\\') )* '\'' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 482 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 473 fragment EscapeSequence : '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | UnicodeEscape @@ -116,7 +116,7 @@ fragment EscapeSequence : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 489 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 480 fragment OctalEscape : '\\' ('0'..'3') ('0'..'7') ('0'..'7') | '\\' ('0'..'7') ('0'..'7') @@ -124,49 +124,49 @@ fragment OctalEscape : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 496 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 487 fragment UnicodeEscape : '\\' 'u' HexDigit HexDigit HexDigit HexDigit ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 501 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 492 fragment HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 506 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 497 DEFINE : {xpandMode=true;} 'DEFINE' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 511 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 502 ENDDEFINE : 'ENDDEFINE' {xpandMode=false;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 516 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 507 AROUND : {xpandMode=true;}'AROUND' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 521 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 512 ENDAROUND : 'ENDAROUND'{xpandMode=false;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 526 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 517 Identifier : ('^')? Letter (Letter|JavaIDDigit)* ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 531 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 522 fragment Letter : '\u0024' | '\u0041'..'\u005a' | @@ -184,7 +184,7 @@ fragment Letter : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 548 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 539 fragment JavaIDDigit : '\u0030'..'\u0039' | @@ -206,49 +206,49 @@ fragment JavaIDDigit : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 569 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 560 WS : (' '|'\r'|'\t'|'\u000C'|'\n') {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 574 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 565 COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 579 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 570 LINE_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n'|EOF) {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 584 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 575 REM_COMMENT_OUT : {!xpandMode}?=> LG 'REM' RG ( options {greedy=false;} : . )* '\u00ABENDREM' RG {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 589 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 580 REM_COMMENT : {xpandMode}?=> 'REM' RG ( options {greedy=false;} : . )* '\u00ABENDREM' {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 594 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 585 TEXT : {xpandMode}?=> RG ~(LG)* (LG)? ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 599 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 590 LG : '\u00AB' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 604 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 595 RG : '\u00BB' ; diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/debugMeWithAntLR.g b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/debugMeWithAntLR.g index d789ae57..db957e3f 100644 --- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/debugMeWithAntLR.g +++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/debugMeWithAntLR.g @@ -56,7 +56,7 @@ r_statement : ; r_textSequence : - (f_text=r_text) (((f_text=r_text)))* + (f_texts=r_text) (((f_texts=r_text)))* ; r_text : @@ -75,7 +75,7 @@ r_errorStatement : r_expandStatement : ('EXPAND') (f_name=r_simpleType) ((('(') (f_paramList=r_parameterList) (')')))? ((((('FOR') (f_forExpression=r_expression))) - | ((('FOREACH') (f_forExpression=r_expression) ((('SEPARATOR') (f_separator=r_expression)))?))))? + | ((('FOREACH') (f_forEachExpression=r_expression) ((('SEPARATOR') (f_separator=r_expression)))?))))? ; r_expressionStmt : @@ -91,7 +91,7 @@ r_foreachStatement : ; r_ifStatement : - ('IF') (f_expression=r_expression) (f_sequence=r_sequence) (f_elseIf=r_elseIfStatement)* (f_else=r_elseStatement)? ('ENDIF') + ('IF') (f_expression=r_expression) (f_sequence=r_sequence) (f_elseIfs=r_elseIfStatement)* (f_else=r_elseStatement)? ('ENDIF') ; r_elseIfStatement : @@ -111,109 +111,105 @@ r_protectStatement : ; r_check : - ('context') (f_unnamed0=r_type) ((('if') (f_unnamed1=r_expression)))? ((('ERROR') - | ('WARNING'))) (f_unnamed2=r_expression) (':') (f_unnamed3=r_expression) (';') + ('context') (f_type=r_type) ((('if') (f_ifExpression=r_expression)))? ((('ERROR') + | ('WARNING'))) (f_message=r_expression) (':') (f_constraint=r_expression) (';') ; r_around : - ('around') (f_unnamed4=r_pointcut) ('(') (((f_unnamed5=r_declaredParameterList) (((',')? ('*')))? - | ('*')))? (')') (':') (f_unnamed6=r_expression) (';') + ('around') (f_unnamed0=r_pointcut) ('(') (((f_unnamed1=r_declaredParameterList) (((',')? ('*')))? + | ('*')))? (')') (':') (f_unnamed2=r_expression) (';') ; r_pointcut : ((('*') - | (f_unnamed7=r_identifier))) ((('*') - | (f_unnamed8=r_identifier) + | (f_unnamed3=r_identifier))) ((('*') + | (f_unnamed4=r_identifier) | ('::')))* ; r_extension : ((('private') | ('cached') - | ('create')))* (f_returnType=r_type)? (f_name=r_identifier) ('(') (f_paramList=r_declaredParameterList)? (')') (':') ((('JAVA') (f_javaReturnType=r_javaType) ('.') (f_javaName=r_identifier) ('(') (((f_unnamed9=r_javaType) (((',') (f_unnamed10=r_javaType)))*))? (')') + | ('create')))* (f_returnType=r_type)? (f_name=r_identifier) ('(') (f_paramList=r_declaredParameterList)? (')') (':') ((('JAVA') (f_javaReturnType=r_javaType) ('.') (f_javaName=r_identifier) ('(') (((f_unnamed5=r_javaType) (((',') (f_unnamed6=r_javaType)))*))? (')') | (f_extendBody=r_expression))) (';') ; r_javaType : - (f_unnamed11=r_identifier) ((('.') (((f_unnamed12=r_identifier) + (f_unnamed7=r_identifier) ((('.') (((f_unnamed8=r_identifier) | ('Collection') | ('List') | ('Set')))))* ; r_test_expression : - (f_unnamed13=r_expression) (EOF) + (f_unnamed9=r_expression) (EOF) ; r_expression : - (f_unnamed14=r_letExpression) + (r_letExpression) ; r_letExpression : - ('let') (f_unnamed15=r_identifier) ('=') (f_unnamed16=r_castedExpression) (':') (f_unnamed17=r_expression) - | (f_unnamed18=r_castedExpression) + ('let') (f_unnamed10=r_identifier) ('=') (f_unnamed11=r_castedExpression) (':') (f_unnamed12=r_expression) + | (f_unnamed13=r_castedExpression) ; r_castedExpression : - ('(' r_type ')' r_chainExpression)=>(('(') (f_unnamed19=r_type) (')') (f_unnamed20=r_chainExpression)) - | (f_unnamed21=r_chainExpression) + ('(' r_type ')' r_chainExpression)=>(('(') (f_type=r_type) (')') (f_target=r_chainExpression)) + | (f_unnamed14=r_chainExpression) ; r_chainExpression : - (f_unnamed22=r_ifExpression) ((('->') (f_unnamed23=r_ifExpression)))* + (f_first=r_ifExpression) ((('->') (f_nexts=r_ifExpression)))* ; r_ifExpression : - (f_unnamed24=r_switchExpression) ((('?') (f_unnamed25=r_expression) (':') (f_unnamed26=r_switchExpression)))? - | ('if') (f_unnamed27=r_expression) ('then') (f_unnamed28=r_switchExpression) ((('else') (f_unnamed29=r_switchExpression)))? + (f_condition0=r_switchExpression) ((('?') (f_then=r_expression) (':') (f_else=r_switchExpression)))? + | ('if') (f_condition1=r_expression) ('then') (f_then=r_switchExpression) ((('else') (f_else=r_switchExpression)))? ; r_switchExpression : - ('switch') ((('(') (f_unnamed30=r_orExpression) (')')))? ('{') (f_unnamed31=r_casePart)* ('default') (':') (f_unnamed32=r_orExpression) ('}') - | (f_unnamed33=r_orExpression) + ('switch') ((('(') (f_expression=r_orExpression) (')')))? ('{') (f_cases=r_casePart)* ('default') (':') (f_default=r_orExpression) ('}') + | (f_unnamed15=r_orExpression) ; r_casePart : - ('case') (f_unnamed34=r_expression) (':') (f_unnamed35=r_expression) + ('case') (f_condition=r_expression) (':') (f_expression=r_expression) ; r_orExpression : - (f_unnamed36=r_andExpression) ((('||') (f_unnamed37=r_andExpression)))* + (f_first=r_andExpression) ((('||') (f_nexts=r_andExpression)))* ; r_andExpression : - (f_unnamed38=r_impliesExpression) ((('&&') (f_unnamed39=r_impliesExpression)))* + (f_first=r_impliesExpression) ((('&&') (f_nexts=r_impliesExpression)))* ; r_impliesExpression : - (f_unnamed40=r_relationalExpression) ((('implies') (f_unnamed41=r_relationalExpression)))* + (f_first=r_relationalExpression) ((('implies') (f_nexts=r_relationalExpression)))* ; r_relationalExpression : - (f_leftOperand=r_additiveExpression) (((f_operator=r_relationalOperator) (f_rightOperand=r_additiveExpression)))* -; - -r_relationalOperator : - ('==') + (f_first=r_additiveExpression) ((((('==') | ('!=') | ('>=') | ('<=') | ('>') - | ('<') + | ('<'))) (f_nexts=r_additiveExpression)))* ; r_additiveExpression : - (f_left=r_multiplicativeExpression) ((((('+') - | ('-'))) (f_right=r_multiplicativeExpression)))* + (f_first=r_multiplicativeExpression) ((((('+') + | ('-'))) (f_nexts=r_multiplicativeExpression)))* ; r_multiplicativeExpression : - (f_left=r_unaryExpression) ((((('*') - | ('/'))) (f_right=r_unaryExpression)))* + (f_first=r_unaryExpression) ((((('*') + | ('/'))) (f_nexts=r_unaryExpression)))* ; r_unaryExpression : - (f_unnamed42=r_infixExpression) + (f_unnamed16=r_infixExpression) | ('!') (f_operand=r_infixExpression) | ('-') (f_operand=r_infixExpression) ; @@ -239,25 +235,25 @@ r_stringLiteral : ; r_paranthesizedExpression : - ('(') (f_unnamed43=r_expression) (')') + ('(') (f_expression=r_expression) (')') ; r_globalVarExpression : - ('GLOBALVAR') (f_unnamed44=r_identifier) + ('GLOBALVAR') (f_unnamed17=r_identifier) ; r_featureCall : - (f_name=r_identifier) ('(') (((f_paramList=r_parameterList)))? (')') + (f_unnamed18=r_collectionExpression) + | (f_name=r_identifier) ('(') (((f_paramList=r_parameterList)))? (')') | (f_type=r_type) - | (f_unnamed45=r_collectionExpression) ; r_listLiteral : - ('{') (((f_unnamed46=r_expression) (((',') (f_unnamed47=r_expression)))*))? ('}') + ('{') (((f_elements=r_expression) (((',') (f_elements=r_expression)))*))? ('}') ; r_constructorCall : - ('new') (f_unnamed48=r_simpleType) + ('new') (f_unnamed19=r_simpleType) ; r_booleanLiteral : @@ -275,7 +271,7 @@ r_numberLiteral : ; r_collectionExpression : - ('typeSelect') ('(') (f_unnamed49=r_type) (')') + ('typeSelect') ('(') (f_type=r_type) (')') | ((('collect') | ('select') | ('selectFirst') @@ -283,7 +279,7 @@ r_collectionExpression : | ('exists') | ('notExists') | ('sortBy') - | ('forAll'))) ('(') (((f_unnamed50=r_identifier) ('|')))? (f_unnamed51=r_expression) (')') + | ('forAll'))) ('(') (((f_variable=r_identifier) ('|')))? (f_expression=r_expression) (')') ; r_declaredParameterList : @@ -306,7 +302,7 @@ r_type : r_collectionType : ((('Collection') | ('List') - | ('Set'))) ((('[') (f_unnamed52=r_simpleType) (']')))? + | ('Set'))) ((('[') (f_elementType=r_simpleType) (']')))? ; r_simpleType : diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java index a1e37be7..9a1ff3e9 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java +++ b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java @@ -11,24 +11,46 @@ import org.eclipse.xpand3.ImportStatement; import org.eclipse.xpand3.SyntaxElement; import org.eclipse.xpand3.Xpand3Factory; import org.eclipse.xpand3.declaration.AbstractDeclaration; +import org.eclipse.xpand3.declaration.Check; import org.eclipse.xpand3.declaration.DeclarationFactory; import org.eclipse.xpand3.declaration.Definition; +import org.eclipse.xpand3.declaration.DefinitionAspect; import org.eclipse.xpand3.declaration.Extension; import org.eclipse.xpand3.expression.AbstractExpression; -import org.eclipse.xpand3.expression.BinaryOperation; import org.eclipse.xpand3.expression.BooleanLiteral; +import org.eclipse.xpand3.expression.Case; +import org.eclipse.xpand3.expression.Cast; +import org.eclipse.xpand3.expression.ChainExpression; +import org.eclipse.xpand3.expression.CollectionExpression; import org.eclipse.xpand3.expression.ExpressionFactory; import org.eclipse.xpand3.expression.FeatureCall; +import org.eclipse.xpand3.expression.IfExpression; +import org.eclipse.xpand3.expression.ListLiteral; +import org.eclipse.xpand3.expression.Literal; +import org.eclipse.xpand3.expression.NullLiteral; import org.eclipse.xpand3.expression.OperationCall; import org.eclipse.xpand3.expression.StringLiteral; +import org.eclipse.xpand3.expression.SwitchExpression; +import org.eclipse.xpand3.expression.TypeSelectExpression; import org.eclipse.xpand3.expression.UnaryOperation; 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.CasePartNode; +import org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.CheckNode; +import org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode; import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode; import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode; +import org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode; import org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode; import org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode; +import org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode; +import org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode; import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode; @@ -37,21 +59,33 @@ import org.eclipse.xpand3.internal.parser.xpand3node.FileNode; import org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode; import org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode; +import org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode; +import org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.ImportNode; import org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode; import org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode; +import org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode; +import org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode; +import org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode; import org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode; import org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode; import org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode; +import org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode; +import org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.TextNode; import org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode; import org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode; import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; import org.eclipse.xpand3.parser.AbstractXpand3NodeSwitch; import org.eclipse.xpand3.statement.AbstractStatement; +import org.eclipse.xpand3.statement.ErrorStatement; +import org.eclipse.xpand3.statement.ExpandStatement; import org.eclipse.xpand3.statement.ExpressionStatement; import org.eclipse.xpand3.statement.FileStatement; import org.eclipse.xpand3.statement.ForEachStatement; @@ -67,37 +101,16 @@ public class Node2AstTransformer extends private StatementFactory statementFactory = StatementFactory.eINSTANCE; private DeclarationFactory declarationFactory = DeclarationFactory.eINSTANCE; - private void setPosition(SyntaxElement syntaxElement, Node node) { + public void setPosition(SyntaxElement syntaxElement, Node node) { syntaxElement.setStart(node.start()); syntaxElement.setLine(node.line()); syntaxElement.setEnd(node.end()); } - private String getTextFromLeafNode(Node node) { - if (!(node instanceof LeafNode)) { - throw new TransformationException("Leaf node expected", node); - } - return ((LeafNode) node).getToken().getText(); - } - // Additional dispatchers for abstract classes - public SyntaxElement caseType(Node node) { - switch (node.eClass().getClassifierID()) { - case Xpand3nodePackage.SIMPLE_TYPE_NODE: - return caseSimpleTypeNode(node); - case Xpand3nodePackage.COLLECTION_TYPE_NODE: - return caseCollectionTypeNode(node); - default: - throw new TransformationException("Illegal type", node); - } - } - - private Identifier createIdentifier(Node node) { - if (!(node instanceof LeafNode)) { - classCastError(node, "LeafNode"); - } - return createIdentifier(((LeafNode) node).getToken().getText(), node); + Identifier createIdentifier(Node node) { + return createIdentifier(node.text(), node); } private Identifier createIdentifier(String text, Node node) { @@ -128,40 +141,42 @@ public class Node2AstTransformer extends SequenceNode sequenceNode = (SequenceNode) node; EList<Node> childNodes = sequenceNode.getChildren(); for (Node childNode : childNodes) { - switch (childNode.eClass().getClassifierID()) { - case Xpand3nodePackage.TEXT_SEQUENCE_NODE: - createTextSequences(childNode, body); - default: - body.add((AbstractStatement) doSwitch(childNode)); - } + body.add((AbstractStatement) doSwitch(childNode)); } } - private void createTextSequences(Node node, - EList<AbstractStatement> containerList) { - if (!(node instanceof TextSequenceNode)) { - classCastError(node, "TextSequenceNode"); - } - EList<CompositeNode> texts = ((TextSequenceNode) node).getText(); - for (CompositeNode text : texts) { - containerList.add((AbstractStatement) caseTextNode(text)); + // Overridden switch methods + + private void createAndAddImplicitlyDeclaredThisParameter( + CompositeNode thisType, EList<DeclaredParameter> parameters) { + if (thisType != null) { + DeclaredParameter dp = xpandFactory.createDeclaredParameter(); + dp.setName(createIdentifier("this", thisType)); + dp.setType((Identifier) caseSimpleTypeNode(thisType)); + setPosition(dp, thisType); + parameters.add(dp); } + } + @Override + public SyntaxElement caseAdditiveExpressionNode(AdditiveExpressionNode node) + throws TransformationException { + return Node2AstUtil.createBinaryOperationChainFromList(node, node + .getFirst(), node.getNexts(), this); } - // Overridden switch methods + @Override + public SyntaxElement caseAndExpressionNode(AndExpressionNode node) + throws TransformationException { + return Node2AstUtil.createBinaryOperationChainFromList(node, node + .getFirst(), node.getNexts(), this); + } @Override - public SyntaxElement caseAdditiveExpressionNode(AdditiveExpressionNode node) + public SyntaxElement caseAroundNode(AroundNode node) throws TransformationException { - BinaryOperation binaryOperation = expressionFactory - .createBinaryOperation(); - binaryOperation.setLeft((AbstractExpression) doSwitch(node.getLeft())); - binaryOperation - .setRight((AbstractExpression) doSwitch(node.getRight())); - binaryOperation - .setOperator(createIdentifier(node.getChildren().get(1))); - return binaryOperation; + // TODO Auto-generated method stub + return super.caseAroundNode(node); } @Override @@ -169,17 +184,115 @@ public class Node2AstTransformer extends throws TransformationException { BooleanLiteral booleanLiteral = expressionFactory .createBooleanLiteral(); - booleanLiteral.setLiteralValue(createIdentifier(node.getChildren().get( - 0))); + booleanLiteral.setLiteralValue(createIdentifier(node)); return booleanLiteral; } @Override + public SyntaxElement caseCasePartNode(CasePartNode node) + throws TransformationException { + Case caseExpression = expressionFactory.createCase(); + setPosition(caseExpression, node); + caseExpression.setCondition((AbstractExpression) doSwitch(node + .getCondition())); + caseExpression.setThenPart((AbstractExpression) doSwitch(node + .getExpression())); + return caseExpression; + } + + @Override + public SyntaxElement caseCastedExpressionNode(CastedExpressionNode node) + throws TransformationException { + Cast cast = expressionFactory.createCast(); + setPosition(cast, node); + cast.setType((Identifier) doSwitch(node.getType())); + cast.setTarget((AbstractExpression) doSwitch(node.getTarget())); + return cast; + } + + @Override + public SyntaxElement caseChainExpressionNode(ChainExpressionNode node) + throws TransformationException { + ChainExpression chainExpression = expressionFactory + .createChainExpression(); + setPosition(chainExpression, node); + chainExpression + .setFirst((AbstractExpression) doSwitch(node.getFirst())); + ChainExpression currentPrevious = chainExpression; + EList<CompositeNode> nextNodes = node.getNexts(); + for (int i = 0; i < nextNodes.size() - 1; ++i) { + ChainExpression nextExpression = expressionFactory + .createChainExpression(); + nextExpression.setFirst((AbstractExpression) doSwitch(nextNodes + .get(i))); + currentPrevious.setNext(nextExpression); + currentPrevious = nextExpression; + } + currentPrevious.setNext((AbstractExpression) doSwitch(nextNodes + .get(nextNodes.size() - 1))); + return chainExpression; + } + + @Override + public SyntaxElement caseCheckNode(CheckNode node) + throws TransformationException { + Check check = declarationFactory.createCheck(); + setPosition(check, node); + check.setErrorSeverity(node.getError() != null); + if (node.getIfExpression() != null) { + check + .setGuard((AbstractExpression) doSwitch(node + .getIfExpression())); + } + check + .setConstraint((AbstractExpression) doSwitch(node + .getConstraint())); + check.setMsg((AbstractExpression) doSwitch(node.getMessage())); + return check; + } + + @Override + public SyntaxElement caseCollectionExpressionNode( + CollectionExpressionNode node) throws TransformationException { + Node kindNode = node.getChildren().get(0); + String kind = kindNode.text(); + if ("typeSelect".equals(kind)) { + TypeSelectExpression typeSelectExpression = expressionFactory + .createTypeSelectExpression(); + setPosition(typeSelectExpression, node); + typeSelectExpression + .setTypeLiteral((Identifier) createIdentifier(node + .getType())); + return typeSelectExpression; + } + CollectionExpression collectionExpression = expressionFactory + .createCollectionExpression(); + setPosition(collectionExpression, node); + collectionExpression.setName(createIdentifier(kindNode)); + if (node.getVariable() != null) { + collectionExpression + .setEleName(createIdentifier(node.getVariable())); + } + collectionExpression.setClosure((AbstractExpression) doSwitch(node + .getExpression())); + return collectionExpression; + } + + @Override + public SyntaxElement caseCollectionTypeNode(CollectionTypeNode node) + throws TransformationException { + Identifier identifier = xpandFactory.createIdentifier(); + setPosition(identifier, node); + identifier.setValue(node.text()); + return identifier; + } + + @Override public SyntaxElement caseDeclaredParameterNode(DeclaredParameterNode dpn) { DeclaredParameter dp = xpandFactory.createDeclaredParameter(); setPosition(dp, dpn); dp.setName((Identifier) caseIdentifierNode(dpn.getName())); - dp.setType((Identifier) caseType(dpn.getPtype())); + dp.setType((Identifier) doSwitch(dpn.getPtype())); return dp; } @@ -191,24 +304,36 @@ public class Node2AstTransformer extends } @Override - public SyntaxElement caseDefinitionNode(DefinitionNode dn) { + public SyntaxElement caseDefinitionAroundNode(DefinitionAroundNode node) + throws TransformationException { + DefinitionAspect definitionAspect = declarationFactory + .createDefinitionAspect(); + setPosition(definitionAspect, node); + definitionAspect.setPointcut((Identifier) casePointcutNode(node + .getPointcut())); + + EList<DeclaredParameter> parameters = definitionAspect.getParams(); + createAndAddImplicitlyDeclaredThisParameter(node.getType(), parameters); + createParameters(node.getParamList(), parameters); + + EList<AbstractStatement> body = definitionAspect.getBody(); + createBody(node.getSequence(), body); + + return definitionAspect; + } + + @Override + public SyntaxElement caseDefinitionNode(DefinitionNode node) { Definition definition = declarationFactory.createDefinition(); - setPosition(definition, dn); - definition.setName((Identifier) caseIdentifierNode(dn.getName())); + setPosition(definition, node); + definition.setName((Identifier) caseIdentifierNode(node.getName())); - CompositeNode tn = dn.getType(); EList<DeclaredParameter> parameters = definition.getParams(); - if (tn != null) { - DeclaredParameter dp = xpandFactory.createDeclaredParameter(); - dp.setName(createIdentifier("this", tn)); - dp.setType((Identifier) caseSimpleTypeNode(tn)); - setPosition(dp, tn); - parameters.add(dp); - } - createParameters(dn.getParamList(), parameters); + createAndAddImplicitlyDeclaredThisParameter(node.getType(), parameters); + createParameters(node.getParamList(), parameters); EList<AbstractStatement> body = definition.getBody(); - createBody(dn.getSequence(), body); + createBody(node.getSequence(), body); return definition; } @@ -228,6 +353,53 @@ public class Node2AstTransformer extends } @Override + public SyntaxElement caseErrorStatementNode(ErrorStatementNode node) + throws TransformationException { + ErrorStatement errorStatement = statementFactory.createErrorStatement(); + setPosition(errorStatement, node); + errorStatement.setMessage((AbstractExpression) doSwitch(node + .getExpression())); + return errorStatement; + } + + @Override + public SyntaxElement caseExpandStatementNode(ExpandStatementNode node) + throws TransformationException { + ExpandStatement expandStatement = statementFactory + .createExpandStatement(); + expandStatement.setDefinition(createIdentifier(node.getName())); + + EList<AbstractExpression> parameters = expandStatement.getParameters(); + if (node.getForEachExpression() != null) { + expandStatement.setForeach(true); + expandStatement.setTarget((AbstractExpression) doSwitch(node + .getForEachExpression())); + if (node.getSeparator() != null) { + expandStatement.setSeparator((AbstractExpression) doSwitch(node + .getSeparator())); + } + } else { + expandStatement.setForeach(false); + if (node.getForExpression() != null) { + expandStatement.setTarget((AbstractExpression) doSwitch(node + .getForExpression())); + } else { + FeatureCall featureCall = expressionFactory.createFeatureCall(); + featureCall.setName(createIdentifier("this", node)); + expandStatement.setTarget(featureCall); + } + } + + ParameterListNode pln = (ParameterListNode) node.getParamList(); + if (pln != null) { + for (Node pn : pln.getParams()) { + parameters.add((AbstractExpression) doSwitch(pn)); + } + } + return expandStatement; + } + + @Override public SyntaxElement caseExpressionStmtNode(ExpressionStmtNode node) throws TransformationException { ExpressionStatement expressionStatement = statementFactory @@ -239,18 +411,27 @@ public class Node2AstTransformer extends } @Override - public SyntaxElement caseExtensionNode(ExtensionNode en) { - Extension ext = declarationFactory.createExtension(); - ext.setName((Identifier) caseIdentifierNode(en.getName())); - DeclaredParameterListNode paramListNode = (DeclaredParameterListNode) en + public SyntaxElement caseExtensionNode(ExtensionNode node) { + Extension extension; + if (node.getCreate() != null) { + extension = declarationFactory.createCreateExtensionStatement(); + } else { + extension = declarationFactory.createExtension(); + } + extension.setName((Identifier) caseIdentifierNode(node.getName())); + DeclaredParameterListNode paramListNode = (DeclaredParameterListNode) node .getParamList(); - EList<DeclaredParameter> parameters = ext.getParams(); + EList<DeclaredParameter> parameters = extension.getParams(); createParameters(paramListNode, parameters); - CompositeNode extendBody = en.getExtendBody(); + CompositeNode extendBody = node.getExtendBody(); if (extendBody != null) { - ext.setBody((AbstractExpression) doSwitch(extendBody)); + extension.setBody((AbstractExpression) doSwitch(extendBody)); + } else { + // TODO JAVA extension } - return ext; + extension.setCached(node.getCached() != null); + extension.setIsPrivate(node.getPrivate() != null); + return extension; } @Override @@ -259,34 +440,37 @@ public class Node2AstTransformer extends ImportStatement importStatement = xpandFactory.createImportStatement(); setPosition(importStatement, node); if (node.getNamespace() != null) { - importStatement.setImportedId((Identifier) caseType(node + importStatement.setImportedId((Identifier) doSwitch(node .getNamespace())); } else if (node.getType() != null) { importStatement - .setImportedId((Identifier) caseType(node.getType())); + .setImportedId((Identifier) doSwitch(node.getType())); } return importStatement; } @Override - public SyntaxElement caseFeatureCallNode(FeatureCallNode featureCallNode) { + public SyntaxElement caseFeatureCallNode(FeatureCallNode node) { + Node firstChildNode = node.getChildren().get(0); + if (firstChildNode.eClass().getClassifierID() == Xpand3nodePackage.COLLECTION_EXPRESSION_NODE) { + return caseCollectionExpressionNode(firstChildNode); + } FeatureCall featureCall; - if (featureCallNode.getName() == null) { + if (node.getName() == null) { featureCall = expressionFactory.createFeatureCall(); } else { featureCall = expressionFactory.createOperationCall(); + ParameterListNode pln = (ParameterListNode) node.getParamList(); EList<AbstractExpression> params = ((OperationCall) featureCall) .getParams(); - ParameterListNode pln = (ParameterListNode) featureCallNode - .getParamList(); if (pln != null) { for (Node pn : pln.getParams()) { - params.add((AbstractExpression) caseExpressionNode(pn)); + params.add((AbstractExpression) doSwitch(pn)); } } } - setPosition(featureCall, featureCallNode); - Node nameNode = featureCallNode.getChildren().get(0); + setPosition(featureCall, node); + Node nameNode = firstChildNode; featureCall.setName((Identifier) doSwitch(nameNode)); return featureCall; } @@ -316,7 +500,22 @@ public class Node2AstTransformer extends @Override public SyntaxElement caseIdentifierNode(IdentifierNode in) { - return createIdentifier((LeafNode) in.getChildren().get(0)); + return createIdentifier(in); + } + + @Override + public SyntaxElement caseIfExpressionNode(IfExpressionNode node) + throws TransformationException { + IfExpression ifExpression = expressionFactory.createIfExpression(); + Node conditionNode = (node.getCondition0() != null) ? node + .getCondition0() : node.getCondition1(); + ifExpression.setCondition((AbstractExpression) doSwitch(conditionNode)); + ifExpression.setThenPart((AbstractExpression) doSwitch(node.getThen())); + if (node.getElse() != null) { + ifExpression.setElsePart((AbstractExpression) doSwitch(node + .getElse())); + } + return ifExpression; } @Override @@ -327,7 +526,7 @@ public class Node2AstTransformer extends .getExpression())); createBody(node.getSequence(), ifStatement.getBody()); IfStatement currentParentIf = ifStatement; - for (Node elseIfNode : node.getElseIf()) { + for (Node elseIfNode : node.getElseIfs()) { ElseIfStatementNode elseIfStatementNode = (ElseIfStatementNode) elseIfNode; IfStatement elseIfStatement = statementFactory.createIfStatement(); setPosition(elseIfStatement, elseIfNode); @@ -352,16 +551,23 @@ public class Node2AstTransformer extends } @Override + public SyntaxElement caseImpliesExpressionNode(ImpliesExpressionNode node) + throws TransformationException { + return Node2AstUtil.createBinaryOperationChainFromList(node, node + .getFirst(), node.getNexts(), this); + } + + @Override public SyntaxElement caseImportNode(ImportNode node) throws TransformationException { ImportStatement importStatement = xpandFactory.createImportStatement(); setPosition(importStatement, node); if (node.getNamespace() != null) { - importStatement.setImportedId((Identifier) caseType(node + importStatement.setImportedId((Identifier) doSwitch(node .getNamespace())); } else if (node.getType() != null) { importStatement - .setImportedId((Identifier) caseType(node.getType())); + .setImportedId((Identifier) doSwitch(node.getType())); } return importStatement; } @@ -379,6 +585,31 @@ public class Node2AstTransformer extends } @Override + public SyntaxElement caseNumberLiteralNode(NumberLiteralNode node) + throws TransformationException { + EList<Node> childNodes = node.getChildren(); + Literal numberLiteral; + if (childNodes.size() > 1) { + numberLiteral = expressionFactory.createRealLiteral(); + } else { + numberLiteral = expressionFactory.createIntegerLiteral(); + } + numberLiteral.setLiteralValue(createIdentifier(node)); + return numberLiteral; + } + + @Override + public SyntaxElement caseListLiteralNode(ListLiteralNode node) + throws TransformationException { + ListLiteral listLiteral = expressionFactory.createListLiteral(); + EList<AbstractExpression> elements = listLiteral.getElements(); + for (Node elementNodes : node.getElements()) { + elements.add((AbstractExpression) doSwitch(elementNodes)); + } + return listLiteral; + } + + @Override public SyntaxElement caseFileNode(FileNode fn) { File file = xpandFactory.createFile(); // TODO: how to handle file name file.setFileName(fn.getName()) @@ -424,26 +655,49 @@ public class Node2AstTransformer extends @Override public SyntaxElement caseMultiplicativeExpressionNode( MultiplicativeExpressionNode node) throws TransformationException { - BinaryOperation binaryOperation = expressionFactory - .createBinaryOperation(); - binaryOperation.setLeft((AbstractExpression) doSwitch(node.getLeft())); - binaryOperation - .setRight((AbstractExpression) doSwitch(node.getRight())); - binaryOperation - .setOperator(createIdentifier(node.getChildren().get(1))); - return binaryOperation; + return Node2AstUtil.createBinaryOperationChainFromList(node, node + .getFirst(), node.getNexts(), this); + } + + @Override + public SyntaxElement caseNullLiteralNode(NullLiteralNode node) + throws TransformationException { + NullLiteral nullLiteral = expressionFactory.createNullLiteral(); + nullLiteral.setLiteralValue(createIdentifier(node)); + return nullLiteral; + } + + @Override + public SyntaxElement caseOrExpressionNode(OrExpressionNode node) + throws TransformationException { + return Node2AstUtil.createBinaryOperationChainFromList(node, node + .getFirst(), node.getNexts(), this); + } + + @Override + public SyntaxElement caseParameterListNode(ParameterListNode node) + throws TransformationException { + throw new TransformationException("Rule should not be called directly", + node); + } + + @Override + public SyntaxElement caseParanthesizedExpressionNode( + ParanthesizedExpressionNode node) throws TransformationException { + return doSwitch(node.getExpression()); + } + + @Override + public SyntaxElement casePointcutNode(PointcutNode node) + throws TransformationException { + return createIdentifier(node); } @Override public SyntaxElement caseRelationalExpressionNode( - RelationalExpressionNode ren) { - BinaryOperation bo = expressionFactory.createBinaryOperation(); - bo.setLeft((AbstractExpression) doSwitch(ren.getLeftOperand())); - bo - .setOperator(createIdentifier(ren.getOperator().getChildren() - .get(0))); - bo.setRight((AbstractExpression) doSwitch(ren.getRightOperand())); - return bo; + RelationalExpressionNode node) { + return Node2AstUtil.createBinaryOperationChainFromList(node, node + .getFirst(), node.getNexts(), this); } @Override @@ -472,12 +726,39 @@ public class Node2AstTransformer extends public SyntaxElement caseStringLiteralNode(StringLiteralNode node) throws TransformationException { StringLiteral stringLiteral = expressionFactory.createStringLiteral(); - stringLiteral.setLiteralValue(createIdentifier(node.getChildren() - .get(0))); + stringLiteral.setLiteralValue(createIdentifier(node)); return stringLiteral; } @Override + public SyntaxElement caseSwitchExpressionNode(SwitchExpressionNode node) + throws TransformationException { + SwitchExpression switchExpression = expressionFactory + .createSwitchExpression(); + setPosition(switchExpression, node); + if (node.getExpression() != null) { + switchExpression.setSwitchExpr((AbstractExpression) doSwitch(node + .getExpression())); + } + for (Node caseNode : node.getCases()) { + switchExpression.getCases().add((Case) caseCasePartNode(caseNode)); + } + CompositeNode defaultNode = node.getDefault(); + if (defaultNode != null) { + switchExpression + .setDefaultExpr((AbstractExpression) doSwitch(defaultNode)); + } + return switchExpression; + } + + @Override + public SyntaxElement caseTest_expressionNode(Test_expressionNode node) + throws TransformationException { + throw new TransformationException("Rule should not be called directly", + node); + } + + @Override public SyntaxElement caseTextNode(TextNode node) throws TransformationException { TextStatement textStatement = statementFactory.createTextStatement(); @@ -490,6 +771,13 @@ public class Node2AstTransformer extends } @Override + public SyntaxElement caseTextSequenceNode(TextSequenceNode node) + throws TransformationException { + throw new TransformationException("Rule should not be called directly", + node); + } + + @Override public SyntaxElement caseUnaryExpressionNode(UnaryExpressionNode node) throws TransformationException { UnaryOperation unaryOperation = expressionFactory diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java new file mode 100644 index 00000000..8aa876ae --- /dev/null +++ b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java @@ -0,0 +1,43 @@ +package org.eclipse.xpand3.parser.node2ast; + +import java.util.List; + +import org.eclipse.tmf.common.node.CompositeNode; +import org.eclipse.tmf.common.node.Node; +import org.eclipse.xpand3.SyntaxElement; +import org.eclipse.xpand3.expression.AbstractExpression; +import org.eclipse.xpand3.expression.BinaryOperation; +import org.eclipse.xpand3.expression.ExpressionFactory; + +public class Node2AstUtil { + + public static SyntaxElement createBinaryOperationChainFromList( + CompositeNode expressionNode, Node firstOperandNode, + List<? extends Node> nextOperandNodes, + Node2AstTransformer transformer) { + BinaryOperation binaryOperation = ExpressionFactory.eINSTANCE + .createBinaryOperation(); + transformer.setPosition(binaryOperation, firstOperandNode); + binaryOperation.setLeft((AbstractExpression) transformer + .doSwitch(firstOperandNode)); + binaryOperation.setOperator(transformer.createIdentifier(expressionNode + .getChildren().get(1))); + BinaryOperation currentLeft = binaryOperation; + for (int i = 0; i < nextOperandNodes.size() - 1; ++i) { + Node nextOperandNode = nextOperandNodes.get(i); + BinaryOperation nextBinaryOperation = ExpressionFactory.eINSTANCE + .createBinaryOperation(); + transformer.setPosition(nextBinaryOperation, nextOperandNode); + nextBinaryOperation.setLeft((AbstractExpression) transformer + .doSwitch(nextOperandNode)); + nextBinaryOperation.setOperator(transformer + .createIdentifier(expressionNode.getChildren().get( + 2 * i + 3))); + currentLeft.setRight(nextBinaryOperation); + currentLeft = nextBinaryOperation; + } + currentLeft.setRight((AbstractExpression) transformer + .doSwitch(nextOperandNodes.get(nextOperandNodes.size() - 1))); + return binaryOperation; + } +} diff --git a/plugins/org.eclipse.xpand3.parser/text/description.txt b/plugins/org.eclipse.xpand3.parser/text/description.txt index 491f6d30..5d54c606 100644 --- a/plugins/org.eclipse.xpand3.parser/text/description.txt +++ b/plugins/org.eclipse.xpand3.parser/text/description.txt @@ -36,7 +36,7 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Reference statements : CompositeNode<<0..*>> Class TextSequenceNode -> CompositeNode - Reference text : CompositeNode<<0..*>> + Reference texts : CompositeNode<<0..*>> Class TextNode -> CompositeNode @@ -46,6 +46,7 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class ExpandStatementNode -> CompositeNode Reference separator : CompositeNode Reference paramList : CompositeNode + Reference forEachExpression : CompositeNode Reference forExpression : CompositeNode Reference name : CompositeNode @@ -65,7 +66,7 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Reference separatorExpression : CompositeNode Class IfStatementNode -> CompositeNode - Reference elseIf : CompositeNode<<0..*>> + Reference elseIfs : CompositeNode<<0..*>> Reference expression : CompositeNode Reference else : CompositeNode Reference sequence : CompositeNode @@ -89,6 +90,12 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Reference cstart : CompositeNode Class CheckNode -> CompositeNode + Reference type : CompositeNode + Reference error : LeafNode + Reference message : CompositeNode + Reference ifExpression : CompositeNode + Reference warning : LeafNode + Reference constraint : CompositeNode Class AroundNode -> CompositeNode @@ -109,40 +116,54 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class Test_expressionNode -> CompositeNode - Class ExpressionNode -> CompositeNode - Class LetExpressionNode -> CompositeNode Class CastedExpressionNode -> CompositeNode + Reference target : CompositeNode + Reference type : CompositeNode Class ChainExpressionNode -> CompositeNode + Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class IfExpressionNode -> CompositeNode + Reference then : CompositeNode + Reference else : CompositeNode + Reference condition0 : CompositeNode + Reference condition1 : CompositeNode Class SwitchExpressionNode -> CompositeNode + Reference default : CompositeNode + Reference expression : CompositeNode + Reference cases : CompositeNode<<0..*>> Class CasePartNode -> CompositeNode + Reference condition : CompositeNode + Reference expression : CompositeNode Class OrExpressionNode -> CompositeNode + Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class AndExpressionNode -> CompositeNode + Reference first : CompositeNode + Reference nexts : CompositeNode<<0..*>> Class ImpliesExpressionNode -> CompositeNode + Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class RelationalExpressionNode -> CompositeNode - Reference operator : CompositeNode - Reference leftOperand : CompositeNode - Reference rightOperand : CompositeNode - - Class RelationalOperatorNode -> CompositeNode + Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class AdditiveExpressionNode -> CompositeNode - Reference left : CompositeNode - Reference right : CompositeNode + Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class MultiplicativeExpressionNode -> CompositeNode - Reference left : CompositeNode - Reference right : CompositeNode + Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class UnaryExpressionNode -> CompositeNode Reference operand : CompositeNode @@ -154,15 +175,17 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class StringLiteralNode -> CompositeNode Class ParanthesizedExpressionNode -> CompositeNode + Reference expression : CompositeNode Class GlobalVarExpressionNode -> CompositeNode Class FeatureCallNode -> CompositeNode + Reference name : CompositeNode Reference type : CompositeNode Reference paramList : CompositeNode - Reference name : CompositeNode Class ListLiteralNode -> CompositeNode + Reference elements : CompositeNode<<0..*>> Class ConstructorCallNode -> CompositeNode @@ -173,18 +196,23 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class NumberLiteralNode -> CompositeNode Class CollectionExpressionNode -> CompositeNode + Reference variable : CompositeNode + Reference expression : CompositeNode + Reference type : CompositeNode Class DeclaredParameterListNode -> CompositeNode Reference params : CompositeNode<<0..*>> Class DeclaredParameterNode -> CompositeNode - Reference name : CompositeNode Reference ptype : CompositeNode + Reference name : CompositeNode Class ParameterListNode -> CompositeNode Reference params : CompositeNode<<0..*>> Class CollectionTypeNode -> CompositeNode + Reference collectionType : LeafNode + Reference elementType : CompositeNode Class SimpleTypeNode -> CompositeNode Reference names : CompositeNode<<0..*>> diff --git a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF index 10559760..9359613a 100644 --- a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF @@ -13,28 +13,21 @@ Require-Bundle: org.antlr.patched;bundle-version="3.0.0", org.eclipse.xtend.backend;bundle-version="0.7.0", org.junit, org.eclipse.emf.ecore.xmi;bundle-version="2.3.0" -Export-Package: org.eclipse.xpand3, - org.eclipse.xpand3.analyzation, +Export-Package: org.eclipse.xpand3.analyzation, + org.eclipse.xpand3, + org.eclipse.xpand3.analyzation.typesystem, org.eclipse.xpand3.analyzation.typesystem.builtin, - org.eclipse.xpand3.analyzation.typesystem.java, - org.eclipse.xpand3.analyzation.typesystem.util, - org.eclipse.xpand3.analyzation.typesystem.xpand3, - org.eclipse.xpand3.ast, org.eclipse.xpand3.declaration, org.eclipse.xpand3.declaration.impl, org.eclipse.xpand3.declaration.util, - org.eclipse.xpand3.declaration.validation, org.eclipse.xpand3.expression, org.eclipse.xpand3.expression.impl, org.eclipse.xpand3.expression.util, - org.eclipse.xpand3.expression.validation, org.eclipse.xpand3.impl, org.eclipse.xpand3.statement, org.eclipse.xpand3.statement.impl, org.eclipse.xpand3.statement.util, - org.eclipse.xpand3.statement.validation, org.eclipse.xpand3.staticTypesystem, org.eclipse.xpand3.staticTypesystem.impl, org.eclipse.xpand3.staticTypesystem.util, - org.eclipse.xpand3.util, - org.eclipse.xpand3.validation + org.eclipse.xpand3.util diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/DeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/DeclarationsContributor.java new file mode 100644 index 00000000..cef4752e --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/DeclarationsContributor.java @@ -0,0 +1,49 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ +package org.eclipse.xpand3.analyzation; + +import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; +import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; +import org.eclipse.xpand3.staticTypesystem.DeclaredType; + +/** + * @author Sven Efftinge + * + */ +public interface DeclarationsContributor { + + /** + * this method is invoked during setup of this contributor. + * @param the type system to be used for resolving type and function references. + */ + void setTypeSystemFactory(TypeSystemFactory tsf); + + /** + * if this contributor has a type with the declared name, the respective DeclareTpye should be returned. + * This method is only invoked once per name, so caching is done by the framework + * @param name + * @return the declared type with the given name or null if there is no such type declared in this Resource. + */ + DeclaredType typeForName(String name); + + /** + * if this contributor has a type with the declared name, the respective DeclareTpye should be returned. + * This method is only invoked once per name. + * @param name + * @return + */ + DeclaredFunction functionForName(String name, AbstractTypeReference...parameterTypes); +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/GenericsUtil.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/GenericsUtil.java deleted file mode 100644 index 7b1c0509..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/GenericsUtil.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * <copyright> - * - * Copyright (c) 2002-2007 itemis AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * itemis AG - Initial API and implementation - * - * </copyright> - * - */ -package org.eclipse.xpand3.analyzation; - -import java.util.Arrays; - -import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; -import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; -import org.eclipse.xpand3.staticTypesystem.DeclaredType; -import org.eclipse.xpand3.staticTypesystem.FunctionType; -import org.eclipse.xpand3.staticTypesystem.StaticTypesystemFactory; -import org.eclipse.xpand3.staticTypesystem.Type; -import org.eclipse.xpand3.staticTypesystem.VoidType; -import org.eclipse.xpand3.staticTypesystem.WildcardType; - -/** - * @author Sven Efftinge - * - */ -public class GenericsUtil { - private final static StaticTypesystemFactory FACTORY = StaticTypesystemFactory.eINSTANCE; - /** - * - */ - private static final VoidType VOID_TYPE = FACTORY.createVoidType(); - - public static WildcardType wildCardWithLower(AbstractTypeReference... lowerBounds) { - WildcardType wildCard = wildCard(); - for (AbstractTypeReference abstractTypeReference : lowerBounds) { - wildCard.getLowerBounds().add(abstractTypeReference); - } - return wildCard; - } - - public static WildcardType wildCard(AbstractTypeReference... upperBounds) { - WildcardType wildCard = FACTORY.createWildcardType(); - for (AbstractTypeReference abstractTypeReference : upperBounds) { - wildCard.getUpperBounds().add(abstractTypeReference); - } - return wildCard; - } - - public static Type typeRef(DeclaredType declaredType, AbstractTypeReference... actualArguments) { - Type type = FACTORY.createType(); - type.setDeclaredType(declaredType); - type.getActualTypeArguments().addAll(Arrays.asList(actualArguments)); - return type; - } - - public static VoidType voidType() { - return VOID_TYPE; - } - - public static FunctionType functionTypeRef(DeclaredFunction declaredFunction, AbstractTypeReference... actualArguments) { - FunctionType type = FACTORY.createFunctionType(); - type.setDeclaredFunction(declaredFunction); - type.getActualTypeArguments().addAll(Arrays.asList(actualArguments)); - return type; - } -} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/LanguageSpecificTypeSystemFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/LanguageSpecificDeclarationContributorFactory.java index a8ee9150..3dbabc50 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/LanguageSpecificTypeSystemFactory.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/LanguageSpecificDeclarationContributorFactory.java @@ -20,7 +20,7 @@ package org.eclipse.xpand3.analyzation; * @author Sven Efftinge * */ -public interface LanguageSpecificTypeSystemFactory { +public interface LanguageSpecificDeclarationContributorFactory { /** * gives the middle end a way to declare if it can and wants to handle a given * source file / resource. If and only if it returns true, it will be asked for @@ -33,5 +33,5 @@ public interface LanguageSpecificTypeSystemFactory { * @param resourceName * @return */ - TypeSystem createTypeSystem(String resourceName); + DeclarationsContributor createDeclarationContributor(String resourceName); } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystem.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystem.java index 264014b0..09755694 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystem.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystem.java @@ -15,10 +15,13 @@ */ package org.eclipse.xpand3.analyzation; +import java.util.List; + import org.eclipse.xpand3.analyzation.typesystem.builtin.BuiltinTypeSystem; import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; -import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; -import org.eclipse.xpand3.staticTypesystem.DeclaredType; +import org.eclipse.xpand3.staticTypesystem.FunctionType; +import org.eclipse.xpand3.staticTypesystem.Type; +import org.eclipse.xpand3.staticTypesystem.WildcardType; /** * @author Sven Efftinge @@ -32,7 +35,6 @@ public interface TypeSystem { final String COLLECTION = "Collection"; final String SET = "Set"; final String LIST = "List"; - final String MAP = "Map"; // Datatypes final String BOOLEAN = "Boolean"; @@ -43,32 +45,18 @@ public interface TypeSystem { // reflection layer types final String FEATURE = "Feature"; final String TYPE = "Type"; - final String FUNCTION = "Function"; + final String OPERATION = "Operation"; final String PROPERTY = "Property"; final String STATIC_PROPERTY = "StaticProperty"; - final BuiltinTypeSystem BUILTIN_TYPESYSTEM = new BuiltinTypeSystem(); + final TypeSystem BUILTIN_TYPESYSTEM = new BuiltinTypeSystem(null); - /** - * if this contributor has a type with the declared name, the respective DeclareTpye should be returned. - * This method is only invoked once per name, so caching is done by the framework - * @param name - * @return the declared type with the given name or null if there is no such type declared in this Resource. - */ - DeclaredType typeForName(String name); + WildcardType wildCard(AbstractTypeReference...upperBounds); + WildcardType wildCardWithLower(AbstractTypeReference...lowerBounds); - /** - * if this contributor has a type with the declared name, the respective DeclareTpye should be returned. - * This method is only invoked once per name. - * @param name - * @return - */ - DeclaredFunction functionForName(String name, AbstractTypeReference...parameterTypes); + Type typeForName(String name, AbstractTypeReference...typeArguments); - /** - * this method is invoked during setup of this contributor. - * @param the type system to be used for resolving type and function references. - */ - void setTypeSystemFactory(TypeSystemFactory tsf); + FunctionType functionForNameAndParameterTypes(String name, AbstractTypeReference...parameterTypes); + FunctionType functionForName(String name, List<AbstractTypeReference> parameterTypes, AbstractTypeReference...typeArguments); } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystemFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystemFactory.java index 6ebe79c4..f9247bc3 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystemFactory.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/TypeSystemFactory.java @@ -18,6 +18,7 @@ package org.eclipse.xpand3.analyzation; import java.util.HashSet; import java.util.Set; +import org.eclipse.xpand3.analyzation.typesystem.TypeSystemImpl; import org.eclipse.xpand3.analyzation.typesystem.builtin.BuiltinTypeSystem; import org.eclipse.xtend.backend.util.Cache; @@ -29,31 +30,36 @@ import org.eclipse.xtend.backend.util.Cache; */ public class TypeSystemFactory { - private static Set<LanguageSpecificTypeSystemFactory> factories = new HashSet<LanguageSpecificTypeSystemFactory>(); - - public void registerLanguageSpecificFactory(LanguageSpecificTypeSystemFactory factory) { + private final static Set<LanguageSpecificDeclarationContributorFactory> factories = new HashSet<LanguageSpecificDeclarationContributorFactory>(); + public static void registerLanguageSpecificFactory(LanguageSpecificDeclarationContributorFactory factory) { factories.add(factory); } private final Cache<String, TypeSystem> cache = new Cache<String, TypeSystem>() { @Override - protected TypeSystem create(String namespace) { - for (LanguageSpecificTypeSystemFactory factory : factories) { - if (factory.canHandle(namespace)) { - TypeSystem typeSystem = factory.createTypeSystem(namespace); - typeSystem.setTypeSystemFactory(TypeSystemFactory.this); - return typeSystem; - } - } - return null; + protected TypeSystem create(String key) { + DeclarationsContributor decl = createDeclarationContributor(key); + decl.setTypeSystemFactory(TypeSystemFactory.this); + TypeSystem ts = new TypeSystemImpl(decl); + return ts; }}; public TypeSystem getTypeSystem(String resourceName) { return cache.get(resourceName); } - public BuiltinTypeSystem getBuiltInTypeSystem() { + public TypeSystem getBuiltInTypeSystem() { return BuiltinTypeSystem.BUILTIN_TYPESYSTEM; } + public DeclarationsContributor createDeclarationContributor(String namespace) { + for (LanguageSpecificDeclarationContributorFactory factory : factories) { + if (factory.canHandle(namespace)) { + return factory.createDeclarationContributor(namespace); + } + } + return null; + } + + } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/AbstractTypeSystemImpl.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/AbstractTypeSystemImpl.java new file mode 100644 index 00000000..de33f8ff --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/AbstractTypeSystemImpl.java @@ -0,0 +1,53 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ +package org.eclipse.xpand3.analyzation.typesystem; + +import org.eclipse.xpand3.analyzation.TypeSystem; +import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; +import org.eclipse.xpand3.staticTypesystem.StaticTypesystemFactory; +import org.eclipse.xpand3.staticTypesystem.WildcardType; + +/** + * @author Sven Efftinge + * + */ +public abstract class AbstractTypeSystemImpl implements TypeSystem { + + protected StaticTypesystemFactory FACTORY = StaticTypesystemFactory.eINSTANCE; + /* + * (non-Javadoc) + * @see org.eclipse.xand3.analyzation.TypeSystem#wildCardWithLower(org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public WildcardType wildCardWithLower(AbstractTypeReference... lowerBounds) { + WildcardType wildCard = wildCard(); + for (AbstractTypeReference abstractTypeReference : lowerBounds) { + wildCard.getLowerBounds().add(abstractTypeReference); + } + return wildCard; + } + + /* + * (non-Javadoc) + * @see org.eclipse.xand3.analyzation.TypeSystem#wildCard(org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public WildcardType wildCard(AbstractTypeReference... upperBounds) { + WildcardType wildCard = FACTORY.createWildcardType(); + for (AbstractTypeReference abstractTypeReference : upperBounds) { + wildCard.getLowerBounds().add(abstractTypeReference); + } + return wildCard; + } +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/CompositeTypeSystemImpl.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/CompositeTypeSystemImpl.java new file mode 100644 index 00000000..6e7d0170 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/CompositeTypeSystemImpl.java @@ -0,0 +1,89 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ +package org.eclipse.xpand3.analyzation.typesystem; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.eclipse.xpand3.analyzation.TypeSystem; +import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; +import org.eclipse.xpand3.staticTypesystem.FunctionType; +import org.eclipse.xpand3.staticTypesystem.Type; + +/** + * @author Sven Efftinge + * + */ +public class CompositeTypeSystemImpl extends AbstractTypeSystemImpl implements TypeSystem { + private List<TypeSystem> delegates = null; + + public CompositeTypeSystemImpl() { + } + + public void addTypeSystem(TypeSystem ts) { + this.delegates.add(ts); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.TypeSystem#functionForName(java.lang.String, + * java.util.List, + * org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public FunctionType functionForName(String name, + List<AbstractTypeReference> parameterTypes, + AbstractTypeReference... typeArguments) { + List<FunctionType> possibilities = new ArrayList<FunctionType>(); + for (TypeSystem ts : delegates) { + FunctionType functionType = ts.functionForName(name, parameterTypes, typeArguments); + if (functionType!=null) + possibilities.add(functionType); + } + if (possibilities.isEmpty()) + return null; + //TODO sort by specialization + return possibilities.get(0); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.TypeSystem#functionForNameAndParameterTypes(java.lang.String, + * org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public FunctionType functionForNameAndParameterTypes(String name, + AbstractTypeReference... parameterTypes) { + return functionForName(name, Arrays.asList(parameterTypes)); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.TypeSystem#typeForName(java.lang.String, + * org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public Type typeForName(String name, AbstractTypeReference... typeArguments) { + for (TypeSystem ts : delegates) { + Type type = ts.typeForName(name, typeArguments); + if (type!=null) + return type; + } + return null; + } + +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/TypeSystemImpl.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/TypeSystemImpl.java new file mode 100644 index 00000000..09179231 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/TypeSystemImpl.java @@ -0,0 +1,98 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ +package org.eclipse.xpand3.analyzation.typesystem; + +import java.util.Arrays; +import java.util.List; + +import org.eclipse.xpand3.analyzation.DeclarationsContributor; +import org.eclipse.xpand3.analyzation.TypeSystem; +import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; +import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; +import org.eclipse.xpand3.staticTypesystem.DeclaredType; +import org.eclipse.xpand3.staticTypesystem.FunctionType; +import org.eclipse.xpand3.staticTypesystem.Type; + +/** + * @author Sven Efftinge + * + */ +public class TypeSystemImpl extends AbstractTypeSystemImpl implements TypeSystem { + + + private DeclarationsContributor contr = null; + + /** + * + */ + public TypeSystemImpl(DeclarationsContributor contributor) { + if (contributor==null) + throw new NullPointerException("contributor was null"); + this.contr = contributor; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.TypeSystem#typeForName(java.lang.String, + * org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public Type typeForName(String name, AbstractTypeReference... typeArguments) { + DeclaredType dt = contr.typeForName(name); + if (dt != null) { + //TODO CACHING + Type t = FACTORY.createType(); + t.setDeclaredType(dt); + t.getActualTypeArguments().addAll(Arrays.asList(typeArguments)); + return t; + } + return null; + } + + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.TypeSystem#functionForName(java.lang.String, + * java.util.List, + * org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public FunctionType functionForName(String name, + List<AbstractTypeReference> parameterTypes, + AbstractTypeReference... typeArguments) { + DeclaredFunction func = contr.functionForName(name, parameterTypes.toArray(new AbstractTypeReference[parameterTypes.size()])); + if (func == null) { + //TODO CACHING + FunctionType funcType = FACTORY.createFunctionType(); + funcType.setDeclaredFunction(func); + funcType.getActualTypeArguments().addAll(Arrays.asList(typeArguments)); + return funcType; + } + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.TypeSystem#functionForNameAndParameterTypes(java.lang.String, + * org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public FunctionType functionForNameAndParameterTypes(String name, + AbstractTypeReference... parameterTypes) { + return functionForName(name, Arrays.asList(parameterTypes)); + } + +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/builtin/BuiltinTypeSystem.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/builtin/BuiltinTypeSystem.java index becae551..3d939770 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/builtin/BuiltinTypeSystem.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/builtin/BuiltinTypeSystem.java @@ -17,35 +17,30 @@ package org.eclipse.xpand3.analyzation.typesystem.builtin; import java.io.IOException; import java.io.InputStream; -import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EFactory; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.xpand3.analyzation.DeclarationsContributor; import org.eclipse.xpand3.analyzation.TypeSystem; import org.eclipse.xpand3.analyzation.TypeSystemFactory; +import org.eclipse.xpand3.analyzation.typesystem.TypeSystemImpl; import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; import org.eclipse.xpand3.staticTypesystem.DeclaredType; import org.eclipse.xpand3.staticTypesystem.Model; import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage; import org.eclipse.xpand3.util.LoaderFactory; -import org.eclipse.xtend.backend.common.BackendType; -import org.eclipse.xtend.backend.common.Function; -import org.eclipse.xtend.backend.common.Property; -import org.eclipse.xtend.backend.common.StaticProperty; /** * @author Sven Efftinge * */ -public class BuiltinTypeSystem implements TypeSystem { +public class BuiltinTypeSystem extends TypeSystemImpl implements TypeSystem { private static Map<String, DeclaredType> types = new HashMap<String, DeclaredType>(); static { Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); @@ -64,62 +59,25 @@ public class BuiltinTypeSystem implements TypeSystem { throw new RuntimeException(e); } } - - public DeclaredType getBuiltinTypeForJavaClass(Class<?> cls) { - if (List.class.isAssignableFrom (cls)) - return types.get(LIST); - if (Set.class.isAssignableFrom(cls)) - return types.get(SET); - if (Collection.class.isAssignableFrom(cls)) - return types.get(COLLECTION); - - if (Map.class.isAssignableFrom(cls)) - return types.get(MAP); - - if (CharSequence.class.isAssignableFrom(cls)) - return types.get(STRING); - - if (cls == Boolean.class || cls == Boolean.TYPE) - return types.get(BOOLEAN); - - if (cls == Long.class || cls == Long.TYPE || cls == Integer.TYPE || cls == Integer.class) - return types.get(INTEGER); - if (cls == Double.class || cls == Double.TYPE) - return types.get(REAL); - - if (Function.class.isAssignableFrom(cls)) - return types.get(FUNCTION); - - if (BackendType.class.isAssignableFrom(cls)) - return types.get(TYPE); - if (Property.class.isAssignableFrom(cls)) - return types.get(PROPERTY); - if (StaticProperty.class.isAssignableFrom(cls)) - return types.get(STATIC_PROPERTY); - if (Object.class.equals(cls)) - return types.get(OBJECT); - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.xpand3.analyzation.TypeSystem#functionForName(java.lang.String, org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + /** + * @param contributor */ - public DeclaredFunction functionForName(String name, - AbstractTypeReference... parameterTypes) { - return null; - } + public BuiltinTypeSystem(DeclarationsContributor contributor) { + super(new DeclarationsContributor() { - /* (non-Javadoc) - * @see org.eclipse.xpand3.analyzation.TypeSystem#setTypeSystemFactory(org.eclipse.xpand3.analyzation.TypeSystemFactory) - */ - public void setTypeSystemFactory(TypeSystemFactory tsf) { - } + public DeclaredFunction functionForName(String name, + AbstractTypeReference... parameterTypes) { + return null; + } - /* (non-Javadoc) - * @see org.eclipse.xpand3.analyzation.TypeSystem#typeForName(java.lang.String) - */ - public DeclaredType typeForName(String name) { - return types.get(name); + public void setTypeSystemFactory(TypeSystemFactory ts) { + } + + public DeclaredType typeForName(String name) { + return types.get(name); + } + + }); } } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaDeclarationsContributor.java new file mode 100644 index 00000000..7dbbf91d --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaDeclarationsContributor.java @@ -0,0 +1,83 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ +package org.eclipse.xpand3.analyzation.typesystem.java; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.xpand3.analyzation.DeclarationsContributor; +import org.eclipse.xpand3.analyzation.TypeSystem; +import org.eclipse.xpand3.analyzation.TypeSystemFactory; +import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; +import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; +import org.eclipse.xpand3.staticTypesystem.DeclaredType; +import org.eclipse.xpand3.util.LoaderFactory; + +/** + * @author Sven Efftinge + * + */ +public class JavaDeclarationsContributor implements DeclarationsContributor { + + private Map<String, DeclaredType> types = new HashMap<String, DeclaredType>(); + + private TypeSystemFactory typeSystemFactory = null; + + private Class<?> cls; + + /** + * + */ + public JavaDeclarationsContributor(String importedNamespace) { + this.cls = LoaderFactory.getClassLoader(this).loadClass(importedNamespace); + if (cls==null) { + throw new IllegalArgumentException("Couldn't find Java Class '"+importedNamespace+"'"); + } + } + + /* + * (non-Javadoc) + * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#setTypeSystem(org.eclipse.xand3.analyzation.TypeSystem) + */ + public void setTypeSystemFactory(TypeSystemFactory tsf) { + this.typeSystemFactory = tsf; + } + + /* (non-Javadoc) + * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#getReferencedResources() + */ + public String[] getReferencedContributors() { + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#typeForName(java.lang.String) + */ + public DeclaredType typeForName(String name) { + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#functionForName(java.lang.String, org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[]) + */ + public DeclaredFunction functionForName(String name, + AbstractTypeReference... parameterTypes) { + return null; + } + +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaTypeSystem.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaTypeSystem.java deleted file mode 100644 index b7354b36..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaTypeSystem.java +++ /dev/null @@ -1,391 +0,0 @@ -/** - * <copyright> - * - * Copyright (c) 2002-2007 itemis AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * itemis AG - Initial API and implementation - * - * </copyright> - * - */ -package org.eclipse.xpand3.analyzation.typesystem.java; - -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.TypeVariable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xpand3.analyzation.GenericsUtil; -import org.eclipse.xpand3.analyzation.TypeSystem; -import org.eclipse.xpand3.analyzation.TypeSystemFactory; -import org.eclipse.xpand3.analyzation.typesystem.util.PolymorphicResolver; -import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; -import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; -import org.eclipse.xpand3.staticTypesystem.DeclaredProperty; -import org.eclipse.xpand3.staticTypesystem.DeclaredStaticProperty; -import org.eclipse.xpand3.staticTypesystem.DeclaredType; -import org.eclipse.xpand3.staticTypesystem.DeclaredTypeParameter; -import org.eclipse.xpand3.staticTypesystem.StaticTypesystemFactory; -import org.eclipse.xpand3.staticTypesystem.Type; -import org.eclipse.xpand3.util.CreateCache; -import org.eclipse.xtend.backend.util.ErrorHandler; -import org.eclipse.xtend.middleend.javaannotations.M2tNoFunction; - -/** - * @author Sven Efftinge - * - */ -public class JavaTypeSystem implements TypeSystem { - - private CreateCache<String, DeclaredType> types = new CreateCache<String, DeclaredType>() { - @Override - protected DeclaredType create(String key) { - if (key.equals(cls.getSimpleName())) { - return StaticTypesystemFactory.eINSTANCE.createDeclaredType(); - } - return null; - } - - @Override - protected void initialize(String key, DeclaredType value) { - initializeDeclaredType(value, key); - } - }; - - private TypeSystemFactory typeSystemFactory = null; - private Class<?> cls; - - /** - * - */ - public JavaTypeSystem(Class<?> javaClass) { - if (javaClass == null) { - throw new IllegalArgumentException("javaClass"); - } - this.cls = javaClass; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#setTypeSystem(org.eclipse.xand3.analyzation.TypeSystem) - */ - public void setTypeSystemFactory(TypeSystemFactory tsf) { - this.typeSystemFactory = tsf; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#typeForName(java.lang.String) - */ - public DeclaredType typeForName(String name) { - return types.get(name); - } - - /** - * @param name - * @return - */ - private DeclaredType initializeDeclaredType(DeclaredType dt, String name) { - dt.setName(name); - TypeVariable<?>[] typeParameters = cls.getTypeParameters(); - for (TypeVariable<?> typeVariable : typeParameters) { - DeclaredTypeParameter dtp = StaticTypesystemFactory.eINSTANCE - .createDeclaredTypeParameter(); - dtp.setName(typeVariable.getName()); - dtp.getUpperBounds().addAll(toTypeRefs(typeVariable.getBounds())); - dt.getDeclaredTypeParameters().add(dtp); - } - - // supertypes - if (cls.getGenericSuperclass() != null - && !cls.getSuperclass().equals(Object.class)) - dt.getSuperTypes().add(toTypeRef(cls.getGenericSuperclass())); - dt.getSuperTypes().addAll(toTypeRefs(cls.getGenericInterfaces())); - if (dt.getSuperTypes().isEmpty()) { - DeclaredType objectType = typeSystemFactory.getBuiltInTypeSystem() - .typeForName(TypeSystem.OBJECT); - dt.getSuperTypes().add(GenericsUtil.typeRef(objectType)); - } - - // properties - try { - PropertyDescriptor[] propertyDescriptors = Introspector - .getBeanInfo(cls).getPropertyDescriptors(); - for (PropertyDescriptor pd : propertyDescriptors) { - if (getDeclaringClass(pd) != cls) - continue; - DeclaredProperty dp = StaticTypesystemFactory.eINSTANCE - .createDeclaredProperty(); - dp.setName(pd.getName()); - dp.setType(toTypeRef(getGenericType(pd))); - dt.getProperties().add(dp); - } - } catch (IntrospectionException e) { - ErrorHandler.handle(e); - return null; - } - - // static properties - Field[] fields = cls.getFields(); - for (Field field : fields) { - if (Modifier.isPublic(field.getModifiers())) { - if (Modifier.isStatic(field.getModifiers())) { - DeclaredStaticProperty dsp = StaticTypesystemFactory.eINSTANCE - .createDeclaredStaticProperty(); - dsp.setName(field.getName()); - dsp.setType((Type) toTypeRef(field.getGenericType())); - dt.getStaticProperties().add(dsp); - } else { - // DeclaredProperty dp = StaticTypesystemFactory.eINSTANCE - // .createDeclaredProperty(); - // dp.setName(field.getName()); - // dp.setType(toTypeRef(field.getGenericType())); - // dt.getProperties().add(dp); - } - } - } - return dt; - } - - /** - * @param pd - * @return - */ - private java.lang.reflect.Type getGenericType(PropertyDescriptor pd) { - if (pd.getReadMethod() != null) - return pd.getReadMethod().getGenericReturnType(); - - return pd.getWriteMethod().getGenericParameterTypes()[0]; - } - - private Class<?> getDeclaringClass(PropertyDescriptor pd) { - if (pd.getReadMethod() != null) - return pd.getReadMethod().getDeclaringClass(); - - return pd.getWriteMethod().getDeclaringClass(); - } - - /** - * @param bounds - * @return - */ - private List<? extends AbstractTypeReference> toTypeRefs( - java.lang.reflect.Type[] bounds) { - List<AbstractTypeReference> result = new ArrayList<AbstractTypeReference>(); - for (java.lang.reflect.Type jt : bounds) { - result.add(toTypeRef(jt)); - } - return result; - } - - /** - * @param genericSuperclass - * @return - */ - private AbstractTypeReference toTypeRef(java.lang.reflect.Type type) { - if (type instanceof Class<?>) { - Class<?> c = (Class<?>) type; - DeclaredType dt = typeSystemFactory.getBuiltInTypeSystem() - .getBuiltinTypeForJavaClass((Class<?>) type); - if (dt != null) { - DeclaredType declaredType = typeSystemFactory - .getBuiltInTypeSystem().typeForName(dt.getName()); - return GenericsUtil.typeRef(declaredType); - } - TypeSystem typeSystem = typeSystemFactory - .getTypeSystem(c.getName()); - DeclaredType declaredType = typeSystem.typeForName(c - .getSimpleName()); - return GenericsUtil.typeRef(declaredType); - } else if (type instanceof TypeVariable) { - TypeVariable<?> tv = (TypeVariable<?>) type; - Object genericDeclaration = tv.getGenericDeclaration(); - if (genericDeclaration instanceof Class) { - Class<?> c = (Class<?>) genericDeclaration; - DeclaredType dt = getDeclaredTypeForJClass(c); - EList<DeclaredTypeParameter> parameters = dt - .getDeclaredTypeParameters(); - for (DeclaredTypeParameter declaredTypeParameter : parameters) { - if (declaredTypeParameter.getName().equals(tv.getName())) { - org.eclipse.xpand3.staticTypesystem.TypeVariable newTv = StaticTypesystemFactory.eINSTANCE - .createTypeVariable(); - newTv.setDeclaredTypeParameter(declaredTypeParameter); - return newTv; - } - } - } else if (genericDeclaration instanceof Method) { - Method m = (Method) genericDeclaration; - DeclaredFunction f = functions.get(m); - EList<DeclaredTypeParameter> parameters = f - .getDeclaredTypeParameters(); - for (DeclaredTypeParameter declaredTypeParameter : parameters) { - if (declaredTypeParameter.getName().equals(tv.getName())) { - org.eclipse.xpand3.staticTypesystem.TypeVariable newTv = StaticTypesystemFactory.eINSTANCE - .createTypeVariable(); - newTv.setDeclaredTypeParameter(declaredTypeParameter); - return newTv; - } - } - } - throw new IllegalStateException( - "Couldn't find declaration for type variable " - + tv.getName()); - } else if (type instanceof java.lang.reflect.ParameterizedType) { - ParameterizedType pt = (ParameterizedType) type; - java.lang.reflect.Type rawType = pt.getRawType(); - Type t = StaticTypesystemFactory.eINSTANCE.createType(); - if (rawType instanceof Class) { - DeclaredType dt = getDeclaredTypeForJClass((Class<?>) rawType); - t.setDeclaredType(dt); - } else { - throw new IllegalStateException("missing implementation for " - + rawType.getClass()); - } - t.getActualTypeArguments().addAll( - toTypeRefs(pt.getActualTypeArguments())); - return t; - } - throw new IllegalArgumentException("toTypeRef not implemented for " - + type.getClass().getSimpleName() + " - " + type); - } - - /** - * @param c - * @return - */ - private DeclaredType getDeclaredTypeForJClass(Class<?> c) { - DeclaredType declaredType = typeSystemFactory.getBuiltInTypeSystem() - .getBuiltinTypeForJavaClass(c); - if (declaredType != null) { - return declaredType; - } - return typeSystemFactory.getTypeSystem(c.getName()).typeForName( - c.getSimpleName()); - } - - /** - * this implementation maps Java methods to functions. Example : interface - * Foo<T extends Bar> { T foo(T x); } - * - * will be mapped to a function with the following signature: - * - * <T extends Bar> T foo(Foo<T> this, T x) - * - */ - public DeclaredFunction functionForName(String name, - AbstractTypeReference... parameterTypes) { - if (functions.isEmpty()) { - initialize(); - } - Collection<DeclaredFunction> values = functions.getMap().values(); - return PolymorphicResolver.findFunction(values, name, parameterTypes, - null); - } - - /** - * - */ - private void initialize() { - Method[] methods = cls.getDeclaredMethods(); - for (Method method : methods) { - if (method.getAnnotation(M2tNoFunction.class) == null) { - functions.get(method); - } - } - } - - private final CreateCache<Method, DeclaredFunction> functions = new CreateCache<Method, DeclaredFunction>() { - - @Override - protected DeclaredFunction create(Method key) { - return StaticTypesystemFactory.eINSTANCE.createDeclaredFunction(); - } - - @Override - protected void initialize(Method method, DeclaredFunction f) { - f.setName(method.getName()); - // parameters - - // if not static add all type parameters from declaring type - if (!Modifier.isStatic(method.getModifiers())) { - org.eclipse.xpand3.staticTypesystem.DeclaredParameter dp = StaticTypesystemFactory.eINSTANCE - .createDeclaredParameter(); - dp.setName("this"); - Class<?> declaringClass = method.getDeclaringClass(); - DeclaredType dt = getDeclaredTypeForJClass(declaringClass); - Type typeRef = StaticTypesystemFactory.eINSTANCE.createType(); - typeRef.setDeclaredType(dt); - for (DeclaredTypeParameter dtp : dt.getDeclaredTypeParameters()) { - // clone the declared type parameters - DeclaredTypeParameter copy = StaticTypesystemFactory.eINSTANCE - .createDeclaredTypeParameter(); - copy.setName(dtp.getName()); - copy.getUpperBounds() - .addAll(cloneAll(dtp.getUpperBounds())); - f.getDeclaredTypeParameters().add(copy); - // and create a type var for the first argument of the - // function - org.eclipse.xpand3.staticTypesystem.TypeVariable var = StaticTypesystemFactory.eINSTANCE - .createTypeVariable(); - var.setDeclaredTypeParameter(copy); - typeRef.getActualTypeArguments().add(var); - } - dp.setType(typeRef); - f.getDeclaredParameters().add(dp); - } - // add type parameters declared for the method - TypeVariable<Method>[] typeParameters = method.getTypeParameters(); - for (TypeVariable<Method> tv : typeParameters) { - // clone the declared type parameters - DeclaredTypeParameter copy = StaticTypesystemFactory.eINSTANCE - .createDeclaredTypeParameter(); - copy.setName(tv.getName()); - copy.getUpperBounds().addAll(toTypeRefs(tv.getBounds())); - f.getDeclaredTypeParameters().add(copy); - } - // now add the return type - java.lang.reflect.Type returnType = method.getGenericReturnType(); - f.setReturnType(toTypeRef(returnType)); - - // now the other parameters - java.lang.reflect.Type[] pts = method.getGenericParameterTypes(); - int i = 1; - for (java.lang.reflect.Type pt : pts) { - org.eclipse.xpand3.staticTypesystem.DeclaredParameter dp1 = StaticTypesystemFactory.eINSTANCE - .createDeclaredParameter(); - f.getDeclaredParameters().add(dp1); - dp1.setName("arg" + (i++)); - dp1.setType(toTypeRef(pt)); - } - f.setReturnType(toTypeRef(method.getGenericReturnType())); - - } - - }; - - /** - * @param upperBounds - * @return - */ - private Collection<? extends AbstractTypeReference> cloneAll( - EList<AbstractTypeReference> upperBounds) { - return new EcoreUtil.Copier().copyAll(upperBounds); - } - -} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaTypeSystemFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaTypeSystemFactory.java deleted file mode 100644 index 291b7656..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/java/JavaTypeSystemFactory.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * <copyright> - * - * Copyright (c) 2002-2007 itemis AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * itemis AG - Initial API and implementation - * - * </copyright> - * - */ -package org.eclipse.xpand3.analyzation.typesystem.java; - -import org.eclipse.xpand3.analyzation.LanguageSpecificTypeSystemFactory; -import org.eclipse.xpand3.analyzation.TypeSystem; -import org.eclipse.xpand3.util.LoaderFactory; -import org.eclipse.xtend.backend.util.Cache; - -/** - * @author Sven Efftinge - * - */ -public class JavaTypeSystemFactory implements LanguageSpecificTypeSystemFactory { - - private Object ctx; - private Cache<String,JavaTypeSystem> typeSystems = new Cache<String, JavaTypeSystem>(){ - - @Override - protected JavaTypeSystem create(String key) { - Class<?> class1 = LoaderFactory.getClassLoader(ctx).loadClass(key); - if (class1!=null) { - return new JavaTypeSystem(class1); - } - return null; - }}; - - public JavaTypeSystemFactory(Object ctx) { - this.ctx = ctx; - } - - /* (non-Javadoc) - * @see org.eclipse.xpand3.analyzation.LanguageSpecificTypeSystemFactory#canHandle(java.lang.String) - */ - public boolean canHandle(String resourceName) { - return LoaderFactory.getClassLoader(ctx).loadClass(resourceName)!=null; - } - - /* (non-Javadoc) - * @see org.eclipse.xpand3.analyzation.LanguageSpecificTypeSystemFactory#createTypeSystem(java.lang.String) - */ - public TypeSystem createTypeSystem(String resourceName) { - return typeSystems.get(resourceName); - } - -} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/util/PolymorphicResolver.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/util/PolymorphicResolver.java deleted file mode 100644 index 3c424536..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/util/PolymorphicResolver.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * <copyright> - * - * Copyright (c) 2002-2007 itemis AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * itemis AG - Initial API and implementation - * - * </copyright> - * - */ -package org.eclipse.xpand3.analyzation.typesystem.util; - -import java.util.Collection; - -import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; -import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; - -/** - * @author Sven Efftinge - * - */ -public class PolymorphicResolver { - - /** - * @param values - * @param name - * @param parameterTypes - * @param object - */ - public static DeclaredFunction findFunction(Collection<DeclaredFunction> functions, - String name, AbstractTypeReference[] parameterTypes, AbstractTypeReference[] typeArguments) { - for (DeclaredFunction f : functions) { - if (f.getName().equals(name)) { - if (f.getDeclaredParameters().size() == parameterTypes.length) { - // TODO check types etc. - return f; - } - } - } - return null; - } - -} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java index 0574225c..3dc3c692 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java @@ -19,20 +19,23 @@ import org.eclipse.xpand3.DeclaredParameter; import org.eclipse.xpand3.File; import org.eclipse.xpand3.Identifier; import org.eclipse.xpand3.ImportStatement; +import org.eclipse.xpand3.analyzation.DeclarationsContributor; import org.eclipse.xpand3.analyzation.TypeSystem; import org.eclipse.xpand3.analyzation.TypeSystemFactory; +import org.eclipse.xpand3.analyzation.typesystem.CompositeTypeSystemImpl; import org.eclipse.xpand3.analyzation.typesystem.util.TypeList; import org.eclipse.xpand3.ast.AstUtil; import org.eclipse.xpand3.declaration.Definition; import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference; import org.eclipse.xpand3.staticTypesystem.DeclaredFunction; import org.eclipse.xpand3.staticTypesystem.DeclaredType; +import org.eclipse.xtend.backend.util.Cache; /** * @author Sven Efftinge * */ public class Xpand3ResourceDeclarationsContributor implements - TypeSystem { + DeclarationsContributor { private File file = null; private TypeSystemFactory typeSystemFactory; @@ -67,10 +70,35 @@ public class Xpand3ResourceDeclarationsContributor implements AbstractTypeReference[] types = new AbstractTypeReference[def.getParams().size()]; for (int i=0;i<types.length;i++) { DeclaredParameter declaredParameter = def.getParams().get(i); + types[i] = getTypeRef(declaredParameter.getType()); } return types; } + /** + * @param type + * @return + */ + private AbstractTypeReference getTypeRef(Identifier type) { + //TODO type Args + return getTypeSystem().typeForName(AstUtil.toString(type)); + } + + private CompositeTypeSystemImpl ts = null; + /** + * @return + */ + private TypeSystem getTypeSystem() { + if (ts==null) { + ts = new CompositeTypeSystemImpl(); + ts.addTypeSystem(typeSystemFactory.getTypeSystem(getResourceName())); + for (ImportStatement is : file.getImports()) { + ts.addTypeSystem(typeSystemFactory.getTypeSystem(is.getImportedId().getValue())); + } + ts.addTypeSystem(typeSystemFactory.getBuiltInTypeSystem()); + } + return ts; + } /** * @return diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/CreateCache.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/CreateCache.java deleted file mode 100644 index 746ec351..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/CreateCache.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * <copyright> - * - * Copyright (c) 2002-2007 itemis AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * itemis AG - Initial API and implementation - * - * </copyright> - * - */ -package org.eclipse.xpand3.util; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author Sven Efftinge - * - */ -public abstract class CreateCache<K, V> { - private final Map<K, V> _cache = new HashMap<K, V>(); - - public V get(K key) { - if (_cache.containsKey(key)) - return _cache.get(key); - - final V result = create(key); - _cache.put(key, result); - if (result != null) - initialize(key, result); - return result; - } - - protected abstract V create(K key); - - protected abstract void initialize(K key, V value); - - public Map<K, V> getMap() { - return _cache; - } - - /** - * @return - */ - public boolean isEmpty() { - return _cache.isEmpty(); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java index 9403a7f1..b6eb7543 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java @@ -128,14 +128,6 @@ public abstract class AbstractXpand3NodeParserTest extends TestCase { return booleanLiteral; } - protected CompositeNode checkChildIsRelationalOperator(Node parent, - int index, String operator) { - CompositeNode booleanLiteral = checkChildIsRule(parent, index, - "relationalOperator", 1); - checkChildIsToken(booleanLiteral, 0, operator); - return booleanLiteral; - } - protected LeafNode checkChildIsToken(Node parent, int index, String tokenText) { return checkIsToken(getChild(parent, index), tokenText); diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java index 3642dc86..3b749c68 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java @@ -9,10 +9,10 @@ public class AllTests { TestSuite suite = new TestSuite("Test for org.eclipse.xpand3.parser"); //$JUnit-BEGIN$ suite.addTestSuite(XpandLexerTest.class); - suite.addTestSuite(Xpand3MigratedNodeParserTest.class); + suite.addTestSuite(ExpressionNodeParserTest.class); suite.addTestSuite(Xpand3ScannerTest.class); suite.addTestSuite(Xpand3NodeParserTest.class); - suite.addTestSuite(StatementParserTest.class); + suite.addTestSuite(StatementNodeParserTest.class); //$JUnit-END$ return suite; } diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/Xpand3MigratedNodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/ExpressionNodeParserTest.java index fd4b52a5..b7d8eae4 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/Xpand3MigratedNodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/ExpressionNodeParserTest.java @@ -5,13 +5,13 @@ import org.antlr.runtime.CommonTokenStream; import org.eclipse.tmf.common.node.CompositeNode; import org.eclipse.tmf.common.node.Node; -public class Xpand3MigratedNodeParserTest extends AbstractXpand3NodeParserTest { +public class ExpressionNodeParserTest extends AbstractXpand3NodeParserTest { public final void testSimple() throws Exception { CompositeNode parse = parse("true == null"); CompositeNode cn = checkIsRule(parse, "relationalExpression", 3); checkChildIsTrueLiteral(cn, 0); - checkChildIsRelationalOperator(cn, 1, "=="); + checkChildIsToken(cn, 1, "=="); CompositeNode nl = checkChildIsRule(cn, 2, "nullLiteral", 1); checkChildIsToken(nl, 0, "null"); } @@ -49,7 +49,7 @@ public class Xpand3MigratedNodeParserTest extends AbstractXpand3NodeParserTest { checkChildIsFeatureCall(ie0, 0, "client"); checkChildIsToken(ie0, 1, "."); checkChildIsFeatureCall(ie0, 2, "sIdent1"); - checkChildIsRelationalOperator(re, 1, "!="); + checkChildIsToken(re, 1, "!="); CompositeNode nl = checkChildIsRule(re, 2, "nullLiteral", 1); checkChildIsToken(nl, 0, "null"); checkChildIsToken(pe, 2, ")"); @@ -188,12 +188,13 @@ public class Xpand3MigratedNodeParserTest extends AbstractXpand3NodeParserTest { } private CompositeNode parse(String s) throws Exception { + System.out.println(s); ANTLRStringStream stream = new ANTLRStringStream(s); Xpand3NodeLexer lexer = new Xpand3NodeLexer(stream); CommonTokenStream tokenStream = new CommonTokenStream(lexer); Xpand3NodeParser xpand3NodeParser = new Xpand3NodeParser(tokenStream); Node rootNode = xpand3NodeParser.r_test_expression(); - System.out.println(rootNode.toDebugString()); + // System.out.println(rootNode.toDebugString()); return (CompositeNode) rootNode; } } diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java index 833f40aa..6e035683 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java @@ -19,7 +19,7 @@ import org.eclipse.tmf.common.node.Node; /** * @author Jan Kšhnlein */ -public class StatementParserTest extends AbstractXpand3NodeParserTest { +public class StatementNodeParserTest extends AbstractXpand3NodeParserTest { private CompositeNode parse(String s) throws Exception { System.out.println(s); ANTLRStringStream stream = new ANTLRStringStream(s); @@ -194,7 +194,7 @@ public class StatementParserTest extends AbstractXpand3NodeParserTest { CompositeNode fs = checkChildIsRule(s, 1, "fileStatement", 5); checkChildIsToken(fs, 0, "FILE"); checkChildIsStringLiteral(fs, 1, "\"test.txt\""); - checkChildIsIdentifier(fs, 2, "ONCE"); + checkChildIsToken(fs, 2, "ONCE"); checkChildIsSequenceText(fs, 3, "", 1); checkChildIsToken(fs, 4, "ENDFILE"); checkChildIsText(s, 2, ""); diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/NewTemplateFile.xpt b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/NewTemplateFile.xpt deleted file mode 100644 index e69de29b..00000000 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/NewTemplateFile.xpt +++ /dev/null diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java index 834418b8..013a1ef7 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java @@ -13,10 +13,18 @@ import org.eclipse.xpand3.parser.Xpand3NodeParser; public class TreetestInterpreterTest extends AbstractEcoreTreeTestInterpreter { + private boolean parseExpression; + public void testStatement() throws Throwable { + parseExpression = false; test("org/eclipse/xpand3/parser/node2ast/statement.ttst"); } + public void testExpression() throws Throwable { + parseExpression = true; + test("org/eclipse/xpand3/parser/node2ast/expression.ttst"); + } + protected EObject parseAndTransform(String testExpressionBody) throws RecognitionException, UnsupportedEncodingException { System.out.println("Expression:" + testExpressionBody); @@ -25,7 +33,8 @@ public class TreetestInterpreterTest extends AbstractEcoreTreeTestInterpreter { CommonTokenStream tokenStream = new CommonTokenStream(lexer); Xpand3NodeParser xpand3NodeParser = new Xpand3NodeParser(tokenStream); - Node rootNode = xpand3NodeParser.r_file(); + Node rootNode = (parseExpression) ? xpand3NodeParser.r_expression() + : xpand3NodeParser.r_file(); if (rootNode == null) { System.out.println("Nothing parsed."); return null; diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/expression.ttst b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/expression.ttst new file mode 100644 index 00000000..5d1ad1ae --- /dev/null +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/expression.ttst @@ -0,0 +1,237 @@ +testCase Expressions +test testSimple +expr <# true == null #> +expected + BinaryOperation { + left=BooleanLiteral { + literalValue=Identifier(value="true") + } + operator=Identifier(value="==") + right=NullLiteral { + literalValue=Identifier(value="null") + } + } + +test testSimple2 +expr <# String.feature.test(true,{"test","hallo"}) #> +expected + OperationCall { + name=Identifier(value="test") + params=[ + BooleanLiteral { + literalValue=Identifier(value="true") + }, + ListLiteral { + elements=[ + StringLiteral { + literalValue=Identifier(value='"test"') + }, + StringLiteral { + literalValue=Identifier(value='"hallo"') + } + ] + } + ] + target=FeatureCall { + name=Identifier(value="feature") + target=FeatureCall { + name=Identifier(value="String") + target=null + } + } + } + +test testIfExpression +expr <# (client.sIdent1 != null) ? client.sIdent1 : "XXXXXXXX" #> +expected + IfExpression { + condition=BinaryOperation { + left=FeatureCall { + name=Identifier(value="sIdent1") + target=FeatureCall { + name=Identifier(value="client") + target=null + } + } + operator=Identifier(value="!=") + right=NullLiteral + } + thenPart=FeatureCall { + name=Identifier(value="sIdent1") + target=FeatureCall { + name=Identifier(value="client") + target=null + } + } + elsePart=StringLiteral { + literalValue=Identifier(value='"XXXXXXXX"') + } + } + +test testIfExpression2 +expr <# if true then true else false #> +expected + IfExpression { + condition=BooleanLiteral { + literalValue=Identifier(value="true") + } + thenPart=BooleanLiteral { + literalValue=Identifier(value="true") + } + elsePart=BooleanLiteral { + literalValue=Identifier(value="false") + } + } + + +test testEscaped +expr <# "\"" #> +expected + StringLiteral { + literalValue=Identifier(value='"\""') + } + +test testNot +expr <# ! ts.checked #> +expected + UnaryOperation { + operator=Identifier(value="!") + operand=FeatureCall { + name=Identifier(value="checked") + target=FeatureCall { + name=Identifier(value="ts") + target=null + } + } + } + +test testCast +expr <# (List[InnerType] ) anExpr #> +expected + Cast { + type=Identifier(value="List[InnerType]") + target=FeatureCall { + name=Identifier(value="anExpr") + target=null + } + } + +test testGenericType +expr <# List[x] #> +expected + FeatureCall { + name=Identifier(value="List[x]") + } + +test testSwitch +expr <# switch { default : true } #> +expected + SwitchExpression { + switchExpr=null + cases=null + defaultExpr=BooleanLiteral { + literalValue=Identifier(value="true") + } + } + +test testChainExpression +expr <# 1 -> 2 -> 3 -> 4 #> +expected + ChainExpression { + first=IntegerLiteral { + literalValue=Identifier(value="1") + } + next=ChainExpression { + first=IntegerLiteral { + literalValue=Identifier(value="2") + } + next=ChainExpression { + first=IntegerLiteral{ + literalValue=Identifier(value="3") + } + next=IntegerLiteral { + literalValue=Identifier(value="4") + } + } + } + } + +test testBooleanExpression +expr <# x implies a && b || c #> +expected + BinaryOperation { + left=BinaryOperation { + left=BinaryOperation { + left= FeatureCall { + name=Identifier(value="x") + } + operator=Identifier(value="implies") + right=FeatureCall { + name=Identifier(value="a") + } + } + operator=Identifier(value="&&") + right=FeatureCall { + name=Identifier(value="b") + } + } + operator=Identifier(value="||") + right=FeatureCall { + name=Identifier(value="c") + } + } + +test testNumberExpression +expr <# 1.5 + 7 / (-2 - 1) #> +expected + BinaryOperation { + left=RealLiteral { + literalValue=Identifier(value="1.5") + } + operator=Identifier(value="+") + right=BinaryOperation { + left=IntegerLiteral { + literalValue=Identifier(value="7") + } + operator=Identifier(value="/") + right=BinaryOperation { + left=UnaryOperation { + operator=Identifier(value="-") + operand=IntegerLiteral { + literalValue=Identifier(value="2") + } + } + operator=Identifier(value="-") + right=IntegerLiteral { + literalValue=Identifier(value="1") + } + } + } + } + + +test testCollectionExpression +expr <# + name.typeSelect(x).select(y|y==0).selectFirst(true) +#> +expected + CollectionExpression { + name=Identifier(value="selectFirst") + eleName=null + closure=BooleanLiteral + target=CollectionExpression { + name=Identifier(value="select") + eleName=Identifier(value="y") + closure=BinaryOperation + target=TypeSelectExpression { + name=Identifier(value="typeSelect") + typeLiteral=Identifier(value="x") + target=FeatureCall { + name=Identifier(value="name") + target=null + } + } + } + } + + diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst index e06512cc..3d2196cb 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst @@ -194,6 +194,7 @@ expr <# #> expected Definition { + name=Identifier(value="test") body=[ TextStatement, IfStatement { @@ -223,3 +224,83 @@ expected ] } + + test testAroundStatement + expr <# «AROUND test::* FOR ecore::EClass»«ERROR name + "x"»«ENDAROUND» #> + expected + DefinitionAspect { + pointcut=Identifier(value="test::*") + params=[ + DeclaredParameter { + name=Identifier(value='this') + type=Identifier(value='ecore::EClass') + } + ] + body=[ + TextStatement(value="»«"), + ErrorStatement { + message=BinaryOperation { + left=FeatureCall + right=StringLiteral + } + }, + TextStatement(value="»«") + ] + } + +test testExpand +expr <# +«DEFINE name FOR x» + «EXPAND name0»«EXPAND name1 FOR a»«EXPAND name2(param) FOREACH x SEPARATOR "y"» +«ENDDEFINE» +#> +expected + Definition { + body=[ + TextStatement, + ExpandStatement(foreach="false") { + definition=Identifier(value="name0") + parameters=null + target=FeatureCall { + name=Identifier(value="this") + } + }, + TextStatement, + ExpandStatement(foreach="false") { + definition=Identifier(value="name1") + parameters=null + target=FeatureCall { + name=Identifier(value="a") + } + }, + TextStatement, + ExpandStatement(foreach="true") { + definition=Identifier(value="name2") + parameters=[ + FeatureCall { + name=Identifier(value="param") + } + ] + target=FeatureCall { + name=Identifier(value="x") + } + separator=StringLiteral { + literalValue=Identifier(value='"y"') + } + }, + TextStatement + ] + } + + +test textCheck +expr <# + context EObject if name=="jan" ERROR "XXX" + name: + x!=17; +#> +expected + Check(errorSeverity="true") { + guard=BinaryOperation + msg=BinaryOperation + constraint=BinaryOperation + }
\ No newline at end of file |