diff options
83 files changed, 3770 insertions, 3286 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF index 715fbaa1..d5821247 100644 --- a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF @@ -11,12 +11,10 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.tmf.common;resolution:=optional;visibility:=reexport, org.eclipse.tmf.common.generator;bundle-version="1.0.0";resolution:=optional, - org.eclipse.xpand3;bundle-version="0.9.0";visibility:=reexport, - org.eclipse.tmf.common.runtime;bundle-version="1.0.0" + org.eclipse.tmf.common.runtime;bundle-version="1.0.0";visibility:=reexport Eclipse-LazyStart: true Export-Package: org.eclipse.xpand3.internal.parser.xpand3node, org.eclipse.xpand3.internal.parser.xpand3node.impl, org.eclipse.xpand3.internal.parser.xpand3node.util, org.eclipse.xpand3.internal.parser.xpand3node.validation, - org.eclipse.xpand3.parser, - org.eclipse.xpand3.parser.node2ast + org.eclipse.xpand3.parser 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 9d1f73f0..958bdbbd 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AndExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: AndExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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.AndExpressionNode#getFirst <em>First</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}</li> * </ul> * </p> * 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 ace70ab8..67083f29 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.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: CastedExpressionNode.java,v 1.4 2008/03/17 10:55:27 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.CastedExpressionNode#getTarget <em>Target</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}</li> * </ul> * </p> * 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 3daddaef..94f1c275 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ChainExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ChainExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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.ChainExpressionNode#getNexts <em>Nexts</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}</li> * </ul> * </p> * 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 5d3f42bc..d28ad5b2 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CheckNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: CheckNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -17,12 +17,12 @@ import org.eclipse.tmf.common.node.LeafNode; * <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#getType <em>Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</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#getMessage <em>Message</em>}</li> * </ul> * </p> * 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 7a46e0f4..fddc0b56 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.3 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: CollectionExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode; * 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> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}</li> * </ul> * </p> * 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 fdc5747e..96d5ead2 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.4 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: DefinitionAroundNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -17,9 +17,9 @@ import org.eclipse.tmf.common.node.CompositeNode; * The following features are supported: * <ul> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}</li> * </ul> * </p> * 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 6ebc7667..311c834a 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.5 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: DefinitionNode.java,v 1.6 2008/03/17 10:55:26 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.DefinitionNode#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType <em>Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getName <em>Name</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}</li> * </ul> * </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 8205abd5..169a0128 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.4 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: ElseIfStatementNode.java,v 1.5 2008/03/17 10:55:27 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.ElseIfStatementNode#getSequence <em>Sequence</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}</li> * </ul> * </p> * 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 0dfec6c7..86779dc1 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.4 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: ExpandStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -17,10 +17,10 @@ import org.eclipse.tmf.common.node.CompositeNode; * The following features are supported: * <ul> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getName <em>Name</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#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> * </p> * 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 21a269a0..49f859ea 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.6 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: ExtensionNode.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -17,15 +17,15 @@ import org.eclipse.tmf.common.node.LeafNode; * <p> * The following features are supported: * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}</li> * </ul> * </p> * 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 6f8f3f81..a041b7ac 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.6 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: FeatureCallNode.java,v 1.7 2008/03/17 10:55:26 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> * 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 f2a98c12..60618892 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.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: FileNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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.FileNode#getDeclarations <em>Declarations</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getImports <em>Imports</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getDeclarations <em>Declarations</em>}</li> * </ul> * </p> * 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 b865ea17..015cc611 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.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ForeachStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -16,11 +16,11 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}</li> * </ul> * </p> * 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 25c5825f..872cbed0 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.3 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: IfExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -16,10 +16,10 @@ import org.eclipse.tmf.common.node.CompositeNode; * <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#getCondition1 <em>Condition1</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#getThen <em>Then</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> * 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 caefefe7..3327ff26 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IfStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: IfStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,10 +18,10 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> - * <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> + * <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> * </ul> * </p> * 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 8bfde46e..6c7d1ade 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ImpliesExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ImpliesExpressionNode.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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.ImpliesExpressionNode#getNexts <em>Nexts</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}</li> * </ul> * </p> * 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 c829e71d..f266d31b 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.2 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: ImportNode.java,v 1.3 2008/03/17 10:55:26 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.ImportNode#getNamespace <em>Namespace</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}</li> * </ul> * </p> * 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 2b3b0e42..1c0e8f44 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.6 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: InfixExpressionNode.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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.InfixExpressionNode#getCalls <em>Calls</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}</li> * </ul> * </p> * 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 96ff1036..4acbe2cc 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.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: LetStatementNode.java,v 1.5 2008/03/17 10:55:26 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.LetStatementNode#getExpression <em>Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}</li> * </ul> * </p> 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 32029eed..4673484c 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MultiplicativeExpressionNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: MultiplicativeExpressionNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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#getNexts <em>Nexts</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}</li> * </ul> * </p> * 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 210ca8de..84555f06 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.4 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: ProtectStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -16,10 +16,10 @@ import org.eclipse.tmf.common.node.CompositeNode; * <p> * The following features are supported: * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}</li> * </ul> * </p> * 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 002f555f..156a9f8f 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SequenceNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: SequenceNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,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.SequenceNode#getTextSequences <em>Text Sequences</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getStatements <em>Statements</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getTextSequences <em>Text Sequences</em>}</li> * </ul> * </p> * 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 c829f272..ebcb318e 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SwitchExpressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: SwitchExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -18,9 +18,9 @@ import org.eclipse.tmf.common.node.CompositeNode; * <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> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}</li> * </ul> * </p> * 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 179614e2..63ad3b41 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.6 2008/03/13 08:40:00 jkohnlein Exp $ + * $Id: Xpand3nodePackage.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node; @@ -89,22 +89,22 @@ public interface Xpand3nodePackage extends EPackage { int FILE_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Declarations</b></em>' reference list. + * The feature id for the '<em><b>Imports</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FILE_NODE__DECLARATIONS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int FILE_NODE__IMPORTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Imports</b></em>' reference list. + * The feature id for the '<em><b>Declarations</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FILE_NODE__IMPORTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int FILE_NODE__DECLARATIONS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>File Node</em>' class. @@ -144,22 +144,22 @@ public interface Xpand3nodePackage extends EPackage { int IMPORT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Namespace</b></em>' reference. + * The feature id for the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPORT_NODE__NAMESPACE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IMPORT_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Type</b></em>' reference. + * The feature id for the '<em><b>Namespace</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPORT_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int IMPORT_NODE__NAMESPACE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Import Node</em>' class. @@ -254,13 +254,13 @@ public interface Xpand3nodePackage extends EPackage { int DEFINITION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Name</b></em>' reference. + * The feature id for the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEFINITION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int DEFINITION_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Type</b></em>' reference. @@ -272,13 +272,13 @@ public interface Xpand3nodePackage extends EPackage { int DEFINITION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Sequence</b></em>' reference. + * The feature id for the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEFINITION_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int DEFINITION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Param List</b></em>' reference. @@ -336,13 +336,13 @@ public interface Xpand3nodePackage extends EPackage { int DEFINITION_AROUND_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Pointcut</b></em>' reference. + * The feature id for the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEFINITION_AROUND_NODE__POINTCUT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int DEFINITION_AROUND_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Param List</b></em>' reference. @@ -354,13 +354,13 @@ public interface Xpand3nodePackage extends EPackage { int DEFINITION_AROUND_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Sequence</b></em>' reference. + * The feature id for the '<em><b>Pointcut</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEFINITION_AROUND_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int DEFINITION_AROUND_NODE__POINTCUT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>Definition Around Node</em>' class. @@ -400,22 +400,22 @@ public interface Xpand3nodePackage extends EPackage { int SEQUENCE_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Text Sequences</b></em>' reference list. + * The feature id for the '<em><b>Statements</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SEQUENCE_NODE__TEXT_SEQUENCES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int SEQUENCE_NODE__STATEMENTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Statements</b></em>' reference list. + * The feature id for the '<em><b>Text Sequences</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SEQUENCE_NODE__STATEMENTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int SEQUENCE_NODE__TEXT_SEQUENCES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Sequence Node</em>' class. @@ -593,40 +593,40 @@ public interface Xpand3nodePackage extends EPackage { int EXPAND_STATEMENT_NODE__SEPARATOR = 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>Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXPAND_STATEMENT_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int EXPAND_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>For Each Expression</b></em>' reference. + * 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_EACH_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int EXPAND_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>For Expression</b></em>' reference. + * The feature id for the '<em><b>Param List</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXPAND_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int EXPAND_STATEMENT_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Name</b></em>' reference. + * 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__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; + int EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Expand Statement Node</em>' class. @@ -776,31 +776,31 @@ public interface Xpand3nodePackage extends EPackage { int FOREACH_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Iterator</b></em>' reference. + * The feature id for the '<em><b>Separator Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FOREACH_STATEMENT_NODE__ITERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Identifier</b></em>' reference. + * The feature id for the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FOREACH_STATEMENT_NODE__IDENTIFIER = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int FOREACH_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Sequence</b></em>' reference. + * The feature id for the '<em><b>Iterator</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FOREACH_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int FOREACH_STATEMENT_NODE__ITERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>For Expression</b></em>' reference. @@ -812,13 +812,13 @@ public interface Xpand3nodePackage extends EPackage { int FOREACH_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Separator Expression</b></em>' reference. + * The feature id for the '<em><b>Identifier</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; + int FOREACH_STATEMENT_NODE__IDENTIFIER = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Foreach Statement Node</em>' class. @@ -858,40 +858,40 @@ public interface Xpand3nodePackage extends EPackage { int IF_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Else Ifs</b></em>' reference list. + * The feature id for the '<em><b>Else</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_STATEMENT_NODE__ELSE_IFS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IF_STATEMENT_NODE__ELSE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Expression</b></em>' reference. + * The feature id for the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Else</b></em>' reference. + * 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 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int IF_STATEMENT_NODE__ELSE_IFS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Sequence</b></em>' reference. + * The feature id for the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>If Statement Node</em>' class. @@ -931,22 +931,22 @@ public interface Xpand3nodePackage extends EPackage { int ELSE_IF_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Sequence</b></em>' reference. + * The feature id for the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ELSE_IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int ELSE_IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Expression</b></em>' reference. + * The feature id for the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ELSE_IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int ELSE_IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Else If Statement Node</em>' class. @@ -1032,22 +1032,22 @@ public interface Xpand3nodePackage extends EPackage { int LET_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Expression</b></em>' reference. + * The feature id for the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LET_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int LET_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Name</b></em>' reference. + * The feature id for the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LET_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int LET_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Sequence</b></em>' reference. @@ -1096,40 +1096,40 @@ public interface Xpand3nodePackage extends EPackage { int PROTECT_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Sequence</b></em>' reference. + * The feature id for the '<em><b>Cstart</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PROTECT_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int PROTECT_STATEMENT_NODE__CSTART = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Cend</b></em>' reference. + * The feature id for the '<em><b>Sequence</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PROTECT_STATEMENT_NODE__CEND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int PROTECT_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Id</b></em>' reference. + * The feature id for the '<em><b>Cend</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PROTECT_STATEMENT_NODE__ID = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int PROTECT_STATEMENT_NODE__CEND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Cstart</b></em>' reference. + * The feature id for the '<em><b>Id</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PROTECT_STATEMENT_NODE__CSTART = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int PROTECT_STATEMENT_NODE__ID = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>Protect Statement Node</em>' class. @@ -1169,58 +1169,58 @@ public interface Xpand3nodePackage extends EPackage { int CHECK_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Type</b></em>' reference. + * The feature id for the '<em><b>Error</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CHECK_NODE__ERROR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Error</b></em>' reference. + * The feature id for the '<em><b>Warning</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE__ERROR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int CHECK_NODE__WARNING = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Message</b></em>' reference. + * The feature id for the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE__MESSAGE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int CHECK_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>If Expression</b></em>' reference. + * The feature id for the '<em><b>Constraint</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE__IF_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int CHECK_NODE__CONSTRAINT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Warning</b></em>' reference. + * The feature id for the '<em><b>If Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE__WARNING = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; + int CHECK_NODE__IF_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Constraint</b></em>' reference. + * The feature id for the '<em><b>Message</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHECK_NODE__CONSTRAINT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5; + int CHECK_NODE__MESSAGE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5; /** * The number of structural features of the '<em>Check Node</em>' class. @@ -1334,85 +1334,85 @@ public interface Xpand3nodePackage extends EPackage { int EXTENSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Param List</b></em>' reference. + * The feature id for the '<em><b>Extend Body</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int EXTENSION_NODE__EXTEND_BODY = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Private</b></em>' reference. + * The feature id for the '<em><b>Java Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int EXTENSION_NODE__JAVA_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Return Type</b></em>' reference. + * The feature id for the '<em><b>Param List</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Java Return Type</b></em>' reference. + * The feature id for the '<em><b>Create</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int EXTENSION_NODE__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Create</b></em>' reference. + * The feature id for the '<em><b>Name</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; + int EXTENSION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Name</b></em>' reference. + * The feature id for the '<em><b>Return Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5; + int EXTENSION_NODE__RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Java Name</b></em>' reference. + * The feature id for the '<em><b>Private</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__JAVA_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6; + int EXTENSION_NODE__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Cached</b></em>' reference. + * The feature id for the '<em><b>Java Return Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__CACHED = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 7; + int EXTENSION_NODE__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Extend Body</b></em>' reference. + * The feature id for the '<em><b>Cached</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_NODE__EXTEND_BODY = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8; + int EXTENSION_NODE__CACHED = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8; /** * The number of structural features of the '<em>Extension Node</em>' class. @@ -1563,22 +1563,22 @@ public interface Xpand3nodePackage extends EPackage { int CASTED_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Target</b></em>' reference. + * The feature id for the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CASTED_EXPRESSION_NODE__TARGET = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CASTED_EXPRESSION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Type</b></em>' reference. + * The feature id for the '<em><b>Target</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CASTED_EXPRESSION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int CASTED_EXPRESSION_NODE__TARGET = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Casted Expression Node</em>' class. @@ -1618,22 +1618,22 @@ public interface Xpand3nodePackage extends EPackage { int CHAIN_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Nexts</b></em>' 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__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int CHAIN_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>First</b></em>' reference. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CHAIN_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int CHAIN_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Chain Expression Node</em>' class. @@ -1673,13 +1673,13 @@ 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. + * The feature id for the '<em><b>Condition1</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_EXPRESSION_NODE__THEN = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IF_EXPRESSION_NODE__CONDITION1 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Else</b></em>' reference. @@ -1691,22 +1691,22 @@ public interface Xpand3nodePackage extends EPackage { int IF_EXPRESSION_NODE__ELSE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Condition0</b></em>' reference. + * The feature id for the '<em><b>Then</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_EXPRESSION_NODE__CONDITION0 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int IF_EXPRESSION_NODE__THEN = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Condition1</b></em>' reference. + * The feature id for the '<em><b>Condition0</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IF_EXPRESSION_NODE__CONDITION1 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; + int IF_EXPRESSION_NODE__CONDITION0 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>If Expression Node</em>' class. @@ -1746,13 +1746,13 @@ 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. + * The feature id for the '<em><b>Cases</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SWITCH_EXPRESSION_NODE__DEFAULT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int SWITCH_EXPRESSION_NODE__CASES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Expression</b></em>' reference. @@ -1764,13 +1764,13 @@ public interface Xpand3nodePackage extends EPackage { int SWITCH_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Cases</b></em>' reference list. + * The feature id for the '<em><b>Default</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SWITCH_EXPRESSION_NODE__CASES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int SWITCH_EXPRESSION_NODE__DEFAULT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Switch Expression Node</em>' class. @@ -1920,22 +1920,22 @@ public interface Xpand3nodePackage extends EPackage { int AND_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>First</b></em>' reference. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int AND_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int AND_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Nexts</b></em>' reference list. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int AND_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int AND_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>And Expression Node</em>' class. @@ -1975,22 +1975,22 @@ public interface Xpand3nodePackage extends EPackage { int IMPLIES_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Nexts</b></em>' reference list. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPLIES_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int IMPLIES_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>First</b></em>' reference. + * The feature id for the '<em><b>Nexts</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IMPLIES_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int IMPLIES_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Implies Expression Node</em>' class. @@ -2140,22 +2140,22 @@ public interface Xpand3nodePackage extends EPackage { int MULTIPLICATIVE_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Nexts</b></em>' reference list. + * The feature id for the '<em><b>First</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MULTIPLICATIVE_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int MULTIPLICATIVE_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>First</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__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int MULTIPLICATIVE_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Multiplicative Expression Node</em>' class. @@ -2241,22 +2241,22 @@ public interface Xpand3nodePackage extends EPackage { int INFIX_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Calls</b></em>' reference list. + * The feature id for the '<em><b>Target</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int INFIX_EXPRESSION_NODE__CALLS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int INFIX_EXPRESSION_NODE__TARGET = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Target</b></em>' reference. + * The feature id for the '<em><b>Calls</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int INFIX_EXPRESSION_NODE__TARGET = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int INFIX_EXPRESSION_NODE__CALLS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Infix Expression Node</em>' class. @@ -2416,31 +2416,31 @@ public interface Xpand3nodePackage extends EPackage { int FEATURE_CALL_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN; /** - * The feature id for the '<em><b>Name</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__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; + int FEATURE_CALL_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Type</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__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Param List</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__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Feature Call Node</em>' class. @@ -2683,22 +2683,22 @@ public interface Xpand3nodePackage extends EPackage { int COLLECTION_EXPRESSION_NODE__VARIABLE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Expression</b></em>' reference. + * The feature id for the '<em><b>Type</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COLLECTION_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; + int COLLECTION_EXPRESSION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Type</b></em>' reference. + * The feature id for the '<em><b>Expression</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COLLECTION_EXPRESSION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; + int COLLECTION_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Collection Expression Node</em>' class. 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 7717cfd7..153c08db 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AndExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: AndExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,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.AndExpressionNodeImpl#getFirst <em>First</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl#getNexts <em>Nexts</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl#getFirst <em>First</em>}</li> * </ul> * </p> * @@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpressionNode { /** - * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getFirst() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode first; + protected EList<CompositeNode> nexts; /** - * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getNexts() + * @see #getFirst() * @generated * @ordered */ - protected EList<CompositeNode> nexts; + protected CompositeNode first; /** * <!-- begin-user-doc --> @@ -138,11 +138,11 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS: + return getNexts(); 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); } @@ -156,13 +156,13 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre @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; + case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -175,12 +175,12 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre @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; + case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -193,10 +193,10 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre @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(); + case Xpand3nodePackage.AND_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/CastedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java index fc2e2c3c..2dc8cf3d 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CastedExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: CastedExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 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.CastedExpressionNodeImpl#getTarget <em>Target</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl#getTarget <em>Target</em>}</li> * </ul> * </p> * @@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements CastedExpressionNode { /** - * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. + * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTarget() + * @see #getType() * @generated * @ordered */ - protected CompositeNode target; + protected CompositeNode type; /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getType() + * @see #getTarget() * @generated * @ordered */ - protected CompositeNode type; + protected CompositeNode target; /** * <!-- begin-user-doc --> @@ -158,12 +158,12 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste @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(); + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + if (resolve) return getTarget(); + return basicGetTarget(); } return super.eGet(featureID, resolve, coreType); } @@ -176,12 +176,12 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste @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; + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + setTarget((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -194,12 +194,12 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste @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; + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + setTarget((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -212,10 +212,10 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste @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; + case Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET: + return target != null; } return super.eIsSet(featureID); } 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 89e34692..f7a26bcf 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ChainExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ChainExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,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.ChainExpressionNodeImpl#getNexts <em>Nexts</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl#getNexts <em>Nexts</em>}</li> * </ul> * </p> * @@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainExpressionNode { /** - * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getNexts() + * @see #getFirst() * @generated * @ordered */ - protected EList<CompositeNode> nexts; + protected CompositeNode first; /** - * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getFirst() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode first; + protected EList<CompositeNode> nexts; /** * <!-- begin-user-doc --> @@ -138,11 +138,11 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE @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(); + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS: + return getNexts(); } return super.eGet(featureID, resolve, coreType); } @@ -156,13 +156,13 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; 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); } @@ -175,12 +175,12 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE @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; + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; } super.eUnset(featureID); } @@ -193,10 +193,10 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE @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; + case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); } return super.eIsSet(featureID); } 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 7696076a..401c2e1c 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CheckNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: CheckNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -28,12 +28,12 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <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#getType <em>Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getConstraint <em>Constraint</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#getMessage <em>Message</em>}</li> * </ul> * </p> * @@ -41,64 +41,64 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The cached value of the '{@link #getError() <em>Error</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getType() + * @see #getError() * @generated * @ordered */ - protected CompositeNode type; + protected LeafNode error; /** - * The cached value of the '{@link #getError() <em>Error</em>}' reference. + * The cached value of the '{@link #getWarning() <em>Warning</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getError() + * @see #getWarning() * @generated * @ordered */ - protected LeafNode error; + protected LeafNode warning; /** - * The cached value of the '{@link #getMessage() <em>Message</em>}' reference. + * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMessage() + * @see #getType() * @generated * @ordered */ - protected CompositeNode message; + protected CompositeNode type; /** - * The cached value of the '{@link #getIfExpression() <em>If Expression</em>}' reference. + * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getIfExpression() + * @see #getConstraint() * @generated * @ordered */ - protected CompositeNode ifExpression; + protected CompositeNode constraint; /** - * The cached value of the '{@link #getWarning() <em>Warning</em>}' reference. + * The cached value of the '{@link #getIfExpression() <em>If Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getWarning() + * @see #getIfExpression() * @generated * @ordered */ - protected LeafNode warning; + protected CompositeNode ifExpression; /** - * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference. + * The cached value of the '{@link #getMessage() <em>Message</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConstraint() + * @see #getMessage() * @generated * @ordered */ - protected CompositeNode constraint; + protected CompositeNode message; /** * <!-- begin-user-doc --> @@ -355,24 +355,24 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { @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__TYPE: + if (resolve) return getType(); + return basicGetType(); case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: if (resolve) return getConstraint(); return basicGetConstraint(); + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + if (resolve) return getIfExpression(); + return basicGetIfExpression(); + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + if (resolve) return getMessage(); + return basicGetMessage(); } return super.eGet(featureID, resolve, coreType); } @@ -385,24 +385,24 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { @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__TYPE: + setType((CompositeNode)newValue); + return; case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: setConstraint((CompositeNode)newValue); return; + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + setIfExpression((CompositeNode)newValue); + return; + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + setMessage((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -415,24 +415,24 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { @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__TYPE: + setType((CompositeNode)null); + return; case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: setConstraint((CompositeNode)null); return; + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + setIfExpression((CompositeNode)null); + return; + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + setMessage((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -445,18 +445,18 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode { @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__TYPE: + return type != null; case Xpand3nodePackage.CHECK_NODE__CONSTRAINT: return constraint != null; + case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION: + return ifExpression != null; + case Xpand3nodePackage.CHECK_NODE__MESSAGE: + return message != null; } return super.eIsSet(featureID); } 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 de5c57a1..f9bb3c41 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CollectionExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: CollectionExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -25,8 +25,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * 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> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getExpression <em>Expression</em>}</li> * </ul> * </p> * @@ -43,23 +43,23 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C */ protected CompositeNode variable; /** - * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExpression() + * @see #getType() * @generated * @ordered */ - protected CompositeNode expression; + protected CompositeNode type; /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getType() + * @see #getExpression() * @generated * @ordered */ - protected CompositeNode type; + protected CompositeNode expression; /** * <!-- begin-user-doc --> @@ -205,12 +205,12 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C 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(); + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); } return super.eGet(featureID, resolve, coreType); } @@ -226,12 +226,12 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C 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; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -247,12 +247,12 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C 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; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -267,10 +267,10 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C 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; + case Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION: + return expression != 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 7e10e7e6..9ab71735 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DefinitionAroundNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: DefinitionAroundNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -28,9 +28,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * The following features are implemented: * <ul> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getPointcut <em>Pointcut</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getParamList <em>Param List</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getSequence <em>Sequence</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getParamList <em>Param List</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getPointcut <em>Pointcut</em>}</li> * </ul> * </p> * @@ -48,14 +48,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin protected CompositeNode type; /** - * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' reference. + * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getPointcut() + * @see #getSequence() * @generated * @ordered */ - protected CompositeNode pointcut; + protected CompositeNode sequence; /** * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. @@ -68,14 +68,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin protected CompositeNode paramList; /** - * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. + * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSequence() + * @see #getPointcut() * @generated * @ordered */ - protected CompositeNode sequence; + protected CompositeNode pointcut; /** * <!-- begin-user-doc --> @@ -259,15 +259,15 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE: if (resolve) return getType(); return basicGetType(); - case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: - if (resolve) return getPointcut(); - return basicGetPointcut(); - case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST: - if (resolve) return getParamList(); - return basicGetParamList(); case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE: if (resolve) return getSequence(); return basicGetSequence(); + case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST: + if (resolve) return getParamList(); + return basicGetParamList(); + case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: + if (resolve) return getPointcut(); + return basicGetPointcut(); } return super.eGet(featureID, resolve, coreType); } @@ -283,14 +283,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE: setType((CompositeNode)newValue); return; - case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: - setPointcut((CompositeNode)newValue); + case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE: + setSequence((CompositeNode)newValue); return; case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST: setParamList((CompositeNode)newValue); return; - case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE: - setSequence((CompositeNode)newValue); + case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: + setPointcut((CompositeNode)newValue); return; } super.eSet(featureID, newValue); @@ -307,14 +307,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE: setType((CompositeNode)null); return; - case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: - setPointcut((CompositeNode)null); + case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE: + setSequence((CompositeNode)null); return; case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST: setParamList((CompositeNode)null); return; - case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE: - setSequence((CompositeNode)null); + case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: + setPointcut((CompositeNode)null); return; } super.eUnset(featureID); @@ -330,12 +330,12 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin switch (featureID) { case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE: return type != null; - case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: - return pointcut != null; - case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST: - return paramList != null; case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE: return sequence != null; + case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST: + return paramList != null; + case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT: + return pointcut != null; } return super.eIsSet(featureID); } 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 4b2400e4..044dd793 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.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: DefinitionNodeImpl.java,v 1.5 2008/03/17 10:55:27 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.DefinitionNodeImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getType <em>Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getSequence <em>Sequence</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getParamList <em>Param List</em>}</li> * </ul> * </p> @@ -38,14 +38,14 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionNode { /** - * The cached value of the '{@link #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getSequence() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode sequence; /** * The cached value of the '{@link #getType() <em>Type</em>}' reference. @@ -58,14 +58,14 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN protected CompositeNode type; /** - * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSequence() + * @see #getName() * @generated * @ordered */ - protected CompositeNode sequence; + protected CompositeNode name; /** * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. @@ -256,15 +256,15 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.DEFINITION_NODE__NAME: - if (resolve) return getName(); - return basicGetName(); - case Xpand3nodePackage.DEFINITION_NODE__TYPE: - if (resolve) return getType(); - return basicGetType(); case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE: if (resolve) return getSequence(); return basicGetSequence(); + case Xpand3nodePackage.DEFINITION_NODE__TYPE: + if (resolve) return getType(); + return basicGetType(); + case Xpand3nodePackage.DEFINITION_NODE__NAME: + if (resolve) return getName(); + return basicGetName(); case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST: if (resolve) return getParamList(); return basicGetParamList(); @@ -280,14 +280,14 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.DEFINITION_NODE__NAME: - setName((CompositeNode)newValue); + case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE: + setSequence((CompositeNode)newValue); return; case Xpand3nodePackage.DEFINITION_NODE__TYPE: setType((CompositeNode)newValue); return; - case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE: - setSequence((CompositeNode)newValue); + case Xpand3nodePackage.DEFINITION_NODE__NAME: + setName((CompositeNode)newValue); return; case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST: setParamList((CompositeNode)newValue); @@ -304,14 +304,14 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.DEFINITION_NODE__NAME: - setName((CompositeNode)null); + case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE: + setSequence((CompositeNode)null); return; case Xpand3nodePackage.DEFINITION_NODE__TYPE: setType((CompositeNode)null); return; - case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE: - setSequence((CompositeNode)null); + case Xpand3nodePackage.DEFINITION_NODE__NAME: + setName((CompositeNode)null); return; case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST: setParamList((CompositeNode)null); @@ -328,12 +328,12 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.DEFINITION_NODE__NAME: - return name != null; - case Xpand3nodePackage.DEFINITION_NODE__TYPE: - return type != null; case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE: return sequence != null; + case Xpand3nodePackage.DEFINITION_NODE__TYPE: + return type != null; + case Xpand3nodePackage.DEFINITION_NODE__NAME: + return name != null; case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST: return paramList != null; } 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 42d5c727..cdaebe79 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ElseIfStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ElseIfStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 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.ElseIfStatementNodeImpl#getSequence <em>Sequence</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl#getExpression <em>Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl#getSequence <em>Sequence</em>}</li> * </ul> * </p> * @@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIfStatementNode { /** - * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSequence() + * @see #getExpression() * @generated * @ordered */ - protected CompositeNode sequence; + protected CompositeNode expression; /** - * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExpression() + * @see #getSequence() * @generated * @ordered */ - protected CompositeNode expression; + protected CompositeNode sequence; /** * <!-- begin-user-doc --> @@ -158,12 +158,12 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: - if (resolve) return getSequence(); - return basicGetSequence(); case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION: if (resolve) return getExpression(); return basicGetExpression(); + case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: + if (resolve) return getSequence(); + return basicGetSequence(); } return super.eGet(featureID, resolve, coreType); } @@ -176,12 +176,12 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: - setSequence((CompositeNode)newValue); - return; case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION: setExpression((CompositeNode)newValue); return; + case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: + setSequence((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -194,12 +194,12 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: - setSequence((CompositeNode)null); - return; case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION: setExpression((CompositeNode)null); return; + case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: + setSequence((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -212,10 +212,10 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: - return sequence != null; case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION: return expression != null; + case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE: + return sequence != null; } return super.eIsSet(featureID); } 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 630f5013..1899809f 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExpandStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ExpandStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -28,10 +28,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * The following features are implemented: * <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#getName <em>Name</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#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> * </p> * @@ -49,44 +49,44 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand protected CompositeNode separator; /** - * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getParamList() + * @see #getName() * @generated * @ordered */ - protected CompositeNode paramList; + protected CompositeNode name; /** - * The cached value of the '{@link #getForEachExpression() <em>For Each Expression</em>}' reference. + * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getForEachExpression() + * @see #getForExpression() * @generated * @ordered */ - protected CompositeNode forEachExpression; + protected CompositeNode forExpression; /** - * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference. + * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getForExpression() + * @see #getParamList() * @generated * @ordered */ - protected CompositeNode forExpression; + protected CompositeNode paramList; /** - * The cached value of the '{@link #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getForEachExpression() <em>For Each Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getForEachExpression() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode forEachExpression; /** * <!-- begin-user-doc --> @@ -308,18 +308,18 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR: if (resolve) return getSeparator(); return basicGetSeparator(); + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: + if (resolve) return getName(); + return basicGetName(); + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: + if (resolve) return getForExpression(); + return basicGetForExpression(); 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(); - case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: - if (resolve) return getName(); - return basicGetName(); } return super.eGet(featureID, resolve, coreType); } @@ -335,18 +335,18 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR: setSeparator((CompositeNode)newValue); return; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: + setName((CompositeNode)newValue); + return; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: + setForExpression((CompositeNode)newValue); + return; 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; - case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: - setName((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -362,18 +362,18 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR: setSeparator((CompositeNode)null); return; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: + setName((CompositeNode)null); + return; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: + setForExpression((CompositeNode)null); + return; 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; - case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: - setName((CompositeNode)null); - return; } super.eUnset(featureID); } @@ -388,14 +388,14 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand switch (featureID) { case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR: return separator != null; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME: + return name != null; + case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION: + return forExpression != 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: - return name != null; } return super.eIsSet(featureID); } 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 a2f4d3cc..7c2abbc3 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.6 2008/03/13 08:40:02 jkohnlein Exp $ + * $Id: ExtensionNodeImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -28,15 +28,15 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getExtendBody <em>Extend Body</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaName <em>Java Name</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getParamList <em>Param List</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>Return Type</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaReturnType <em>Java Return Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getCreate <em>Create</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaName <em>Java Name</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>Return Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaReturnType <em>Java Return Type</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getCached <em>Cached</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getExtendBody <em>Extend Body</em>}</li> * </ul> * </p> * @@ -44,94 +44,94 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNode { /** - * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. + * The cached value of the '{@link #getExtendBody() <em>Extend Body</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getParamList() + * @see #getExtendBody() * @generated * @ordered */ - protected CompositeNode paramList; + protected CompositeNode extendBody; /** - * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference. + * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getPrivate() + * @see #getJavaName() * @generated * @ordered */ - protected LeafNode private_; + protected CompositeNode javaName; /** - * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference. + * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getReturnType() + * @see #getParamList() * @generated * @ordered */ - protected CompositeNode returnType; + protected CompositeNode paramList; /** - * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference. + * The cached value of the '{@link #getCreate() <em>Create</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getJavaReturnType() + * @see #getCreate() * @generated * @ordered */ - protected CompositeNode javaReturnType; + protected LeafNode create; /** - * The cached value of the '{@link #getCreate() <em>Create</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getCreate() + * @see #getName() * @generated * @ordered */ - protected LeafNode create; + protected CompositeNode name; /** - * The cached value of the '{@link #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getReturnType() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode returnType; /** - * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference. + * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getJavaName() + * @see #getPrivate() * @generated * @ordered */ - protected CompositeNode javaName; + protected LeafNode private_; /** - * The cached value of the '{@link #getCached() <em>Cached</em>}' reference. + * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getCached() + * @see #getJavaReturnType() * @generated * @ordered */ - protected LeafNode cached; + protected CompositeNode javaReturnType; /** - * The cached value of the '{@link #getExtendBody() <em>Extend Body</em>}' reference. + * The cached value of the '{@link #getCached() <em>Cached</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExtendBody() + * @see #getCached() * @generated * @ordered */ - protected CompositeNode extendBody; + protected LeafNode cached; /** * <!-- begin-user-doc --> @@ -502,33 +502,33 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: + if (resolve) return getExtendBody(); + return basicGetExtendBody(); + case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: + if (resolve) return getJavaName(); + return basicGetJavaName(); case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST: if (resolve) return getParamList(); return basicGetParamList(); - case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: - if (resolve) return getPrivate(); - return basicGetPrivate(); - case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: - if (resolve) return getReturnType(); - return basicGetReturnType(); - case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: - if (resolve) return getJavaReturnType(); - return basicGetJavaReturnType(); case Xpand3nodePackage.EXTENSION_NODE__CREATE: if (resolve) return getCreate(); return basicGetCreate(); case Xpand3nodePackage.EXTENSION_NODE__NAME: if (resolve) return getName(); return basicGetName(); - case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: - if (resolve) return getJavaName(); - return basicGetJavaName(); + case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: + if (resolve) return getReturnType(); + return basicGetReturnType(); + case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: + if (resolve) return getPrivate(); + return basicGetPrivate(); + case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: + if (resolve) return getJavaReturnType(); + return basicGetJavaReturnType(); case Xpand3nodePackage.EXTENSION_NODE__CACHED: if (resolve) return getCached(); return basicGetCached(); - case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: - if (resolve) return getExtendBody(); - return basicGetExtendBody(); } return super.eGet(featureID, resolve, coreType); } @@ -541,17 +541,14 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST: - setParamList((CompositeNode)newValue); - return; - case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: - setPrivate((LeafNode)newValue); + case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: + setExtendBody((CompositeNode)newValue); return; - case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: - setReturnType((CompositeNode)newValue); + case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: + setJavaName((CompositeNode)newValue); return; - case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: - setJavaReturnType((CompositeNode)newValue); + case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST: + setParamList((CompositeNode)newValue); return; case Xpand3nodePackage.EXTENSION_NODE__CREATE: setCreate((LeafNode)newValue); @@ -559,15 +556,18 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod case Xpand3nodePackage.EXTENSION_NODE__NAME: setName((CompositeNode)newValue); return; - case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: - setJavaName((CompositeNode)newValue); + case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: + setReturnType((CompositeNode)newValue); + return; + case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: + setPrivate((LeafNode)newValue); + return; + case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: + setJavaReturnType((CompositeNode)newValue); return; case Xpand3nodePackage.EXTENSION_NODE__CACHED: setCached((LeafNode)newValue); return; - case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: - setExtendBody((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -580,17 +580,14 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST: - setParamList((CompositeNode)null); - return; - case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: - setPrivate((LeafNode)null); + case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: + setExtendBody((CompositeNode)null); return; - case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: - setReturnType((CompositeNode)null); + case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: + setJavaName((CompositeNode)null); return; - case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: - setJavaReturnType((CompositeNode)null); + case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST: + setParamList((CompositeNode)null); return; case Xpand3nodePackage.EXTENSION_NODE__CREATE: setCreate((LeafNode)null); @@ -598,15 +595,18 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod case Xpand3nodePackage.EXTENSION_NODE__NAME: setName((CompositeNode)null); return; - case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: - setJavaName((CompositeNode)null); + case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: + setReturnType((CompositeNode)null); + return; + case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: + setPrivate((LeafNode)null); + return; + case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: + setJavaReturnType((CompositeNode)null); return; case Xpand3nodePackage.EXTENSION_NODE__CACHED: setCached((LeafNode)null); return; - case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: - setExtendBody((CompositeNode)null); - return; } super.eUnset(featureID); } @@ -619,24 +619,24 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod @Override public boolean eIsSet(int featureID) { switch (featureID) { + case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: + return extendBody != null; + case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: + return javaName != null; case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST: return paramList != null; - case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: - return private_ != null; - case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: - return returnType != null; - case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: - return javaReturnType != null; case Xpand3nodePackage.EXTENSION_NODE__CREATE: return create != null; case Xpand3nodePackage.EXTENSION_NODE__NAME: return name != null; - case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME: - return javaName != null; + case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE: + return returnType != null; + case Xpand3nodePackage.EXTENSION_NODE__PRIVATE: + return private_ != null; + case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE: + return javaReturnType != null; case Xpand3nodePackage.EXTENSION_NODE__CACHED: return cached != null; - case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY: - return extendBody != null; } return super.eIsSet(featureID); } 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 b9fad10d..20fb015d 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.6 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: FeatureCallNodeImpl.java,v 1.7 2008/03/17 10:55:27 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 #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getType() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode type; /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getType() + * @see #getParamList() * @generated * @ordered */ - protected CompositeNode type; + protected CompositeNode paramList; /** - * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getParamList() + * @see #getName() * @generated * @ordered */ - protected CompositeNode paramList; + protected CompositeNode name; /** * <!-- begin-user-doc --> @@ -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 ac6c8e61..fe79ddca 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.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: FileNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -28,8 +28,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.FileNodeImpl#getDeclarations <em>Declarations</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl#getImports <em>Imports</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl#getDeclarations <em>Declarations</em>}</li> * </ul> * </p> * @@ -37,24 +37,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class FileNodeImpl extends CompositeNodeImpl implements FileNode { /** - * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' reference list. + * The cached value of the '{@link #getImports() <em>Imports</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getDeclarations() + * @see #getImports() * @generated * @ordered */ - protected EList<CompositeNode> declarations; + protected EList<CompositeNode> imports; /** - * The cached value of the '{@link #getImports() <em>Imports</em>}' reference list. + * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getImports() + * @see #getDeclarations() * @generated * @ordered */ - protected EList<CompositeNode> imports; + protected EList<CompositeNode> declarations; /** * <!-- begin-user-doc --> @@ -107,10 +107,10 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.FILE_NODE__DECLARATIONS: - return getDeclarations(); case Xpand3nodePackage.FILE_NODE__IMPORTS: return getImports(); + case Xpand3nodePackage.FILE_NODE__DECLARATIONS: + return getDeclarations(); } return super.eGet(featureID, resolve, coreType); } @@ -124,14 +124,14 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.FILE_NODE__DECLARATIONS: - getDeclarations().clear(); - getDeclarations().addAll((Collection<? extends CompositeNode>)newValue); - return; case Xpand3nodePackage.FILE_NODE__IMPORTS: getImports().clear(); getImports().addAll((Collection<? extends CompositeNode>)newValue); return; + case Xpand3nodePackage.FILE_NODE__DECLARATIONS: + getDeclarations().clear(); + getDeclarations().addAll((Collection<? extends CompositeNode>)newValue); + return; } super.eSet(featureID, newValue); } @@ -144,12 +144,12 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode { @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.FILE_NODE__DECLARATIONS: - getDeclarations().clear(); - return; case Xpand3nodePackage.FILE_NODE__IMPORTS: getImports().clear(); return; + case Xpand3nodePackage.FILE_NODE__DECLARATIONS: + getDeclarations().clear(); + return; } super.eUnset(featureID); } @@ -162,10 +162,10 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.FILE_NODE__DECLARATIONS: - return declarations != null && !declarations.isEmpty(); case Xpand3nodePackage.FILE_NODE__IMPORTS: return imports != null && !imports.isEmpty(); + case Xpand3nodePackage.FILE_NODE__DECLARATIONS: + return declarations != null && !declarations.isEmpty(); } return super.eIsSet(featureID); } 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 83b8bca7..c3b056ae 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ForeachStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ForeachStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -27,11 +27,11 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getIterator <em>Iterator</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getIdentifier <em>Identifier</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getSeparatorExpression <em>Separator Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getSequence <em>Sequence</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getIterator <em>Iterator</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getForExpression <em>For Expression</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getSeparatorExpression <em>Separator Expression</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getIdentifier <em>Identifier</em>}</li> * </ul> * </p> * @@ -39,34 +39,34 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements ForeachStatementNode { /** - * The cached value of the '{@link #getIterator() <em>Iterator</em>}' reference. + * The cached value of the '{@link #getSeparatorExpression() <em>Separator Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getIterator() + * @see #getSeparatorExpression() * @generated * @ordered */ - protected CompositeNode iterator; + protected CompositeNode separatorExpression; /** - * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' reference. + * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getIdentifier() + * @see #getSequence() * @generated * @ordered */ - protected CompositeNode identifier; + protected CompositeNode sequence; /** - * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. + * The cached value of the '{@link #getIterator() <em>Iterator</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSequence() + * @see #getIterator() * @generated * @ordered */ - protected CompositeNode sequence; + protected CompositeNode iterator; /** * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference. @@ -79,14 +79,14 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea protected CompositeNode forExpression; /** - * The cached value of the '{@link #getSeparatorExpression() <em>Separator Expression</em>}' reference. + * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSeparatorExpression() + * @see #getIdentifier() * @generated * @ordered */ - protected CompositeNode separatorExpression; + protected CompositeNode identifier; /** * <!-- begin-user-doc --> @@ -305,21 +305,21 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: - if (resolve) return getIterator(); - return basicGetIterator(); - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: - if (resolve) return getIdentifier(); - return basicGetIdentifier(); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: + if (resolve) return getSeparatorExpression(); + return basicGetSeparatorExpression(); case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE: if (resolve) return getSequence(); return basicGetSequence(); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: + if (resolve) return getIterator(); + return basicGetIterator(); case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION: if (resolve) return getForExpression(); return basicGetForExpression(); - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: - if (resolve) return getSeparatorExpression(); - return basicGetSeparatorExpression(); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: + if (resolve) return getIdentifier(); + return basicGetIdentifier(); } return super.eGet(featureID, resolve, coreType); } @@ -332,20 +332,20 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: - setIterator((CompositeNode)newValue); - return; - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: - setIdentifier((CompositeNode)newValue); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: + setSeparatorExpression((CompositeNode)newValue); return; case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)newValue); return; + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: + setIterator((CompositeNode)newValue); + return; case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION: setForExpression((CompositeNode)newValue); return; - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: - setSeparatorExpression((CompositeNode)newValue); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: + setIdentifier((CompositeNode)newValue); return; } super.eSet(featureID, newValue); @@ -359,20 +359,20 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: - setIterator((CompositeNode)null); - return; - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: - setIdentifier((CompositeNode)null); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: + setSeparatorExpression((CompositeNode)null); return; case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)null); return; + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: + setIterator((CompositeNode)null); + return; case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION: setForExpression((CompositeNode)null); return; - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: - setSeparatorExpression((CompositeNode)null); + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: + setIdentifier((CompositeNode)null); return; } super.eUnset(featureID); @@ -386,16 +386,16 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: - return iterator != null; - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: - return identifier != null; + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: + return separatorExpression != null; case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE: return sequence != null; + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR: + return iterator != null; case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION: return forExpression != null; - case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION: - return separatorExpression != null; + case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER: + return identifier != null; } return super.eIsSet(featureID); } 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 255e622b..efc50124 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IfExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: IfExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -27,10 +27,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <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#getCondition1 <em>Condition1</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#getThen <em>Then</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> * @@ -38,14 +38,14 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpressionNode { /** - * The cached value of the '{@link #getThen() <em>Then</em>}' reference. + * The cached value of the '{@link #getCondition1() <em>Condition1</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getThen() + * @see #getCondition1() * @generated * @ordered */ - protected CompositeNode then; + protected CompositeNode condition1; /** * The cached value of the '{@link #getElse() <em>Else</em>}' reference. @@ -58,24 +58,24 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress protected CompositeNode else_; /** - * The cached value of the '{@link #getCondition0() <em>Condition0</em>}' reference. + * The cached value of the '{@link #getThen() <em>Then</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getCondition0() + * @see #getThen() * @generated * @ordered */ - protected CompositeNode condition0; + protected CompositeNode then; /** - * The cached value of the '{@link #getCondition1() <em>Condition1</em>}' reference. + * The cached value of the '{@link #getCondition0() <em>Condition0</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getCondition1() + * @see #getCondition0() * @generated * @ordered */ - protected CompositeNode condition1; + protected CompositeNode condition0; /** * <!-- begin-user-doc --> @@ -256,18 +256,18 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress @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__CONDITION1: + if (resolve) return getCondition1(); + return basicGetCondition1(); case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: if (resolve) return getElse(); return basicGetElse(); + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + if (resolve) return getThen(); + return basicGetThen(); 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); } @@ -280,18 +280,18 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: - setThen((CompositeNode)newValue); + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + setCondition1((CompositeNode)newValue); return; case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: setElse((CompositeNode)newValue); return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + setThen((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); } @@ -304,18 +304,18 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: - setThen((CompositeNode)null); + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + setCondition1((CompositeNode)null); return; case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: setElse((CompositeNode)null); return; + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + setThen((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); } @@ -328,14 +328,14 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: - return then != null; + case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: + return condition1 != null; case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE: return else_ != null; + case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN: + return then != null; case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0: return condition0 != null; - case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1: - return condition1 != null; } return super.eIsSet(featureID); } 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 d332c056..b483702b 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IfStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: IfStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,10 +33,10 @@ 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#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> + * <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> * </ul> * </p> * @@ -44,44 +44,44 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatementNode { /** - * The cached value of the '{@link #getElseIfs() <em>Else Ifs</em>}' reference list. + * The cached value of the '{@link #getElse() <em>Else</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getElseIfs() + * @see #getElse() * @generated * @ordered */ - protected EList<CompositeNode> elseIfs; + protected CompositeNode else_; /** - * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExpression() + * @see #getSequence() * @generated * @ordered */ - protected CompositeNode expression; + protected CompositeNode sequence; /** - * The cached value of the '{@link #getElse() <em>Else</em>}' reference. + * The cached value of the '{@link #getElseIfs() <em>Else Ifs</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getElse() + * @see #getElseIfs() * @generated * @ordered */ - protected CompositeNode else_; + protected EList<CompositeNode> elseIfs; /** - * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSequence() + * @see #getExpression() * @generated * @ordered */ - protected CompositeNode sequence; + protected CompositeNode expression; /** * <!-- begin-user-doc --> @@ -236,17 +236,17 @@ 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_IFS: - return getElseIfs(); - case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: - if (resolve) return getExpression(); - return basicGetExpression(); case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE: if (resolve) return getElse(); return basicGetElse(); case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE: if (resolve) return getSequence(); return basicGetSequence(); + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + return getElseIfs(); + case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); } return super.eGet(featureID, resolve, coreType); } @@ -260,6 +260,12 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE: + setElse((CompositeNode)newValue); + return; + case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE: + setSequence((CompositeNode)newValue); + return; case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: getElseIfs().clear(); getElseIfs().addAll((Collection<? extends CompositeNode>)newValue); @@ -267,12 +273,6 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: setExpression((CompositeNode)newValue); return; - case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE: - setElse((CompositeNode)newValue); - return; - case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE: - setSequence((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -285,18 +285,18 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: - getElseIfs().clear(); - return; - case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: - setExpression((CompositeNode)null); - return; case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE: setElse((CompositeNode)null); return; case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)null); return; + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + getElseIfs().clear(); + return; + case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -309,14 +309,14 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen @Override public boolean eIsSet(int featureID) { switch (featureID) { - 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: return else_ != null; case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE: return sequence != null; + case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS: + return elseIfs != null && !elseIfs.isEmpty(); + case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION: + return expression != null; } return super.eIsSet(featureID); } 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 35943cb3..4131fc86 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ImpliesExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:02 jkohnlein Exp $ + * $Id: ImpliesExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,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.ImpliesExpressionNodeImpl#getNexts <em>Nexts</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getNexts <em>Nexts</em>}</li> * </ul> * </p> * @@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements ImpliesExpressionNode { /** - * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getNexts() + * @see #getFirst() * @generated * @ordered */ - protected EList<CompositeNode> nexts; + protected CompositeNode first; /** - * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getFirst() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode first; + protected EList<CompositeNode> nexts; /** * <!-- begin-user-doc --> @@ -138,11 +138,11 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl @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(); + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS: + return getNexts(); } return super.eGet(featureID, resolve, coreType); } @@ -156,13 +156,13 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; 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); } @@ -175,12 +175,12 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl @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; + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; } super.eUnset(featureID); } @@ -193,10 +193,10 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl @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; + case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); } return super.eIsSet(featureID); } 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 c87a42d8..c7061754 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.2 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ImportNodeImpl.java,v 1.3 2008/03/17 10:55:27 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.ImportNodeImpl#getNamespace <em>Namespace</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl#getNamespace <em>Namespace</em>}</li> * </ul> * </p> * @@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode { /** - * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' reference. + * The cached value of the '{@link #getType() <em>Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getNamespace() + * @see #getType() * @generated * @ordered */ - protected CompositeNode namespace; + protected CompositeNode type; /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getType() + * @see #getNamespace() * @generated * @ordered */ - protected CompositeNode type; + protected CompositeNode namespace; /** * <!-- begin-user-doc --> @@ -158,12 +158,12 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: - if (resolve) return getNamespace(); - return basicGetNamespace(); case Xpand3nodePackage.IMPORT_NODE__TYPE: if (resolve) return getType(); return basicGetType(); + case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: + if (resolve) return getNamespace(); + return basicGetNamespace(); } return super.eGet(featureID, resolve, coreType); } @@ -176,12 +176,12 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: - setNamespace((CompositeNode)newValue); - return; case Xpand3nodePackage.IMPORT_NODE__TYPE: setType((CompositeNode)newValue); return; + case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: + setNamespace((CompositeNode)newValue); + return; } super.eSet(featureID, newValue); } @@ -194,12 +194,12 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode { @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: - setNamespace((CompositeNode)null); - return; case Xpand3nodePackage.IMPORT_NODE__TYPE: setType((CompositeNode)null); return; + case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: + setNamespace((CompositeNode)null); + return; } super.eUnset(featureID); } @@ -212,10 +212,10 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: - return namespace != null; case Xpand3nodePackage.IMPORT_NODE__TYPE: return type != null; + case Xpand3nodePackage.IMPORT_NODE__NAMESPACE: + return namespace != null; } return super.eIsSet(featureID); } 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 1d174d7f..c0c15704 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.6 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: InfixExpressionNodeImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,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.InfixExpressionNodeImpl#getCalls <em>Calls</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl#getTarget <em>Target</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl#getCalls <em>Calls</em>}</li> * </ul> * </p> * @@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixExpressionNode { /** - * The cached value of the '{@link #getCalls() <em>Calls</em>}' reference list. + * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getCalls() + * @see #getTarget() * @generated * @ordered */ - protected EList<CompositeNode> calls; + protected CompositeNode target; /** - * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. + * The cached value of the '{@link #getCalls() <em>Calls</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTarget() + * @see #getCalls() * @generated * @ordered */ - protected CompositeNode target; + protected EList<CompositeNode> calls; /** * <!-- begin-user-doc --> @@ -138,11 +138,11 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: - return getCalls(); case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET: if (resolve) return getTarget(); return basicGetTarget(); + case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: + return getCalls(); } return super.eGet(featureID, resolve, coreType); } @@ -156,13 +156,13 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET: + setTarget((CompositeNode)newValue); + return; case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: getCalls().clear(); getCalls().addAll((Collection<? extends CompositeNode>)newValue); return; - case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET: - setTarget((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -175,12 +175,12 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: - getCalls().clear(); - return; case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET: setTarget((CompositeNode)null); return; + case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: + getCalls().clear(); + return; } super.eUnset(featureID); } @@ -193,10 +193,10 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: - return calls != null && !calls.isEmpty(); case Xpand3nodePackage.INFIX_EXPRESSION_NODE__TARGET: return target != null; + case Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS: + return calls != null && !calls.isEmpty(); } return super.eIsSet(featureID); } 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 9e36777c..abfcb318 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LetStatementNodeImpl.java,v 1.4 2008/03/13 08:40:02 jkohnlein Exp $ + * $Id: LetStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 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.LetStatementNodeImpl#getExpression <em>Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl#getExpression <em>Expression</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl#getSequence <em>Sequence</em>}</li> * </ul> * </p> @@ -37,24 +37,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatementNode { /** - * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. + * The cached value of the '{@link #getName() <em>Name</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExpression() + * @see #getName() * @generated * @ordered */ - protected CompositeNode expression; + protected CompositeNode name; /** - * The cached value of the '{@link #getName() <em>Name</em>}' reference. + * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getName() + * @see #getExpression() * @generated * @ordered */ - protected CompositeNode name; + protected CompositeNode expression; /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. @@ -207,12 +207,12 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: - if (resolve) return getExpression(); - return basicGetExpression(); case Xpand3nodePackage.LET_STATEMENT_NODE__NAME: if (resolve) return getName(); return basicGetName(); + case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: + if (resolve) return getExpression(); + return basicGetExpression(); case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE: if (resolve) return getSequence(); return basicGetSequence(); @@ -228,12 +228,12 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: - setExpression((CompositeNode)newValue); - return; case Xpand3nodePackage.LET_STATEMENT_NODE__NAME: setName((CompositeNode)newValue); return; + case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: + setExpression((CompositeNode)newValue); + return; case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)newValue); return; @@ -249,12 +249,12 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: - setExpression((CompositeNode)null); - return; case Xpand3nodePackage.LET_STATEMENT_NODE__NAME: setName((CompositeNode)null); return; + case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: + setExpression((CompositeNode)null); + return; case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)null); return; @@ -270,10 +270,10 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: - return expression != null; case Xpand3nodePackage.LET_STATEMENT_NODE__NAME: return name != null; + case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION: + return expression != null; case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE: return sequence != null; } 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 08a0b208..3c028c24 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MultiplicativeExpressionNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: MultiplicativeExpressionNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,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#getNexts <em>Nexts</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getFirst <em>First</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getNexts <em>Nexts</em>}</li> * </ul> * </p> * @@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implements MultiplicativeExpressionNode { /** - * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. + * The cached value of the '{@link #getFirst() <em>First</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getNexts() + * @see #getFirst() * @generated * @ordered */ - protected EList<CompositeNode> nexts; + protected CompositeNode first; /** - * The cached value of the '{@link #getFirst() <em>First</em>}' reference. + * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getFirst() + * @see #getNexts() * @generated * @ordered */ - protected CompositeNode first; + protected EList<CompositeNode> nexts; /** * <!-- begin-user-doc --> @@ -138,11 +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__NEXTS: - return getNexts(); case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: if (resolve) return getFirst(); return basicGetFirst(); + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + return getNexts(); } return super.eGet(featureID, resolve, coreType); } @@ -156,13 +156,13 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: + setFirst((CompositeNode)newValue); + return; case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: getNexts().clear(); getNexts().addAll((Collection<? extends CompositeNode>)newValue); return; - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: - setFirst((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -175,12 +175,12 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: - getNexts().clear(); - return; case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: setFirst((CompositeNode)null); return; + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + getNexts().clear(); + return; } super.eUnset(featureID); } @@ -193,10 +193,10 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: - return nexts != null && !nexts.isEmpty(); case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__FIRST: return first != null; + case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS: + return nexts != null && !nexts.isEmpty(); } return super.eIsSet(featureID); } 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 0701e949..326746e3 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ProtectStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: ProtectStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -27,10 +27,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; * <p> * The following features are implemented: * <ul> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getCstart <em>Cstart</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getSequence <em>Sequence</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getCend <em>Cend</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getCstart <em>Cstart</em>}</li> * </ul> * </p> * @@ -38,6 +38,16 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements ProtectStatementNode { /** + * The cached value of the '{@link #getCstart() <em>Cstart</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCstart() + * @generated + * @ordered + */ + protected CompositeNode cstart; + + /** * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -68,16 +78,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote protected CompositeNode id; /** - * The cached value of the '{@link #getCstart() <em>Cstart</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getCstart() - * @generated - * @ordered - */ - protected CompositeNode cstart; - - /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -256,6 +256,9 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: + if (resolve) return getCstart(); + return basicGetCstart(); case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE: if (resolve) return getSequence(); return basicGetSequence(); @@ -265,9 +268,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID: if (resolve) return getId(); return basicGetId(); - case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: - if (resolve) return getCstart(); - return basicGetCstart(); } return super.eGet(featureID, resolve, coreType); } @@ -280,6 +280,9 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: + setCstart((CompositeNode)newValue); + return; case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)newValue); return; @@ -289,9 +292,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID: setId((CompositeNode)newValue); return; - case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: - setCstart((CompositeNode)newValue); - return; } super.eSet(featureID, newValue); } @@ -304,6 +304,9 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote @Override public void eUnset(int featureID) { switch (featureID) { + case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: + setCstart((CompositeNode)null); + return; case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE: setSequence((CompositeNode)null); return; @@ -313,9 +316,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID: setId((CompositeNode)null); return; - case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: - setCstart((CompositeNode)null); - return; } super.eUnset(featureID); } @@ -328,14 +328,14 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote @Override public boolean eIsSet(int featureID) { switch (featureID) { + case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: + return cstart != null; case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE: return sequence != null; case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CEND: return cend != null; case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID: return id != null; - case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART: - return cstart != null; } return super.eIsSet(featureID); } 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 cfab847b..8b416bc2 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SequenceNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: SequenceNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -28,8 +28,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.SequenceNodeImpl#getTextSequences <em>Text Sequences</em>}</li> * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl#getStatements <em>Statements</em>}</li> + * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl#getTextSequences <em>Text Sequences</em>}</li> * </ul> * </p> * @@ -37,24 +37,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode { /** - * The cached value of the '{@link #getTextSequences() <em>Text Sequences</em>}' reference list. + * The cached value of the '{@link #getStatements() <em>Statements</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTextSequences() + * @see #getStatements() * @generated * @ordered */ - protected EList<CompositeNode> textSequences; + protected EList<CompositeNode> statements; /** - * The cached value of the '{@link #getStatements() <em>Statements</em>}' reference list. + * The cached value of the '{@link #getTextSequences() <em>Text Sequences</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getStatements() + * @see #getTextSequences() * @generated * @ordered */ - protected EList<CompositeNode> statements; + protected EList<CompositeNode> textSequences; /** * <!-- begin-user-doc --> @@ -107,10 +107,10 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: - return getTextSequences(); case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS: return getStatements(); + case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: + return getTextSequences(); } return super.eGet(featureID, resolve, coreType); } @@ -124,14 +124,14 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: - getTextSequences().clear(); - getTextSequences().addAll((Collection<? extends CompositeNode>)newValue); - return; case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS: getStatements().clear(); getStatements().addAll((Collection<? extends CompositeNode>)newValue); return; + case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: + getTextSequences().clear(); + getTextSequences().addAll((Collection<? extends CompositeNode>)newValue); + return; } super.eSet(featureID, newValue); } @@ -144,12 +144,12 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: - getTextSequences().clear(); - return; case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS: getStatements().clear(); return; + case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: + getTextSequences().clear(); + return; } super.eUnset(featureID); } @@ -162,10 +162,10 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode @Override public boolean eIsSet(int featureID) { switch (featureID) { - case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: - return textSequences != null && !textSequences.isEmpty(); case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS: return statements != null && !statements.isEmpty(); + case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES: + return textSequences != null && !textSequences.isEmpty(); } return super.eIsSet(featureID); } 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 47d8684b..313d9e08 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,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SwitchExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: SwitchExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -33,9 +33,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.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> + * <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#getDefault <em>Default</em>}</li> * </ul> * </p> * @@ -43,14 +43,14 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage; */ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements SwitchExpressionNode { /** - * The cached value of the '{@link #getDefault() <em>Default</em>}' reference. + * The cached value of the '{@link #getCases() <em>Cases</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getDefault() + * @see #getCases() * @generated * @ordered */ - protected CompositeNode default_; + protected EList<CompositeNode> cases; /** * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference. @@ -63,14 +63,14 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc protected CompositeNode expression; /** - * The cached value of the '{@link #getCases() <em>Cases</em>}' reference list. + * The cached value of the '{@link #getDefault() <em>Default</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getCases() + * @see #getDefault() * @generated * @ordered */ - protected EList<CompositeNode> cases; + protected CompositeNode default_; /** * <!-- begin-user-doc --> @@ -187,14 +187,14 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc @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__CASES: + return getCases(); case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: if (resolve) return getExpression(); return basicGetExpression(); - case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: - return getCases(); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: + if (resolve) return getDefault(); + return basicGetDefault(); } return super.eGet(featureID, resolve, coreType); } @@ -208,15 +208,15 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: - setDefault((CompositeNode)newValue); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: + getCases().clear(); + getCases().addAll((Collection<? extends 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); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: + setDefault((CompositeNode)newValue); return; } super.eSet(featureID, newValue); @@ -230,14 +230,14 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc @Override public void eUnset(int featureID) { switch (featureID) { - case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: - setDefault((CompositeNode)null); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: + getCases().clear(); return; case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: setExpression((CompositeNode)null); return; - case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES: - getCases().clear(); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: + setDefault((CompositeNode)null); return; } super.eUnset(featureID); @@ -251,12 +251,12 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc @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(); + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION: + return expression != null; + case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT: + return default_ != null; } return super.eIsSet(featureID); } 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 f1cab16c..40f2e67c 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.6 2008/03/13 08:40:01 jkohnlein Exp $ + * $Id: Xpand3nodePackageImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $ */ package org.eclipse.xpand3.internal.parser.xpand3node.impl; @@ -542,7 +542,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getFileNode_Declarations() { - return (EReference)fileNodeEClass.getEStructuralFeatures().get(0); + return (EReference)fileNodeEClass.getEStructuralFeatures().get(1); } /** @@ -551,7 +551,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getFileNode_Imports() { - return (EReference)fileNodeEClass.getEStructuralFeatures().get(1); + return (EReference)fileNodeEClass.getEStructuralFeatures().get(0); } /** @@ -569,7 +569,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getImportNode_Namespace() { - return (EReference)importNodeEClass.getEStructuralFeatures().get(0); + return (EReference)importNodeEClass.getEStructuralFeatures().get(1); } /** @@ -578,7 +578,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getImportNode_Type() { - return (EReference)importNodeEClass.getEStructuralFeatures().get(1); + return (EReference)importNodeEClass.getEStructuralFeatures().get(0); } /** @@ -623,7 +623,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getDefinitionNode_Name() { - return (EReference)definitionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)definitionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -641,7 +641,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getDefinitionNode_Sequence() { - return (EReference)definitionNodeEClass.getEStructuralFeatures().get(2); + return (EReference)definitionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -677,7 +677,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getDefinitionAroundNode_Pointcut() { - return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(1); + return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(3); } /** @@ -695,7 +695,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getDefinitionAroundNode_Sequence() { - return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(3); + return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(1); } /** @@ -713,7 +713,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getSequenceNode_TextSequences() { - return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(0); + return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(1); } /** @@ -722,7 +722,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getSequenceNode_Statements() { - return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(1); + return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(0); } /** @@ -794,7 +794,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExpandStatementNode_ParamList() { - return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(1); + return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(3); } /** @@ -803,7 +803,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExpandStatementNode_ForEachExpression() { - return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(2); + return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(4); } /** @@ -812,7 +812,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExpandStatementNode_ForExpression() { - return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(3); + return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -821,7 +821,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExpandStatementNode_Name() { - return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(4); + return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -893,7 +893,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getForeachStatementNode_Iterator() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(0); + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -902,7 +902,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getForeachStatementNode_Identifier() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(1); + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(4); } /** @@ -911,7 +911,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getForeachStatementNode_Sequence() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(2); + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -929,7 +929,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getForeachStatementNode_SeparatorExpression() { - return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(4); + return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -947,7 +947,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfStatementNode_ElseIfs() { - return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(0); + return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -956,7 +956,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfStatementNode_Expression() { - return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(1); + return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(3); } /** @@ -965,7 +965,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfStatementNode_Else() { - return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(2); + return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -974,7 +974,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfStatementNode_Sequence() { - return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(3); + return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -992,7 +992,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getElseIfStatementNode_Sequence() { - return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(0); + return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1001,7 +1001,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getElseIfStatementNode_Expression() { - return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(1); + return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1037,7 +1037,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getLetStatementNode_Expression() { - return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(0); + return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1046,7 +1046,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getLetStatementNode_Name() { - return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(1); + return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1073,7 +1073,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getProtectStatementNode_Sequence() { - return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(0); + return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1082,7 +1082,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getProtectStatementNode_Cend() { - return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(1); + return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1091,7 +1091,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getProtectStatementNode_Id() { - return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(2); + return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(3); } /** @@ -1100,7 +1100,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getProtectStatementNode_Cstart() { - return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(3); + return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1118,7 +1118,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCheckNode_Type() { - return (EReference)checkNodeEClass.getEStructuralFeatures().get(0); + return (EReference)checkNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1127,7 +1127,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCheckNode_Error() { - return (EReference)checkNodeEClass.getEStructuralFeatures().get(1); + return (EReference)checkNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1136,7 +1136,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCheckNode_Message() { - return (EReference)checkNodeEClass.getEStructuralFeatures().get(2); + return (EReference)checkNodeEClass.getEStructuralFeatures().get(5); } /** @@ -1145,7 +1145,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCheckNode_IfExpression() { - return (EReference)checkNodeEClass.getEStructuralFeatures().get(3); + return (EReference)checkNodeEClass.getEStructuralFeatures().get(4); } /** @@ -1154,7 +1154,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCheckNode_Warning() { - return (EReference)checkNodeEClass.getEStructuralFeatures().get(4); + return (EReference)checkNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1163,7 +1163,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCheckNode_Constraint() { - return (EReference)checkNodeEClass.getEStructuralFeatures().get(5); + return (EReference)checkNodeEClass.getEStructuralFeatures().get(3); } /** @@ -1199,7 +1199,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_ParamList() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1208,7 +1208,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_Private() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6); } /** @@ -1217,7 +1217,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_ReturnType() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5); } /** @@ -1226,7 +1226,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_JavaReturnType() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7); } /** @@ -1235,7 +1235,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_Create() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3); } /** @@ -1244,7 +1244,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_Name() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4); } /** @@ -1253,7 +1253,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_JavaName() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1262,7 +1262,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_Cached() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8); } /** @@ -1271,7 +1271,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getExtensionNode_ExtendBody() { - return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8); + return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1316,7 +1316,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCastedExpressionNode_Target() { - return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1325,7 +1325,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCastedExpressionNode_Type() { - return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1343,7 +1343,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getChainExpressionNode_Nexts() { - return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1352,7 +1352,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getChainExpressionNode_First() { - return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1370,7 +1370,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfExpressionNode_Then() { - return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1388,7 +1388,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfExpressionNode_Condition0() { - return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(2); + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(3); } /** @@ -1397,7 +1397,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getIfExpressionNode_Condition1() { - return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(3); + return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1415,7 +1415,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getSwitchExpressionNode_Default() { - return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1433,7 +1433,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getSwitchExpressionNode_Cases() { - return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(2); + return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1505,7 +1505,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getAndExpressionNode_First() { - return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1514,7 +1514,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getAndExpressionNode_Nexts() { - return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1532,7 +1532,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getImpliesExpressionNode_Nexts() { - return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1541,7 +1541,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getImpliesExpressionNode_First() { - return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1613,7 +1613,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getMultiplicativeExpressionNode_Nexts() { - return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1622,7 +1622,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getMultiplicativeExpressionNode_First() { - return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1658,7 +1658,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getInfixExpressionNode_Calls() { - return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(0); + return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1667,7 +1667,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getInfixExpressionNode_Target() { - return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1721,7 +1721,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getFeatureCallNode_ParamList() { - return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(2); + return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1730,7 +1730,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getFeatureCallNode_Name() { - return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0); + return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1739,7 +1739,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getFeatureCallNode_Type() { - return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1); + return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0); } /** @@ -1820,7 +1820,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCollectionExpressionNode_Expression() { - return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(1); + return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(2); } /** @@ -1829,7 +1829,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac * @generated */ public EReference getCollectionExpressionNode_Type() { - return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(2); + return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(1); } /** @@ -1978,32 +1978,32 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac // Create classes and their features fileNodeEClass = createEClass(FILE_NODE); - createEReference(fileNodeEClass, FILE_NODE__DECLARATIONS); createEReference(fileNodeEClass, FILE_NODE__IMPORTS); + createEReference(fileNodeEClass, FILE_NODE__DECLARATIONS); importNodeEClass = createEClass(IMPORT_NODE); - createEReference(importNodeEClass, IMPORT_NODE__NAMESPACE); createEReference(importNodeEClass, IMPORT_NODE__TYPE); + createEReference(importNodeEClass, IMPORT_NODE__NAMESPACE); extensionImportNodeEClass = createEClass(EXTENSION_IMPORT_NODE); createEReference(extensionImportNodeEClass, EXTENSION_IMPORT_NODE__TYPE); createEReference(extensionImportNodeEClass, EXTENSION_IMPORT_NODE__NAMESPACE); definitionNodeEClass = createEClass(DEFINITION_NODE); - createEReference(definitionNodeEClass, DEFINITION_NODE__NAME); - createEReference(definitionNodeEClass, DEFINITION_NODE__TYPE); createEReference(definitionNodeEClass, DEFINITION_NODE__SEQUENCE); + createEReference(definitionNodeEClass, DEFINITION_NODE__TYPE); + createEReference(definitionNodeEClass, DEFINITION_NODE__NAME); createEReference(definitionNodeEClass, DEFINITION_NODE__PARAM_LIST); definitionAroundNodeEClass = createEClass(DEFINITION_AROUND_NODE); createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__TYPE); - createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__POINTCUT); - createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__PARAM_LIST); createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__SEQUENCE); + createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__PARAM_LIST); + createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__POINTCUT); sequenceNodeEClass = createEClass(SEQUENCE_NODE); - createEReference(sequenceNodeEClass, SEQUENCE_NODE__TEXT_SEQUENCES); createEReference(sequenceNodeEClass, SEQUENCE_NODE__STATEMENTS); + createEReference(sequenceNodeEClass, SEQUENCE_NODE__TEXT_SEQUENCES); textSequenceNodeEClass = createEClass(TEXT_SEQUENCE_NODE); createEReference(textSequenceNodeEClass, TEXT_SEQUENCE_NODE__TEXTS); @@ -2015,10 +2015,10 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac expandStatementNodeEClass = createEClass(EXPAND_STATEMENT_NODE); createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__SEPARATOR); + createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__NAME); + createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__FOR_EXPRESSION); 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); expressionStmtNodeEClass = createEClass(EXPRESSION_STMT_NODE); createEReference(expressionStmtNodeEClass, EXPRESSION_STMT_NODE__EXPRESSION); @@ -2029,58 +2029,58 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac createEReference(fileStatementNodeEClass, FILE_STATEMENT_NODE__NAME_EXPRESSION); foreachStatementNodeEClass = createEClass(FOREACH_STATEMENT_NODE); - createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__ITERATOR); - createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__IDENTIFIER); + createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION); createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEQUENCE); + createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__ITERATOR); createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__FOR_EXPRESSION); - createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION); + createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__IDENTIFIER); ifStatementNodeEClass = createEClass(IF_STATEMENT_NODE); - 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); + createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE_IFS); + createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__EXPRESSION); elseIfStatementNodeEClass = createEClass(ELSE_IF_STATEMENT_NODE); - createEReference(elseIfStatementNodeEClass, ELSE_IF_STATEMENT_NODE__SEQUENCE); createEReference(elseIfStatementNodeEClass, ELSE_IF_STATEMENT_NODE__EXPRESSION); + createEReference(elseIfStatementNodeEClass, ELSE_IF_STATEMENT_NODE__SEQUENCE); elseStatementNodeEClass = createEClass(ELSE_STATEMENT_NODE); createEReference(elseStatementNodeEClass, ELSE_STATEMENT_NODE__SEQUENCE); letStatementNodeEClass = createEClass(LET_STATEMENT_NODE); - createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__EXPRESSION); createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__NAME); + createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__EXPRESSION); createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__SEQUENCE); protectStatementNodeEClass = createEClass(PROTECT_STATEMENT_NODE); + createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__CSTART); createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__SEQUENCE); createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__CEND); createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__ID); - 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__TYPE); createEReference(checkNodeEClass, CHECK_NODE__CONSTRAINT); + createEReference(checkNodeEClass, CHECK_NODE__IF_EXPRESSION); + createEReference(checkNodeEClass, CHECK_NODE__MESSAGE); aroundNodeEClass = createEClass(AROUND_NODE); pointcutNodeEClass = createEClass(POINTCUT_NODE); extensionNodeEClass = createEClass(EXTENSION_NODE); + createEReference(extensionNodeEClass, EXTENSION_NODE__EXTEND_BODY); + createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_NAME); createEReference(extensionNodeEClass, EXTENSION_NODE__PARAM_LIST); - createEReference(extensionNodeEClass, EXTENSION_NODE__PRIVATE); - createEReference(extensionNodeEClass, EXTENSION_NODE__RETURN_TYPE); - createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_RETURN_TYPE); createEReference(extensionNodeEClass, EXTENSION_NODE__CREATE); createEReference(extensionNodeEClass, EXTENSION_NODE__NAME); - createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_NAME); + createEReference(extensionNodeEClass, EXTENSION_NODE__RETURN_TYPE); + createEReference(extensionNodeEClass, EXTENSION_NODE__PRIVATE); + createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_RETURN_TYPE); createEReference(extensionNodeEClass, EXTENSION_NODE__CACHED); - createEReference(extensionNodeEClass, EXTENSION_NODE__EXTEND_BODY); javaTypeNodeEClass = createEClass(JAVA_TYPE_NODE); @@ -2089,23 +2089,23 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac letExpressionNodeEClass = createEClass(LET_EXPRESSION_NODE); castedExpressionNodeEClass = createEClass(CASTED_EXPRESSION_NODE); - createEReference(castedExpressionNodeEClass, CASTED_EXPRESSION_NODE__TARGET); createEReference(castedExpressionNodeEClass, CASTED_EXPRESSION_NODE__TYPE); + createEReference(castedExpressionNodeEClass, CASTED_EXPRESSION_NODE__TARGET); chainExpressionNodeEClass = createEClass(CHAIN_EXPRESSION_NODE); - createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__NEXTS); createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__FIRST); + createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__NEXTS); ifExpressionNodeEClass = createEClass(IF_EXPRESSION_NODE); - createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__THEN); + createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION1); createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__ELSE); + createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__THEN); 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); + createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__EXPRESSION); + createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__DEFAULT); casePartNodeEClass = createEClass(CASE_PART_NODE); createEReference(casePartNodeEClass, CASE_PART_NODE__CONDITION); @@ -2116,12 +2116,12 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac createEReference(orExpressionNodeEClass, OR_EXPRESSION_NODE__FIRST); andExpressionNodeEClass = createEClass(AND_EXPRESSION_NODE); - createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__FIRST); createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__NEXTS); + createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__FIRST); impliesExpressionNodeEClass = createEClass(IMPLIES_EXPRESSION_NODE); - createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__NEXTS); createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__FIRST); + createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__NEXTS); relationalExpressionNodeEClass = createEClass(RELATIONAL_EXPRESSION_NODE); createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__NEXTS); @@ -2132,15 +2132,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac createEReference(additiveExpressionNodeEClass, ADDITIVE_EXPRESSION_NODE__FIRST); multiplicativeExpressionNodeEClass = createEClass(MULTIPLICATIVE_EXPRESSION_NODE); - createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__NEXTS); createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__FIRST); + createEReference(multiplicativeExpressionNodeEClass, MULTIPLICATIVE_EXPRESSION_NODE__NEXTS); unaryExpressionNodeEClass = createEClass(UNARY_EXPRESSION_NODE); createEReference(unaryExpressionNodeEClass, UNARY_EXPRESSION_NODE__OPERAND); infixExpressionNodeEClass = createEClass(INFIX_EXPRESSION_NODE); - createEReference(infixExpressionNodeEClass, INFIX_EXPRESSION_NODE__CALLS); createEReference(infixExpressionNodeEClass, INFIX_EXPRESSION_NODE__TARGET); + createEReference(infixExpressionNodeEClass, INFIX_EXPRESSION_NODE__CALLS); stringLiteralNodeEClass = createEClass(STRING_LITERAL_NODE); @@ -2150,9 +2150,9 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac globalVarExpressionNodeEClass = createEClass(GLOBAL_VAR_EXPRESSION_NODE); featureCallNodeEClass = createEClass(FEATURE_CALL_NODE); - createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME); createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__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); @@ -2167,8 +2167,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac collectionExpressionNodeEClass = createEClass(COLLECTION_EXPRESSION_NODE); createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__VARIABLE); - createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__EXPRESSION); createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__TYPE); + createEReference(collectionExpressionNodeEClass, COLLECTION_EXPRESSION_NODE__EXPRESSION); declaredParameterListNodeEClass = createEClass(DECLARED_PARAMETER_LIST_NODE); createEReference(declaredParameterListNodeEClass, DECLARED_PARAMETER_LIST_NODE__PARAMS); @@ -2278,32 +2278,32 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac // Initialize classes and features; add operations and parameters initEClass(fileNodeEClass, FileNode.class, "FileNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getFileNode_Declarations(), theNodePackage.getCompositeNode(), null, "declarations", null, 0, -1, FileNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getFileNode_Imports(), theNodePackage.getCompositeNode(), null, "imports", null, 0, -1, FileNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getFileNode_Declarations(), theNodePackage.getCompositeNode(), null, "declarations", null, 0, -1, FileNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(importNodeEClass, ImportNode.class, "ImportNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getImportNode_Namespace(), theNodePackage.getCompositeNode(), null, "namespace", null, 0, 1, ImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getImportNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, ImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getImportNode_Namespace(), theNodePackage.getCompositeNode(), null, "namespace", null, 0, 1, ImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(extensionImportNodeEClass, ExtensionImportNode.class, "ExtensionImportNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getExtensionImportNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, ExtensionImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExtensionImportNode_Namespace(), theNodePackage.getCompositeNode(), null, "namespace", null, 0, 1, ExtensionImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(definitionNodeEClass, DefinitionNode.class, "DefinitionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getDefinitionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDefinitionNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDefinitionNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDefinitionNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDefinitionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDefinitionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(definitionAroundNodeEClass, DefinitionAroundNode.class, "DefinitionAroundNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getDefinitionAroundNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDefinitionAroundNode_Pointcut(), theNodePackage.getCompositeNode(), null, "pointcut", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDefinitionAroundNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDefinitionAroundNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDefinitionAroundNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDefinitionAroundNode_Pointcut(), theNodePackage.getCompositeNode(), null, "pointcut", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(sequenceNodeEClass, SequenceNode.class, "SequenceNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSequenceNode_TextSequences(), theNodePackage.getCompositeNode(), null, "textSequences", null, 0, -1, SequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 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); + initEReference(getSequenceNode_TextSequences(), theNodePackage.getCompositeNode(), null, "textSequences", 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_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); @@ -2315,10 +2315,10 @@ 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_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); + 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_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); initEClass(expressionStmtNodeEClass, ExpressionStmtNode.class, "ExpressionStmtNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getExpressionStmtNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, ExpressionStmtNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2329,58 +2329,58 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEReference(getFileStatementNode_NameExpression(), theNodePackage.getCompositeNode(), null, "nameExpression", null, 0, 1, FileStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(foreachStatementNodeEClass, ForeachStatementNode.class, "ForeachStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getForeachStatementNode_Iterator(), theNodePackage.getCompositeNode(), null, "iterator", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getForeachStatementNode_Identifier(), theNodePackage.getCompositeNode(), null, "identifier", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); initEReference(getForeachStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getForeachStatementNode_Iterator(), theNodePackage.getCompositeNode(), null, "iterator", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getForeachStatementNode_ForExpression(), theNodePackage.getCompositeNode(), null, "forExpression", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - 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); + initEReference(getForeachStatementNode_Identifier(), theNodePackage.getCompositeNode(), null, "identifier", 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_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); + 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); initEClass(elseIfStatementNodeEClass, ElseIfStatementNode.class, "ElseIfStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getElseIfStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ElseIfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getElseIfStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, ElseIfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getElseIfStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ElseIfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(elseStatementNodeEClass, ElseStatementNode.class, "ElseStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getElseStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ElseStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(letStatementNodeEClass, LetStatementNode.class, "LetStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getLetStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getLetStatementNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getLetStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getLetStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(protectStatementNodeEClass, ProtectStatementNode.class, "ProtectStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + 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); initEReference(getProtectStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getProtectStatementNode_Cend(), theNodePackage.getCompositeNode(), null, "cend", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getProtectStatementNode_Id(), theNodePackage.getCompositeNode(), null, "id", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - 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_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_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); + 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_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); initEClass(aroundNodeEClass, AroundNode.class, "AroundNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(pointcutNodeEClass, PointcutNode.class, "PointcutNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(extensionNodeEClass, ExtensionNode.class, "ExtensionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getExtensionNode_ExtendBody(), theNodePackage.getCompositeNode(), null, "extendBody", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getExtensionNode_JavaName(), theNodePackage.getCompositeNode(), null, "javaName", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExtensionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExtensionNode_Private(), theNodePackage.getLeafNode(), null, "private", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExtensionNode_ReturnType(), theNodePackage.getCompositeNode(), null, "returnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExtensionNode_JavaReturnType(), theNodePackage.getCompositeNode(), null, "javaReturnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExtensionNode_Create(), theNodePackage.getLeafNode(), null, "create", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExtensionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExtensionNode_JavaName(), theNodePackage.getCompositeNode(), null, "javaName", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getExtensionNode_ReturnType(), theNodePackage.getCompositeNode(), null, "returnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getExtensionNode_Private(), theNodePackage.getLeafNode(), null, "private", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getExtensionNode_JavaReturnType(), theNodePackage.getCompositeNode(), null, "javaReturnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getExtensionNode_Cached(), theNodePackage.getLeafNode(), null, "cached", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExtensionNode_ExtendBody(), theNodePackage.getCompositeNode(), null, "extendBody", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(javaTypeNodeEClass, JavaTypeNode.class, "JavaTypeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2389,23 +2389,23 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac 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); + 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); 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); + 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); 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_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); 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_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_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); + 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_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); 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); @@ -2416,12 +2416,12 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac 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); + 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); 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); + 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); initEClass(relationalExpressionNodeEClass, RelationalExpressionNode.class, "RelationalExpressionNode", !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); @@ -2432,15 +2432,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac 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_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); + 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); 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); initEClass(infixExpressionNodeEClass, InfixExpressionNode.class, "InfixExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getInfixExpressionNode_Calls(), theNodePackage.getCompositeNode(), null, "calls", null, 0, -1, InfixExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getInfixExpressionNode_Target(), theNodePackage.getCompositeNode(), null, "target", null, 0, 1, InfixExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getInfixExpressionNode_Calls(), theNodePackage.getCompositeNode(), null, "calls", null, 0, -1, InfixExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(stringLiteralNodeEClass, StringLiteralNode.class, "StringLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2450,9 +2450,9 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac initEClass(globalVarExpressionNodeEClass, GlobalVarExpressionNode.class, "GlobalVarExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(featureCallNodeEClass, FeatureCallNode.class, "FeatureCallNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getFeatureCallNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getFeatureCallNode_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); @@ -2467,8 +2467,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac 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); + 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); 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); diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore index 1848d010..65007139 100644 --- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore +++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore @@ -2,19 +2,19 @@ <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xpand3node" nsURI="http://www.eclipse.org/tmf/common/Xpand3Node" nsPrefix="xpand3node"> <eClassifiers xsi:type="ecore:EClass" name="FileNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1"> + <eStructuralFeatures xsi:type="ecore:EReference" name="imports" 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="imports" upperBound="-1"> + <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" 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="ImportNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="namespace"> + <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="type"> + <eStructuralFeatures xsi:type="ecore:EReference" name="namespace"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> @@ -29,13 +29,13 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="DefinitionNode"> <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="sequence"> <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> - <eStructuralFeatures xsi:type="ecore:EReference" name="sequence"> + <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"> @@ -47,22 +47,22 @@ <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="pointcut"> + <eStructuralFeatures xsi:type="ecore:EReference" name="sequence"> <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"> <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="sequence"> + <eStructuralFeatures xsi:type="ecore:EReference" name="pointcut"> <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="SequenceNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="textSequences" upperBound="-1"> + <eStructuralFeatures xsi:type="ecore:EReference" name="statements" 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="statements" upperBound="-1"> + <eStructuralFeatures xsi:type="ecore:EReference" name="textSequences" 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> @@ -86,16 +86,16 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="separator"> <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="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="forEachExpression"> + <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> - <eStructuralFeatures xsi:type="ecore:EReference" name="forExpression"> + <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="name"> + <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> </eClassifiers> @@ -119,43 +119,43 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ForeachStatementNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="iterator"> + <eStructuralFeatures xsi:type="ecore:EReference" name="separatorExpression"> <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="identifier"> + <eStructuralFeatures xsi:type="ecore:EReference" name="sequence"> <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="sequence"> + <eStructuralFeatures xsi:type="ecore:EReference" name="iterator"> <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> - <eStructuralFeatures xsi:type="ecore:EReference" name="separatorExpression"> + <eStructuralFeatures xsi:type="ecore:EReference" name="identifier"> <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="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="elseIfs" upperBound="-1"> + <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="expression"> + <eStructuralFeatures xsi:type="ecore:EReference" name="sequence"> <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"> + <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="sequence"> + <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="ElseIfStatementNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="sequence"> + <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="expression"> + <eStructuralFeatures xsi:type="ecore:EReference" name="sequence"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> </eClassifiers> @@ -167,10 +167,10 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="LetStatementNode"> <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"> + <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="name"> + <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="sequence"> @@ -179,6 +179,9 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ProtectStatementNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="cstart"> + <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="sequence"> <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> </eStructuralFeatures> @@ -188,28 +191,25 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="id"> <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="cstart"> - <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="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"> + <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="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="ifExpression"> + <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> - <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 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="constraint"> + <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> </eClassifiers> @@ -221,16 +221,13 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ExtensionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="paramList"> + <eStructuralFeatures xsi:type="ecore:EReference" name="extendBody"> <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="private"> - <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="returnType"> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaName"> <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="javaReturnType"> + <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="create"> @@ -239,15 +236,18 @@ <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="javaName"> + <eStructuralFeatures xsi:type="ecore:EReference" name="returnType"> <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="cached"> + <eStructuralFeatures xsi:type="ecore:EReference" name="private"> <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="extendBody"> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaReturnType"> <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="cached"> + <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="JavaTypeNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> @@ -260,46 +260,46 @@ </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"> + <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="type"> + <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> </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"> + <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="first"> + <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="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"> + <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> <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"> + <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="condition1"> + <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> </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"> + <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> <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"> + <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> </eClassifiers> @@ -323,19 +323,19 @@ </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"> + <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="nexts" upperBound="-1"> + <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="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"> + <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="first"> + <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> @@ -359,10 +359,10 @@ </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="nexts" upperBound="-1"> + <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="first"> + <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> @@ -374,10 +374,10 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="InfixExpressionNode"> <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="calls" upperBound="-1"> + <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="target"> + <eStructuralFeatures xsi:type="ecore:EReference" name="calls" 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> @@ -395,15 +395,15 @@ </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="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="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="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="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> <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"/> @@ -428,10 +428,10 @@ <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"> + <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="type"> + <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> diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf index de491e6b..7c80fa40 100644 --- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf +++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.tmf @@ -1,6 +1,6 @@ grammar Xpand3Node; -normalizable file : +file : (imports+=nsImport)* (declarations+=abstractDeclaration)* EOF @@ -132,7 +132,7 @@ protectStatement : // Xtend start check : - 'context' type=type ('if' ifExpression=expression)? ('ERROR'|'WARNING') message=expression ':' + 'context' type=type ('if' ifExpression=expression)? (error='ERROR'|warning='WARNING') message=expression ':' constraint=expression ';' ; 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 d6bc6fc8..eeb6b4c8 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 @@ -28,8 +28,7 @@ package org.eclipse.xpand3.parser; r_file returns [CompositeNode cn] @init{ cn = factory.createFileNode(); - } - @after{ cn = normalize(cn); } : + } : (((f_imports=r_nsImport { addToChildren(cn, f_imports); ((FileNode) cn).getImports().add(f_imports); })))* (((f_declarations=r_abstractDeclaration { addToChildren(cn, f_declarations); ((FileNode) cn).getDeclarations().add(f_declarations); })))* (EOF) ; 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 15821ec5..d7233d86 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-13 07:58:07 +// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-17 09:48:32 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: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:462:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:462: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:462: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("463:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input); + new NoViableAltException("462:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input); throw nvae; } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:4: '0' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:462:4: '0' { match('0'); } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:10: '1' .. '9' ( '0' .. '9' )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:462:10: '1' .. '9' ( '0' .. '9' )* { matchRange('1','9'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:463:19: ( '0' .. '9' )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:462: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:463:19: '0' .. '9' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:462: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:468:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467: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("467:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input); + new NoViableAltException("466:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input); throw nvae; } switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' { match('\"'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467: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:468:10: EscapeSequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467:10: EscapeSequence { mEscapeSequence(); } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:27: ~ ( '\\\\' | '\\\"' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:467: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:469:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468: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:469:15: EscapeSequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468:15: EscapeSequence { mEscapeSequence(); } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:32: ~ ( '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:468: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:474:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:473: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("473:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input); + new NoViableAltException("472: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("473:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input); + new NoViableAltException("472: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:474:3: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:473: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:475:9: UnicodeEscape + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:474:9: UnicodeEscape { mUnicodeEscape(); } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:476:9: OctalEscape + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:475: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:481:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480: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("480:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input); + new NoViableAltException("479: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("480:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input); + new NoViableAltException("479: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:481:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) { match('\\'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:8: ( '0' .. '3' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:9: '0' .. '3' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480:8: ( '0' .. '3' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480:9: '0' .. '3' { matchRange('0','3'); } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:19: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:20: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480:19: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480:20: '0' .. '7' { matchRange('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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480:30: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:480: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:482:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) { match('\\'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:14: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:15: '0' .. '7' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:14: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:15: '0' .. '7' { matchRange('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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481:25: ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:481: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:483:9: '\\\\' ( '0' .. '7' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:482:9: '\\\\' ( '0' .. '7' ) { match('\\'); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:14: ( '0' .. '7' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483: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'); @@ -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:488: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:487:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:487: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:493: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:492:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492: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:498:3: ( 'DEFINE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:498:3: 'DEFINE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:497:3: ( 'DEFINE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:497: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:503:3: ( 'ENDDEFINE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:3: 'ENDDEFINE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:502:3: ( 'ENDDEFINE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:502: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:508:3: ( 'AROUND' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: 'AROUND' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:507:3: ( 'AROUND' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:507: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:513:3: ( 'ENDAROUND' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:513:3: 'ENDAROUND' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: ( 'ENDAROUND' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512: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: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:517:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:517:3: ( '^' )? Letter ( Letter | JavaIDDigit )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:3: ( '^' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:517: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:518:4: '^' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:517:4: '^' { match('^'); @@ -2354,7 +2354,7 @@ public class Xpand3NodeLexer extends Lexer { } mLetter(); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:518:17: ( Letter | JavaIDDigit )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:517: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: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:522: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: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:540: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:561: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:560:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:560: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:566: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:565:3: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:565:3: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:566:8: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:565: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:566:36: . + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:565: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:571: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:570:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) { match("//"); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:8: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570: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:571:8: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570: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:571:22: ( ( '\\r' )? '\\n' | EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570: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:571:23: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570:23: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:23: ( '\\r' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570: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:571:23: '\\r' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570:23: '\\r' { match('\r'); @@ -2614,7 +2614,7 @@ public class Xpand3NodeLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:571:34: EOF + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:570: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: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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575: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:576:31: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575: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:576:59: . + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:575: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:581: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:580:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580: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:581:27: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580: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:581:55: . + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:580: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:586: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:585:3: ({...}? => RG (~ ( LG ) )* ( LG )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585:3: {...}? => RG (~ ( LG ) )* ( LG )? { if ( !(xpandMode) ) { throw new FailedPredicateException(input, "TEXT", "xpandMode"); } mRG(); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:586:21: (~ ( LG ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585: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:586:21: ~ ( LG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585: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:586:28: ( LG )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585: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:586:29: LG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:585: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:591:3: ( '\\u00AB' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:591:3: '\\u00AB' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:590:3: ( '\\u00AB' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:590: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:596:3: ( '\\u00BB' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:596:3: '\\u00BB' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595:3: ( '\\u00BB' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:595: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 6fb7f58d..473830a5 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-13 07:58:06 +// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-17 09:48:31 package org.eclipse.xpand3.parser; @@ -67,10 +67,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createFileNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( ( (f_imports= r_nsImport ) ) )* ( ( (f_declarations= r_abstractDeclaration ) ) )* ( EOF ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (f_imports= r_nsImport ) ) )* ( ( (f_declarations= r_abstractDeclaration ) ) )* ( EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:2: ( ( ( (f_imports= r_nsImport ) ) )* ( ( (f_declarations= r_abstractDeclaration ) ) )* ( EOF ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:2: ( ( (f_imports= r_nsImport ) ) )* ( ( (f_declarations= r_abstractDeclaration ) ) )* ( EOF ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (f_imports= r_nsImport ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:2: ( ( (f_imports= r_nsImport ) ) )* loop1: do { int alt1=2; @@ -92,15 +92,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (f_imports= r_nsImport ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:3: ( (f_imports= r_nsImport ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (f_imports= r_nsImport ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (f_imports= r_nsImport ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:3: ( (f_imports= r_nsImport ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:4: (f_imports= r_nsImport ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (f_imports= r_nsImport ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:5: f_imports= r_nsImport + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:4: (f_imports= r_nsImport ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:5: f_imports= r_nsImport { - pushFollow(FOLLOW_r_nsImport_in_r_file80); + pushFollow(FOLLOW_r_nsImport_in_r_file75); f_imports=r_nsImport(); _fsp--; if (failed) return cn; @@ -122,7 +122,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:109: ( ( (f_declarations= r_abstractDeclaration ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:109: ( ( (f_declarations= r_abstractDeclaration ) ) )* loop2: do { int alt2=2; @@ -135,15 +135,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:110: ( (f_declarations= r_abstractDeclaration ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:110: ( (f_declarations= r_abstractDeclaration ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:110: ( (f_declarations= r_abstractDeclaration ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:111: (f_declarations= r_abstractDeclaration ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:110: ( (f_declarations= r_abstractDeclaration ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:111: (f_declarations= r_abstractDeclaration ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:111: (f_declarations= r_abstractDeclaration ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:112: f_declarations= r_abstractDeclaration + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:111: (f_declarations= r_abstractDeclaration ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:112: f_declarations= r_abstractDeclaration { - pushFollow(FOLLOW_r_abstractDeclaration_in_r_file93); + pushFollow(FOLLOW_r_abstractDeclaration_in_r_file88); f_declarations=r_abstractDeclaration(); _fsp--; if (failed) return cn; @@ -165,19 +165,16 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:247: ( EOF ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:248: EOF + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:247: ( EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:32:248: EOF { - match(input,EOF,FOLLOW_EOF_in_r_file102); if (failed) return cn; + match(input,EOF,FOLLOW_EOF_in_r_file97); if (failed) return cn; } } - if ( backtracking==0 ) { - cn = normalize(cn); - } } catch (RecognitionException re) { reportError(re); @@ -191,7 +188,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_nsImport - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:1: r_nsImport returns [CompositeNode cn] : ( ( r_import ) | ( r_extensionImport ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:35:1: r_nsImport returns [CompositeNode cn] : ( ( r_import ) | ( r_extensionImport ) ); public CompositeNode r_nsImport() throws RecognitionException { CompositeNode cn = null; @@ -201,7 +198,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:2: ( ( r_import ) | ( r_extensionImport ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:2: ( ( r_import ) | ( r_extensionImport ) ) int alt3=2; switch ( input.LA(1) ) { case LG: @@ -217,7 +214,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("36:1: r_nsImport returns [CompositeNode cn] : ( ( r_import ) | ( r_extensionImport ) );", 3, 1, input); + new NoViableAltException("35:1: r_nsImport returns [CompositeNode cn] : ( ( r_import ) | ( r_extensionImport ) );", 3, 1, input); throw nvae; } @@ -236,19 +233,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("36:1: r_nsImport returns [CompositeNode cn] : ( ( r_import ) | ( r_extensionImport ) );", 3, 0, input); + new NoViableAltException("35:1: r_nsImport returns [CompositeNode cn] : ( ( r_import ) | ( r_extensionImport ) );", 3, 0, input); throw nvae; } switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:2: ( r_import ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:2: ( r_import ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:2: ( r_import ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:3: r_import + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:2: ( r_import ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:36:3: r_import { - pushFollow(FOLLOW_r_import_in_r_nsImport119); + pushFollow(FOLLOW_r_import_in_r_nsImport114); r_import1=r_import(); _fsp--; if (failed) return cn; @@ -262,12 +259,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:4: ( r_extensionImport ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:4: ( r_extensionImport ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:4: ( r_extensionImport ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:5: r_extensionImport + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:4: ( r_extensionImport ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:37:5: r_extensionImport { - pushFollow(FOLLOW_r_extensionImport_in_r_nsImport128); + pushFollow(FOLLOW_r_extensionImport_in_r_nsImport123); r_extensionImport2=r_extensionImport(); _fsp--; if (failed) return cn; @@ -295,7 +292,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_import - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:1: r_import returns [CompositeNode cn] : ( ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'import' ) (f_type= r_type ) ( ';' ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:1: r_import returns [CompositeNode cn] : ( ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'import' ) (f_type= r_type ) ( ';' ) ); public CompositeNode r_import() throws RecognitionException { CompositeNode cn = null; @@ -307,7 +304,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createImportNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'import' ) (f_type= r_type ) ( ';' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:2: ( ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'import' ) (f_type= r_type ) ( ';' ) ) int alt4=2; int LA4_0 = input.LA(1); @@ -320,44 +317,44 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("41:1: r_import returns [CompositeNode cn] : ( ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'import' ) (f_type= r_type ) ( ';' ) );", 4, 0, input); + new NoViableAltException("40:1: r_import returns [CompositeNode cn] : ( ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'import' ) (f_type= r_type ) ( ';' ) );", 4, 0, input); throw nvae; } switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:2: ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:3: ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:2: ( ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:3: ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:3: ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:4: ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:3: ( ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:4: ( LG ) ( 'IMPORT' ) (f_namespace= r_simpleType ) ( RG ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:4: ( LG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:5: LG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:4: ( LG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:5: LG { - match(input,LG,FOLLOW_LG_in_r_import154); if (failed) return cn; + match(input,LG,FOLLOW_LG_in_r_import149); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:45: ( 'IMPORT' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:46: 'IMPORT' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:45: ( 'IMPORT' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:46: 'IMPORT' { - match(input,25,FOLLOW_25_in_r_import160); if (failed) return cn; + match(input,25,FOLLOW_25_in_r_import155); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:92: (f_namespace= r_simpleType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:93: f_namespace= r_simpleType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:92: (f_namespace= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:93: f_namespace= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_import168); + pushFollow(FOLLOW_r_simpleType_in_r_import163); f_namespace=r_simpleType(); _fsp--; if (failed) return cn; @@ -367,10 +364,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:200: ( RG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:201: RG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:200: ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:201: RG { - match(input,RG,FOLLOW_RG_in_r_import174); if (failed) return cn; + match(input,RG,FOLLOW_RG_in_r_import169); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -387,22 +384,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( 'import' ) (f_type= r_type ) ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:4: ( 'import' ) (f_type= r_type ) ( ';' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( 'import' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:5: 'import' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:4: ( 'import' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:5: 'import' { - match(input,26,FOLLOW_26_in_r_import185); if (failed) return cn; + match(input,26,FOLLOW_26_in_r_import180); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:51: (f_type= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:52: f_type= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:51: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:52: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_import193); + pushFollow(FOLLOW_r_type_in_r_import188); f_type=r_type(); _fsp--; if (failed) return cn; @@ -412,10 +409,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:133: ( ';' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:134: ';' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:133: ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:134: ';' { - match(input,27,FOLLOW_27_in_r_import199); if (failed) return cn; + match(input,27,FOLLOW_27_in_r_import194); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -440,7 +437,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_extensionImport - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:1: r_extensionImport returns [CompositeNode cn] : ( ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:1: r_extensionImport returns [CompositeNode cn] : ( ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) ); public CompositeNode r_extensionImport() throws RecognitionException { CompositeNode cn = null; @@ -452,7 +449,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createExtensionImportNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:2: ( ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:2: ( ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) ) int alt6=2; int LA6_0 = input.LA(1); @@ -465,44 +462,44 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("48:1: r_extensionImport returns [CompositeNode cn] : ( ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) );", 6, 0, input); + new NoViableAltException("47:1: r_extensionImport returns [CompositeNode cn] : ( ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) | ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:2: ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:2: ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:2: ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:3: ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:2: ( ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:3: ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:3: ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:4: ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:3: ( ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:4: ( LG ) ( 'EXTENSION' ) (f_namespace= r_simpleType ) ( RG ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:4: ( LG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:5: LG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:4: ( LG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:5: LG { - match(input,LG,FOLLOW_LG_in_r_extensionImport225); if (failed) return cn; + match(input,LG,FOLLOW_LG_in_r_extensionImport220); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:45: ( 'EXTENSION' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:46: 'EXTENSION' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:45: ( 'EXTENSION' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:46: 'EXTENSION' { - match(input,28,FOLLOW_28_in_r_extensionImport231); if (failed) return cn; + match(input,28,FOLLOW_28_in_r_extensionImport226); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:95: (f_namespace= r_simpleType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:96: f_namespace= r_simpleType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:95: (f_namespace= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:96: f_namespace= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_extensionImport239); + pushFollow(FOLLOW_r_simpleType_in_r_extensionImport234); f_namespace=r_simpleType(); _fsp--; if (failed) return cn; @@ -512,10 +509,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:212: ( RG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:213: RG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:212: ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:213: RG { - match(input,RG,FOLLOW_RG_in_r_extensionImport245); if (failed) return cn; + match(input,RG,FOLLOW_RG_in_r_extensionImport240); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -532,22 +529,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:4: ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:4: ( 'extension' ) (f_type= r_type ) ( 'reexport' )? ( ';' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:4: ( 'extension' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:5: 'extension' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:4: ( 'extension' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:5: 'extension' { - match(input,29,FOLLOW_29_in_r_extensionImport256); if (failed) return cn; + match(input,29,FOLLOW_29_in_r_extensionImport251); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:54: (f_type= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:55: f_type= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:54: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:55: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_extensionImport264); + pushFollow(FOLLOW_r_type_in_r_extensionImport259); f_type=r_type(); _fsp--; if (failed) return cn; @@ -557,7 +554,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:145: ( 'reexport' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:145: ( 'reexport' )? int alt5=2; int LA5_0 = input.LA(1); @@ -566,9 +563,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:146: 'reexport' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:146: 'reexport' { - match(input,30,FOLLOW_30_in_r_extensionImport270); if (failed) return cn; + match(input,30,FOLLOW_30_in_r_extensionImport265); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -578,10 +575,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:195: ( ';' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:52:196: ';' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:195: ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:51:196: ';' { - match(input,27,FOLLOW_27_in_r_extensionImport277); if (failed) return cn; + match(input,27,FOLLOW_27_in_r_extensionImport272); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -606,7 +603,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_abstractDeclaration - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) ); public CompositeNode r_abstractDeclaration() throws RecognitionException { CompositeNode cn = null; @@ -622,7 +619,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:2: ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:2: ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) ) int alt7=5; switch ( input.LA(1) ) { case 59: @@ -659,7 +656,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("55:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) );", 7, 4, input); + new NoViableAltException("54:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) );", 7, 4, input); throw nvae; } @@ -668,19 +665,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("55:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) );", 7, 0, input); + new NoViableAltException("54:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) );", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:2: ( r_check ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:2: ( r_check ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:2: ( r_check ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:3: r_check + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:2: ( r_check ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:55:3: r_check { - pushFollow(FOLLOW_r_check_in_r_abstractDeclaration296); + pushFollow(FOLLOW_r_check_in_r_abstractDeclaration291); r_check3=r_check(); _fsp--; if (failed) return cn; @@ -694,12 +691,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:57:4: ( r_around ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:4: ( r_around ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:57:4: ( r_around ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:57:5: r_around + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:4: ( r_around ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:5: r_around { - pushFollow(FOLLOW_r_around_in_r_abstractDeclaration305); + pushFollow(FOLLOW_r_around_in_r_abstractDeclaration300); r_around4=r_around(); _fsp--; if (failed) return cn; @@ -713,12 +710,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:4: ( r_extension ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:57:4: ( r_extension ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:4: ( r_extension ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:5: r_extension + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:57:4: ( r_extension ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:57:5: r_extension { - pushFollow(FOLLOW_r_extension_in_r_abstractDeclaration314); + pushFollow(FOLLOW_r_extension_in_r_abstractDeclaration309); r_extension5=r_extension(); _fsp--; if (failed) return cn; @@ -732,12 +729,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:4: ( r_definition ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:4: ( r_definition ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:4: ( r_definition ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:5: r_definition + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:4: ( r_definition ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:58:5: r_definition { - pushFollow(FOLLOW_r_definition_in_r_abstractDeclaration323); + pushFollow(FOLLOW_r_definition_in_r_abstractDeclaration318); r_definition6=r_definition(); _fsp--; if (failed) return cn; @@ -751,12 +748,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:4: ( r_definitionAround ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:4: ( r_definitionAround ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:4: ( r_definitionAround ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:5: r_definitionAround + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:4: ( r_definitionAround ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:5: r_definitionAround { - pushFollow(FOLLOW_r_definitionAround_in_r_abstractDeclaration332); + pushFollow(FOLLOW_r_definitionAround_in_r_abstractDeclaration327); r_definitionAround7=r_definitionAround(); _fsp--; if (failed) return cn; @@ -784,7 +781,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_definition - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:63:1: r_definition returns [CompositeNode cn] : ( LG ) ( DEFINE ) (f_name= r_identifier ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDDEFINE ) ( RG ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:62:1: r_definition returns [CompositeNode cn] : ( LG ) ( DEFINE ) (f_name= r_identifier ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDDEFINE ) ( RG ) ; public CompositeNode r_definition() throws RecognitionException { CompositeNode cn = null; @@ -800,33 +797,33 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createDefinitionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:2: ( ( LG ) ( DEFINE ) (f_name= r_identifier ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDDEFINE ) ( RG ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:2: ( LG ) ( DEFINE ) (f_name= r_identifier ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDDEFINE ) ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: ( ( LG ) ( DEFINE ) (f_name= r_identifier ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDDEFINE ) ( RG ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: ( LG ) ( DEFINE ) (f_name= r_identifier ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDDEFINE ) ( RG ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:2: ( LG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:3: LG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: ( LG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:3: LG { - match(input,LG,FOLLOW_LG_in_r_definition356); if (failed) return cn; + match(input,LG,FOLLOW_LG_in_r_definition351); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:43: ( DEFINE ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:44: DEFINE + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:43: ( DEFINE ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:44: DEFINE { - match(input,DEFINE,FOLLOW_DEFINE_in_r_definition362); if (failed) return cn; + match(input,DEFINE,FOLLOW_DEFINE_in_r_definition357); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:88: (f_name= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:89: f_name= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:88: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:89: f_name= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_definition370); + pushFollow(FOLLOW_r_identifier_in_r_definition365); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -836,7 +833,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:180: ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:180: ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? int alt12=2; int LA12_0 = input.LA(1); @@ -845,22 +842,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt12) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:181: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:181: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:181: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:182: ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:181: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:182: ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:182: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:183: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:182: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:183: '(' { - match(input,31,FOLLOW_31_in_r_definition378); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_definition373); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:224: ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:224: ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? int alt11=2; int LA11_0 = input.LA(1); @@ -869,9 +866,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt11) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:225: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:225: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:225: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:225: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) int alt10=2; int LA10_0 = input.LA(1); @@ -884,18 +881,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("66:225: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 10, 0, input); + new NoViableAltException("65:225: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 10, 0, input); throw nvae; } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:226: (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:226: (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:226: (f_paramList= r_declaredParameterList ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:227: f_paramList= r_declaredParameterList + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:226: (f_paramList= r_declaredParameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:227: f_paramList= r_declaredParameterList { - pushFollow(FOLLOW_r_declaredParameterList_in_r_definition388); + pushFollow(FOLLOW_r_declaredParameterList_in_r_definition383); f_paramList=r_declaredParameterList(); _fsp--; if (failed) return cn; @@ -905,7 +902,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:349: ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:349: ( ( ( ',' )? ( '*' ) ) )? int alt9=2; int LA9_0 = input.LA(1); @@ -914,12 +911,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:350: ( ( ',' )? ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:350: ( ( ',' )? ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:350: ( ( ',' )? ( '*' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:351: ( ',' )? ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:350: ( ( ',' )? ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:351: ( ',' )? ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:351: ( ',' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:351: ( ',' )? int alt8=2; int LA8_0 = input.LA(1); @@ -928,9 +925,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:352: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:352: ',' { - match(input,32,FOLLOW_32_in_r_definition396); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_definition391); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -940,10 +937,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:394: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:395: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:394: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:395: '*' { - match(input,33,FOLLOW_33_in_r_definition403); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_definition398); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -963,12 +960,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:4: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:4: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:5: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:5: '*' { - match(input,33,FOLLOW_33_in_r_definition415); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_definition410); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -987,10 +984,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:49: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:50: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:49: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:50: ')' { - match(input,34,FOLLOW_34_in_r_definition424); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_definition419); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1006,20 +1003,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:94: ( 'FOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:95: 'FOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:94: ( 'FOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:95: 'FOR' { - match(input,35,FOLLOW_35_in_r_definition433); if (failed) return cn; + match(input,35,FOLLOW_35_in_r_definition428); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:138: (f_type= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:139: f_type= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:138: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:139: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_definition441); + pushFollow(FOLLOW_r_type_in_r_definition436); f_type=r_type(); _fsp--; if (failed) return cn; @@ -1029,10 +1026,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:224: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:225: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:224: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:225: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_definition449); + pushFollow(FOLLOW_r_sequence_in_r_definition444); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -1042,20 +1039,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:330: ( ENDDEFINE ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:331: ENDDEFINE + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:330: ( ENDDEFINE ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:331: ENDDEFINE { - match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_r_definition455); if (failed) return cn; + match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_r_definition450); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:378: ( RG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:379: RG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:378: ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:66:379: RG { - match(input,RG,FOLLOW_RG_in_r_definition461); if (failed) return cn; + match(input,RG,FOLLOW_RG_in_r_definition456); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1078,7 +1075,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_definitionAround - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:1: r_definitionAround returns [CompositeNode cn] : ( LG ) ( AROUND ) (f_pointcut= r_pointcut ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDAROUND ) ( RG ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:1: r_definitionAround returns [CompositeNode cn] : ( LG ) ( AROUND ) (f_pointcut= r_pointcut ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDAROUND ) ( RG ) ; public CompositeNode r_definitionAround() throws RecognitionException { CompositeNode cn = null; @@ -1094,33 +1091,33 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createDefinitionAroundNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:2: ( ( LG ) ( AROUND ) (f_pointcut= r_pointcut ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDAROUND ) ( RG ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:2: ( LG ) ( AROUND ) (f_pointcut= r_pointcut ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDAROUND ) ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:2: ( ( LG ) ( AROUND ) (f_pointcut= r_pointcut ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDAROUND ) ( RG ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:2: ( LG ) ( AROUND ) (f_pointcut= r_pointcut ) ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (f_type= r_type ) (f_sequence= r_sequence ) ( ENDAROUND ) ( RG ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:2: ( LG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:3: LG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:2: ( LG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:3: LG { - match(input,LG,FOLLOW_LG_in_r_definitionAround485); if (failed) return cn; + match(input,LG,FOLLOW_LG_in_r_definitionAround480); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:43: ( AROUND ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:44: AROUND + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:43: ( AROUND ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:44: AROUND { - match(input,AROUND,FOLLOW_AROUND_in_r_definitionAround491); if (failed) return cn; + match(input,AROUND,FOLLOW_AROUND_in_r_definitionAround486); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:88: (f_pointcut= r_pointcut ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:89: f_pointcut= r_pointcut + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:88: (f_pointcut= r_pointcut ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:89: f_pointcut= r_pointcut { - pushFollow(FOLLOW_r_pointcut_in_r_definitionAround499); + pushFollow(FOLLOW_r_pointcut_in_r_definitionAround494); f_pointcut=r_pointcut(); _fsp--; if (failed) return cn; @@ -1130,7 +1127,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:200: ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:200: ( ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? int alt17=2; int LA17_0 = input.LA(1); @@ -1139,22 +1136,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt17) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:201: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:201: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:201: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:202: ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:201: ( ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:202: ( '(' ) ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:202: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:203: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:202: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:203: '(' { - match(input,31,FOLLOW_31_in_r_definitionAround507); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_definitionAround502); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:244: ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:244: ( ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? int alt16=2; int LA16_0 = input.LA(1); @@ -1163,9 +1160,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt16) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:245: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:245: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:245: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:245: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) int alt15=2; int LA15_0 = input.LA(1); @@ -1178,18 +1175,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("73:245: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 15, 0, input); + new NoViableAltException("72:245: ( (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 15, 0, input); throw nvae; } switch (alt15) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:246: (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:246: (f_paramList= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:246: (f_paramList= r_declaredParameterList ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:247: f_paramList= r_declaredParameterList + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:246: (f_paramList= r_declaredParameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:247: f_paramList= r_declaredParameterList { - pushFollow(FOLLOW_r_declaredParameterList_in_r_definitionAround517); + pushFollow(FOLLOW_r_declaredParameterList_in_r_definitionAround512); f_paramList=r_declaredParameterList(); _fsp--; if (failed) return cn; @@ -1199,7 +1196,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:375: ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:375: ( ( ( ',' )? ( '*' ) ) )? int alt14=2; int LA14_0 = input.LA(1); @@ -1208,12 +1205,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt14) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:376: ( ( ',' )? ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:376: ( ( ',' )? ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:376: ( ( ',' )? ( '*' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:377: ( ',' )? ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:376: ( ( ',' )? ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:377: ( ',' )? ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:377: ( ',' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:377: ( ',' )? int alt13=2; int LA13_0 = input.LA(1); @@ -1222,9 +1219,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt13) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:378: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:378: ',' { - match(input,32,FOLLOW_32_in_r_definitionAround525); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_definitionAround520); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1234,10 +1231,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:420: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:421: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:420: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:421: '*' { - match(input,33,FOLLOW_33_in_r_definitionAround532); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_definitionAround527); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1257,12 +1254,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:4: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:5: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:5: '*' { - match(input,33,FOLLOW_33_in_r_definitionAround544); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_definitionAround539); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1281,10 +1278,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:49: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:50: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:49: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:50: ')' { - match(input,34,FOLLOW_34_in_r_definitionAround553); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_definitionAround548); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1300,20 +1297,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:94: ( 'FOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:95: 'FOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:94: ( 'FOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:95: 'FOR' { - match(input,35,FOLLOW_35_in_r_definitionAround562); if (failed) return cn; + match(input,35,FOLLOW_35_in_r_definitionAround557); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:138: (f_type= r_type ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:139: f_type= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:138: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:139: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_definitionAround570); + pushFollow(FOLLOW_r_type_in_r_definitionAround565); f_type=r_type(); _fsp--; if (failed) return cn; @@ -1323,10 +1320,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:230: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:231: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:230: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:231: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_definitionAround578); + pushFollow(FOLLOW_r_sequence_in_r_definitionAround573); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -1336,20 +1333,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:342: ( ENDAROUND ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:343: ENDAROUND + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:342: ( ENDAROUND ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:343: ENDAROUND { - match(input,ENDAROUND,FOLLOW_ENDAROUND_in_r_definitionAround584); if (failed) return cn; + match(input,ENDAROUND,FOLLOW_ENDAROUND_in_r_definitionAround579); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:390: ( RG ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:74:391: RG + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:390: ( RG ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:391: RG { - match(input,RG,FOLLOW_RG_in_r_definitionAround590); if (failed) return cn; + match(input,RG,FOLLOW_RG_in_r_definitionAround585); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1372,7 +1369,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_sequence - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:77:1: r_sequence returns [CompositeNode cn] : (f_textSequences= r_textSequence ) ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:76:1: r_sequence returns [CompositeNode cn] : (f_textSequences= r_textSequence ) ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* ; public CompositeNode r_sequence() throws RecognitionException { CompositeNode cn = null; @@ -1384,13 +1381,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createSequenceNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:2: ( (f_textSequences= r_textSequence ) ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:2: (f_textSequences= r_textSequence ) ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: ( (f_textSequences= r_textSequence ) ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (f_textSequences= r_textSequence ) ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:2: (f_textSequences= r_textSequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:3: f_textSequences= r_textSequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (f_textSequences= r_textSequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:3: f_textSequences= r_textSequence { - pushFollow(FOLLOW_r_textSequence_in_r_sequence616); + pushFollow(FOLLOW_r_textSequence_in_r_sequence611); f_textSequences=r_textSequence(); _fsp--; if (failed) return cn; @@ -1400,7 +1397,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:136: ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:136: ( ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) )* loop18: do { int alt18=2; @@ -1413,15 +1410,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt18) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:137: ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:137: ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:137: ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:138: (f_statements= r_statement ) (f_textSequences= r_textSequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:137: ( (f_statements= r_statement ) (f_textSequences= r_textSequence ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:138: (f_statements= r_statement ) (f_textSequences= r_textSequence ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:138: (f_statements= r_statement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:139: f_statements= r_statement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:138: (f_statements= r_statement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:139: f_statements= r_statement { - pushFollow(FOLLOW_r_statement_in_r_sequence626); + pushFollow(FOLLOW_r_statement_in_r_sequence621); f_statements=r_statement(); _fsp--; if (failed) return cn; @@ -1431,10 +1428,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:257: (f_textSequences= r_textSequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:80:258: f_textSequences= r_textSequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:257: (f_textSequences= r_textSequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:258: f_textSequences= r_textSequence { - pushFollow(FOLLOW_r_textSequence_in_r_sequence634); + pushFollow(FOLLOW_r_textSequence_in_r_sequence629); f_textSequences=r_textSequence(); _fsp--; if (failed) return cn; @@ -1472,7 +1469,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_statement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:83:1: r_statement returns [CompositeNode cn] : ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:82:1: r_statement returns [CompositeNode cn] : ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) ); public CompositeNode r_statement() throws RecognitionException { CompositeNode cn = null; @@ -1490,7 +1487,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:2: ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:83:2: ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) ) int alt19=6; switch ( input.LA(1) ) { case StringLiteral: @@ -1554,19 +1551,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("83:1: r_statement returns [CompositeNode cn] : ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) );", 19, 0, input); + new NoViableAltException("82:1: r_statement returns [CompositeNode cn] : ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) );", 19, 0, input); throw nvae; } switch (alt19) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:2: ( r_simpleStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:83:2: ( r_simpleStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:2: ( r_simpleStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:3: r_simpleStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:83:2: ( r_simpleStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:83:3: r_simpleStatement { - pushFollow(FOLLOW_r_simpleStatement_in_r_statement656); + pushFollow(FOLLOW_r_simpleStatement_in_r_statement651); r_simpleStatement8=r_simpleStatement(); _fsp--; if (failed) return cn; @@ -1580,12 +1577,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:85:4: ( r_fileStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:4: ( r_fileStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:85:4: ( r_fileStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:85:5: r_fileStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:4: ( r_fileStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:5: r_fileStatement { - pushFollow(FOLLOW_r_fileStatement_in_r_statement665); + pushFollow(FOLLOW_r_fileStatement_in_r_statement660); r_fileStatement9=r_fileStatement(); _fsp--; if (failed) return cn; @@ -1599,12 +1596,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:4: ( r_foreachStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:85:4: ( r_foreachStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:4: ( r_foreachStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:5: r_foreachStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:85:4: ( r_foreachStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:85:5: r_foreachStatement { - pushFollow(FOLLOW_r_foreachStatement_in_r_statement674); + pushFollow(FOLLOW_r_foreachStatement_in_r_statement669); r_foreachStatement10=r_foreachStatement(); _fsp--; if (failed) return cn; @@ -1618,12 +1615,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:4: ( r_ifStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:4: ( r_ifStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:4: ( r_ifStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:5: r_ifStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:4: ( r_ifStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:5: r_ifStatement { - pushFollow(FOLLOW_r_ifStatement_in_r_statement683); + pushFollow(FOLLOW_r_ifStatement_in_r_statement678); r_ifStatement11=r_ifStatement(); _fsp--; if (failed) return cn; @@ -1637,12 +1634,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( r_letStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:4: ( r_letStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( r_letStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:5: r_letStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:4: ( r_letStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:5: r_letStatement { - pushFollow(FOLLOW_r_letStatement_in_r_statement692); + pushFollow(FOLLOW_r_letStatement_in_r_statement687); r_letStatement12=r_letStatement(); _fsp--; if (failed) return cn; @@ -1656,12 +1653,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( r_protectStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( r_protectStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( r_protectStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:5: r_protectStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( r_protectStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:5: r_protectStatement { - pushFollow(FOLLOW_r_protectStatement_in_r_statement701); + pushFollow(FOLLOW_r_protectStatement_in_r_statement696); r_protectStatement13=r_protectStatement(); _fsp--; if (failed) return cn; @@ -1689,7 +1686,7 @@ 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_texts= r_text ) ( ( (f_texts= r_text ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:1: r_textSequence returns [CompositeNode cn] : (f_texts= r_text ) ( ( (f_texts= r_text ) ) )* ; public CompositeNode r_textSequence() throws RecognitionException { CompositeNode cn = null; @@ -1699,13 +1696,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createTextSequenceNode(); try { - // ./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:95:2: ( (f_texts= r_text ) ( ( (f_texts= r_text ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:2: (f_texts= r_text ) ( ( (f_texts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:2: (f_texts= r_text ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:3: f_texts= r_text { - pushFollow(FOLLOW_r_text_in_r_textSequence732); + pushFollow(FOLLOW_r_text_in_r_textSequence727); f_texts=r_text(); _fsp--; if (failed) return cn; @@ -1715,7 +1712,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:100: ( ( (f_texts= r_text ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:100: ( ( (f_texts= r_text ) ) )* loop20: do { int alt20=2; @@ -1737,15 +1734,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt20) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:101: ( (f_texts= r_text ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:101: ( (f_texts= 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:95:101: ( (f_texts= r_text ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:102: (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:103: f_texts= r_text + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:102: (f_texts= r_text ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:95:103: f_texts= r_text { - pushFollow(FOLLOW_r_text_in_r_textSequence742); + pushFollow(FOLLOW_r_text_in_r_textSequence737); f_texts=r_text(); _fsp--; if (failed) return cn; @@ -1786,17 +1783,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_text - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:1: r_text returns [CompositeNode cn] : ( '-' )? ( TEXT ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:98:1: r_text returns [CompositeNode cn] : ( '-' )? ( TEXT ) ; public CompositeNode r_text() throws RecognitionException { CompositeNode cn = null; cn = factory.createTextNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:2: ( ( '-' )? ( TEXT ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:2: ( '-' )? ( TEXT ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:2: ( ( '-' )? ( TEXT ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:2: ( '-' )? ( TEXT ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:2: ( '-' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:2: ( '-' )? int alt21=2; int LA21_0 = input.LA(1); @@ -1805,9 +1802,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt21) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:3: '-' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:3: '-' { - match(input,36,FOLLOW_36_in_r_text769); if (failed) return cn; + match(input,36,FOLLOW_36_in_r_text764); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1817,10 +1814,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:45: ( TEXT ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:46: TEXT + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:45: ( TEXT ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:101:46: TEXT { - match(input,TEXT,FOLLOW_TEXT_in_r_text776); if (failed) return cn; + match(input,TEXT,FOLLOW_TEXT_in_r_text771); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -1843,7 +1840,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_simpleStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:1: r_simpleStatement returns [CompositeNode cn] : ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:104:1: r_simpleStatement returns [CompositeNode cn] : ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) ); public CompositeNode r_simpleStatement() throws RecognitionException { CompositeNode cn = null; @@ -1855,7 +1852,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:2: ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) ) int alt22=3; switch ( input.LA(1) ) { case 37: @@ -1902,19 +1899,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("105:1: r_simpleStatement returns [CompositeNode cn] : ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) );", 22, 0, input); + new NoViableAltException("104:1: r_simpleStatement returns [CompositeNode cn] : ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) );", 22, 0, input); throw nvae; } switch (alt22) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:2: ( r_errorStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: ( r_errorStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:2: ( r_errorStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:3: r_errorStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: ( r_errorStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:3: r_errorStatement { - pushFollow(FOLLOW_r_errorStatement_in_r_simpleStatement795); + pushFollow(FOLLOW_r_errorStatement_in_r_simpleStatement790); r_errorStatement14=r_errorStatement(); _fsp--; if (failed) return cn; @@ -1928,12 +1925,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:4: ( r_expandStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:4: ( r_expandStatement ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:4: ( r_expandStatement ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:5: r_expandStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:4: ( r_expandStatement ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:106:5: r_expandStatement { - pushFollow(FOLLOW_r_expandStatement_in_r_simpleStatement804); + pushFollow(FOLLOW_r_expandStatement_in_r_simpleStatement799); r_expandStatement15=r_expandStatement(); _fsp--; if (failed) return cn; @@ -1947,12 +1944,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:108:4: ( r_expressionStmt ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:4: ( r_expressionStmt ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:108:4: ( r_expressionStmt ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:108:5: r_expressionStmt + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:4: ( r_expressionStmt ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:5: r_expressionStmt { - pushFollow(FOLLOW_r_expressionStmt_in_r_simpleStatement813); + pushFollow(FOLLOW_r_expressionStmt_in_r_simpleStatement808); r_expressionStmt16=r_expressionStmt(); _fsp--; if (failed) return cn; @@ -1980,7 +1977,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_errorStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:111:1: r_errorStatement returns [CompositeNode cn] : ( 'ERROR' ) (f_expression= r_expression ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:1: r_errorStatement returns [CompositeNode cn] : ( 'ERROR' ) (f_expression= r_expression ) ; public CompositeNode r_errorStatement() throws RecognitionException { CompositeNode cn = null; @@ -1990,23 +1987,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createErrorStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:114:2: ( ( 'ERROR' ) (f_expression= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:114:2: ( 'ERROR' ) (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:2: ( ( 'ERROR' ) (f_expression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:2: ( 'ERROR' ) (f_expression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:114:2: ( 'ERROR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:114:3: 'ERROR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:2: ( 'ERROR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:3: 'ERROR' { - match(input,37,FOLLOW_37_in_r_errorStatement837); if (failed) return cn; + match(input,37,FOLLOW_37_in_r_errorStatement832); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:114:48: (f_expression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:114:49: f_expression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:48: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:113:49: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_errorStatement845); + pushFollow(FOLLOW_r_expression_in_r_errorStatement840); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -2032,7 +2029,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_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) )? ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:116: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; @@ -2050,23 +2047,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { 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_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:119: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:119: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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:2: ( 'EXPAND' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:3: 'EXPAND' { - match(input,38,FOLLOW_38_in_r_expandStatement869); if (failed) return cn; + match(input,38,FOLLOW_38_in_r_expandStatement864); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:49: (f_name= r_simpleType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:50: f_name= r_simpleType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:49: (f_name= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:50: f_name= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_expandStatement877); + pushFollow(FOLLOW_r_simpleType_in_r_expandStatement872); f_name=r_simpleType(); _fsp--; if (failed) return cn; @@ -2076,7 +2073,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:146: ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:146: ( ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) )? int alt23=2; int LA23_0 = input.LA(1); @@ -2085,25 +2082,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt23) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:147: ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:147: ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:147: ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:148: ( '(' ) (f_paramList= r_parameterList ) ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:147: ( ( '(' ) (f_paramList= r_parameterList ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:148: ( '(' ) (f_paramList= r_parameterList ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:148: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:149: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:148: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:149: '(' { - match(input,31,FOLLOW_31_in_r_expandStatement885); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_expandStatement880); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:190: (f_paramList= r_parameterList ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:191: f_paramList= r_parameterList + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:190: (f_paramList= r_parameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:191: f_paramList= r_parameterList { - pushFollow(FOLLOW_r_parameterList_in_r_expandStatement893); + pushFollow(FOLLOW_r_parameterList_in_r_expandStatement888); f_paramList=r_parameterList(); _fsp--; if (failed) return cn; @@ -2113,10 +2110,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:310: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:311: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:310: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:311: ')' { - match(input,34,FOLLOW_34_in_r_expandStatement899); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_expandStatement894); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -2132,7 +2129,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 ) ) )? ) ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119: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); @@ -2141,9 +2138,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_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119: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_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119: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); @@ -2156,34 +2153,34 @@ 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_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) )", 25, 0, input); + new NoViableAltException("119:356: ( ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) | ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) )", 25, 0, input); throw nvae; } switch (alt25) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:357: ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:357: ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:357: ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:358: ( ( 'FOR' ) (f_forExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:357: ( ( ( 'FOR' ) (f_forExpression= r_expression ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:358: ( ( 'FOR' ) (f_forExpression= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:358: ( ( 'FOR' ) (f_forExpression= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:359: ( 'FOR' ) (f_forExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:358: ( ( 'FOR' ) (f_forExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:359: ( 'FOR' ) (f_forExpression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:359: ( 'FOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:360: 'FOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:359: ( 'FOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:360: 'FOR' { - match(input,35,FOLLOW_35_in_r_expandStatement912); if (failed) return cn; + match(input,35,FOLLOW_35_in_r_expandStatement907); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:403: (f_forExpression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:404: f_forExpression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:403: (f_forExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:119:404: f_forExpression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_expandStatement920); + pushFollow(FOLLOW_r_expression_in_r_expandStatement915); f_forExpression=r_expression(); _fsp--; if (failed) return cn; @@ -2203,28 +2200,28 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./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:120:4: ( ( ( 'FOREACH' ) (f_forEachExpression= 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:120:4: ( ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:5: ( ( '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:6: ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:5: ( ( 'FOREACH' ) (f_forEachExpression= r_expression ) ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120: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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:6: ( 'FOREACH' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:7: 'FOREACH' { - match(input,39,FOLLOW_39_in_r_expandStatement933); if (failed) return cn; + match(input,39,FOLLOW_39_in_r_expandStatement928); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:54: (f_forEachExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:55: f_forEachExpression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_expandStatement941); + pushFollow(FOLLOW_r_expression_in_r_expandStatement936); f_forEachExpression=r_expression(); _fsp--; if (failed) return cn; @@ -2234,7 +2231,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:203: ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:203: ( ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) )? int alt24=2; int LA24_0 = input.LA(1); @@ -2243,25 +2240,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt24) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:204: ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:204: ( ( '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:120:204: ( ( 'SEPARATOR' ) (f_separator= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:205: ( 'SEPARATOR' ) (f_separator= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:205: ( 'SEPARATOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:121:206: 'SEPARATOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:205: ( 'SEPARATOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:206: 'SEPARATOR' { - match(input,40,FOLLOW_40_in_r_expandStatement949); if (failed) return cn; + match(input,40,FOLLOW_40_in_r_expandStatement944); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:255: (f_separator= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:256: f_separator= r_expression { - pushFollow(FOLLOW_r_expression_in_r_expandStatement957); + pushFollow(FOLLOW_r_expression_in_r_expandStatement952); f_separator=r_expression(); _fsp--; if (failed) return cn; @@ -2314,7 +2311,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_expressionStmt - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:124:1: r_expressionStmt returns [CompositeNode cn] : (f_expression= r_expression ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:123:1: r_expressionStmt returns [CompositeNode cn] : (f_expression= r_expression ) ; public CompositeNode r_expressionStmt() throws RecognitionException { CompositeNode cn = null; @@ -2324,13 +2321,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createExpressionStmtNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:2: ( (f_expression= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:2: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:126:2: ( (f_expression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:126:2: (f_expression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:2: (f_expression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:3: f_expression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:126:2: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:126:3: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_expressionStmt991); + pushFollow(FOLLOW_r_expression_in_r_expressionStmt986); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -2356,7 +2353,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_fileStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:1: r_fileStatement returns [CompositeNode cn] : ( 'FILE' ) (f_nameExpression= r_expression ) ( ( ( 'ONCE' ) ) )? ( ( (f_identifier= r_identifier ) ) )? (f_sequence= r_sequence ) ( 'ENDFILE' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:129:1: r_fileStatement returns [CompositeNode cn] : ( 'FILE' ) (f_nameExpression= r_expression ) ( ( ( 'ONCE' ) ) )? ( ( (f_identifier= r_identifier ) ) )? (f_sequence= r_sequence ) ( 'ENDFILE' ) ; public CompositeNode r_fileStatement() throws RecognitionException { CompositeNode cn = null; @@ -2370,23 +2367,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createFileStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:2: ( ( 'FILE' ) (f_nameExpression= r_expression ) ( ( ( 'ONCE' ) ) )? ( ( (f_identifier= r_identifier ) ) )? (f_sequence= r_sequence ) ( 'ENDFILE' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:2: ( 'FILE' ) (f_nameExpression= r_expression ) ( ( ( 'ONCE' ) ) )? ( ( (f_identifier= r_identifier ) ) )? (f_sequence= r_sequence ) ( 'ENDFILE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:2: ( ( 'FILE' ) (f_nameExpression= r_expression ) ( ( ( 'ONCE' ) ) )? ( ( (f_identifier= r_identifier ) ) )? (f_sequence= r_sequence ) ( 'ENDFILE' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:2: ( 'FILE' ) (f_nameExpression= r_expression ) ( ( ( 'ONCE' ) ) )? ( ( (f_identifier= r_identifier ) ) )? (f_sequence= r_sequence ) ( 'ENDFILE' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:2: ( 'FILE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:3: 'FILE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:2: ( 'FILE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:3: 'FILE' { - match(input,41,FOLLOW_41_in_r_fileStatement1015); if (failed) return cn; + match(input,41,FOLLOW_41_in_r_fileStatement1010); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:47: (f_nameExpression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:48: f_nameExpression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:47: (f_nameExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:48: f_nameExpression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_fileStatement1023); + pushFollow(FOLLOW_r_expression_in_r_fileStatement1018); f_nameExpression=r_expression(); _fsp--; if (failed) return cn; @@ -2396,7 +2393,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:182: ( ( ( 'ONCE' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:182: ( ( ( 'ONCE' ) ) )? int alt27=2; int LA27_0 = input.LA(1); @@ -2405,15 +2402,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt27) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:183: ( ( 'ONCE' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:183: ( ( 'ONCE' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:183: ( ( 'ONCE' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:184: ( 'ONCE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:183: ( ( 'ONCE' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:184: ( 'ONCE' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:184: ( 'ONCE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:185: 'ONCE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:184: ( 'ONCE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:185: 'ONCE' { - match(input,42,FOLLOW_42_in_r_fileStatement1031); if (failed) return cn; + match(input,42,FOLLOW_42_in_r_fileStatement1026); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -2429,7 +2426,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:232: ( ( (f_identifier= r_identifier ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:232: ( ( (f_identifier= r_identifier ) ) )? int alt28=2; int LA28_0 = input.LA(1); @@ -2438,15 +2435,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt28) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:233: ( (f_identifier= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:233: ( (f_identifier= r_identifier ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:233: ( (f_identifier= r_identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:234: (f_identifier= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:233: ( (f_identifier= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:234: (f_identifier= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:234: (f_identifier= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:235: f_identifier= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:234: (f_identifier= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:235: f_identifier= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_fileStatement1044); + pushFollow(FOLLOW_r_identifier_in_r_fileStatement1039); f_identifier=r_identifier(); _fsp--; if (failed) return cn; @@ -2465,10 +2462,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:356: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:357: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:356: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:357: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_fileStatement1055); + pushFollow(FOLLOW_r_sequence_in_r_fileStatement1050); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -2478,10 +2475,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:465: ( 'ENDFILE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:133:466: 'ENDFILE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:465: ( 'ENDFILE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:466: 'ENDFILE' { - match(input,43,FOLLOW_43_in_r_fileStatement1061); if (failed) return cn; + match(input,43,FOLLOW_43_in_r_fileStatement1056); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -2504,7 +2501,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_foreachStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:136:1: r_foreachStatement returns [CompositeNode cn] : ( 'FOREACH' ) (f_forExpression= r_expression ) ( 'AS' ) (f_identifier= r_identifier ) ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? (f_sequence= r_sequence ) ( 'ENDFOREACH' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:1: r_foreachStatement returns [CompositeNode cn] : ( 'FOREACH' ) (f_forExpression= r_expression ) ( 'AS' ) (f_identifier= r_identifier ) ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? (f_sequence= r_sequence ) ( 'ENDFOREACH' ) ; public CompositeNode r_foreachStatement() throws RecognitionException { CompositeNode cn = null; @@ -2522,23 +2519,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createForeachStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:2: ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( 'AS' ) (f_identifier= r_identifier ) ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? (f_sequence= r_sequence ) ( 'ENDFOREACH' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:2: ( 'FOREACH' ) (f_forExpression= r_expression ) ( 'AS' ) (f_identifier= r_identifier ) ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? (f_sequence= r_sequence ) ( 'ENDFOREACH' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:2: ( ( 'FOREACH' ) (f_forExpression= r_expression ) ( 'AS' ) (f_identifier= r_identifier ) ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? (f_sequence= r_sequence ) ( 'ENDFOREACH' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:2: ( 'FOREACH' ) (f_forExpression= r_expression ) ( 'AS' ) (f_identifier= r_identifier ) ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? (f_sequence= r_sequence ) ( 'ENDFOREACH' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:2: ( 'FOREACH' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:3: 'FOREACH' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:2: ( 'FOREACH' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:3: 'FOREACH' { - match(input,39,FOLLOW_39_in_r_foreachStatement1085); if (failed) return cn; + match(input,39,FOLLOW_39_in_r_foreachStatement1080); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:50: (f_forExpression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:51: f_forExpression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:50: (f_forExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:51: f_forExpression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_foreachStatement1093); + pushFollow(FOLLOW_r_expression_in_r_foreachStatement1088); f_forExpression=r_expression(); _fsp--; if (failed) return cn; @@ -2548,20 +2545,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:184: ( 'AS' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:185: 'AS' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:184: ( 'AS' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:185: 'AS' { - match(input,44,FOLLOW_44_in_r_foreachStatement1099); if (failed) return cn; + match(input,44,FOLLOW_44_in_r_foreachStatement1094); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:227: (f_identifier= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:228: f_identifier= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:227: (f_identifier= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:228: f_identifier= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_foreachStatement1107); + pushFollow(FOLLOW_r_identifier_in_r_foreachStatement1102); f_identifier=r_identifier(); _fsp--; if (failed) return cn; @@ -2571,7 +2568,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:349: ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:349: ( ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) )? int alt29=2; int LA29_0 = input.LA(1); @@ -2580,25 +2577,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt29) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:350: ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:350: ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:350: ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:351: ( 'ITERATOR' ) (f_iterator= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:350: ( ( 'ITERATOR' ) (f_iterator= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:351: ( 'ITERATOR' ) (f_iterator= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:351: ( 'ITERATOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:352: 'ITERATOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:351: ( 'ITERATOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:352: 'ITERATOR' { - match(input,45,FOLLOW_45_in_r_foreachStatement1115); if (failed) return cn; + match(input,45,FOLLOW_45_in_r_foreachStatement1110); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:400: (f_iterator= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:401: f_iterator= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:400: (f_iterator= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:401: f_iterator= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_foreachStatement1123); + pushFollow(FOLLOW_r_identifier_in_r_foreachStatement1118); f_iterator=r_identifier(); _fsp--; if (failed) return cn; @@ -2617,7 +2614,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:517: ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:517: ( ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) )? int alt30=2; int LA30_0 = input.LA(1); @@ -2626,25 +2623,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt30) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:518: ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:518: ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:518: ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:519: ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:518: ( ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:519: ( 'SEPARATOR' ) (f_separatorExpression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:519: ( 'SEPARATOR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:520: 'SEPARATOR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:519: ( 'SEPARATOR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:520: 'SEPARATOR' { - match(input,40,FOLLOW_40_in_r_foreachStatement1134); if (failed) return cn; + match(input,40,FOLLOW_40_in_r_foreachStatement1129); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:569: (f_separatorExpression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:570: f_separatorExpression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:569: (f_separatorExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:570: f_separatorExpression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_foreachStatement1142); + pushFollow(FOLLOW_r_expression_in_r_foreachStatement1137); f_separatorExpression=r_expression(); _fsp--; if (failed) return cn; @@ -2663,10 +2660,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:730: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:731: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:730: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:731: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_foreachStatement1153); + pushFollow(FOLLOW_r_sequence_in_r_foreachStatement1148); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -2676,10 +2673,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:842: ( 'ENDFOREACH' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:139:843: 'ENDFOREACH' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:842: ( 'ENDFOREACH' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:138:843: 'ENDFOREACH' { - match(input,46,FOLLOW_46_in_r_foreachStatement1159); if (failed) return cn; + match(input,46,FOLLOW_46_in_r_foreachStatement1154); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -2702,7 +2699,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_elseIfs= r_elseIfStatement )* (f_else= r_elseStatement )? ( 'ENDIF' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:141: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; @@ -2718,23 +2715,23 @@ 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_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:144: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:144: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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:2: ( 'IF' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:3: 'IF' { - match(input,47,FOLLOW_47_in_r_ifStatement1183); if (failed) return cn; + match(input,47,FOLLOW_47_in_r_ifStatement1178); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:45: (f_expression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:46: f_expression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:45: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:46: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_ifStatement1191); + pushFollow(FOLLOW_r_expression_in_r_ifStatement1186); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -2744,10 +2741,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:162: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:163: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:162: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:163: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_ifStatement1199); + pushFollow(FOLLOW_r_sequence_in_r_ifStatement1194); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -2757,7 +2754,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:269: (f_elseIfs= r_elseIfStatement )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:269: (f_elseIfs= r_elseIfStatement )* loop31: do { int alt31=2; @@ -2770,9 +2767,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt31) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:270: f_elseIfs= r_elseIfStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:270: f_elseIfs= r_elseIfStatement { - pushFollow(FOLLOW_r_elseIfStatement_in_r_ifStatement1207); + pushFollow(FOLLOW_r_elseIfStatement_in_r_ifStatement1202); f_elseIfs=r_elseIfStatement(); _fsp--; if (failed) return cn; @@ -2788,7 +2785,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:386: (f_else= r_elseStatement )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:386: (f_else= r_elseStatement )? int alt32=2; int LA32_0 = input.LA(1); @@ -2797,9 +2794,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt32) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:387: f_else= r_elseStatement + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:387: f_else= r_elseStatement { - pushFollow(FOLLOW_r_elseStatement_in_r_ifStatement1216); + pushFollow(FOLLOW_r_elseStatement_in_r_ifStatement1211); f_else=r_elseStatement(); _fsp--; if (failed) return cn; @@ -2812,10 +2809,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:483: ( 'ENDIF' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:484: 'ENDIF' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:483: ( 'ENDIF' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:144:484: 'ENDIF' { - match(input,48,FOLLOW_48_in_r_ifStatement1223); if (failed) return cn; + match(input,48,FOLLOW_48_in_r_ifStatement1218); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -2838,7 +2835,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_elseIfStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:148:1: r_elseIfStatement returns [CompositeNode cn] : ( 'ELSEIF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:147:1: r_elseIfStatement returns [CompositeNode cn] : ( 'ELSEIF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) ; public CompositeNode r_elseIfStatement() throws RecognitionException { CompositeNode cn = null; @@ -2850,23 +2847,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createElseIfStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( ( 'ELSEIF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'ELSEIF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:2: ( ( 'ELSEIF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:2: ( 'ELSEIF' ) (f_expression= r_expression ) (f_sequence= r_sequence ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'ELSEIF' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:3: 'ELSEIF' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:2: ( 'ELSEIF' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:3: 'ELSEIF' { - match(input,49,FOLLOW_49_in_r_elseIfStatement1247); if (failed) return cn; + match(input,49,FOLLOW_49_in_r_elseIfStatement1242); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:49: (f_expression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:50: f_expression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:49: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:50: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_elseIfStatement1255); + pushFollow(FOLLOW_r_expression_in_r_elseIfStatement1250); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -2876,10 +2873,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:170: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:171: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:170: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:150:171: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_elseIfStatement1263); + pushFollow(FOLLOW_r_sequence_in_r_elseIfStatement1258); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -2905,7 +2902,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_elseStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:1: r_elseStatement returns [CompositeNode cn] : ( 'ELSE' ) (f_sequence= r_sequence ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:153:1: r_elseStatement returns [CompositeNode cn] : ( 'ELSE' ) (f_sequence= r_sequence ) ; public CompositeNode r_elseStatement() throws RecognitionException { CompositeNode cn = null; @@ -2915,23 +2912,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createElseStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( 'ELSE' ) (f_sequence= r_sequence ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( 'ELSE' ) (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:2: ( ( 'ELSE' ) (f_sequence= r_sequence ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:2: ( 'ELSE' ) (f_sequence= r_sequence ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( 'ELSE' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: 'ELSE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:2: ( 'ELSE' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:3: 'ELSE' { - match(input,50,FOLLOW_50_in_r_elseStatement1287); if (failed) return cn; + match(input,50,FOLLOW_50_in_r_elseStatement1282); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:47: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:48: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:47: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:156:48: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_elseStatement1295); + pushFollow(FOLLOW_r_sequence_in_r_elseStatement1290); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -2957,7 +2954,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_letStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:160:1: r_letStatement returns [CompositeNode cn] : ( 'LET' ) (f_expression= r_expression ) ( 'AS' ) (f_name= r_identifier ) (f_sequence= r_sequence ) ( 'ENDLET' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:1: r_letStatement returns [CompositeNode cn] : ( 'LET' ) (f_expression= r_expression ) ( 'AS' ) (f_name= r_identifier ) (f_sequence= r_sequence ) ( 'ENDLET' ) ; public CompositeNode r_letStatement() throws RecognitionException { CompositeNode cn = null; @@ -2971,23 +2968,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createLetStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:2: ( ( 'LET' ) (f_expression= r_expression ) ( 'AS' ) (f_name= r_identifier ) (f_sequence= r_sequence ) ( 'ENDLET' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:2: ( 'LET' ) (f_expression= r_expression ) ( 'AS' ) (f_name= r_identifier ) (f_sequence= r_sequence ) ( 'ENDLET' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:2: ( ( 'LET' ) (f_expression= r_expression ) ( 'AS' ) (f_name= r_identifier ) (f_sequence= r_sequence ) ( 'ENDLET' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:2: ( 'LET' ) (f_expression= r_expression ) ( 'AS' ) (f_name= r_identifier ) (f_sequence= r_sequence ) ( 'ENDLET' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:2: ( 'LET' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:3: 'LET' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:2: ( 'LET' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:3: 'LET' { - match(input,51,FOLLOW_51_in_r_letStatement1319); if (failed) return cn; + match(input,51,FOLLOW_51_in_r_letStatement1314); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:46: (f_expression= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:47: f_expression= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:46: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:47: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_letStatement1327); + pushFollow(FOLLOW_r_expression_in_r_letStatement1322); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -2997,20 +2994,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:164: ( 'AS' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:165: 'AS' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:164: ( 'AS' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:165: 'AS' { - match(input,44,FOLLOW_44_in_r_letStatement1333); if (failed) return cn; + match(input,44,FOLLOW_44_in_r_letStatement1328); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:207: (f_name= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:208: f_name= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:207: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:208: f_name= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_letStatement1341); + pushFollow(FOLLOW_r_identifier_in_r_letStatement1336); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -3020,10 +3017,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:301: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:302: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:301: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:302: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_letStatement1349); + pushFollow(FOLLOW_r_sequence_in_r_letStatement1344); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -3033,10 +3030,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:409: ( 'ENDLET' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:163:410: 'ENDLET' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:409: ( 'ENDLET' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:410: 'ENDLET' { - match(input,52,FOLLOW_52_in_r_letStatement1355); if (failed) return cn; + match(input,52,FOLLOW_52_in_r_letStatement1350); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3059,7 +3056,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_protectStatement - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:1: r_protectStatement returns [CompositeNode cn] : ( 'PROTECT' ) ( 'CSTART' ) (f_cstart= r_expression ) ( 'CEND' ) (f_cend= r_expression ) ( 'ID' ) (f_id= r_expression ) ( 'DISABLE' )? (f_sequence= r_sequence ) ( 'ENDPROTECT' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:1: r_protectStatement returns [CompositeNode cn] : ( 'PROTECT' ) ( 'CSTART' ) (f_cstart= r_expression ) ( 'CEND' ) (f_cend= r_expression ) ( 'ID' ) (f_id= r_expression ) ( 'DISABLE' )? (f_sequence= r_sequence ) ( 'ENDPROTECT' ) ; public CompositeNode r_protectStatement() throws RecognitionException { CompositeNode cn = null; @@ -3075,33 +3072,33 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createProtectStatementNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:2: ( ( 'PROTECT' ) ( 'CSTART' ) (f_cstart= r_expression ) ( 'CEND' ) (f_cend= r_expression ) ( 'ID' ) (f_id= r_expression ) ( 'DISABLE' )? (f_sequence= r_sequence ) ( 'ENDPROTECT' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:2: ( 'PROTECT' ) ( 'CSTART' ) (f_cstart= r_expression ) ( 'CEND' ) (f_cend= r_expression ) ( 'ID' ) (f_id= r_expression ) ( 'DISABLE' )? (f_sequence= r_sequence ) ( 'ENDPROTECT' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:2: ( ( 'PROTECT' ) ( 'CSTART' ) (f_cstart= r_expression ) ( 'CEND' ) (f_cend= r_expression ) ( 'ID' ) (f_id= r_expression ) ( 'DISABLE' )? (f_sequence= r_sequence ) ( 'ENDPROTECT' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:2: ( 'PROTECT' ) ( 'CSTART' ) (f_cstart= r_expression ) ( 'CEND' ) (f_cend= r_expression ) ( 'ID' ) (f_id= r_expression ) ( 'DISABLE' )? (f_sequence= r_sequence ) ( 'ENDPROTECT' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:2: ( 'PROTECT' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:3: 'PROTECT' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:2: ( 'PROTECT' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:3: 'PROTECT' { - match(input,53,FOLLOW_53_in_r_protectStatement1379); if (failed) return cn; + match(input,53,FOLLOW_53_in_r_protectStatement1374); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:50: ( 'CSTART' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:51: 'CSTART' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:50: ( 'CSTART' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:51: 'CSTART' { - match(input,54,FOLLOW_54_in_r_protectStatement1385); if (failed) return cn; + match(input,54,FOLLOW_54_in_r_protectStatement1380); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:97: (f_cstart= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:98: f_cstart= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:97: (f_cstart= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:98: f_cstart= r_expression { - pushFollow(FOLLOW_r_expression_in_r_protectStatement1393); + pushFollow(FOLLOW_r_expression_in_r_protectStatement1388); f_cstart=r_expression(); _fsp--; if (failed) return cn; @@ -3111,20 +3108,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:203: ( 'CEND' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:204: 'CEND' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:203: ( 'CEND' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:204: 'CEND' { - match(input,55,FOLLOW_55_in_r_protectStatement1399); if (failed) return cn; + match(input,55,FOLLOW_55_in_r_protectStatement1394); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:248: (f_cend= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:249: f_cend= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:248: (f_cend= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:249: f_cend= r_expression { - pushFollow(FOLLOW_r_expression_in_r_protectStatement1407); + pushFollow(FOLLOW_r_expression_in_r_protectStatement1402); f_cend=r_expression(); _fsp--; if (failed) return cn; @@ -3134,20 +3131,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:346: ( 'ID' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:347: 'ID' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:346: ( 'ID' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:347: 'ID' { - match(input,56,FOLLOW_56_in_r_protectStatement1413); if (failed) return cn; + match(input,56,FOLLOW_56_in_r_protectStatement1408); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:389: (f_id= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:390: f_id= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:389: (f_id= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:390: f_id= r_expression { - pushFollow(FOLLOW_r_expression_in_r_protectStatement1421); + pushFollow(FOLLOW_r_expression_in_r_protectStatement1416); f_id=r_expression(); _fsp--; if (failed) return cn; @@ -3157,7 +3154,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:479: ( 'DISABLE' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:479: ( 'DISABLE' )? int alt33=2; int LA33_0 = input.LA(1); @@ -3166,9 +3163,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt33) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:480: 'DISABLE' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:480: 'DISABLE' { - match(input,57,FOLLOW_57_in_r_protectStatement1427); if (failed) return cn; + match(input,57,FOLLOW_57_in_r_protectStatement1422); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3178,10 +3175,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:528: (f_sequence= r_sequence ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:529: f_sequence= r_sequence + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:528: (f_sequence= r_sequence ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:529: f_sequence= r_sequence { - pushFollow(FOLLOW_r_sequence_in_r_protectStatement1436); + pushFollow(FOLLOW_r_sequence_in_r_protectStatement1431); f_sequence=r_sequence(); _fsp--; if (failed) return cn; @@ -3191,10 +3188,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:640: ( 'ENDPROTECT' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:169:641: 'ENDPROTECT' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:640: ( 'ENDPROTECT' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:641: 'ENDPROTECT' { - match(input,58,FOLLOW_58_in_r_protectStatement1442); if (failed) return cn; + match(input,58,FOLLOW_58_in_r_protectStatement1437); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3217,7 +3214,7 @@ 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_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:171: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; @@ -3233,23 +3230,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createCheckNode(); try { - // ./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:174: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:174: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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:2: ( 'context' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:3: 'context' { - match(input,59,FOLLOW_59_in_r_check1466); if (failed) return cn; + match(input,59,FOLLOW_59_in_r_check1461); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:50: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:51: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_check1474); + pushFollow(FOLLOW_r_type_in_r_check1469); f_type=r_type(); _fsp--; if (failed) return cn; @@ -3259,7 +3256,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:131: ( ( ( 'if' ) (f_ifExpression= r_expression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:131: ( ( ( 'if' ) (f_ifExpression= r_expression ) ) )? int alt34=2; int LA34_0 = input.LA(1); @@ -3268,25 +3265,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt34) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:132: ( ( 'if' ) (f_ifExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:132: ( ( 'if' ) (f_ifExpression= 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:174:132: ( ( 'if' ) (f_ifExpression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:133: ( 'if' ) (f_ifExpression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:133: ( 'if' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:134: 'if' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:133: ( 'if' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:134: 'if' { - match(input,60,FOLLOW_60_in_r_check1482); if (failed) return cn; + match(input,60,FOLLOW_60_in_r_check1477); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:176: (f_ifExpression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:177: f_ifExpression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_check1490); + pushFollow(FOLLOW_r_expression_in_r_check1485); f_ifExpression=r_expression(); _fsp--; if (failed) return cn; @@ -3305,10 +3302,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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:174:298: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:299: ( ( 'ERROR' ) | ( 'WARNING' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:299: ( ( 'ERROR' ) | ( 'WARNING' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:299: ( ( 'ERROR' ) | ( 'WARNING' ) ) int alt35=2; int LA35_0 = input.LA(1); @@ -3321,18 +3318,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("175:299: ( ( 'ERROR' ) | ( 'WARNING' ) )", 35, 0, input); + new NoViableAltException("174:299: ( ( 'ERROR' ) | ( 'WARNING' ) )", 35, 0, input); throw nvae; } switch (alt35) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:300: ( 'ERROR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:300: ( 'ERROR' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:300: ( 'ERROR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:301: 'ERROR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:300: ( 'ERROR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:301: 'ERROR' { - match(input,37,FOLLOW_37_in_r_check1501); if (failed) return cn; + match(input,37,FOLLOW_37_in_r_check1496); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "error"); } @@ -3343,12 +3340,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: ( 'WARNING' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:4: ( 'WARNING' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: ( 'WARNING' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:5: 'WARNING' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:4: ( 'WARNING' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:5: 'WARNING' { - match(input,61,FOLLOW_61_in_r_check1510); if (failed) return cn; + match(input,61,FOLLOW_61_in_r_check1505); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "warning"); } @@ -3364,10 +3361,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:59: (f_message= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:60: f_message= r_expression { - pushFollow(FOLLOW_r_expression_in_r_check1520); + pushFollow(FOLLOW_r_expression_in_r_check1515); f_message=r_expression(); _fsp--; if (failed) return cn; @@ -3377,20 +3374,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:158: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:159: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:158: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:159: ':' { - match(input,62,FOLLOW_62_in_r_check1526); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_check1521); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:200: (f_constraint= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:201: f_constraint= r_expression { - pushFollow(FOLLOW_r_expression_in_r_check1534); + pushFollow(FOLLOW_r_expression_in_r_check1529); f_constraint=r_expression(); _fsp--; if (failed) return cn; @@ -3400,10 +3397,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:311: ( ';' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:312: ';' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:311: ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:312: ';' { - match(input,27,FOLLOW_27_in_r_check1540); if (failed) return cn; + match(input,27,FOLLOW_27_in_r_check1535); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3426,7 +3423,7 @@ 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_unnamed0= r_pointcut ) ( '(' ) ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed2= r_expression ) ( ';' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:178: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; @@ -3440,23 +3437,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createAroundNode(); try { - // ./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:181:2: ( ( 'around' ) (f_unnamed0= r_pointcut ) ( '(' ) ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (f_unnamed2= r_expression ) ( ';' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181: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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:2: ( 'around' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:3: 'around' { - match(input,63,FOLLOW_63_in_r_around1564); if (failed) return cn; + match(input,63,FOLLOW_63_in_r_around1559); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:49: (f_unnamed0= r_pointcut ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:50: f_unnamed0= r_pointcut { - pushFollow(FOLLOW_r_pointcut_in_r_around1572); + pushFollow(FOLLOW_r_pointcut_in_r_around1567); f_unnamed0=r_pointcut(); _fsp--; if (failed) return cn; @@ -3466,17 +3463,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:108: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:109: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:108: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:109: '(' { - match(input,31,FOLLOW_31_in_r_around1578); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_around1573); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:150: ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:150: ( ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? int alt39=2; int LA39_0 = input.LA(1); @@ -3485,9 +3482,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt39) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) int alt38=2; int LA38_0 = input.LA(1); @@ -3500,18 +3497,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("182:151: ( (f_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 38, 0, input); + new NoViableAltException("181: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_unnamed1= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:152: (f_unnamed1= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:152: (f_unnamed1= r_declaredParameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:153: f_unnamed1= r_declaredParameterList { - pushFollow(FOLLOW_r_declaredParameterList_in_r_around1588); + pushFollow(FOLLOW_r_declaredParameterList_in_r_around1583); f_unnamed1=r_declaredParameterList(); _fsp--; if (failed) return cn; @@ -3521,7 +3518,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:224: ( ( ( ',' )? ( '*' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:224: ( ( ( ',' )? ( '*' ) ) )? int alt37=2; int LA37_0 = input.LA(1); @@ -3530,12 +3527,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt37) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:225: ( ( ',' )? ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:225: ( ( ',' )? ( '*' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:225: ( ( ',' )? ( '*' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:226: ( ',' )? ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:225: ( ( ',' )? ( '*' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:226: ( ',' )? ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:226: ( ',' )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:226: ( ',' )? int alt36=2; int LA36_0 = input.LA(1); @@ -3544,9 +3541,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt36) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:227: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:227: ',' { - match(input,32,FOLLOW_32_in_r_around1596); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_around1591); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3556,10 +3553,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:269: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:270: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:269: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:181:270: '*' { - match(input,33,FOLLOW_33_in_r_around1603); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_around1598); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3579,12 +3576,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:4: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:4: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:5: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:5: '*' { - match(input,33,FOLLOW_33_in_r_around1615); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_around1610); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3603,30 +3600,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:49: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:50: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:49: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:50: ')' { - match(input,34,FOLLOW_34_in_r_around1624); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_around1619); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:91: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:92: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:91: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:92: ':' { - match(input,62,FOLLOW_62_in_r_around1630); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_around1625); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:133: (f_unnamed2= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:134: f_unnamed2= r_expression { - pushFollow(FOLLOW_r_expression_in_r_around1638); + pushFollow(FOLLOW_r_expression_in_r_around1633); f_unnamed2=r_expression(); _fsp--; if (failed) return cn; @@ -3636,10 +3633,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:194: ( ';' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:183:195: ';' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:194: ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:195: ';' { - match(input,27,FOLLOW_27_in_r_around1644); if (failed) return cn; + match(input,27,FOLLOW_27_in_r_around1639); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3662,7 +3659,7 @@ 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_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:185:1: r_pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* ; public CompositeNode r_pointcut() throws RecognitionException { CompositeNode cn = null; @@ -3674,13 +3671,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createPointcutNode(); try { - // ./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:188:2: ( ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) ( ( ( '*' ) | (f_unnamed4= 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:188:2: ( ( ( '*' ) | (f_unnamed3= r_identifier ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:3: ( ( '*' ) | (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:188:3: ( ( '*' ) | (f_unnamed3= r_identifier ) ) int alt40=2; int LA40_0 = input.LA(1); @@ -3693,18 +3690,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("189:3: ( ( '*' ) | (f_unnamed3= r_identifier ) )", 40, 0, input); + new NoViableAltException("188:3: ( ( '*' ) | (f_unnamed3= r_identifier ) )", 40, 0, input); throw nvae; } switch (alt40) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:4: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:4: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:5: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:4: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:5: '*' { - match(input,33,FOLLOW_33_in_r_pointcut1670); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_pointcut1665); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3715,12 +3712,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed3= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:4: (f_unnamed3= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:4: (f_unnamed3= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:5: f_unnamed3= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_pointcut1681); + pushFollow(FOLLOW_r_identifier_in_r_pointcut1676); f_unnamed3=r_identifier(); _fsp--; if (failed) return cn; @@ -3739,7 +3736,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:67: ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:67: ( ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) )* loop42: do { int alt42=2; @@ -3752,9 +3749,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt42) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) ) int alt41=3; switch ( input.LA(1) ) { case 33: @@ -3775,19 +3772,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("190:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) )", 41, 0, input); + new NoViableAltException("189:68: ( ( '*' ) | (f_unnamed4= r_identifier ) | ( '::' ) )", 41, 0, input); throw nvae; } switch (alt41) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:69: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:69: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:69: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:70: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:69: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:189:70: '*' { - match(input,33,FOLLOW_33_in_r_pointcut1691); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_pointcut1686); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3798,12 +3795,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: (f_unnamed4= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed4= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:4: (f_unnamed4= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:5: f_unnamed4= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_pointcut1702); + pushFollow(FOLLOW_r_identifier_in_r_pointcut1697); f_unnamed4=r_identifier(); _fsp--; if (failed) return cn; @@ -3817,12 +3814,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:4: ( '::' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: ( '::' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:4: ( '::' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:192:5: '::' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:4: ( '::' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:191:5: '::' { - match(input,64,FOLLOW_64_in_r_pointcut1711); if (failed) return cn; + match(input,64,FOLLOW_64_in_r_pointcut1706); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -3860,7 +3857,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_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) ) ( ';' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194: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; @@ -3884,10 +3881,10 @@ 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_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:197: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:197: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' ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* loop44: do { int alt44=2; @@ -3900,9 +3897,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt44) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) int alt43=3; switch ( input.LA(1) ) { case 65: @@ -3923,19 +3920,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("198:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )", 43, 0, input); + new NoViableAltException("197:3: ( ( 'private' ) | ( 'cached' ) | ( 'create' ) )", 43, 0, input); throw nvae; } switch (alt43) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:4: ( 'private' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:4: ( 'private' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:4: ( 'private' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:5: 'private' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:4: ( 'private' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:5: 'private' { - match(input,65,FOLLOW_65_in_r_extension1740); if (failed) return cn; + match(input,65,FOLLOW_65_in_r_extension1735); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "private"); } @@ -3946,12 +3943,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:4: ( 'cached' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:4: ( 'cached' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:4: ( 'cached' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:5: 'cached' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:4: ( 'cached' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:198:5: 'cached' { - match(input,66,FOLLOW_66_in_r_extension1749); if (failed) return cn; + match(input,66,FOLLOW_66_in_r_extension1744); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "cached"); } @@ -3962,12 +3959,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:4: ( 'create' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:4: ( 'create' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:4: ( 'create' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:5: 'create' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:4: ( 'create' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:5: 'create' { - match(input,67,FOLLOW_67_in_r_extension1758); if (failed) return cn; + match(input,67,FOLLOW_67_in_r_extension1753); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "create"); } @@ -3989,7 +3986,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:58: (f_returnType= r_type )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:58: (f_returnType= r_type )? int alt45=2; int LA45_0 = input.LA(1); @@ -4005,9 +4002,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt45) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:59: f_returnType= r_type + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:59: f_returnType= r_type { - pushFollow(FOLLOW_r_type_in_r_extension1769); + pushFollow(FOLLOW_r_type_in_r_extension1764); f_returnType=r_type(); _fsp--; if (failed) return cn; @@ -4020,10 +4017,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:168: (f_name= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:169: f_name= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:168: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:169: f_name= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_extension1778); + pushFollow(FOLLOW_r_identifier_in_r_extension1773); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -4033,17 +4030,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:259: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:260: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:259: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:260: '(' { - match(input,31,FOLLOW_31_in_r_extension1784); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_extension1779); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:301: (f_paramList= r_declaredParameterList )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:301: (f_paramList= r_declaredParameterList )? int alt46=2; int LA46_0 = input.LA(1); @@ -4052,9 +4049,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt46) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:302: f_paramList= r_declaredParameterList + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:302: f_paramList= r_declaredParameterList { - pushFollow(FOLLOW_r_declaredParameterList_in_r_extension1792); + pushFollow(FOLLOW_r_declaredParameterList_in_r_extension1787); f_paramList=r_declaredParameterList(); _fsp--; if (failed) return cn; @@ -4067,30 +4064,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:424: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:425: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:424: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:425: ')' { - match(input,34,FOLLOW_34_in_r_extension1799); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_extension1794); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:466: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:467: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:466: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:467: ':' { - match(input,62,FOLLOW_62_in_r_extension1805); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_extension1800); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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:199: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:199: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_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199: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); @@ -4103,28 +4100,28 @@ 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_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) | (f_extendBody= r_expression ) )", 49, 0, input); + new NoViableAltException("199: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_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199: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' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:510: ( 'JAVA' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:511: 'JAVA' { - match(input,68,FOLLOW_68_in_r_extension1813); if (failed) return cn; + match(input,68,FOLLOW_68_in_r_extension1808); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:555: (f_javaReturnType= r_javaType ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:556: f_javaReturnType= r_javaType + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:555: (f_javaReturnType= r_javaType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:556: f_javaReturnType= r_javaType { - pushFollow(FOLLOW_r_javaType_in_r_extension1821); + pushFollow(FOLLOW_r_javaType_in_r_extension1816); f_javaReturnType=r_javaType(); _fsp--; if (failed) return cn; @@ -4134,20 +4131,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:684: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:685: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:684: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:685: '.' { - match(input,69,FOLLOW_69_in_r_extension1827); if (failed) return cn; + match(input,69,FOLLOW_69_in_r_extension1822); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:726: (f_javaName= r_identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:727: f_javaName= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:726: (f_javaName= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:727: f_javaName= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_extension1835); + pushFollow(FOLLOW_r_identifier_in_r_extension1830); f_javaName=r_identifier(); _fsp--; if (failed) return cn; @@ -4157,17 +4154,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:833: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:834: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:833: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:834: '(' { - match(input,31,FOLLOW_31_in_r_extension1841); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_extension1836); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:875: ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:875: ( ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) )? int alt48=2; int LA48_0 = input.LA(1); @@ -4176,15 +4173,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt48) { case 1 : - // ./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:199:876: ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= 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:199:876: ( (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:877: (f_unnamed5= r_javaType ) ( ( ( ',' ) (f_unnamed6= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:877: (f_unnamed5= r_javaType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:878: f_unnamed5= r_javaType { - pushFollow(FOLLOW_r_javaType_in_r_extension1851); + pushFollow(FOLLOW_r_javaType_in_r_extension1846); f_unnamed5=r_javaType(); _fsp--; if (failed) return cn; @@ -4194,7 +4191,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:936: ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:936: ( ( ( ',' ) (f_unnamed6= r_javaType ) ) )* loop47: do { int alt47=2; @@ -4207,25 +4204,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt47) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:937: ( ( ',' ) (f_unnamed6= r_javaType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:937: ( ( ',' ) (f_unnamed6= 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:199:937: ( ( ',' ) (f_unnamed6= r_javaType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199: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: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:938: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:939: ',' { - match(input,32,FOLLOW_32_in_r_extension1859); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_extension1854); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:980: (f_unnamed6= r_javaType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:981: f_unnamed6= r_javaType { - pushFollow(FOLLOW_r_javaType_in_r_extension1867); + pushFollow(FOLLOW_r_javaType_in_r_extension1862); f_unnamed6=r_javaType(); _fsp--; if (failed) return cn; @@ -4256,10 +4253,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:1045: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:1046: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:1045: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:199:1046: ')' { - match(input,34,FOLLOW_34_in_r_extension1879); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_extension1874); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -4270,12 +4267,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:4: (f_extendBody= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:4: (f_extendBody= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:4: (f_extendBody= r_expression ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:5: f_extendBody= r_expression + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:4: (f_extendBody= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:5: f_extendBody= r_expression { - pushFollow(FOLLOW_r_expression_in_r_extension1890); + pushFollow(FOLLOW_r_expression_in_r_extension1885); f_extendBody=r_expression(); _fsp--; if (failed) return cn; @@ -4294,10 +4291,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:121: ( ';' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:122: ';' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:121: ( ';' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:200:122: ';' { - match(input,27,FOLLOW_27_in_r_extension1898); if (failed) return cn; + match(input,27,FOLLOW_27_in_r_extension1893); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -4320,7 +4317,7 @@ 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_unnamed7= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:203: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; @@ -4332,13 +4329,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createJavaTypeNode(); try { - // ./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:206:2: ( (f_unnamed7= r_identifier ) ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206: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 ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:3: f_unnamed7= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:2: (f_unnamed7= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:3: f_unnamed7= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_javaType1924); + pushFollow(FOLLOW_r_identifier_in_r_javaType1919); f_unnamed7=r_identifier(); _fsp--; if (failed) return cn; @@ -4348,7 +4345,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:63: ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:63: ( ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* loop51: do { int alt51=2; @@ -4376,25 +4373,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt51) { case 1 : - // ./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:206:64: ( ( '.' ) ( ( (f_unnamed8= 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:206:64: ( ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:65: ( '.' ) ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:65: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:66: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:65: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:66: '.' { - match(input,69,FOLLOW_69_in_r_javaType1932); if (failed) return cn; + match(input,69,FOLLOW_69_in_r_javaType1927); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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:206:107: ( ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:108: ( (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:206:108: ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) int alt50=4; switch ( input.LA(1) ) { case Identifier: @@ -4420,19 +4417,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("207:108: ( (f_unnamed8= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 50, 0, input); + new NoViableAltException("206: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:109: (f_unnamed8= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:109: (f_unnamed8= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:109: (f_unnamed8= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:206:110: f_unnamed8= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_javaType1942); + pushFollow(FOLLOW_r_identifier_in_r_javaType1937); f_unnamed8=r_identifier(); _fsp--; if (failed) return cn; @@ -4446,12 +4443,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:4: ( 'Collection' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:4: ( 'Collection' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:4: ( 'Collection' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:5: 'Collection' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:4: ( 'Collection' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:207:5: 'Collection' { - match(input,70,FOLLOW_70_in_r_javaType1951); if (failed) return cn; + match(input,70,FOLLOW_70_in_r_javaType1946); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -4462,12 +4459,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:4: ( 'List' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:4: ( 'List' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:4: ( 'List' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:5: 'List' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:4: ( 'List' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:208:5: 'List' { - match(input,71,FOLLOW_71_in_r_javaType1960); if (failed) return cn; + match(input,71,FOLLOW_71_in_r_javaType1955); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -4478,12 +4475,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:210:4: ( 'Set' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:4: ( 'Set' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:210:4: ( 'Set' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:210:5: 'Set' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:4: ( 'Set' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:209:5: 'Set' { - match(input,72,FOLLOW_72_in_r_javaType1969); if (failed) return cn; + match(input,72,FOLLOW_72_in_r_javaType1964); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -4527,7 +4524,7 @@ 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_unnamed9= r_expression ) ( EOF ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:212:1: r_test_expression returns [CompositeNode cn] : (f_unnamed9= r_expression ) ( EOF ) ; public CompositeNode r_test_expression() throws RecognitionException { CompositeNode cn = null; @@ -4537,13 +4534,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createTest_expressionNode(); try { - // ./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:216:2: ( (f_unnamed9= r_expression ) ( EOF ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:216:2: (f_unnamed9= r_expression ) ( EOF ) { - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:216:2: (f_unnamed9= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:216:3: f_unnamed9= r_expression { - pushFollow(FOLLOW_r_expression_in_r_test_expression2005); + pushFollow(FOLLOW_r_expression_in_r_test_expression2000); f_unnamed9=r_expression(); _fsp--; if (failed) return cn; @@ -4553,10 +4550,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:63: ( EOF ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:217:64: EOF + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:216:63: ( EOF ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:216:64: EOF { - match(input,EOF,FOLLOW_EOF_in_r_test_expression2011); if (failed) return cn; + match(input,EOF,FOLLOW_EOF_in_r_test_expression2006); if (failed) return cn; } @@ -4579,7 +4576,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_expression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:1: r_expression returns [CompositeNode cn] : ( r_letExpression ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:219:1: r_expression returns [CompositeNode cn] : ( r_letExpression ) ; public CompositeNode r_expression() throws RecognitionException { CompositeNode cn = null; @@ -4587,13 +4584,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./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:220:2: ( ( r_letExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:2: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:2: ( r_letExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:220:3: r_letExpression { - pushFollow(FOLLOW_r_letExpression_in_r_expression2028); + pushFollow(FOLLOW_r_letExpression_in_r_expression2023); r_letExpression17=r_letExpression(); _fsp--; if (failed) return cn; @@ -4619,7 +4616,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_letExpression - // ./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 ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:223: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; @@ -4635,7 +4632,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createLetExpressionNode(); try { - // ./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 ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227: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); @@ -4648,28 +4645,28 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("223: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:228:2: ( 'let' ) (f_unnamed10= r_identifier ) ( '=' ) (f_unnamed11= r_castedExpression ) ( ':' ) (f_unnamed12= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: ( 'let' ) (f_unnamed10= r_identifier ) ( '=' ) (f_unnamed11= r_castedExpression ) ( ':' ) (f_unnamed12= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:2: ( 'let' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:3: 'let' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:2: ( 'let' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:3: 'let' { - match(input,73,FOLLOW_73_in_r_letExpression2057); if (failed) return cn; + match(input,73,FOLLOW_73_in_r_letExpression2052); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:46: (f_unnamed10= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:47: f_unnamed10= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_letExpression2065); + pushFollow(FOLLOW_r_identifier_in_r_letExpression2060); f_unnamed10=r_identifier(); _fsp--; if (failed) return cn; @@ -4679,20 +4676,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:109: ( '=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:110: '=' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:109: ( '=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:110: '=' { - match(input,74,FOLLOW_74_in_r_letExpression2071); if (failed) return cn; + match(input,74,FOLLOW_74_in_r_letExpression2066); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:151: (f_unnamed11= r_castedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:152: f_unnamed11= r_castedExpression { - pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2079); + pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2074); f_unnamed11=r_castedExpression(); _fsp--; if (failed) return cn; @@ -4702,20 +4699,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:220: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:221: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:220: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:221: ':' { - match(input,62,FOLLOW_62_in_r_letExpression2085); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_letExpression2080); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:262: (f_unnamed12= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:227:263: f_unnamed12= r_expression { - pushFollow(FOLLOW_r_expression_in_r_letExpression2093); + pushFollow(FOLLOW_r_expression_in_r_letExpression2088); f_unnamed12=r_expression(); _fsp--; if (failed) return cn; @@ -4729,12 +4726,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:229:4: (f_unnamed13= r_castedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:4: (f_unnamed13= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:4: (f_unnamed13= r_castedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:228:5: f_unnamed13= r_castedExpression { - pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2104); + pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2099); f_unnamed13=r_castedExpression(); _fsp--; if (failed) return cn; @@ -4765,7 +4762,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_castedExpression - // ./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 ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:231: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; @@ -4779,30 +4776,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createCastedExpressionNode(); try { - // ./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 ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235: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:236:2: ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:2: ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= 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:235:38: ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:39: ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:39: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:40: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:39: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:40: '(' { - match(input,31,FOLLOW_31_in_r_castedExpression2144); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_castedExpression2139); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:81: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:82: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_castedExpression2152); + pushFollow(FOLLOW_r_type_in_r_castedExpression2147); f_type=r_type(); _fsp--; if (failed) return cn; @@ -4812,20 +4809,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:173: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:174: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:173: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:174: ')' { - match(input,34,FOLLOW_34_in_r_castedExpression2158); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_castedExpression2153); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:215: (f_target= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:216: f_target= r_chainExpression { - pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2166); + pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2161); f_target=r_chainExpression(); _fsp--; if (failed) return cn; @@ -4842,12 +4839,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:237:4: (f_unnamed14= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:4: (f_unnamed14= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:4: (f_unnamed14= r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:236:5: f_unnamed14= r_chainExpression { - pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2178); + pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression2173); f_unnamed14=r_chainExpression(); _fsp--; if (failed) return cn; @@ -4878,7 +4875,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_chainExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:240:1: r_chainExpression returns [CompositeNode cn] : (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:239:1: r_chainExpression returns [CompositeNode cn] : (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* ; public CompositeNode r_chainExpression() throws RecognitionException { CompositeNode cn = null; @@ -4890,13 +4887,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createChainExpressionNode(); try { - // ./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:243:2: ( (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:2: (f_first= r_ifExpression ) ( ( ( '->' ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:2: (f_first= r_ifExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:3: f_first= r_ifExpression { - pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2209); + pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2204); f_first=r_ifExpression(); _fsp--; if (failed) return cn; @@ -4906,7 +4903,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:105: ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:105: ( ( ( '->' ) (f_nexts= r_ifExpression ) ) )* loop54: do { int alt54=2; @@ -4919,25 +4916,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt54) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:106: ( ( '->' ) (f_nexts= r_ifExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:106: ( ( '->' ) (f_nexts= 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:243:106: ( ( '->' ) (f_nexts= r_ifExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:107: ( '->' ) (f_nexts= r_ifExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:107: ( '->' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:244:108: '->' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:107: ( '->' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:108: '->' { - match(input,75,FOLLOW_75_in_r_chainExpression2217); if (failed) return cn; + match(input,75,FOLLOW_75_in_r_chainExpression2212); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:150: (f_nexts= r_ifExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:243:151: f_nexts= r_ifExpression { - pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2225); + pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression2220); f_nexts=r_ifExpression(); _fsp--; if (failed) return cn; @@ -4978,7 +4975,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_ifExpression - // ./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 ) ) )? ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:246: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; @@ -4994,7 +4991,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createIfExpressionNode(); try { - // ./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 ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250: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); @@ -5007,18 +5004,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("246: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:251:2: (f_condition0= r_switchExpression ) ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:2: (f_condition0= r_switchExpression ) ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:2: (f_condition0= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:3: f_condition0= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2259); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2254); f_condition0=r_switchExpression(); _fsp--; if (failed) return cn; @@ -5028,7 +5025,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:126: ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:126: ( ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) )? int alt55=2; int LA55_0 = input.LA(1); @@ -5037,25 +5034,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt55) { case 1 : - // ./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:250:127: ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= 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:250:127: ( ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:128: ( '?' ) (f_then= r_expression ) ( ':' ) (f_else= r_switchExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:128: ( '?' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:129: '?' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:128: ( '?' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:129: '?' { - match(input,76,FOLLOW_76_in_r_ifExpression2267); if (failed) return cn; + match(input,76,FOLLOW_76_in_r_ifExpression2262); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:170: (f_then= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:171: f_then= r_expression { - pushFollow(FOLLOW_r_expression_in_r_ifExpression2275); + pushFollow(FOLLOW_r_expression_in_r_ifExpression2270); f_then=r_expression(); _fsp--; if (failed) return cn; @@ -5065,20 +5062,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:264: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:265: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:264: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:265: ':' { - match(input,62,FOLLOW_62_in_r_ifExpression2281); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_ifExpression2276); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:306: (f_else= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:250:307: f_else= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2289); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2284); f_else=r_switchExpression(); _fsp--; if (failed) return cn; @@ -5101,22 +5098,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./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:251:4: ( 'if' ) (f_condition1= r_expression ) ( 'then' ) (f_then= r_switchExpression ) ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:4: ( 'if' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:5: 'if' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:4: ( 'if' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:5: 'if' { - match(input,60,FOLLOW_60_in_r_ifExpression2301); if (failed) return cn; + match(input,60,FOLLOW_60_in_r_ifExpression2296); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:47: (f_condition1= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:48: f_condition1= r_expression { - pushFollow(FOLLOW_r_expression_in_r_ifExpression2309); + pushFollow(FOLLOW_r_expression_in_r_ifExpression2304); f_condition1=r_expression(); _fsp--; if (failed) return cn; @@ -5126,20 +5123,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:165: ( 'then' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:166: 'then' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:165: ( 'then' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:166: 'then' { - match(input,77,FOLLOW_77_in_r_ifExpression2315); if (failed) return cn; + match(input,77,FOLLOW_77_in_r_ifExpression2310); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:210: (f_then= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:211: f_then= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2323); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2318); f_then=r_switchExpression(); _fsp--; if (failed) return cn; @@ -5149,7 +5146,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:310: ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:310: ( ( ( 'else' ) (f_else= r_switchExpression ) ) )? int alt56=2; int LA56_0 = input.LA(1); @@ -5158,25 +5155,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt56) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:311: ( ( 'else' ) (f_else= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:311: ( ( 'else' ) (f_else= 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:251:311: ( ( 'else' ) (f_else= r_switchExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:312: ( 'else' ) (f_else= r_switchExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:312: ( 'else' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:252:313: 'else' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:312: ( 'else' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:313: 'else' { - match(input,78,FOLLOW_78_in_r_ifExpression2331); if (failed) return cn; + match(input,78,FOLLOW_78_in_r_ifExpression2326); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:357: (f_else= r_switchExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:251:358: f_else= r_switchExpression { - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2339); + pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression2334); f_else=r_switchExpression(); _fsp--; if (failed) return cn; @@ -5216,7 +5213,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_switchExpression - // ./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 ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:254: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; @@ -5232,7 +5229,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createSwitchExpressionNode(); try { - // ./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 ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258: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); @@ -5245,25 +5242,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("254: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:259:2: ( 'switch' ) ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_cases= r_casePart )* ( 'default' ) ( ':' ) (f_default= r_orExpression ) ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:2: ( 'switch' ) ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? ( '{' ) (f_cases= r_casePart )* ( 'default' ) ( ':' ) (f_default= r_orExpression ) ( '}' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:2: ( 'switch' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:3: 'switch' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:2: ( 'switch' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:3: 'switch' { - match(input,79,FOLLOW_79_in_r_switchExpression2371); if (failed) return cn; + match(input,79,FOLLOW_79_in_r_switchExpression2366); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:49: ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:49: ( ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) )? int alt58=2; int LA58_0 = input.LA(1); @@ -5272,25 +5269,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt58) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:50: ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:50: ( ( '(' ) (f_expression= 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:258:50: ( ( '(' ) (f_expression= r_orExpression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:51: ( '(' ) (f_expression= r_orExpression ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:51: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:52: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:51: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:52: '(' { - match(input,31,FOLLOW_31_in_r_switchExpression2379); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_switchExpression2374); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:93: (f_expression= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:94: f_expression= r_orExpression { - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2387); + pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2382); f_expression=r_orExpression(); _fsp--; if (failed) return cn; @@ -5300,10 +5297,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:217: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:218: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:217: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:218: ')' { - match(input,34,FOLLOW_34_in_r_switchExpression2393); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_switchExpression2388); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5319,17 +5316,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:262: ( '{' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:263: '{' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:262: ( '{' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:263: '{' { - match(input,80,FOLLOW_80_in_r_switchExpression2402); if (failed) return cn; + match(input,80,FOLLOW_80_in_r_switchExpression2397); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:304: (f_cases= r_casePart )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:304: (f_cases= r_casePart )* loop59: do { int alt59=2; @@ -5342,9 +5339,9 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt59) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:305: f_cases= r_casePart + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:305: f_cases= r_casePart { - pushFollow(FOLLOW_r_casePart_in_r_switchExpression2410); + pushFollow(FOLLOW_r_casePart_in_r_switchExpression2405); f_cases=r_casePart(); _fsp--; if (failed) return cn; @@ -5360,30 +5357,30 @@ public class Xpand3NodeParser extends AbstractNodeParser { } } while (true); - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:411: ( 'default' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:412: 'default' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:411: ( 'default' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:412: 'default' { - match(input,81,FOLLOW_81_in_r_switchExpression2417); if (failed) return cn; + match(input,81,FOLLOW_81_in_r_switchExpression2412); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:459: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:460: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:459: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:460: ':' { - match(input,62,FOLLOW_62_in_r_switchExpression2423); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_switchExpression2418); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:501: (f_default= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:502: f_default= r_orExpression { - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2431); + pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2426); f_default=r_orExpression(); _fsp--; if (failed) return cn; @@ -5393,10 +5390,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:613: ( '}' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:614: '}' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:613: ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:258:614: '}' { - match(input,82,FOLLOW_82_in_r_switchExpression2437); if (failed) return cn; + match(input,82,FOLLOW_82_in_r_switchExpression2432); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5407,12 +5404,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:260:4: (f_unnamed15= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:4: (f_unnamed15= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:4: (f_unnamed15= r_orExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:259:5: f_unnamed15= r_orExpression { - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2448); + pushFollow(FOLLOW_r_orExpression_in_r_switchExpression2443); f_unnamed15=r_orExpression(); _fsp--; if (failed) return cn; @@ -5443,7 +5440,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_casePart - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:263:1: r_casePart returns [CompositeNode cn] : ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:262:1: r_casePart returns [CompositeNode cn] : ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) ; public CompositeNode r_casePart() throws RecognitionException { CompositeNode cn = null; @@ -5455,23 +5452,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createCasePartNode(); try { - // ./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:265:2: ( ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:2: ( 'case' ) (f_condition= r_expression ) ( ':' ) (f_expression= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:2: ( 'case' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:3: 'case' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:2: ( 'case' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:3: 'case' { - match(input,83,FOLLOW_83_in_r_casePart2472); if (failed) return cn; + match(input,83,FOLLOW_83_in_r_casePart2467); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:47: (f_condition= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:48: f_condition= r_expression { - pushFollow(FOLLOW_r_expression_in_r_casePart2480); + pushFollow(FOLLOW_r_expression_in_r_casePart2475); f_condition=r_expression(); _fsp--; if (failed) return cn; @@ -5481,20 +5478,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:157: ( ':' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:266:158: ':' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:157: ( ':' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:158: ':' { - match(input,62,FOLLOW_62_in_r_casePart2486); if (failed) return cn; + match(input,62,FOLLOW_62_in_r_casePart2481); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:199: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:265:200: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_casePart2494); + pushFollow(FOLLOW_r_expression_in_r_casePart2489); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -5520,7 +5517,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_orExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:269:1: r_orExpression returns [CompositeNode cn] : (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:268:1: r_orExpression returns [CompositeNode cn] : (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* ; public CompositeNode r_orExpression() throws RecognitionException { CompositeNode cn = null; @@ -5532,13 +5529,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createOrExpressionNode(); try { - // ./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:272:2: ( (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:2: (f_first= r_andExpression ) ( ( ( '||' ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:2: (f_first= r_andExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:3: f_first= r_andExpression { - pushFollow(FOLLOW_r_andExpression_in_r_orExpression2525); + pushFollow(FOLLOW_r_andExpression_in_r_orExpression2520); f_first=r_andExpression(); _fsp--; if (failed) return cn; @@ -5548,7 +5545,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:103: ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:103: ( ( ( '||' ) (f_nexts= r_andExpression ) ) )* loop61: do { int alt61=2; @@ -5561,25 +5558,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt61) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:104: ( ( '||' ) (f_nexts= r_andExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:104: ( ( '||' ) (f_nexts= 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:272:104: ( ( '||' ) (f_nexts= r_andExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:105: ( '||' ) (f_nexts= r_andExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:105: ( '||' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:273:106: '||' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:105: ( '||' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:106: '||' { - match(input,84,FOLLOW_84_in_r_orExpression2533); if (failed) return cn; + match(input,84,FOLLOW_84_in_r_orExpression2528); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:148: (f_nexts= r_andExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:272:149: f_nexts= r_andExpression { - pushFollow(FOLLOW_r_andExpression_in_r_orExpression2541); + pushFollow(FOLLOW_r_andExpression_in_r_orExpression2536); f_nexts=r_andExpression(); _fsp--; if (failed) return cn; @@ -5620,7 +5617,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_andExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:276:1: r_andExpression returns [CompositeNode cn] : (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:275:1: r_andExpression returns [CompositeNode cn] : (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* ; public CompositeNode r_andExpression() throws RecognitionException { CompositeNode cn = null; @@ -5632,13 +5629,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createAndExpressionNode(); try { - // ./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:279:2: ( (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:2: (f_first= r_impliesExpression ) ( ( ( '&&' ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:2: (f_first= r_impliesExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:3: f_first= r_impliesExpression { - pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2575); + pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2570); f_first=r_impliesExpression(); _fsp--; if (failed) return cn; @@ -5648,7 +5645,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:108: ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:108: ( ( ( '&&' ) (f_nexts= r_impliesExpression ) ) )* loop62: do { int alt62=2; @@ -5661,25 +5658,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt62) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:109: ( ( '&&' ) (f_nexts= r_impliesExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:109: ( ( '&&' ) (f_nexts= 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:279:109: ( ( '&&' ) (f_nexts= r_impliesExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:110: ( '&&' ) (f_nexts= r_impliesExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:110: ( '&&' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:280:111: '&&' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:110: ( '&&' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:111: '&&' { - match(input,85,FOLLOW_85_in_r_andExpression2583); if (failed) return cn; + match(input,85,FOLLOW_85_in_r_andExpression2578); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:153: (f_nexts= r_impliesExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:279:154: f_nexts= r_impliesExpression { - pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2591); + pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression2586); f_nexts=r_impliesExpression(); _fsp--; if (failed) return cn; @@ -5720,7 +5717,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_impliesExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:283:1: r_impliesExpression returns [CompositeNode cn] : (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:282:1: r_impliesExpression returns [CompositeNode cn] : (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* ; public CompositeNode r_impliesExpression() throws RecognitionException { CompositeNode cn = null; @@ -5732,13 +5729,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createImpliesExpressionNode(); try { - // ./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:286:2: ( (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:2: (f_first= r_relationalExpression ) ( ( ( 'implies' ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:2: (f_first= r_relationalExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:3: f_first= r_relationalExpression { - pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2625); + pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2620); f_first=r_relationalExpression(); _fsp--; if (failed) return cn; @@ -5748,7 +5745,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:115: ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:115: ( ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) )* loop63: do { int alt63=2; @@ -5761,25 +5758,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt63) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:116: ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:116: ( ( 'implies' ) (f_nexts= 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:286:116: ( ( 'implies' ) (f_nexts= r_relationalExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:117: ( 'implies' ) (f_nexts= r_relationalExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:117: ( 'implies' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:287:118: 'implies' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:117: ( 'implies' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:118: 'implies' { - match(input,86,FOLLOW_86_in_r_impliesExpression2633); if (failed) return cn; + match(input,86,FOLLOW_86_in_r_impliesExpression2628); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:165: (f_nexts= r_relationalExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:286:166: f_nexts= r_relationalExpression { - pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2641); + pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression2636); f_nexts=r_relationalExpression(); _fsp--; if (failed) return cn; @@ -5820,7 +5817,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_relationalExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:290:1: r_relationalExpression returns [CompositeNode cn] : (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:289:1: r_relationalExpression returns [CompositeNode cn] : (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* ; public CompositeNode r_relationalExpression() throws RecognitionException { CompositeNode cn = null; @@ -5832,13 +5829,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createRelationalExpressionNode(); try { - // ./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:293:2: ( (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:2: (f_first= r_additiveExpression ) ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:2: (f_first= r_additiveExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:3: f_first= r_additiveExpression { - pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2675); + pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2670); f_first=r_additiveExpression(); _fsp--; if (failed) return cn; @@ -5848,7 +5845,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:116: ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:116: ( ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) )* loop65: do { int alt65=2; @@ -5861,15 +5858,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt65) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:117: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:117: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= 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:293:117: ( ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:118: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) (f_nexts= r_additiveExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:118: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:118: ( ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) ) int alt64=6; switch ( input.LA(1) ) { case 87: @@ -5905,19 +5902,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("294:119: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )", 64, 0, input); + new NoViableAltException("293: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:293:120: ( '==' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:120: ( '==' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:121: '==' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:120: ( '==' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:293:121: '==' { - match(input,87,FOLLOW_87_in_r_relationalExpression2685); if (failed) return cn; + match(input,87,FOLLOW_87_in_r_relationalExpression2680); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5928,12 +5925,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( '!=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:4: ( '!=' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( '!=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:5: '!=' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:4: ( '!=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:294:5: '!=' { - match(input,88,FOLLOW_88_in_r_relationalExpression2694); if (failed) return cn; + match(input,88,FOLLOW_88_in_r_relationalExpression2689); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5944,12 +5941,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( '>=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( '>=' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( '>=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:5: '>=' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:4: ( '>=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:295:5: '>=' { - match(input,89,FOLLOW_89_in_r_relationalExpression2703); if (failed) return cn; + match(input,89,FOLLOW_89_in_r_relationalExpression2698); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5960,12 +5957,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( '<=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( '<=' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( '<=' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:5: '<=' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:4: ( '<=' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:296:5: '<=' { - match(input,90,FOLLOW_90_in_r_relationalExpression2712); if (failed) return cn; + match(input,90,FOLLOW_90_in_r_relationalExpression2707); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5976,12 +5973,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( '>' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( '>' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( '>' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:5: '>' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:4: ( '>' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:297:5: '>' { - match(input,91,FOLLOW_91_in_r_relationalExpression2721); if (failed) return cn; + match(input,91,FOLLOW_91_in_r_relationalExpression2716); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -5992,12 +5989,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:4: ( '<' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( '<' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:4: ( '<' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:299:5: '<' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:4: ( '<' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:5: '<' { - match(input,92,FOLLOW_92_in_r_relationalExpression2730); if (failed) return cn; + match(input,92,FOLLOW_92_in_r_relationalExpression2725); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6013,10 +6010,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:48: (f_nexts= r_additiveExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:298:49: f_nexts= r_additiveExpression { - pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2740); + pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression2735); f_nexts=r_additiveExpression(); _fsp--; if (failed) return cn; @@ -6057,7 +6054,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_additiveExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:302:1: r_additiveExpression returns [CompositeNode cn] : (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:301:1: r_additiveExpression returns [CompositeNode cn] : (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* ; public CompositeNode r_additiveExpression() throws RecognitionException { CompositeNode cn = null; @@ -6069,13 +6066,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createAdditiveExpressionNode(); try { - // ./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:305:2: ( (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:2: (f_first= r_multiplicativeExpression ) ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:2: (f_first= r_multiplicativeExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:3: f_first= r_multiplicativeExpression { - pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2774); + pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2769); f_first=r_multiplicativeExpression(); _fsp--; if (failed) return cn; @@ -6085,7 +6082,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:120: ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:120: ( ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) )* loop67: do { int alt67=2; @@ -6107,15 +6104,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt67) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:121: ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:121: ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= 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:305:121: ( ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:122: ( ( ( '+' ) | ( '-' ) ) ) (f_nexts= r_multiplicativeExpression ) { - // ./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:305:122: ( ( ( '+' ) | ( '-' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:123: ( ( '+' ) | ( '-' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:123: ( ( '+' ) | ( '-' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:123: ( ( '+' ) | ( '-' ) ) int alt66=2; int LA66_0 = input.LA(1); @@ -6128,18 +6125,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("306:123: ( ( '+' ) | ( '-' ) )", 66, 0, input); + new NoViableAltException("305:123: ( ( '+' ) | ( '-' ) )", 66, 0, input); throw nvae; } switch (alt66) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:124: ( '+' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:124: ( '+' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:124: ( '+' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:125: '+' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:124: ( '+' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:305:125: '+' { - match(input,93,FOLLOW_93_in_r_additiveExpression2784); if (failed) return cn; + match(input,93,FOLLOW_93_in_r_additiveExpression2779); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6150,12 +6147,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:4: ( '-' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:4: ( '-' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:4: ( '-' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:307:5: '-' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:4: ( '-' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:5: '-' { - match(input,36,FOLLOW_36_in_r_additiveExpression2793); if (failed) return cn; + match(input,36,FOLLOW_36_in_r_additiveExpression2788); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6171,10 +6168,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:48: (f_nexts= r_multiplicativeExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:306:49: f_nexts= r_multiplicativeExpression { - pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2803); + pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2798); f_nexts=r_multiplicativeExpression(); _fsp--; if (failed) return cn; @@ -6215,7 +6212,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_multiplicativeExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:310:1: r_multiplicativeExpression returns [CompositeNode cn] : (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:309:1: r_multiplicativeExpression returns [CompositeNode cn] : (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* ; public CompositeNode r_multiplicativeExpression() throws RecognitionException { CompositeNode cn = null; @@ -6227,13 +6224,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createMultiplicativeExpressionNode(); try { - // ./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:313:2: ( (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:2: (f_first= r_unaryExpression ) ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:2: (f_first= r_unaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:3: f_first= r_unaryExpression { - pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2837); + pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2832); f_first=r_unaryExpression(); _fsp--; if (failed) return cn; @@ -6243,7 +6240,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:117: ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:117: ( ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) )* loop69: do { int alt69=2; @@ -6256,15 +6253,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt69) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:118: ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:118: ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= 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:313:118: ( ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:119: ( ( ( '*' ) | ( '/' ) ) ) (f_nexts= r_unaryExpression ) { - // ./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:313:119: ( ( ( '*' ) | ( '/' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:120: ( ( '*' ) | ( '/' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:120: ( ( '*' ) | ( '/' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:120: ( ( '*' ) | ( '/' ) ) int alt68=2; int LA68_0 = input.LA(1); @@ -6277,18 +6274,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("314:120: ( ( '*' ) | ( '/' ) )", 68, 0, input); + new NoViableAltException("313:120: ( ( '*' ) | ( '/' ) )", 68, 0, input); throw nvae; } switch (alt68) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:121: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:121: ( '*' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:121: ( '*' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:122: '*' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:121: ( '*' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:313:122: '*' { - match(input,33,FOLLOW_33_in_r_multiplicativeExpression2847); if (failed) return cn; + match(input,33,FOLLOW_33_in_r_multiplicativeExpression2842); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6299,12 +6296,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:4: ( '/' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:4: ( '/' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:4: ( '/' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:315:5: '/' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:4: ( '/' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:5: '/' { - match(input,94,FOLLOW_94_in_r_multiplicativeExpression2856); if (failed) return cn; + match(input,94,FOLLOW_94_in_r_multiplicativeExpression2851); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6320,10 +6317,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:48: (f_nexts= r_unaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:314:49: f_nexts= r_unaryExpression { - pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2866); + pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2861); f_nexts=r_unaryExpression(); _fsp--; if (failed) return cn; @@ -6364,7 +6361,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_unaryExpression - // ./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 ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:317: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; @@ -6376,7 +6373,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createUnaryExpressionNode(); try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:2: ( (f_unnamed16= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:2: ( (f_unnamed16= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) ) int alt70=3; switch ( input.LA(1) ) { case StringLiteral: @@ -6418,19 +6415,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("318:1: r_unaryExpression returns [CompositeNode cn] : ( (f_unnamed16= r_infixExpression ) | ( '!' ) (f_operand= r_infixExpression ) | ( '-' ) (f_operand= r_infixExpression ) );", 70, 0, input); + new NoViableAltException("317: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:322:2: (f_unnamed16= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:2: (f_unnamed16= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:2: (f_unnamed16= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:321:3: f_unnamed16= r_infixExpression { - pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2900); + pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2895); f_unnamed16=r_infixExpression(); _fsp--; if (failed) return cn; @@ -6444,22 +6441,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: ( '!' ) (f_operand= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:4: ( '!' ) (f_operand= r_infixExpression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: ( '!' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:5: '!' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:4: ( '!' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:5: '!' { - match(input,95,FOLLOW_95_in_r_unaryExpression2909); if (failed) return cn; + match(input,95,FOLLOW_95_in_r_unaryExpression2904); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:46: (f_operand= r_infixExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:322:47: f_operand= r_infixExpression { - pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2917); + pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2912); f_operand=r_infixExpression(); _fsp--; if (failed) return cn; @@ -6473,22 +6470,22 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324: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:324:4: ( '-' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:324:5: '-' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:4: ( '-' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:323:5: '-' { - match(input,36,FOLLOW_36_in_r_unaryExpression2926); if (failed) return cn; + match(input,36,FOLLOW_36_in_r_unaryExpression2921); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./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_unaryExpression2934); + pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression2929); f_operand=r_infixExpression(); _fsp--; if (failed) return cn; @@ -6519,7 +6516,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_infixExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:327:1: r_infixExpression returns [CompositeNode cn] : (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:326:1: r_infixExpression returns [CompositeNode cn] : (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ; public CompositeNode r_infixExpression() throws RecognitionException { CompositeNode cn = null; @@ -6531,13 +6528,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createInfixExpressionNode(); try { - // ./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:330:2: ( (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:2: (f_target= r_primaryExpression ) ( ( ( '.' ) (f_calls= r_featureCall ) ) )* { - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:2: (f_target= r_primaryExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:3: f_target= r_primaryExpression { - pushFollow(FOLLOW_r_primaryExpression_in_r_infixExpression2965); + pushFollow(FOLLOW_r_primaryExpression_in_r_infixExpression2960); f_target=r_primaryExpression(); _fsp--; if (failed) return cn; @@ -6547,7 +6544,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:114: ( ( ( '.' ) (f_calls= r_featureCall ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:114: ( ( ( '.' ) (f_calls= r_featureCall ) ) )* loop71: do { int alt71=2; @@ -6560,25 +6557,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt71) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:115: ( ( '.' ) (f_calls= r_featureCall ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330: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:331:116: ( '.' ) (f_calls= r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:115: ( ( '.' ) (f_calls= r_featureCall ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:116: ( '.' ) (f_calls= r_featureCall ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:116: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:331:117: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:116: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:117: '.' { - match(input,69,FOLLOW_69_in_r_infixExpression2973); if (failed) return cn; + match(input,69,FOLLOW_69_in_r_infixExpression2968); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:158: (f_calls= r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:330:159: f_calls= r_featureCall { - pushFollow(FOLLOW_r_featureCall_in_r_infixExpression2981); + pushFollow(FOLLOW_r_featureCall_in_r_infixExpression2976); f_calls=r_featureCall(); _fsp--; if (failed) return cn; @@ -6619,7 +6616,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_primaryExpression - // ./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 ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:333: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; @@ -6643,7 +6640,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./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 ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:334: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: @@ -6707,19 +6704,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("333: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:335:2: ( r_stringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:334:2: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:334:2: ( r_stringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:334:3: r_stringLiteral { - pushFollow(FOLLOW_r_stringLiteral_in_r_primaryExpression3003); + pushFollow(FOLLOW_r_stringLiteral_in_r_primaryExpression2998); r_stringLiteral18=r_stringLiteral(); _fsp--; if (failed) return cn; @@ -6733,12 +6730,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:4: ( r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:4: ( r_featureCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:335:5: r_featureCall { - pushFollow(FOLLOW_r_featureCall_in_r_primaryExpression3012); + pushFollow(FOLLOW_r_featureCall_in_r_primaryExpression3007); r_featureCall19=r_featureCall(); _fsp--; if (failed) return cn; @@ -6752,12 +6749,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:4: ( r_booleanLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:4: ( r_booleanLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:336:5: r_booleanLiteral { - pushFollow(FOLLOW_r_booleanLiteral_in_r_primaryExpression3021); + pushFollow(FOLLOW_r_booleanLiteral_in_r_primaryExpression3016); r_booleanLiteral20=r_booleanLiteral(); _fsp--; if (failed) return cn; @@ -6771,12 +6768,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:4: ( r_numberLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:4: ( r_numberLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:337:5: r_numberLiteral { - pushFollow(FOLLOW_r_numberLiteral_in_r_primaryExpression3030); + pushFollow(FOLLOW_r_numberLiteral_in_r_primaryExpression3025); r_numberLiteral21=r_numberLiteral(); _fsp--; if (failed) return cn; @@ -6790,12 +6787,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( r_nullLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:4: ( r_nullLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:338:5: r_nullLiteral { - pushFollow(FOLLOW_r_nullLiteral_in_r_primaryExpression3039); + pushFollow(FOLLOW_r_nullLiteral_in_r_primaryExpression3034); r_nullLiteral22=r_nullLiteral(); _fsp--; if (failed) return cn; @@ -6809,12 +6806,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:4: ( r_listLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:4: ( r_listLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:339:5: r_listLiteral { - pushFollow(FOLLOW_r_listLiteral_in_r_primaryExpression3048); + pushFollow(FOLLOW_r_listLiteral_in_r_primaryExpression3043); r_listLiteral23=r_listLiteral(); _fsp--; if (failed) return cn; @@ -6828,12 +6825,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 7 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:4: ( r_constructorCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:4: ( r_constructorCall ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:340:5: r_constructorCall { - pushFollow(FOLLOW_r_constructorCall_in_r_primaryExpression3057); + pushFollow(FOLLOW_r_constructorCall_in_r_primaryExpression3052); r_constructorCall24=r_constructorCall(); _fsp--; if (failed) return cn; @@ -6847,12 +6844,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 8 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:4: ( r_globalVarExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:4: ( r_globalVarExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:341:5: r_globalVarExpression { - pushFollow(FOLLOW_r_globalVarExpression_in_r_primaryExpression3066); + pushFollow(FOLLOW_r_globalVarExpression_in_r_primaryExpression3061); r_globalVarExpression25=r_globalVarExpression(); _fsp--; if (failed) return cn; @@ -6866,12 +6863,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 9 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:343:4: ( r_paranthesizedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:4: ( r_paranthesizedExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:342:5: r_paranthesizedExpression { - pushFollow(FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3075); + pushFollow(FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3070); r_paranthesizedExpression26=r_paranthesizedExpression(); _fsp--; if (failed) return cn; @@ -6899,20 +6896,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_stringLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:346:1: r_stringLiteral returns [CompositeNode cn] : ( StringLiteral ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:345: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:349:2: ( ( StringLiteral ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:2: ( StringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:2: ( ( StringLiteral ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:2: ( StringLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:2: ( StringLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:349:3: StringLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:2: ( StringLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:348:3: StringLiteral { - match(input,StringLiteral,FOLLOW_StringLiteral_in_r_stringLiteral3099); if (failed) return cn; + match(input,StringLiteral,FOLLOW_StringLiteral_in_r_stringLiteral3094); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6935,7 +6932,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_paranthesizedExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:352:1: r_paranthesizedExpression returns [CompositeNode cn] : ( '(' ) (f_expression= r_expression ) ( ')' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:351:1: r_paranthesizedExpression returns [CompositeNode cn] : ( '(' ) (f_expression= r_expression ) ( ')' ) ; public CompositeNode r_paranthesizedExpression() throws RecognitionException { CompositeNode cn = null; @@ -6945,23 +6942,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createParanthesizedExpressionNode(); try { - // ./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:354:2: ( ( '(' ) (f_expression= r_expression ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:2: ( '(' ) (f_expression= r_expression ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:2: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:3: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:2: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:3: '(' { - match(input,31,FOLLOW_31_in_r_paranthesizedExpression3123); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_paranthesizedExpression3118); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:44: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:45: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_paranthesizedExpression3131); + pushFollow(FOLLOW_r_expression_in_r_paranthesizedExpression3126); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -6971,10 +6968,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:173: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:355:174: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:173: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:354:174: ')' { - match(input,34,FOLLOW_34_in_r_paranthesizedExpression3137); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_paranthesizedExpression3132); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -6997,7 +6994,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_globalVarExpression - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:358:1: r_globalVarExpression returns [CompositeNode cn] : ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:357:1: r_globalVarExpression returns [CompositeNode cn] : ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) ; public CompositeNode r_globalVarExpression() throws RecognitionException { CompositeNode cn = null; @@ -7007,23 +7004,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createGlobalVarExpressionNode(); try { - // ./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:360:2: ( ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:2: ( 'GLOBALVAR' ) (f_unnamed17= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:2: ( 'GLOBALVAR' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:361:3: 'GLOBALVAR' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:2: ( 'GLOBALVAR' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:3: 'GLOBALVAR' { - match(input,96,FOLLOW_96_in_r_globalVarExpression3161); if (failed) return cn; + match(input,96,FOLLOW_96_in_r_globalVarExpression3156); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:52: (f_unnamed17= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:360:53: f_unnamed17= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_globalVarExpression3169); + pushFollow(FOLLOW_r_identifier_in_r_globalVarExpression3164); f_unnamed17=r_identifier(); _fsp--; if (failed) return cn; @@ -7049,7 +7046,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_featureCall - // ./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 ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:363: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; @@ -7065,7 +7062,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createFeatureCallNode(); try { - // ./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 ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:366: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: @@ -7094,7 +7091,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("363: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; } @@ -7110,19 +7107,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("363: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:367:2: (f_unnamed18= r_collectionExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:366: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:366:2: (f_unnamed18= r_collectionExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:366:3: f_unnamed18= r_collectionExpression { - pushFollow(FOLLOW_r_collectionExpression_in_r_featureCall3195); + pushFollow(FOLLOW_r_collectionExpression_in_r_featureCall3190); f_unnamed18=r_collectionExpression(); _fsp--; if (failed) return cn; @@ -7136,12 +7133,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:4: (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:4: (f_name= r_identifier ) ( '(' ) ( ( (f_paramList= r_parameterList ) ) )? ( ')' ) { - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:4: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:5: f_name= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_featureCall3206); + pushFollow(FOLLOW_r_identifier_in_r_featureCall3201); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -7151,17 +7148,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:97: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:98: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:97: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:98: '(' { - match(input,31,FOLLOW_31_in_r_featureCall3212); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_featureCall3207); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:139: ( ( (f_paramList= r_parameterList ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:139: ( ( (f_paramList= r_parameterList ) ) )? int alt73=2; int LA73_0 = input.LA(1); @@ -7170,15 +7167,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt73) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:140: ( (f_paramList= r_parameterList ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:140: ( (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:367:140: ( (f_paramList= r_parameterList ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:141: (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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:141: (f_paramList= r_parameterList ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:142: f_paramList= r_parameterList { - pushFollow(FOLLOW_r_parameterList_in_r_featureCall3222); + pushFollow(FOLLOW_r_parameterList_in_r_featureCall3217); f_paramList=r_parameterList(); _fsp--; if (failed) return cn; @@ -7197,10 +7194,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:260: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:261: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:260: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:367:261: ')' { - match(input,34,FOLLOW_34_in_r_featureCall3231); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_featureCall3226); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7211,12 +7208,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:369:4: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:4: (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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:4: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:368:5: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_featureCall3242); + pushFollow(FOLLOW_r_type_in_r_featureCall3237); f_type=r_type(); _fsp--; if (failed) return cn; @@ -7244,7 +7241,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_listLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:372:1: r_listLiteral returns [CompositeNode cn] : ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:371:1: r_listLiteral returns [CompositeNode cn] : ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) ; public CompositeNode r_listLiteral() throws RecognitionException { CompositeNode cn = null; @@ -7254,20 +7251,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createListLiteralNode(); try { - // ./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:374:2: ( ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:2: ( '{' ) ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? ( '}' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:2: ( '{' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:3: '{' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:2: ( '{' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:3: '{' { - match(input,80,FOLLOW_80_in_r_listLiteral3266); if (failed) return cn; + match(input,80,FOLLOW_80_in_r_listLiteral3261); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:44: ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:44: ( ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) )? int alt76=2; int LA76_0 = input.LA(1); @@ -7276,15 +7273,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt76) { case 1 : - // ./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:374:45: ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= 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:374:45: ( (f_elements= r_expression ) ( ( ( ',' ) (f_elements= r_expression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:46: (f_elements= r_expression ) ( ( ( ',' ) (f_elements= 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:46: (f_elements= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:47: f_elements= r_expression { - pushFollow(FOLLOW_r_expression_in_r_listLiteral3276); + pushFollow(FOLLOW_r_expression_in_r_listLiteral3271); f_elements=r_expression(); _fsp--; if (failed) return cn; @@ -7294,7 +7291,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:161: ( ( ( ',' ) (f_elements= r_expression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:161: ( ( ( ',' ) (f_elements= r_expression ) ) )* loop75: do { int alt75=2; @@ -7307,25 +7304,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt75) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:162: ( ( ',' ) (f_elements= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:162: ( ( ',' ) (f_elements= 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:374:162: ( ( ',' ) (f_elements= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:163: ( ',' ) (f_elements= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:163: ( ',' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:164: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:163: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:164: ',' { - match(input,32,FOLLOW_32_in_r_listLiteral3284); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_listLiteral3279); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:205: (f_elements= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:206: f_elements= r_expression { - pushFollow(FOLLOW_r_expression_in_r_listLiteral3292); + pushFollow(FOLLOW_r_expression_in_r_listLiteral3287); f_elements=r_expression(); _fsp--; if (failed) return cn; @@ -7356,10 +7353,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:326: ( '}' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:375:327: '}' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:326: ( '}' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:374:327: '}' { - match(input,82,FOLLOW_82_in_r_listLiteral3304); if (failed) return cn; + match(input,82,FOLLOW_82_in_r_listLiteral3299); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7382,7 +7379,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_constructorCall - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:378:1: r_constructorCall returns [CompositeNode cn] : ( 'new' ) (f_unnamed19= r_simpleType ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:377:1: r_constructorCall returns [CompositeNode cn] : ( 'new' ) (f_unnamed19= r_simpleType ) ; public CompositeNode r_constructorCall() throws RecognitionException { CompositeNode cn = null; @@ -7392,23 +7389,23 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createConstructorCallNode(); try { - // ./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:380:2: ( ( 'new' ) (f_unnamed19= r_simpleType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:380:2: ( 'new' ) (f_unnamed19= r_simpleType ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:2: ( 'new' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:381:3: 'new' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:380:2: ( 'new' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:380:3: 'new' { - match(input,97,FOLLOW_97_in_r_constructorCall3328); if (failed) return cn; + match(input,97,FOLLOW_97_in_r_constructorCall3323); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:380:46: (f_unnamed19= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:380:47: f_unnamed19= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_constructorCall3336); + pushFollow(FOLLOW_r_simpleType_in_r_constructorCall3331); f_unnamed19=r_simpleType(); _fsp--; if (failed) return cn; @@ -7434,14 +7431,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_booleanLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:384:1: r_booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:383: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:387:2: ( ( 'false' ) | ( 'true' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:386:2: ( ( 'false' ) | ( 'true' ) ) int alt77=2; int LA77_0 = input.LA(1); @@ -7454,18 +7451,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("384:1: r_booleanLiteral returns [CompositeNode cn] : ( ( 'false' ) | ( 'true' ) );", 77, 0, input); + new NoViableAltException("383: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:387:2: ( 'false' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:386:2: ( 'false' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:2: ( 'false' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:3: 'false' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:386:2: ( 'false' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:386:3: 'false' { - match(input,98,FOLLOW_98_in_r_booleanLiteral3360); if (failed) return cn; + match(input,98,FOLLOW_98_in_r_booleanLiteral3355); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7476,12 +7473,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:388:4: ( 'true' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:4: ( 'true' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:388:4: ( 'true' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:388:5: 'true' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:4: ( 'true' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:387:5: 'true' { - match(input,99,FOLLOW_99_in_r_booleanLiteral3369); if (failed) return cn; + match(input,99,FOLLOW_99_in_r_booleanLiteral3364); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7506,20 +7503,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_nullLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:391:1: r_nullLiteral returns [CompositeNode cn] : ( 'null' ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:390: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:394:2: ( ( 'null' ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:2: ( 'null' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:393:2: ( ( 'null' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:393:2: ( 'null' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:2: ( 'null' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:394:3: 'null' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:393:2: ( 'null' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:393:3: 'null' { - match(input,100,FOLLOW_100_in_r_nullLiteral3393); if (failed) return cn; + match(input,100,FOLLOW_100_in_r_nullLiteral3388); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7542,14 +7539,14 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_numberLiteral - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:396: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:400:2: ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:399:2: ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) ) int alt78=2; int LA78_0 = input.LA(1); @@ -7568,7 +7565,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 2, input); + new NoViableAltException("396:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 2, input); throw nvae; } @@ -7579,7 +7576,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 1, input); + new NoViableAltException("396:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 1, input); throw nvae; } @@ -7587,18 +7584,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("397:1: r_numberLiteral returns [CompositeNode cn] : ( ( IntLiteral ) | ( IntLiteral ) ( '.' ) ( IntLiteral ) );", 78, 0, input); + new NoViableAltException("396: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:400:2: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:399:2: ( IntLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:2: ( IntLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:3: IntLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:399:2: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:399:3: IntLiteral { - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3417); if (failed) return cn; + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3412); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7609,32 +7606,32 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:4: ( IntLiteral ) ( '.' ) ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:4: ( IntLiteral ) ( '.' ) ( IntLiteral ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:4: ( IntLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:5: IntLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:4: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:5: IntLiteral { - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3426); if (failed) return cn; + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3421); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:53: ( '.' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:54: '.' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:53: ( '.' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:54: '.' { - match(input,69,FOLLOW_69_in_r_numberLiteral3432); if (failed) return cn; + match(input,69,FOLLOW_69_in_r_numberLiteral3427); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:95: ( IntLiteral ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:401:96: IntLiteral + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:95: ( IntLiteral ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:400:96: IntLiteral { - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3438); if (failed) return cn; + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral3433); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7659,7 +7656,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_collectionExpression - // ./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 ) ( ')' ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403: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; @@ -7673,7 +7670,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createCollectionExpressionNode(); try { - // ./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 ) ( ')' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406: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); @@ -7686,38 +7683,38 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - 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); + new NoViableAltException("403: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:407:2: ( 'typeSelect' ) ( '(' ) (f_type= r_type ) ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:2: ( 'typeSelect' ) ( '(' ) (f_type= r_type ) ( ')' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:2: ( 'typeSelect' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: 'typeSelect' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:2: ( 'typeSelect' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:3: 'typeSelect' { - match(input,101,FOLLOW_101_in_r_collectionExpression3462); if (failed) return cn; + match(input,101,FOLLOW_101_in_r_collectionExpression3457); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:53: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:54: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:53: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:54: '(' { - match(input,31,FOLLOW_31_in_r_collectionExpression3468); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_collectionExpression3463); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:95: (f_type= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:96: f_type= r_type { - pushFollow(FOLLOW_r_type_in_r_collectionExpression3476); + pushFollow(FOLLOW_r_type_in_r_collectionExpression3471); f_type=r_type(); _fsp--; if (failed) return cn; @@ -7727,10 +7724,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:191: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:192: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:191: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:406:192: ')' { - match(input,34,FOLLOW_34_in_r_collectionExpression3482); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_collectionExpression3477); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7741,12 +7738,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./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:407: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: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:407:4: ( ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407: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' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) ) int alt79=8; switch ( input.LA(1) ) { case 102: @@ -7792,19 +7789,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("408:5: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )", 79, 0, input); + new NoViableAltException("407: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:408:6: ( 'collect' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:6: ( 'collect' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:6: ( 'collect' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:7: 'collect' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:6: ( 'collect' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:7: 'collect' { - match(input,102,FOLLOW_102_in_r_collectionExpression3493); if (failed) return cn; + match(input,102,FOLLOW_102_in_r_collectionExpression3488); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7815,12 +7812,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:4: ( 'select' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:4: ( 'select' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:4: ( 'select' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:5: 'select' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:4: ( 'select' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:5: 'select' { - match(input,103,FOLLOW_103_in_r_collectionExpression3502); if (failed) return cn; + match(input,103,FOLLOW_103_in_r_collectionExpression3497); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7831,12 +7828,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( 'selectFirst' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:4: ( 'selectFirst' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( 'selectFirst' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:5: 'selectFirst' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:4: ( 'selectFirst' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:5: 'selectFirst' { - match(input,104,FOLLOW_104_in_r_collectionExpression3511); if (failed) return cn; + match(input,104,FOLLOW_104_in_r_collectionExpression3506); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7847,12 +7844,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 4 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:4: ( 'reject' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( 'reject' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:4: ( 'reject' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:5: 'reject' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:4: ( 'reject' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:410:5: 'reject' { - match(input,105,FOLLOW_105_in_r_collectionExpression3520); if (failed) return cn; + match(input,105,FOLLOW_105_in_r_collectionExpression3515); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7863,12 +7860,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 5 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:4: ( 'exists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:4: ( 'exists' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:4: ( 'exists' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:5: 'exists' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:4: ( 'exists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:411:5: 'exists' { - match(input,106,FOLLOW_106_in_r_collectionExpression3529); if (failed) return cn; + match(input,106,FOLLOW_106_in_r_collectionExpression3524); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7879,12 +7876,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 6 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:4: ( 'notExists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:4: ( 'notExists' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:4: ( 'notExists' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:5: 'notExists' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:4: ( 'notExists' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:5: 'notExists' { - match(input,107,FOLLOW_107_in_r_collectionExpression3538); if (failed) return cn; + match(input,107,FOLLOW_107_in_r_collectionExpression3533); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7895,12 +7892,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 7 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:4: ( 'sortBy' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:4: ( 'sortBy' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:4: ( 'sortBy' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:5: 'sortBy' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:4: ( 'sortBy' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:5: 'sortBy' { - match(input,108,FOLLOW_108_in_r_collectionExpression3547); if (failed) return cn; + match(input,108,FOLLOW_108_in_r_collectionExpression3542); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7911,12 +7908,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 8 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:4: ( 'forAll' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:4: ( 'forAll' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:4: ( 'forAll' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:5: 'forAll' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:4: ( 'forAll' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:5: 'forAll' { - match(input,109,FOLLOW_109_in_r_collectionExpression3556); if (failed) return cn; + match(input,109,FOLLOW_109_in_r_collectionExpression3551); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7932,17 +7929,17 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:53: ( '(' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:54: '(' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:53: ( '(' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:54: '(' { - match(input,31,FOLLOW_31_in_r_collectionExpression3564); if (failed) return cn; + match(input,31,FOLLOW_31_in_r_collectionExpression3559); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:95: ( ( (f_variable= r_identifier ) ( '|' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:95: ( ( (f_variable= r_identifier ) ( '|' ) ) )? int alt80=2; int LA80_0 = input.LA(1); @@ -7955,15 +7952,15 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt80) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:96: ( (f_variable= r_identifier ) ( '|' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:96: ( (f_variable= 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:414:96: ( (f_variable= r_identifier ) ( '|' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:97: (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:415:98: f_variable= r_identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:97: (f_variable= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:98: f_variable= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_collectionExpression3574); + pushFollow(FOLLOW_r_identifier_in_r_collectionExpression3569); f_variable=r_identifier(); _fsp--; if (failed) return cn; @@ -7973,10 +7970,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:215: ( '|' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:216: '|' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:215: ( '|' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:216: '|' { - match(input,110,FOLLOW_110_in_r_collectionExpression3580); if (failed) return cn; + match(input,110,FOLLOW_110_in_r_collectionExpression3575); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -7992,10 +7989,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:260: (f_expression= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:261: f_expression= r_expression { - pushFollow(FOLLOW_r_expression_in_r_collectionExpression3591); + pushFollow(FOLLOW_r_expression_in_r_collectionExpression3586); f_expression=r_expression(); _fsp--; if (failed) return cn; @@ -8005,10 +8002,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:386: ( ')' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:387: ')' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:386: ( ')' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:387: ')' { - match(input,34,FOLLOW_34_in_r_collectionExpression3597); if (failed) return cn; + match(input,34,FOLLOW_34_in_r_collectionExpression3592); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8033,7 +8030,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_declaredParameterList - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:1: r_declaredParameterList returns [CompositeNode cn] : (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:417:1: r_declaredParameterList returns [CompositeNode cn] : (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ; public CompositeNode r_declaredParameterList() throws RecognitionException { CompositeNode cn = null; @@ -8043,13 +8040,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createDeclaredParameterListNode(); try { - // ./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:420:2: ( (f_params= r_declaredParameter ) ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:2: (f_params= r_declaredParameter ) ( ( ( ',' ) (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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:2: (f_params= r_declaredParameter ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:3: f_params= r_declaredParameter { - pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3623); + pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3618); f_params=r_declaredParameter(); _fsp--; if (failed) return cn; @@ -8059,7 +8056,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:126: ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:126: ( ( ( ',' ) (f_params= r_declaredParameter ) ) )* loop82: do { int alt82=2; @@ -8078,25 +8075,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt82) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:127: ( ( ',' ) (f_params= r_declaredParameter ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420: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:421:128: ( ',' ) (f_params= r_declaredParameter ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:127: ( ( ',' ) (f_params= r_declaredParameter ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:128: ( ',' ) (f_params= r_declaredParameter ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:128: ( ',' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:421:129: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:128: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:129: ',' { - match(input,32,FOLLOW_32_in_r_declaredParameterList3631); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_declaredParameterList3626); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:170: (f_params= r_declaredParameter ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:171: f_params= r_declaredParameter { - pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3639); + pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList3634); f_params=r_declaredParameter(); _fsp--; if (failed) return cn; @@ -8134,7 +8131,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_declaredParameter - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:1: r_declaredParameter returns [CompositeNode cn] : (f_ptype= r_type ) (f_name= r_identifier ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:423:1: r_declaredParameter returns [CompositeNode cn] : (f_ptype= r_type ) (f_name= r_identifier ) ; public CompositeNode r_declaredParameter() throws RecognitionException { CompositeNode cn = null; @@ -8146,13 +8143,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createDeclaredParameterNode(); try { - // ./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:426:2: ( (f_ptype= r_type ) (f_name= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:426:2: (f_ptype= r_type ) (f_name= r_identifier ) { - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:426:2: (f_ptype= r_type ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:426:3: f_ptype= r_type { - pushFollow(FOLLOW_r_type_in_r_declaredParameter3668); + pushFollow(FOLLOW_r_type_in_r_declaredParameter3663); f_ptype=r_type(); _fsp--; if (failed) return cn; @@ -8162,10 +8159,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:426:99: (f_name= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:426:100: f_name= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_declaredParameter3676); + pushFollow(FOLLOW_r_identifier_in_r_declaredParameter3671); f_name=r_identifier(); _fsp--; if (failed) return cn; @@ -8191,7 +8188,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_parameterList - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:430:1: r_parameterList returns [CompositeNode cn] : (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:429:1: r_parameterList returns [CompositeNode cn] : (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ; public CompositeNode r_parameterList() throws RecognitionException { CompositeNode cn = null; @@ -8201,13 +8198,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createParameterListNode(); try { - // ./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:432:2: ( (f_params= r_expression ) ( ( ( ',' ) (f_params= r_expression ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:2: (f_params= r_expression ) ( ( ( ',' ) (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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:2: (f_params= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:3: f_params= r_expression { - pushFollow(FOLLOW_r_expression_in_r_parameterList3702); + pushFollow(FOLLOW_r_expression_in_r_parameterList3697); f_params=r_expression(); _fsp--; if (failed) return cn; @@ -8217,7 +8214,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:111: ( ( ( ',' ) (f_params= r_expression ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:111: ( ( ( ',' ) (f_params= r_expression ) ) )* loop83: do { int alt83=2; @@ -8230,25 +8227,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt83) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:112: ( ( ',' ) (f_params= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432: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:433:113: ( ',' ) (f_params= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:112: ( ( ',' ) (f_params= r_expression ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:113: ( ',' ) (f_params= r_expression ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:113: ( ',' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:433:114: ',' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:113: ( ',' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:114: ',' { - match(input,32,FOLLOW_32_in_r_parameterList3710); if (failed) return cn; + match(input,32,FOLLOW_32_in_r_parameterList3705); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:155: (f_params= r_expression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:156: f_params= r_expression { - pushFollow(FOLLOW_r_expression_in_r_parameterList3718); + pushFollow(FOLLOW_r_expression_in_r_parameterList3713); f_params=r_expression(); _fsp--; if (failed) return cn; @@ -8286,7 +8283,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_type - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) ); + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:435:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) ); public CompositeNode r_type() throws RecognitionException { CompositeNode cn = null; @@ -8296,7 +8293,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { try { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:2: ( ( r_collectionType ) | ( r_simpleType ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:2: ( ( r_collectionType ) | ( r_simpleType ) ) int alt84=2; int LA84_0 = input.LA(1); @@ -8309,18 +8306,18 @@ public class Xpand3NodeParser extends AbstractNodeParser { else { if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("436:1: r_type returns [CompositeNode cn] : ( ( r_collectionType ) | ( r_simpleType ) );", 84, 0, input); + new NoViableAltException("435: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:437:2: ( r_collectionType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:2: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:2: ( r_collectionType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:3: r_collectionType { - pushFollow(FOLLOW_r_collectionType_in_r_type3740); + pushFollow(FOLLOW_r_collectionType_in_r_type3735); r_collectionType27=r_collectionType(); _fsp--; if (failed) return cn; @@ -8334,12 +8331,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:438:4: ( r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:4: ( 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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:4: ( r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:437:5: r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_type3749); + pushFollow(FOLLOW_r_simpleType_in_r_type3744); r_simpleType28=r_simpleType(); _fsp--; if (failed) return cn; @@ -8367,7 +8364,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_collectionType - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:441:1: r_collectionType returns [CompositeNode cn] : ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:440:1: r_collectionType returns [CompositeNode cn] : ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? ; public CompositeNode r_collectionType() throws RecognitionException { CompositeNode cn = null; @@ -8377,13 +8374,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createCollectionTypeNode(); try { - // ./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:443:2: ( ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:2: ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? { - // ./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:443:2: ( ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) int alt85=3; switch ( input.LA(1) ) { case 70: @@ -8404,19 +8401,19 @@ public class Xpand3NodeParser extends AbstractNodeParser { default: if (backtracking>0) {failed=true; return cn;} NoViableAltException nvae = - new NoViableAltException("444:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 85, 0, input); + new NoViableAltException("443:3: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 85, 0, input); throw nvae; } switch (alt85) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:4: ( 'Collection' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:4: ( 'Collection' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:4: ( 'Collection' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:5: 'Collection' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:4: ( 'Collection' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:5: 'Collection' { - match(input,70,FOLLOW_70_in_r_collectionType3775); if (failed) return cn; + match(input,70,FOLLOW_70_in_r_collectionType3770); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "collectionType"); } @@ -8427,12 +8424,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 2 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:4: ( 'List' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:4: ( 'List' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:4: ( 'List' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:5: 'List' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:4: ( 'List' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:5: 'List' { - match(input,71,FOLLOW_71_in_r_collectionType3784); if (failed) return cn; + match(input,71,FOLLOW_71_in_r_collectionType3779); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "collectionType"); } @@ -8443,12 +8440,12 @@ public class Xpand3NodeParser extends AbstractNodeParser { } break; case 3 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:4: ( 'Set' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:4: ( 'Set' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:4: ( 'Set' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:5: 'Set' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:4: ( 'Set' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:5: 'Set' { - match(input,72,FOLLOW_72_in_r_collectionType3793); if (failed) return cn; + match(input,72,FOLLOW_72_in_r_collectionType3788); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, "collectionType"); } @@ -8464,7 +8461,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:62: ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:62: ( ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) )? int alt86=2; int LA86_0 = input.LA(1); @@ -8473,25 +8470,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { } switch (alt86) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:63: ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:63: ( ( '[' ) (f_elementType= 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:445:63: ( ( '[' ) (f_elementType= r_simpleType ) ( ']' ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:64: ( '[' ) (f_elementType= r_simpleType ) ( ']' ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:64: ( '[' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:65: '[' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:64: ( '[' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:65: '[' { - match(input,111,FOLLOW_111_in_r_collectionType3803); if (failed) return cn; + match(input,111,FOLLOW_111_in_r_collectionType3798); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:106: (f_elementType= r_simpleType ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:107: f_elementType= r_simpleType { - pushFollow(FOLLOW_r_simpleType_in_r_collectionType3811); + pushFollow(FOLLOW_r_simpleType_in_r_collectionType3806); f_elementType=r_simpleType(); _fsp--; if (failed) return cn; @@ -8501,10 +8498,10 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:230: ( ']' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:446:231: ']' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:230: ( ']' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:445:231: ']' { - match(input,112,FOLLOW_112_in_r_collectionType3817); if (failed) return cn; + match(input,112,FOLLOW_112_in_r_collectionType3812); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8536,7 +8533,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_simpleType - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:449:1: r_simpleType returns [CompositeNode cn] : (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:1: r_simpleType returns [CompositeNode cn] : (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ; public CompositeNode r_simpleType() throws RecognitionException { CompositeNode cn = null; @@ -8546,13 +8543,13 @@ public class Xpand3NodeParser extends AbstractNodeParser { cn = factory.createSimpleTypeNode(); try { - // ./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:451:2: ( (f_names= r_identifier ) ( ( ( '::' ) (f_names= r_identifier ) ) )* ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:2: (f_names= r_identifier ) ( ( ( '::' ) (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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:2: (f_names= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:3: f_names= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_simpleType3846); + pushFollow(FOLLOW_r_identifier_in_r_simpleType3841); f_names=r_identifier(); _fsp--; if (failed) return cn; @@ -8562,7 +8559,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:104: ( ( ( '::' ) (f_names= r_identifier ) ) )* + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:104: ( ( ( '::' ) (f_names= r_identifier ) ) )* loop87: do { int alt87=2; @@ -8575,25 +8572,25 @@ public class Xpand3NodeParser extends AbstractNodeParser { switch (alt87) { case 1 : - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:105: ( ( '::' ) (f_names= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451: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:452:106: ( '::' ) (f_names= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:105: ( ( '::' ) (f_names= r_identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:106: ( '::' ) (f_names= r_identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:106: ( '::' ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:107: '::' + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:106: ( '::' ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:107: '::' { - match(input,64,FOLLOW_64_in_r_simpleType3854); if (failed) return cn; + match(input,64,FOLLOW_64_in_r_simpleType3849); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } } - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:149: (f_names= r_identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:451:150: f_names= r_identifier { - pushFollow(FOLLOW_r_identifier_in_r_simpleType3862); + pushFollow(FOLLOW_r_identifier_in_r_simpleType3857); f_names=r_identifier(); _fsp--; if (failed) return cn; @@ -8631,20 +8628,20 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start r_identifier - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:455:1: r_identifier returns [CompositeNode cn] : ( Identifier ) ; + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:454: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:458:2: ( ( Identifier ) ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:2: ( Identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:457:2: ( ( Identifier ) ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:457:2: ( Identifier ) { - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:2: ( Identifier ) - // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:458:3: Identifier + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:457:2: ( Identifier ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:457:3: Identifier { - match(input,Identifier,FOLLOW_Identifier_in_r_identifier3889); if (failed) return cn; + match(input,Identifier,FOLLOW_Identifier_in_r_identifier3884); if (failed) return cn; if ( backtracking==0 ) { addLeafNodeForToken(cn, null); } @@ -8667,16 +8664,16 @@ public class Xpand3NodeParser extends AbstractNodeParser { // $ANTLR start synpred1 public void synpred1_fragment() throws RecognitionException { - // ./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 + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:2: ( '(' r_type ')' r_chainExpression ) + // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:235:3: '(' r_type ')' r_chainExpression { - match(input,31,FOLLOW_31_in_synpred12133); if (failed) return ; - pushFollow(FOLLOW_r_type_in_synpred12135); + match(input,31,FOLLOW_31_in_synpred12128); if (failed) return ; + pushFollow(FOLLOW_r_type_in_synpred12130); r_type(); _fsp--; if (failed) return ; - match(input,34,FOLLOW_34_in_synpred12137); if (failed) return ; - pushFollow(FOLLOW_r_chainExpression_in_synpred12139); + match(input,34,FOLLOW_34_in_synpred12132); if (failed) return ; + pushFollow(FOLLOW_r_chainExpression_in_synpred12134); r_chainExpression(); _fsp--; if (failed) return ; @@ -8827,7 +8824,7 @@ public class Xpand3NodeParser extends AbstractNodeParser { this.transition = DFA53_transition; } public String getDescription() { - return "232:1: r_castedExpression returns [CompositeNode cn] : ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (f_type= r_type ) ( ')' ) (f_target= r_chainExpression ) ) | (f_unnamed14= r_chainExpression ) );"; + return "231: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; @@ -8937,336 +8934,336 @@ public class Xpand3NodeParser extends AbstractNodeParser { } - public static final BitSet FOLLOW_r_nsImport_in_r_file80 = new BitSet(new long[]{0x8800000024002010L,0x00000000000001CEL}); - public static final BitSet FOLLOW_r_abstractDeclaration_in_r_file93 = new BitSet(new long[]{0x8800000000002010L,0x00000000000001CEL}); - public static final BitSet FOLLOW_EOF_in_r_file102 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_import_in_r_nsImport119 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_extensionImport_in_r_nsImport128 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LG_in_r_import154 = new BitSet(new long[]{0x0000000002000000L}); - public static final BitSet FOLLOW_25_in_r_import160 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_simpleType_in_r_import168 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RG_in_r_import174 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_26_in_r_import185 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_import193 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_27_in_r_import199 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LG_in_r_extensionImport225 = new BitSet(new long[]{0x0000000010000000L}); - public static final BitSet FOLLOW_28_in_r_extensionImport231 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_simpleType_in_r_extensionImport239 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RG_in_r_extensionImport245 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_29_in_r_extensionImport256 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_extensionImport264 = new BitSet(new long[]{0x0000000048000000L}); - public static final BitSet FOLLOW_30_in_r_extensionImport270 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_27_in_r_extensionImport277 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_check_in_r_abstractDeclaration296 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_around_in_r_abstractDeclaration305 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_extension_in_r_abstractDeclaration314 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_definition_in_r_abstractDeclaration323 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_definitionAround_in_r_abstractDeclaration332 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LG_in_r_definition356 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_DEFINE_in_r_definition362 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_definition370 = new BitSet(new long[]{0x0000000880000000L}); - public static final BitSet FOLLOW_31_in_r_definition378 = new BitSet(new long[]{0x0000000600002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_declaredParameterList_in_r_definition388 = new BitSet(new long[]{0x0000000700000000L}); - public static final BitSet FOLLOW_32_in_r_definition396 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_r_definition403 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_33_in_r_definition415 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_definition424 = new BitSet(new long[]{0x0000000800000000L}); - public static final BitSet FOLLOW_35_in_r_definition433 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_definition441 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_definition449 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_ENDDEFINE_in_r_definition455 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RG_in_r_definition461 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LG_in_r_definitionAround485 = new BitSet(new long[]{0x0000000000000100L}); - public static final BitSet FOLLOW_AROUND_in_r_definitionAround491 = new BitSet(new long[]{0x0000000200002000L}); - public static final BitSet FOLLOW_r_pointcut_in_r_definitionAround499 = new BitSet(new long[]{0x0000000880000000L}); - public static final BitSet FOLLOW_31_in_r_definitionAround507 = new BitSet(new long[]{0x0000000600002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_declaredParameterList_in_r_definitionAround517 = new BitSet(new long[]{0x0000000700000000L}); - public static final BitSet FOLLOW_32_in_r_definitionAround525 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_r_definitionAround532 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_33_in_r_definitionAround544 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_definitionAround553 = new BitSet(new long[]{0x0000000800000000L}); - public static final BitSet FOLLOW_35_in_r_definitionAround562 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_definitionAround570 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_definitionAround578 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_ENDAROUND_in_r_definitionAround584 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RG_in_r_definitionAround590 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_textSequence_in_r_sequence616 = new BitSet(new long[]{0x102882F080003802L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_statement_in_r_sequence626 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_textSequence_in_r_sequence634 = new BitSet(new long[]{0x102882F080003802L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_simpleStatement_in_r_statement656 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_fileStatement_in_r_statement665 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_foreachStatement_in_r_statement674 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_ifStatement_in_r_statement683 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_letStatement_in_r_statement692 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_protectStatement_in_r_statement701 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_text_in_r_textSequence732 = new BitSet(new long[]{0x0000001000000402L}); - public static final BitSet FOLLOW_r_text_in_r_textSequence742 = new BitSet(new long[]{0x0000001000000402L}); - public static final BitSet FOLLOW_36_in_r_text769 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_TEXT_in_r_text776 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_errorStatement_in_r_simpleStatement795 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_expandStatement_in_r_simpleStatement804 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_expressionStmt_in_r_simpleStatement813 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_37_in_r_errorStatement837 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_errorStatement845 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_38_in_r_expandStatement869 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_simpleType_in_r_expandStatement877 = new BitSet(new long[]{0x0000008880000002L}); - public static final BitSet FOLLOW_31_in_r_expandStatement885 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_parameterList_in_r_expandStatement893 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_expandStatement899 = new BitSet(new long[]{0x0000008800000002L}); - public static final BitSet FOLLOW_35_in_r_expandStatement912 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_expandStatement920 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_39_in_r_expandStatement933 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_expandStatement941 = new BitSet(new long[]{0x0000010000000002L}); - public static final BitSet FOLLOW_40_in_r_expandStatement949 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_expandStatement957 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_expression_in_r_expressionStmt991 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_41_in_r_fileStatement1015 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_fileStatement1023 = new BitSet(new long[]{0x0000041000002400L}); - public static final BitSet FOLLOW_42_in_r_fileStatement1031 = new BitSet(new long[]{0x0000001000002400L}); - public static final BitSet FOLLOW_r_identifier_in_r_fileStatement1044 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_fileStatement1055 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_43_in_r_fileStatement1061 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_39_in_r_foreachStatement1085 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_foreachStatement1093 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_44_in_r_foreachStatement1099 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_foreachStatement1107 = new BitSet(new long[]{0x0000211000000400L}); - public static final BitSet FOLLOW_45_in_r_foreachStatement1115 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_foreachStatement1123 = new BitSet(new long[]{0x0000011000000400L}); - public static final BitSet FOLLOW_40_in_r_foreachStatement1134 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_foreachStatement1142 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_foreachStatement1153 = new BitSet(new long[]{0x0000400000000000L}); - public static final BitSet FOLLOW_46_in_r_foreachStatement1159 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_47_in_r_ifStatement1183 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_ifStatement1191 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_ifStatement1199 = new BitSet(new long[]{0x0007000000000000L}); - public static final BitSet FOLLOW_r_elseIfStatement_in_r_ifStatement1207 = new BitSet(new long[]{0x0007000000000000L}); - public static final BitSet FOLLOW_r_elseStatement_in_r_ifStatement1216 = new BitSet(new long[]{0x0001000000000000L}); - public static final BitSet FOLLOW_48_in_r_ifStatement1223 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_49_in_r_elseIfStatement1247 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_elseIfStatement1255 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_elseIfStatement1263 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_50_in_r_elseStatement1287 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_elseStatement1295 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_51_in_r_letStatement1319 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_letStatement1327 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_44_in_r_letStatement1333 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_letStatement1341 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_letStatement1349 = new BitSet(new long[]{0x0010000000000000L}); - public static final BitSet FOLLOW_52_in_r_letStatement1355 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_53_in_r_protectStatement1379 = new BitSet(new long[]{0x0040000000000000L}); - public static final BitSet FOLLOW_54_in_r_protectStatement1385 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_protectStatement1393 = new BitSet(new long[]{0x0080000000000000L}); - public static final BitSet FOLLOW_55_in_r_protectStatement1399 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_protectStatement1407 = new BitSet(new long[]{0x0100000000000000L}); - public static final BitSet FOLLOW_56_in_r_protectStatement1413 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_protectStatement1421 = new BitSet(new long[]{0x0200001000000400L}); - public static final BitSet FOLLOW_57_in_r_protectStatement1427 = new BitSet(new long[]{0x0000001000000400L}); - public static final BitSet FOLLOW_r_sequence_in_r_protectStatement1436 = new BitSet(new long[]{0x0400000000000000L}); - public static final BitSet FOLLOW_58_in_r_protectStatement1442 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_59_in_r_check1466 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_type_in_r_check1474 = new BitSet(new long[]{0x3000002000000000L}); - public static final BitSet FOLLOW_60_in_r_check1482 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_check1490 = new BitSet(new long[]{0x2000002000000000L}); - public static final BitSet FOLLOW_37_in_r_check1501 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_61_in_r_check1510 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_check1520 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_check1526 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_check1534 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_27_in_r_check1540 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_63_in_r_around1564 = new BitSet(new long[]{0x0000000200002000L}); - public static final BitSet FOLLOW_r_pointcut_in_r_around1572 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_r_around1578 = new BitSet(new long[]{0x0000000600002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_declaredParameterList_in_r_around1588 = new BitSet(new long[]{0x0000000700000000L}); - public static final BitSet FOLLOW_32_in_r_around1596 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_r_around1603 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_33_in_r_around1615 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_around1624 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_around1630 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); - public static final BitSet FOLLOW_r_expression_in_r_around1638 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_27_in_r_around1644 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_33_in_r_pointcut1670 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); - public static final BitSet FOLLOW_r_identifier_in_r_pointcut1681 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); - public static final BitSet FOLLOW_33_in_r_pointcut1691 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); - public static final BitSet FOLLOW_r_identifier_in_r_pointcut1702 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); - public static final BitSet FOLLOW_64_in_r_pointcut1711 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); - public static final BitSet FOLLOW_65_in_r_extension1740 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001CEL}); - public static final BitSet FOLLOW_66_in_r_extension1749 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001CEL}); - public static final BitSet FOLLOW_67_in_r_extension1758 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001CEL}); - public static final BitSet FOLLOW_r_type_in_r_extension1769 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_extension1778 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_r_extension1784 = new BitSet(new long[]{0x0000000400002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_declaredParameterList_in_r_extension1792 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_34_in_r_extension1799 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_62_in_r_extension1805 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183D0L}); - public static final BitSet FOLLOW_68_in_r_extension1813 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_javaType_in_r_extension1821 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L}); - public static final BitSet FOLLOW_69_in_r_extension1827 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_identifier_in_r_extension1835 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_r_extension1841 = new BitSet(new long[]{0x0000000400002000L}); - public static final BitSet FOLLOW_r_javaType_in_r_extension1851 = new BitSet(new long[]{0x0000000500000000L}); - public static final BitSet FOLLOW_32_in_r_extension1859 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_r_javaType_in_r_extension1867 = new BitSet(new long[]{0x0000000500000000L}); - public static final BitSet FOLLOW_34_in_r_extension1879 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_r_expression_in_r_extension1890 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_27_in_r_extension1898 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_r_identifier_in_r_javaType1924 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - public static final BitSet FOLLOW_69_in_r_javaType1932 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); - public static final BitSet FOLLOW_r_identifier_in_r_javaType1942 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - public static final BitSet FOLLOW_70_in_r_javaType1951 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - public static final BitSet FOLLOW_71_in_r_javaType1960 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - 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_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_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_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}); + public static final BitSet FOLLOW_r_nsImport_in_r_file75 = new BitSet(new long[]{0x8800000024002010L,0x00000000000001CEL}); + public static final BitSet FOLLOW_r_abstractDeclaration_in_r_file88 = new BitSet(new long[]{0x8800000000002010L,0x00000000000001CEL}); + public static final BitSet FOLLOW_EOF_in_r_file97 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_import_in_r_nsImport114 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_extensionImport_in_r_nsImport123 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LG_in_r_import149 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_25_in_r_import155 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_import163 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RG_in_r_import169 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_26_in_r_import180 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_import188 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_27_in_r_import194 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LG_in_r_extensionImport220 = new BitSet(new long[]{0x0000000010000000L}); + public static final BitSet FOLLOW_28_in_r_extensionImport226 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_extensionImport234 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RG_in_r_extensionImport240 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_29_in_r_extensionImport251 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_extensionImport259 = new BitSet(new long[]{0x0000000048000000L}); + public static final BitSet FOLLOW_30_in_r_extensionImport265 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_27_in_r_extensionImport272 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_check_in_r_abstractDeclaration291 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_around_in_r_abstractDeclaration300 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_extension_in_r_abstractDeclaration309 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_definition_in_r_abstractDeclaration318 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_definitionAround_in_r_abstractDeclaration327 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LG_in_r_definition351 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_DEFINE_in_r_definition357 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_definition365 = new BitSet(new long[]{0x0000000880000000L}); + public static final BitSet FOLLOW_31_in_r_definition373 = new BitSet(new long[]{0x0000000600002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_declaredParameterList_in_r_definition383 = new BitSet(new long[]{0x0000000700000000L}); + public static final BitSet FOLLOW_32_in_r_definition391 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_r_definition398 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_33_in_r_definition410 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_definition419 = new BitSet(new long[]{0x0000000800000000L}); + public static final BitSet FOLLOW_35_in_r_definition428 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_definition436 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_definition444 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_ENDDEFINE_in_r_definition450 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RG_in_r_definition456 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LG_in_r_definitionAround480 = new BitSet(new long[]{0x0000000000000100L}); + public static final BitSet FOLLOW_AROUND_in_r_definitionAround486 = new BitSet(new long[]{0x0000000200002000L}); + public static final BitSet FOLLOW_r_pointcut_in_r_definitionAround494 = new BitSet(new long[]{0x0000000880000000L}); + public static final BitSet FOLLOW_31_in_r_definitionAround502 = new BitSet(new long[]{0x0000000600002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_declaredParameterList_in_r_definitionAround512 = new BitSet(new long[]{0x0000000700000000L}); + public static final BitSet FOLLOW_32_in_r_definitionAround520 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_r_definitionAround527 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_33_in_r_definitionAround539 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_definitionAround548 = new BitSet(new long[]{0x0000000800000000L}); + public static final BitSet FOLLOW_35_in_r_definitionAround557 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_definitionAround565 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_definitionAround573 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_ENDAROUND_in_r_definitionAround579 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RG_in_r_definitionAround585 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_textSequence_in_r_sequence611 = new BitSet(new long[]{0x102882F080003802L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_statement_in_r_sequence621 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_textSequence_in_r_sequence629 = new BitSet(new long[]{0x102882F080003802L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_simpleStatement_in_r_statement651 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_fileStatement_in_r_statement660 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_foreachStatement_in_r_statement669 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_ifStatement_in_r_statement678 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_letStatement_in_r_statement687 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_protectStatement_in_r_statement696 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_text_in_r_textSequence727 = new BitSet(new long[]{0x0000001000000402L}); + public static final BitSet FOLLOW_r_text_in_r_textSequence737 = new BitSet(new long[]{0x0000001000000402L}); + public static final BitSet FOLLOW_36_in_r_text764 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_TEXT_in_r_text771 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_errorStatement_in_r_simpleStatement790 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_expandStatement_in_r_simpleStatement799 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_expressionStmt_in_r_simpleStatement808 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_37_in_r_errorStatement832 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_errorStatement840 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_38_in_r_expandStatement864 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_expandStatement872 = new BitSet(new long[]{0x0000008880000002L}); + public static final BitSet FOLLOW_31_in_r_expandStatement880 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_parameterList_in_r_expandStatement888 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_expandStatement894 = new BitSet(new long[]{0x0000008800000002L}); + public static final BitSet FOLLOW_35_in_r_expandStatement907 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_expandStatement915 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_39_in_r_expandStatement928 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_expandStatement936 = new BitSet(new long[]{0x0000010000000002L}); + public static final BitSet FOLLOW_40_in_r_expandStatement944 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_expandStatement952 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_expression_in_r_expressionStmt986 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_41_in_r_fileStatement1010 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_fileStatement1018 = new BitSet(new long[]{0x0000041000002400L}); + public static final BitSet FOLLOW_42_in_r_fileStatement1026 = new BitSet(new long[]{0x0000001000002400L}); + public static final BitSet FOLLOW_r_identifier_in_r_fileStatement1039 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_fileStatement1050 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_43_in_r_fileStatement1056 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_39_in_r_foreachStatement1080 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_foreachStatement1088 = new BitSet(new long[]{0x0000100000000000L}); + public static final BitSet FOLLOW_44_in_r_foreachStatement1094 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_foreachStatement1102 = new BitSet(new long[]{0x0000211000000400L}); + public static final BitSet FOLLOW_45_in_r_foreachStatement1110 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_foreachStatement1118 = new BitSet(new long[]{0x0000011000000400L}); + public static final BitSet FOLLOW_40_in_r_foreachStatement1129 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_foreachStatement1137 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_foreachStatement1148 = new BitSet(new long[]{0x0000400000000000L}); + public static final BitSet FOLLOW_46_in_r_foreachStatement1154 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_47_in_r_ifStatement1178 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_ifStatement1186 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_ifStatement1194 = new BitSet(new long[]{0x0007000000000000L}); + public static final BitSet FOLLOW_r_elseIfStatement_in_r_ifStatement1202 = new BitSet(new long[]{0x0007000000000000L}); + public static final BitSet FOLLOW_r_elseStatement_in_r_ifStatement1211 = new BitSet(new long[]{0x0001000000000000L}); + public static final BitSet FOLLOW_48_in_r_ifStatement1218 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_49_in_r_elseIfStatement1242 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_elseIfStatement1250 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_elseIfStatement1258 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_50_in_r_elseStatement1282 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_elseStatement1290 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_51_in_r_letStatement1314 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_letStatement1322 = new BitSet(new long[]{0x0000100000000000L}); + public static final BitSet FOLLOW_44_in_r_letStatement1328 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_letStatement1336 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_letStatement1344 = new BitSet(new long[]{0x0010000000000000L}); + public static final BitSet FOLLOW_52_in_r_letStatement1350 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_53_in_r_protectStatement1374 = new BitSet(new long[]{0x0040000000000000L}); + public static final BitSet FOLLOW_54_in_r_protectStatement1380 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_protectStatement1388 = new BitSet(new long[]{0x0080000000000000L}); + public static final BitSet FOLLOW_55_in_r_protectStatement1394 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_protectStatement1402 = new BitSet(new long[]{0x0100000000000000L}); + public static final BitSet FOLLOW_56_in_r_protectStatement1408 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_protectStatement1416 = new BitSet(new long[]{0x0200001000000400L}); + public static final BitSet FOLLOW_57_in_r_protectStatement1422 = new BitSet(new long[]{0x0000001000000400L}); + public static final BitSet FOLLOW_r_sequence_in_r_protectStatement1431 = new BitSet(new long[]{0x0400000000000000L}); + public static final BitSet FOLLOW_58_in_r_protectStatement1437 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_59_in_r_check1461 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_check1469 = new BitSet(new long[]{0x3000002000000000L}); + public static final BitSet FOLLOW_60_in_r_check1477 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_check1485 = new BitSet(new long[]{0x2000002000000000L}); + public static final BitSet FOLLOW_37_in_r_check1496 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_61_in_r_check1505 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_check1515 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_check1521 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_check1529 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_27_in_r_check1535 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_63_in_r_around1559 = new BitSet(new long[]{0x0000000200002000L}); + public static final BitSet FOLLOW_r_pointcut_in_r_around1567 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_around1573 = new BitSet(new long[]{0x0000000600002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_declaredParameterList_in_r_around1583 = new BitSet(new long[]{0x0000000700000000L}); + public static final BitSet FOLLOW_32_in_r_around1591 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_r_around1598 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_33_in_r_around1610 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_around1619 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_around1625 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_around1633 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_27_in_r_around1639 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_33_in_r_pointcut1665 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); + public static final BitSet FOLLOW_r_identifier_in_r_pointcut1676 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); + public static final BitSet FOLLOW_33_in_r_pointcut1686 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); + public static final BitSet FOLLOW_r_identifier_in_r_pointcut1697 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); + public static final BitSet FOLLOW_64_in_r_pointcut1706 = new BitSet(new long[]{0x0000000200002002L,0x0000000000000001L}); + public static final BitSet FOLLOW_65_in_r_extension1735 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001CEL}); + public static final BitSet FOLLOW_66_in_r_extension1744 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001CEL}); + public static final BitSet FOLLOW_67_in_r_extension1753 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001CEL}); + public static final BitSet FOLLOW_r_type_in_r_extension1764 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_extension1773 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_extension1779 = new BitSet(new long[]{0x0000000400002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_declaredParameterList_in_r_extension1787 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_extension1794 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_extension1800 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183D0L}); + public static final BitSet FOLLOW_68_in_r_extension1808 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_javaType_in_r_extension1816 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_69_in_r_extension1822 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_extension1830 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_extension1836 = new BitSet(new long[]{0x0000000400002000L}); + public static final BitSet FOLLOW_r_javaType_in_r_extension1846 = new BitSet(new long[]{0x0000000500000000L}); + public static final BitSet FOLLOW_32_in_r_extension1854 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_javaType_in_r_extension1862 = new BitSet(new long[]{0x0000000500000000L}); + public static final BitSet FOLLOW_34_in_r_extension1874 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_r_expression_in_r_extension1885 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_27_in_r_extension1893 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_identifier_in_r_javaType1919 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_69_in_r_javaType1927 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_identifier_in_r_javaType1937 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_70_in_r_javaType1946 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_71_in_r_javaType1955 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_72_in_r_javaType1964 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_r_expression_in_r_test_expression2000 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_r_test_expression2006 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_letExpression_in_r_expression2023 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_73_in_r_letExpression2052 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_letExpression2060 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L}); + public static final BitSet FOLLOW_74_in_r_letExpression2066 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_castedExpression_in_r_letExpression2074 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_letExpression2080 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_letExpression2088 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_castedExpression_in_r_letExpression2099 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_r_castedExpression2139 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_castedExpression2147 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_castedExpression2153 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_chainExpression_in_r_castedExpression2161 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_chainExpression_in_r_castedExpression2173 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_ifExpression_in_r_chainExpression2204 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L}); + public static final BitSet FOLLOW_75_in_r_chainExpression2212 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_ifExpression_in_r_chainExpression2220 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2254 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L}); + public static final BitSet FOLLOW_76_in_r_ifExpression2262 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_ifExpression2270 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_ifExpression2276 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2284 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_60_in_r_ifExpression2296 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_ifExpression2304 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L}); + public static final BitSet FOLLOW_77_in_r_ifExpression2310 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2318 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L}); + public static final BitSet FOLLOW_78_in_r_ifExpression2326 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_switchExpression_in_r_ifExpression2334 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_79_in_r_switchExpression2366 = new BitSet(new long[]{0x0000000080000000L,0x0000000000010000L}); + public static final BitSet FOLLOW_31_in_r_switchExpression2374 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2382 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_switchExpression2388 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L}); + public static final BitSet FOLLOW_80_in_r_switchExpression2397 = new BitSet(new long[]{0x0000000000000000L,0x00000000000A0000L}); + public static final BitSet FOLLOW_r_casePart_in_r_switchExpression2405 = new BitSet(new long[]{0x0000000000000000L,0x00000000000A0000L}); + public static final BitSet FOLLOW_81_in_r_switchExpression2412 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_switchExpression2418 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2426 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_82_in_r_switchExpression2432 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_orExpression_in_r_switchExpression2443 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_83_in_r_casePart2467 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_casePart2475 = new BitSet(new long[]{0x4000000000000000L}); + public static final BitSet FOLLOW_62_in_r_casePart2481 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_casePart2489 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_andExpression_in_r_orExpression2520 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L}); + public static final BitSet FOLLOW_84_in_r_orExpression2528 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_andExpression_in_r_orExpression2536 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L}); + public static final BitSet FOLLOW_r_impliesExpression_in_r_andExpression2570 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L}); + public static final BitSet FOLLOW_85_in_r_andExpression2578 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_impliesExpression_in_r_andExpression2586 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L}); + public static final BitSet FOLLOW_r_relationalExpression_in_r_impliesExpression2620 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L}); + public static final BitSet FOLLOW_86_in_r_impliesExpression2628 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_relationalExpression_in_r_impliesExpression2636 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L}); + public static final BitSet FOLLOW_r_additiveExpression_in_r_relationalExpression2670 = new BitSet(new long[]{0x0000000000000002L,0x000000001F800000L}); + public static final BitSet FOLLOW_87_in_r_relationalExpression2680 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_88_in_r_relationalExpression2689 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_89_in_r_relationalExpression2698 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_90_in_r_relationalExpression2707 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_91_in_r_relationalExpression2716 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_92_in_r_relationalExpression2725 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_additiveExpression_in_r_relationalExpression2735 = new BitSet(new long[]{0x0000000000000002L,0x000000001F800000L}); + public static final BitSet FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2769 = new BitSet(new long[]{0x0000001000000002L,0x0000000020000000L}); + public static final BitSet FOLLOW_93_in_r_additiveExpression2779 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_36_in_r_additiveExpression2788 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_multiplicativeExpression_in_r_additiveExpression2798 = new BitSet(new long[]{0x0000001000000002L,0x0000000020000000L}); + public static final BitSet FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2832 = new BitSet(new long[]{0x0000000200000002L,0x0000000040000000L}); + public static final BitSet FOLLOW_33_in_r_multiplicativeExpression2842 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_94_in_r_multiplicativeExpression2851 = new BitSet(new long[]{0x0000001080003800L,0x00003FFF800101C0L}); + public static final BitSet FOLLOW_r_unaryExpression_in_r_multiplicativeExpression2861 = new BitSet(new long[]{0x0000000200000002L,0x0000000040000000L}); + public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2895 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_95_in_r_unaryExpression2904 = new BitSet(new long[]{0x0000000080003800L,0x00003FFF000101C0L}); + public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2912 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_36_in_r_unaryExpression2921 = new BitSet(new long[]{0x0000000080003800L,0x00003FFF000101C0L}); + public static final BitSet FOLLOW_r_infixExpression_in_r_unaryExpression2929 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_primaryExpression_in_r_infixExpression2960 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_69_in_r_infixExpression2968 = new BitSet(new long[]{0x0000000000002000L,0x00003FE0000001C0L}); + public static final BitSet FOLLOW_r_featureCall_in_r_infixExpression2976 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); + public static final BitSet FOLLOW_r_stringLiteral_in_r_primaryExpression2998 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_featureCall_in_r_primaryExpression3007 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_booleanLiteral_in_r_primaryExpression3016 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_numberLiteral_in_r_primaryExpression3025 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_nullLiteral_in_r_primaryExpression3034 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_listLiteral_in_r_primaryExpression3043 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_constructorCall_in_r_primaryExpression3052 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_globalVarExpression_in_r_primaryExpression3061 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_paranthesizedExpression_in_r_primaryExpression3070 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_StringLiteral_in_r_stringLiteral3094 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_r_paranthesizedExpression3118 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_paranthesizedExpression3126 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_paranthesizedExpression3132 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_96_in_r_globalVarExpression3156 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_globalVarExpression3164 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_collectionExpression_in_r_featureCall3190 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_identifier_in_r_featureCall3201 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_featureCall3207 = new BitSet(new long[]{0x1000001480003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_parameterList_in_r_featureCall3217 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_featureCall3226 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_type_in_r_featureCall3237 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_80_in_r_listLiteral3261 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800583C0L}); + public static final BitSet FOLLOW_r_expression_in_r_listLiteral3271 = new BitSet(new long[]{0x0000000100000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_32_in_r_listLiteral3279 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_listLiteral3287 = new BitSet(new long[]{0x0000000100000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_82_in_r_listLiteral3299 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_97_in_r_constructorCall3323 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_constructorCall3331 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_98_in_r_booleanLiteral3355 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_99_in_r_booleanLiteral3364 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_100_in_r_nullLiteral3388 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3412 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3421 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_69_in_r_numberLiteral3427 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_IntLiteral_in_r_numberLiteral3433 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_101_in_r_collectionExpression3457 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_collectionExpression3463 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_r_collectionExpression3471 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_collectionExpression3477 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_102_in_r_collectionExpression3488 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_103_in_r_collectionExpression3497 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_104_in_r_collectionExpression3506 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_105_in_r_collectionExpression3515 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_106_in_r_collectionExpression3524 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_107_in_r_collectionExpression3533 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_108_in_r_collectionExpression3542 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_109_in_r_collectionExpression3551 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_31_in_r_collectionExpression3559 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_identifier_in_r_collectionExpression3569 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000000L}); + public static final BitSet FOLLOW_110_in_r_collectionExpression3575 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_collectionExpression3586 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_r_collectionExpression3592 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_declaredParameter_in_r_declaredParameterList3618 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_32_in_r_declaredParameterList3626 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_declaredParameter_in_r_declaredParameterList3634 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_r_type_in_r_declaredParameter3663 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_declaredParameter3671 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_expression_in_r_parameterList3697 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_32_in_r_parameterList3705 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800183C0L}); + public static final BitSet FOLLOW_r_expression_in_r_parameterList3713 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_r_collectionType_in_r_type3735 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_simpleType_in_r_type3744 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_70_in_r_collectionType3770 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); + public static final BitSet FOLLOW_71_in_r_collectionType3779 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); + public static final BitSet FOLLOW_72_in_r_collectionType3788 = new BitSet(new long[]{0x0000000000000002L,0x0000800000000000L}); + public static final BitSet FOLLOW_111_in_r_collectionType3798 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_simpleType_in_r_collectionType3806 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); + public static final BitSet FOLLOW_112_in_r_collectionType3812 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_r_identifier_in_r_simpleType3841 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); + public static final BitSet FOLLOW_64_in_r_simpleType3849 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_r_identifier_in_r_simpleType3857 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); + public static final BitSet FOLLOW_Identifier_in_r_identifier3884 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_synpred12128 = new BitSet(new long[]{0x0000000000002000L,0x00000000000001C0L}); + public static final BitSet FOLLOW_r_type_in_synpred12130 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_34_in_synpred12132 = new BitSet(new long[]{0x1000001080003800L,0x00003FFF800181C0L}); + public static final BitSet FOLLOW_r_chainExpression_in_synpred12134 = 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 71bbbf74..ac80fc77 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" 462 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 461 IntLiteral : ('0' | '1'..'9' '0'..'9'*) ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 467 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 466 StringLiteral : '\"' ( EscapeSequence | ~('\\'|'\"') )* '\"' | '\'' ( EscapeSequence | ~('\''|'\\') )* '\'' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 473 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 472 fragment EscapeSequence : '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | UnicodeEscape @@ -116,7 +116,7 @@ fragment EscapeSequence : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 480 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 479 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" 487 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 486 fragment UnicodeEscape : '\\' 'u' HexDigit HexDigit HexDigit HexDigit ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 492 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 491 fragment HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 497 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 496 DEFINE : {xpandMode=true;} 'DEFINE' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 502 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 501 ENDDEFINE : 'ENDDEFINE' {xpandMode=false;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 507 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 506 AROUND : {xpandMode=true;}'AROUND' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 512 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 511 ENDAROUND : 'ENDAROUND'{xpandMode=false;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 517 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 516 Identifier : ('^')? Letter (Letter|JavaIDDigit)* ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 522 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 521 fragment Letter : '\u0024' | '\u0041'..'\u005a' | @@ -184,7 +184,7 @@ fragment Letter : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 539 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 538 fragment JavaIDDigit : '\u0030'..'\u0039' | @@ -206,49 +206,49 @@ fragment JavaIDDigit : ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 560 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 559 WS : (' '|'\r'|'\t'|'\u000C'|'\n') {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 565 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 564 COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 570 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 569 LINE_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n'|EOF) {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 575 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 574 REM_COMMENT_OUT : {!xpandMode}?=> LG 'REM' RG ( options {greedy=false;} : . )* '\u00ABENDREM' RG {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 580 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 579 REM_COMMENT : {xpandMode}?=> 'REM' RG ( options {greedy=false;} : . )* '\u00ABENDREM' {$channel=HIDDEN;} ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 585 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 584 TEXT : {xpandMode}?=> RG ~(LG)* (LG)? ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 590 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 589 LG : '\u00AB' ; -// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 595 +// $ANTLR src "./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g" 594 RG : '\u00BB' ; diff --git a/plugins/org.eclipse.xpand3.parser/text/description.txt b/plugins/org.eclipse.xpand3.parser/text/description.txt index 5d54c606..aa323dcf 100644 --- a/plugins/org.eclipse.xpand3.parser/text/description.txt +++ b/plugins/org.eclipse.xpand3.parser/text/description.txt @@ -8,32 +8,32 @@ This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class FileNode -> CompositeNode - Reference declarations : CompositeNode<<0..*>> Reference imports : CompositeNode<<0..*>> + Reference declarations : CompositeNode<<0..*>> Class ImportNode -> CompositeNode - Reference namespace : CompositeNode Reference type : CompositeNode + Reference namespace : CompositeNode Class ExtensionImportNode -> CompositeNode Reference type : CompositeNode Reference namespace : CompositeNode Class DefinitionNode -> CompositeNode - Reference name : CompositeNode - Reference type : CompositeNode Reference sequence : CompositeNode + Reference type : CompositeNode + Reference name : CompositeNode Reference paramList : CompositeNode Class DefinitionAroundNode -> CompositeNode Reference type : CompositeNode - Reference pointcut : CompositeNode - Reference paramList : CompositeNode Reference sequence : CompositeNode + Reference paramList : CompositeNode + Reference pointcut : CompositeNode Class SequenceNode -> CompositeNode - Reference textSequences : CompositeNode<<0..*>> Reference statements : CompositeNode<<0..*>> + Reference textSequences : CompositeNode<<0..*>> Class TextSequenceNode -> CompositeNode Reference texts : CompositeNode<<0..*>> @@ -45,10 +45,10 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class ExpandStatementNode -> CompositeNode Reference separator : CompositeNode + Reference name : CompositeNode + Reference forExpression : CompositeNode Reference paramList : CompositeNode Reference forEachExpression : CompositeNode - Reference forExpression : CompositeNode - Reference name : CompositeNode Class ExpressionStmtNode -> CompositeNode Reference expression : CompositeNode @@ -59,58 +59,58 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Reference nameExpression : CompositeNode Class ForeachStatementNode -> CompositeNode - Reference iterator : CompositeNode - Reference identifier : CompositeNode + Reference separatorExpression : CompositeNode Reference sequence : CompositeNode + Reference iterator : CompositeNode Reference forExpression : CompositeNode - Reference separatorExpression : CompositeNode + Reference identifier : CompositeNode Class IfStatementNode -> CompositeNode - Reference elseIfs : CompositeNode<<0..*>> - Reference expression : CompositeNode Reference else : CompositeNode Reference sequence : CompositeNode + Reference elseIfs : CompositeNode<<0..*>> + Reference expression : CompositeNode Class ElseIfStatementNode -> CompositeNode - Reference sequence : CompositeNode Reference expression : CompositeNode + Reference sequence : CompositeNode Class ElseStatementNode -> CompositeNode Reference sequence : CompositeNode Class LetStatementNode -> CompositeNode - Reference expression : CompositeNode Reference name : CompositeNode + Reference expression : CompositeNode Reference sequence : CompositeNode Class ProtectStatementNode -> CompositeNode + Reference cstart : CompositeNode Reference sequence : CompositeNode Reference cend : CompositeNode Reference id : CompositeNode - Reference cstart : CompositeNode Class CheckNode -> CompositeNode - Reference type : CompositeNode Reference error : LeafNode - Reference message : CompositeNode - Reference ifExpression : CompositeNode Reference warning : LeafNode + Reference type : CompositeNode Reference constraint : CompositeNode + Reference ifExpression : CompositeNode + Reference message : CompositeNode Class AroundNode -> CompositeNode Class PointcutNode -> CompositeNode Class ExtensionNode -> CompositeNode + Reference extendBody : CompositeNode + Reference javaName : CompositeNode Reference paramList : CompositeNode - Reference private : LeafNode - Reference returnType : CompositeNode - Reference javaReturnType : CompositeNode Reference create : LeafNode Reference name : CompositeNode - Reference javaName : CompositeNode + Reference returnType : CompositeNode + Reference private : LeafNode + Reference javaReturnType : CompositeNode Reference cached : LeafNode - Reference extendBody : CompositeNode Class JavaTypeNode -> CompositeNode @@ -119,23 +119,23 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class LetExpressionNode -> CompositeNode Class CastedExpressionNode -> CompositeNode - Reference target : CompositeNode Reference type : CompositeNode + Reference target : CompositeNode Class ChainExpressionNode -> CompositeNode - Reference nexts : CompositeNode<<0..*>> Reference first : CompositeNode + Reference nexts : CompositeNode<<0..*>> Class IfExpressionNode -> CompositeNode - Reference then : CompositeNode + Reference condition1 : CompositeNode Reference else : CompositeNode + Reference then : CompositeNode Reference condition0 : CompositeNode - Reference condition1 : CompositeNode Class SwitchExpressionNode -> CompositeNode - Reference default : CompositeNode - Reference expression : CompositeNode Reference cases : CompositeNode<<0..*>> + Reference expression : CompositeNode + Reference default : CompositeNode Class CasePartNode -> CompositeNode Reference condition : CompositeNode @@ -146,12 +146,12 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Reference first : CompositeNode Class AndExpressionNode -> CompositeNode - Reference first : CompositeNode Reference nexts : CompositeNode<<0..*>> + Reference first : CompositeNode Class ImpliesExpressionNode -> CompositeNode - Reference nexts : CompositeNode<<0..*>> Reference first : CompositeNode + Reference nexts : CompositeNode<<0..*>> Class RelationalExpressionNode -> CompositeNode Reference nexts : CompositeNode<<0..*>> @@ -162,15 +162,15 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Reference first : CompositeNode Class MultiplicativeExpressionNode -> CompositeNode - Reference nexts : CompositeNode<<0..*>> Reference first : CompositeNode + Reference nexts : CompositeNode<<0..*>> Class UnaryExpressionNode -> CompositeNode Reference operand : CompositeNode Class InfixExpressionNode -> CompositeNode - Reference calls : CompositeNode<<0..*>> Reference target : CompositeNode + Reference calls : CompositeNode<<0..*>> Class StringLiteralNode -> CompositeNode @@ -180,9 +180,9 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> 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..*>> @@ -197,8 +197,8 @@ Package xpand3node <http://www.eclipse.org/tmf/common/Xpand3Node> Class CollectionExpressionNode -> CompositeNode Reference variable : CompositeNode - Reference expression : CompositeNode Reference type : CompositeNode + Reference expression : CompositeNode Class DeclaredParameterListNode -> CompositeNode Reference params : CompositeNode<<0..*>> diff --git a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF index 10559760..991ca2bf 100644 --- a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.antlr.patched;bundle-version="3.0.0", org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.xtend.backend;bundle-version="0.7.0", org.junit, - org.eclipse.emf.ecore.xmi;bundle-version="2.3.0" + org.eclipse.emf.ecore.xmi;bundle-version="2.3.0", + org.eclipse.xpand3.parser Export-Package: org.eclipse.xpand3, org.eclipse.xpand3.analyzation, org.eclipse.xpand3.analyzation.typesystem.builtin, @@ -29,6 +30,8 @@ Export-Package: org.eclipse.xpand3, org.eclipse.xpand3.expression.util, org.eclipse.xpand3.expression.validation, org.eclipse.xpand3.impl, + org.eclipse.xpand3.parser, + org.eclipse.xpand3.parser.node2ast, org.eclipse.xpand3.statement, org.eclipse.xpand3.statement.impl, org.eclipse.xpand3.statement.util, diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java index f4ffe4e7..6992ef83 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java @@ -2,38 +2,36 @@ * <copyright> * </copyright> * - * $Id: ImportStatement.java,v 1.3 2008/03/14 10:18:41 jkohnlein Exp $ + * $Id: ImportStatement.java,v 1.4 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Import Statement</b></em>'. * <!-- end-user-doc --> - * + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}</li> - * <li>{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}</li> + * <li>{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}</li> + * <li>{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.xpand3.Xpand3Package#getImportStatement() * @model * @generated */ public interface ImportStatement extends SyntaxElement { /** - * Returns the value of the '<em><b>Imported Id</b></em>' containment - * reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Imported Id</b></em>' containment reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Imported Id</em>' containment reference * isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * - * @return the value of the '<em>Imported Id</em>' containment - * reference. + * @return the value of the '<em>Imported Id</em>' containment reference. * @see #setImportedId(Identifier) * @see org.eclipse.xpand3.Xpand3Package#getImportStatement_ImportedId() * @model containment="true" @@ -42,12 +40,9 @@ public interface ImportStatement extends SyntaxElement { Identifier getImportedId(); /** - * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}' - * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Imported Id</em>' containment - * reference. + * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Imported Id</em>' containment reference. * @see #getImportedId() * @generated */ @@ -71,11 +66,9 @@ public interface ImportStatement extends SyntaxElement { boolean isExported(); /** - * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Exported</em>' attribute. + * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Exported</em>' attribute. * @see #isExported() * @generated */ diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java index 81fa55a4..e10d206c 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AbstractAspect.java,v 1.2 2008/03/07 11:10:54 jkohnlein Exp $ + * $Id: AbstractAspect.java,v 1.3 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration; @@ -21,7 +21,6 @@ import org.eclipse.xpand3.SyntaxElement; * The following features are supported: * <ul> * <li>{@link org.eclipse.xpand3.declaration.AbstractAspect#getPointcut <em>Pointcut</em>}</li> - * <li>{@link org.eclipse.xpand3.declaration.AbstractAspect#getParams <em>Params</em>}</li> * <li>{@link org.eclipse.xpand3.declaration.AbstractAspect#isWildparams <em>Wildparams</em>}</li> * </ul> * </p> @@ -30,7 +29,7 @@ import org.eclipse.xpand3.SyntaxElement; * @model abstract="true" * @generated */ -public interface AbstractAspect extends SyntaxElement { +public interface AbstractAspect extends AbstractDeclaration { /** * Returns the value of the '<em><b>Pointcut</b></em>' containment reference. * <!-- begin-user-doc --> @@ -58,22 +57,6 @@ public interface AbstractAspect extends SyntaxElement { void setPointcut(Identifier value); /** - * Returns the value of the '<em><b>Params</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.xpand3.DeclaredParameter}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Params</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Params</em>' containment reference list. - * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractAspect_Params() - * @model containment="true" - * @generated - */ - EList<DeclaredParameter> getParams(); - - /** * Returns the value of the '<em><b>Wildparams</b></em>' attribute. * <!-- begin-user-doc --> * <p> diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java index 3adc3459..b70e44ec 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclarationPackage.java,v 1.4 2008/03/07 11:10:54 jkohnlein Exp $ + * $Id: DeclarationPackage.java,v 1.5 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration; @@ -596,7 +596,7 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT__LINE = Xpand3Package.SYNTAX_ELEMENT__LINE; + int ABSTRACT_ASPECT__LINE = ABSTRACT_DECLARATION__LINE; /** * The feature id for the '<em><b>Start</b></em>' attribute. @@ -605,7 +605,7 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT__START = Xpand3Package.SYNTAX_ELEMENT__START; + int ABSTRACT_ASPECT__START = ABSTRACT_DECLARATION__START; /** * The feature id for the '<em><b>End</b></em>' attribute. @@ -614,7 +614,7 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT__END = Xpand3Package.SYNTAX_ELEMENT__END; + int ABSTRACT_ASPECT__END = ABSTRACT_DECLARATION__END; /** * The feature id for the '<em><b>File Name</b></em>' attribute. @@ -623,16 +623,16 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT__FILE_NAME = Xpand3Package.SYNTAX_ELEMENT__FILE_NAME; + int ABSTRACT_ASPECT__FILE_NAME = ABSTRACT_DECLARATION__FILE_NAME; /** - * The feature id for the '<em><b>Pointcut</b></em>' containment reference. + * The feature id for the '<em><b>Owner</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ASPECT__POINTCUT = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 0; + int ABSTRACT_ASPECT__OWNER = ABSTRACT_DECLARATION__OWNER; /** * The feature id for the '<em><b>Params</b></em>' containment reference list. @@ -641,7 +641,34 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT__PARAMS = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 1; + int ABSTRACT_ASPECT__PARAMS = ABSTRACT_DECLARATION__PARAMS; + + /** + * The feature id for the '<em><b>Is Private</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_ASPECT__IS_PRIVATE = ABSTRACT_DECLARATION__IS_PRIVATE; + + /** + * The feature id for the '<em><b>Guard</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_ASPECT__GUARD = ABSTRACT_DECLARATION__GUARD; + + /** + * The feature id for the '<em><b>Pointcut</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_ASPECT__POINTCUT = ABSTRACT_DECLARATION_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Wildparams</b></em>' attribute. @@ -650,7 +677,7 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT__WILDPARAMS = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 2; + int ABSTRACT_ASPECT__WILDPARAMS = ABSTRACT_DECLARATION_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Abstract Aspect</em>' class. @@ -659,7 +686,7 @@ public interface DeclarationPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ASPECT_FEATURE_COUNT = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 3; + int ABSTRACT_ASPECT_FEATURE_COUNT = ABSTRACT_DECLARATION_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.ExtensionAspectImpl <em>Extension Aspect</em>}' class. @@ -708,13 +735,13 @@ public interface DeclarationPackage extends EPackage { int EXTENSION_ASPECT__FILE_NAME = ABSTRACT_ASPECT__FILE_NAME; /** - * The feature id for the '<em><b>Pointcut</b></em>' containment reference. + * The feature id for the '<em><b>Owner</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXTENSION_ASPECT__POINTCUT = ABSTRACT_ASPECT__POINTCUT; + int EXTENSION_ASPECT__OWNER = ABSTRACT_ASPECT__OWNER; /** * The feature id for the '<em><b>Params</b></em>' containment reference list. @@ -726,6 +753,33 @@ public interface DeclarationPackage extends EPackage { int EXTENSION_ASPECT__PARAMS = ABSTRACT_ASPECT__PARAMS; /** + * The feature id for the '<em><b>Is Private</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTENSION_ASPECT__IS_PRIVATE = ABSTRACT_ASPECT__IS_PRIVATE; + + /** + * The feature id for the '<em><b>Guard</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTENSION_ASPECT__GUARD = ABSTRACT_ASPECT__GUARD; + + /** + * The feature id for the '<em><b>Pointcut</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTENSION_ASPECT__POINTCUT = ABSTRACT_ASPECT__POINTCUT; + + /** * The feature id for the '<em><b>Wildparams</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -799,13 +853,13 @@ public interface DeclarationPackage extends EPackage { int DEFINITION_ASPECT__FILE_NAME = ABSTRACT_ASPECT__FILE_NAME; /** - * The feature id for the '<em><b>Pointcut</b></em>' containment reference. + * The feature id for the '<em><b>Owner</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEFINITION_ASPECT__POINTCUT = ABSTRACT_ASPECT__POINTCUT; + int DEFINITION_ASPECT__OWNER = ABSTRACT_ASPECT__OWNER; /** * The feature id for the '<em><b>Params</b></em>' containment reference list. @@ -817,6 +871,33 @@ public interface DeclarationPackage extends EPackage { int DEFINITION_ASPECT__PARAMS = ABSTRACT_ASPECT__PARAMS; /** + * The feature id for the '<em><b>Is Private</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DEFINITION_ASPECT__IS_PRIVATE = ABSTRACT_ASPECT__IS_PRIVATE; + + /** + * The feature id for the '<em><b>Guard</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DEFINITION_ASPECT__GUARD = ABSTRACT_ASPECT__GUARD; + + /** + * The feature id for the '<em><b>Pointcut</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DEFINITION_ASPECT__POINTCUT = ABSTRACT_ASPECT__POINTCUT; + + /** * The feature id for the '<em><b>Wildparams</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1385,17 +1466,6 @@ public interface DeclarationPackage extends EPackage { EReference getAbstractAspect_Pointcut(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.declaration.AbstractAspect#getParams <em>Params</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Params</em>'. - * @see org.eclipse.xpand3.declaration.AbstractAspect#getParams() - * @see #getAbstractAspect() - * @generated - */ - EReference getAbstractAspect_Params(); - - /** * Returns the meta object for the attribute '{@link org.eclipse.xpand3.declaration.AbstractAspect#isWildparams <em>Wildparams</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1721,14 +1791,6 @@ public interface DeclarationPackage extends EPackage { EReference ABSTRACT_ASPECT__POINTCUT = eINSTANCE.getAbstractAspect_Pointcut(); /** - * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ABSTRACT_ASPECT__PARAMS = eINSTANCE.getAbstractAspect_Params(); - - /** * The meta object literal for the '<em><b>Wildparams</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java index 1ab7fe5a..a4ba5e21 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AbstractAspectImpl.java,v 1.2 2008/03/07 11:10:53 jkohnlein Exp $ + * $Id: AbstractAspectImpl.java,v 1.3 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration.impl; @@ -37,14 +37,13 @@ import org.eclipse.xpand3.impl.SyntaxElementImpl; * The following features are implemented: * <ul> * <li>{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl#getPointcut <em>Pointcut</em>}</li> - * <li>{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl#getParams <em>Params</em>}</li> * <li>{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl#isWildparams <em>Wildparams</em>}</li> * </ul> * </p> * * @generated */ -public abstract class AbstractAspectImpl extends SyntaxElementImpl implements AbstractAspect { +public abstract class AbstractAspectImpl extends AbstractDeclarationImpl implements AbstractAspect { /** * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' containment reference. * <!-- begin-user-doc --> @@ -56,16 +55,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab protected Identifier pointcut; /** - * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getParams() - * @generated - * @ordered - */ - protected EList<DeclaredParameter> params; - - /** * The default value of the '{@link #isWildparams() <em>Wildparams</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -152,18 +141,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab * <!-- end-user-doc --> * @generated */ - public EList<DeclaredParameter> getParams() { - if (params == null) { - params = new EObjectContainmentEList<DeclaredParameter>(DeclaredParameter.class, this, DeclarationPackage.ABSTRACT_ASPECT__PARAMS); - } - return params; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public boolean isWildparams() { return wildparams; } @@ -190,8 +167,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab switch (featureID) { case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT: return basicSetPointcut(null, msgs); - case DeclarationPackage.ABSTRACT_ASPECT__PARAMS: - return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -206,8 +181,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab switch (featureID) { case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT: return getPointcut(); - case DeclarationPackage.ABSTRACT_ASPECT__PARAMS: - return getParams(); case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS: return isWildparams() ? Boolean.TRUE : Boolean.FALSE; } @@ -226,10 +199,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT: setPointcut((Identifier)newValue); return; - case DeclarationPackage.ABSTRACT_ASPECT__PARAMS: - getParams().clear(); - getParams().addAll((Collection<? extends DeclaredParameter>)newValue); - return; case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS: setWildparams(((Boolean)newValue).booleanValue()); return; @@ -248,9 +217,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT: setPointcut((Identifier)null); return; - case DeclarationPackage.ABSTRACT_ASPECT__PARAMS: - getParams().clear(); - return; case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS: setWildparams(WILDPARAMS_EDEFAULT); return; @@ -268,8 +234,6 @@ public abstract class AbstractAspectImpl extends SyntaxElementImpl implements Ab switch (featureID) { case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT: return pointcut != null; - case DeclarationPackage.ABSTRACT_ASPECT__PARAMS: - return params != null && !params.isEmpty(); case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS: return wildparams != WILDPARAMS_EDEFAULT; } diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java index b45b1286..78edde72 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclarationPackageImpl.java,v 1.4 2008/03/07 11:10:52 jkohnlein Exp $ + * $Id: DeclarationPackageImpl.java,v 1.5 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration.impl; @@ -342,17 +342,8 @@ public class DeclarationPackageImpl extends EPackageImpl implements DeclarationP * <!-- end-user-doc --> * @generated */ - public EReference getAbstractAspect_Params() { - return (EReference)abstractAspectEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EAttribute getAbstractAspect_Wildparams() { - return (EAttribute)abstractAspectEClass.getEStructuralFeatures().get(2); + return (EAttribute)abstractAspectEClass.getEStructuralFeatures().get(1); } /** @@ -538,7 +529,6 @@ public class DeclarationPackageImpl extends EPackageImpl implements DeclarationP abstractAspectEClass = createEClass(ABSTRACT_ASPECT); createEReference(abstractAspectEClass, ABSTRACT_ASPECT__POINTCUT); - createEReference(abstractAspectEClass, ABSTRACT_ASPECT__PARAMS); createEAttribute(abstractAspectEClass, ABSTRACT_ASPECT__WILDPARAMS); extensionAspectEClass = createEClass(EXTENSION_ASPECT); @@ -600,7 +590,7 @@ public class DeclarationPackageImpl extends EPackageImpl implements DeclarationP definitionEClass.getESuperTypes().add(this.getAbstractNamedDeclaration()); adviceEClass.getESuperTypes().add(this.getAbstractNamedDeclaration()); extensionEClass.getESuperTypes().add(this.getAbstractNamedDeclaration()); - abstractAspectEClass.getESuperTypes().add(theXpand3Package.getSyntaxElement()); + abstractAspectEClass.getESuperTypes().add(this.getAbstractDeclaration()); extensionAspectEClass.getESuperTypes().add(this.getAbstractAspect()); definitionAspectEClass.getESuperTypes().add(this.getAbstractAspect()); checkEClass.getESuperTypes().add(this.getAbstractDeclaration()); @@ -628,7 +618,6 @@ public class DeclarationPackageImpl extends EPackageImpl implements DeclarationP initEClass(abstractAspectEClass, AbstractAspect.class, "AbstractAspect", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getAbstractAspect_Pointcut(), theXpand3Package.getIdentifier(), null, "pointcut", null, 0, 1, AbstractAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getAbstractAspect_Params(), theXpand3Package.getDeclaredParameter(), null, "params", null, 0, -1, AbstractAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getAbstractAspect_Wildparams(), ecorePackage.getEBoolean(), "wildparams", null, 0, 1, AbstractAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(extensionAspectEClass, ExtensionAspect.class, "ExtensionAspect", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java index 2dfac08d..1f752e52 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclarationSwitch.java,v 1.2 2008/03/07 11:10:55 jkohnlein Exp $ + * $Id: DeclarationSwitch.java,v 1.3 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration.util; @@ -134,6 +134,7 @@ public class DeclarationSwitch<T> { case DeclarationPackage.ABSTRACT_ASPECT: { AbstractAspect abstractAspect = (AbstractAspect)theEObject; T result = caseAbstractAspect(abstractAspect); + if (result == null) result = caseAbstractDeclaration(abstractAspect); if (result == null) result = caseSyntaxElement(abstractAspect); if (result == null) result = defaultCase(theEObject); return result; @@ -142,6 +143,7 @@ public class DeclarationSwitch<T> { ExtensionAspect extensionAspect = (ExtensionAspect)theEObject; T result = caseExtensionAspect(extensionAspect); if (result == null) result = caseAbstractAspect(extensionAspect); + if (result == null) result = caseAbstractDeclaration(extensionAspect); if (result == null) result = caseSyntaxElement(extensionAspect); if (result == null) result = defaultCase(theEObject); return result; @@ -150,6 +152,7 @@ public class DeclarationSwitch<T> { DefinitionAspect definitionAspect = (DefinitionAspect)theEObject; T result = caseDefinitionAspect(definitionAspect); if (result == null) result = caseAbstractAspect(definitionAspect); + if (result == null) result = caseAbstractDeclaration(definitionAspect); if (result == null) result = caseSyntaxElement(definitionAspect); if (result == null) result = defaultCase(theEObject); return result; diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/UnaryOperationValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/UnaryOperationValidator.java new file mode 100644 index 00000000..6161dc39 --- /dev/null +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/UnaryOperationValidator.java @@ -0,0 +1,24 @@ +/** + * <copyright> + * </copyright> + * + * $Id: UnaryOperationValidator.java,v 1.3 2008/03/17 10:55:13 jkohnlein Exp $ + */ +package org.eclipse.xpand3.expression.validation; + +import org.eclipse.xpand3.Identifier; + +import org.eclipse.xpand3.expression.AbstractExpression; + +/** + * A sample validator interface for {@link org.eclipse.xpand3.expression.UnaryOperation}. + * 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 UnaryOperationValidator { + boolean validate(); + + boolean validateOperator(Identifier value); + boolean validateOperand(AbstractExpression value); +} diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java index c4ac245e..1bc7fac5 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: FileStatementValidator.java,v 1.5 2008/03/13 11:41:50 sefftinge Exp $ + * $Id: FileStatementValidator.java,v 1.6 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.statement.validation; @@ -21,4 +21,6 @@ public interface FileStatementValidator { boolean validateFileNameExpression(AbstractExpression value); boolean validateOutletNameIdentifier(Identifier value); + + boolean validateOnce(boolean value); } diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java index caefab02..d436e1c0 100644 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java +++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ForEachStatementValidator.java,v 1.5 2008/03/13 11:41:50 sefftinge Exp $ + * $Id: ForEachStatementValidator.java,v 1.6 2008/03/17 10:55:13 jkohnlein Exp $ */ package org.eclipse.xpand3.statement.validation; @@ -20,6 +20,8 @@ public interface ForEachStatementValidator { boolean validate(); boolean validateTarget(AbstractExpression value); + boolean validateSeparator(AbstractExpression value); + boolean validateSeperator(AbstractExpression value); boolean validateVariable(Identifier value); boolean validateIteratorName(Identifier value); diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/BackendAstUtil.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/BackendAstUtil.java index 875cc80b..ec4eea35 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/BackendAstUtil.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/BackendAstUtil.java @@ -20,7 +20,7 @@ import org.eclipse.xtend.backend.common.SourcePos; /** * @author Sven Efftinge - * + * */ public class BackendAstUtil { /** @@ -30,4 +30,5 @@ public class BackendAstUtil { public static SourcePos getSourcePos(SyntaxElement se) { return new SourcePos(se.getFileName(), se.getFileName(), se.getLine()); } + } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Declaration2Backend.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Declaration2Backend.java index b0d12971..12191ac1 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Declaration2Backend.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Declaration2Backend.java @@ -15,13 +15,193 @@ */ package org.eclipse.xpand3.middlend; +import static org.eclipse.xpand3.middlend.BackendAstUtil.getSourcePos; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.xpand3.DeclaredParameter; +import org.eclipse.xpand3.SyntaxElement; +import org.eclipse.xpand3.declaration.AbstractAspect; +import org.eclipse.xpand3.declaration.AbstractDeclaration; +import org.eclipse.xpand3.declaration.AbstractNamedDeclaration; +import org.eclipse.xpand3.declaration.Advice; +import org.eclipse.xpand3.declaration.Check; +import org.eclipse.xpand3.declaration.CreateExtensionStatement; +import org.eclipse.xpand3.declaration.Definition; +import org.eclipse.xpand3.declaration.DefinitionAspect; +import org.eclipse.xpand3.declaration.Extension; +import org.eclipse.xpand3.declaration.ExtensionAspect; +import org.eclipse.xpand3.declaration.JavaExtensionStatement; import org.eclipse.xpand3.declaration.util.DeclarationSwitch; +import org.eclipse.xpand3.statement.AbstractStatement; +import org.eclipse.xtend.backend.aop.AroundAdvice; +import org.eclipse.xtend.backend.common.BackendType; +import org.eclipse.xtend.backend.common.ExpressionBase; import org.eclipse.xtend.backend.common.Function; +import org.eclipse.xtend.backend.expr.SequenceExpression; +import org.eclipse.xtend.backend.functions.SourceDefinedFunction; +import org.eclipse.xtend.backend.util.Pair; /** * @author Jan Köhnlein - * + * */ -public class Declaration2Backend extends DeclarationSwitch<Function>{ +public class Declaration2Backend extends DeclarationSwitch<Object> { + + private Xpand3MiddleEnd xpand3MiddleEnd; + + public Declaration2Backend(Xpand3MiddleEnd xpand3MiddleEnd) { + this.xpand3MiddleEnd = xpand3MiddleEnd; + } + + private Expression2Backend getExpression2Backend() { + return xpand3MiddleEnd.getExpression2Backend(); + } + + private Statement2Backend getStatement2Backend() { + return xpand3MiddleEnd.getStatement2Backend(); + } + + private Function createSourceDefinedFunctionFromAbstractDeclaration( + AbstractDeclaration declaration, String name, ExpressionBase body, + boolean isCached, Pair<String, BackendType>... additionalParameters) { + EList<DeclaredParameter> declaredParams = declaration.getParams(); + int numDeclaredParams = declaredParams.size(); + List<String> paramNames = new ArrayList<String>(numDeclaredParams + + additionalParameters.length); + List<BackendType> paramBackendTypes = new ArrayList<BackendType>( + numDeclaredParams + additionalParameters.length); + for (Pair<String, BackendType> additionalParameter : additionalParameters) { + paramNames.add(additionalParameter.getFirst()); + paramBackendTypes.add(additionalParameter.getSecond()); + } + for (int i = 0; i < numDeclaredParams; ++i) { + DeclaredParameter declaredParam = declaredParams.get(i); + paramNames.add(declaredParam.getName().getValue()); + paramBackendTypes.add(xpand3MiddleEnd + .backendTypeForName(declaredParam.getType())); + } + ExpressionBase guard = getExpression2Backend().doSwitch( + declaration.getGuard()); + return new SourceDefinedFunction(name, paramNames, paramBackendTypes, + body, isCached, guard); + } + + private SequenceExpression createSequenceExpressionFromStatementBody( + Definition object) { + List<ExpressionBase> bodyExpressions = new ArrayList<ExpressionBase>( + object.getBody().size()); + for (AbstractStatement bodyStatement : object.getBody()) { + bodyExpressions.add(getStatement2Backend().doSwitch(bodyStatement)); + } + // TODO: what exactly is source position? + SequenceExpression sequenceExpression = new SequenceExpression( + bodyExpressions, getSourcePos(object)); + return sequenceExpression; + } + + /* + * Overriden switch methods + */ + + @Override + public Object caseCheck(Check check) { + ExpressionBase body = getExpression2Backend().doSwitch( + check.getConstraint()); + // TODO: how to handle errorSeverity, message and feature + return createSourceDefinedFunctionFromAbstractDeclaration(check, "", + body, false); + } + + @Override + public Object caseCreateExtensionStatement( + CreateExtensionStatement createExtension) { + ExpressionBase body = getExpression2Backend().doSwitch( + createExtension.getBody()); + // TODO: return type (currently not in frontend AST model) + return createSourceDefinedFunctionFromAbstractDeclaration( + createExtension, createExtension.getName().getValue(), body, + true); + } + + @Override + public Object caseDefinition(Definition definition) { + SequenceExpression sequenceExpression = createSequenceExpressionFromStatementBody(definition); + return createSourceDefinedFunctionFromAbstractDeclaration(definition, + definition.getName().getValue(), sequenceExpression, false); + } + + @Override + public AroundAdvice caseDefinitionAspect(DefinitionAspect object) { + throw new RuntimeException("Not implemented yet"); + // TODO + } + + @Override + public Function caseExtension(Extension extension) { + ExpressionBase body = getExpression2Backend().doSwitch( + extension.getBody()); + boolean isCached = extension.isCached(); + // TODO: return type (currently not in frontend AST model) + return createSourceDefinedFunctionFromAbstractDeclaration(extension, + extension.getName().getValue(), body, isCached); + } + + @Override + public AroundAdvice caseExtensionAspect(ExtensionAspect object) { + throw new RuntimeException("Not implemented yet"); + // TODO + // ExpressionBase body = + // getExpression2Backend().doSwitch(object.getExpression()); + // return new AroundAdvice(body); + } + + @Override + public Object caseJavaExtensionStatement(JavaExtensionStatement object) { + throw new RuntimeException("Not implemented yet"); + // TODO + } + + /* + * The following methods are either belong to abstract superclasses or + * deprecated classes + */ + + @Override + public Object caseAbstractAspect(AbstractAspect object) { + xpand3MiddleEnd.handleTransformationError( + "Method should never be called", null); + return null; + } + + @Override + public Object caseAbstractDeclaration(AbstractDeclaration object) { + xpand3MiddleEnd.handleTransformationError( + "Method should never be called", null); + return null; + } + + @Override + public Object caseAbstractNamedDeclaration(AbstractNamedDeclaration object) { + xpand3MiddleEnd.handleTransformationError( + "Method should never be called", null); + return null; + } + + @Override + public Object caseAdvice(Advice object) { + xpand3MiddleEnd.handleTransformationError( + "Method should never be called", null); + return null; + } + + @Override + public Object caseSyntaxElement(SyntaxElement object) { + xpand3MiddleEnd.handleTransformationError( + "Method should never be called", null); + return null; + } } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Expression2Backend.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Expression2Backend.java index 9e68c1d5..e8f9b934 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Expression2Backend.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Expression2Backend.java @@ -20,9 +20,6 @@ import static org.eclipse.xpand3.middlend.BackendAstUtil.getSourcePos; import java.util.ArrayList; import java.util.List; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xpand3.Identifier; import org.eclipse.xpand3.SyntaxElement; import org.eclipse.xpand3.analyzation.AnalyzeContext; import org.eclipse.xpand3.analyzation.GenericsUtil; @@ -40,11 +37,8 @@ import org.eclipse.xpand3.expression.NullLiteral; import org.eclipse.xpand3.expression.RealLiteral; import org.eclipse.xpand3.expression.StringLiteral; import org.eclipse.xpand3.expression.util.ExpressionSwitch; -import org.eclipse.xpand3.staticTypesystem.DeclaredType; import org.eclipse.xpand3.staticTypesystem.Type; import org.eclipse.xpand3.util.SyntaxConstants; -import org.eclipse.xtend.backend.common.BackendType; -import org.eclipse.xtend.backend.common.BackendTypesystem; import org.eclipse.xtend.backend.common.ExpressionBase; import org.eclipse.xtend.backend.common.SourcePos; import org.eclipse.xtend.backend.expr.CreateUncachedExpression; @@ -63,9 +57,21 @@ import org.eclipse.xtend.backend.types.builtin.CollectionType; */ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { - private BackendTypesystem backendTypes = null; private TypeSystem frontendTypes = null; private AnalyzeContext ctx = null; + private Xpand3MiddleEnd xpand3MiddleEnd; + + public Expression2Backend(Xpand3MiddleEnd xpand3MiddleEnd) { + this.xpand3MiddleEnd = xpand3MiddleEnd; + } + + private Statement2Backend getStatement2Backend() { + return xpand3MiddleEnd.getStatement2Backend(); + } + + private Declaration2Backend getDeclaration2Backend() { + return xpand3MiddleEnd.getDeclaration2Backend(); + } @Override public ExpressionBase caseBinaryOperation(BinaryOperation object) { @@ -134,15 +140,15 @@ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { public ExpressionBase caseConstructorCallExpression( ConstructorCallExpression expr) { - return new CreateUncachedExpression(backendTypeForName(expr.getType()), getSourcePos(expr)); + return new CreateUncachedExpression(xpand3MiddleEnd + .backendTypeForName(expr.getType()), getSourcePos(expr)); } /** * @param string * @param expr */ - protected void handleTransformationError(String string, - SyntaxElement expr) { + protected void handleTransformationError(String string, SyntaxElement expr) { throw new RuntimeException(string); } @@ -151,11 +157,11 @@ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { if (expr.getTarget() == null) { // 1. check for a static property if (expr.getName().getValue().lastIndexOf(SyntaxConstants.NS_DELIM) != -1) { -// stat -// final StaticProperty staticProp = typeConverter -// .getEnumLiteral(expr.getName()); -// if (staticProp != null) -// return new LiteralExpression(staticProp.get(), sourcePos); + // stat + // final StaticProperty staticProp = typeConverter + // .getEnumLiteral(expr.getName()); + // if (staticProp != null) + // return new LiteralExpression(staticProp.get(), sourcePos); throw new UnsupportedOperationException("StaticProperties"); } // 2. check for a local variable @@ -164,8 +170,9 @@ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { sourcePos); // 3. check for a type literal try { - //TODO - return new LiteralExpression(backendTypeForName(expr.getName()), sourcePos); + // TODO + return new LiteralExpression(xpand3MiddleEnd + .backendTypeForName(expr.getName()), sourcePos); } catch (IllegalArgumentException exc) { } // do nothing - this means // it is not a type literal @@ -175,8 +182,8 @@ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { final ExpressionBase thisExpr = new LocalVarEvalExpression( org.eclipse.xtend.backend.common.SyntaxConstants.THIS, sourcePos); - return createPropertyExpression(thisExpr, (Type) ctx.getThis().getValue(), expr - .getName().getValue(), sourcePos); + return createPropertyExpression(thisExpr, (Type) ctx.getThis() + .getValue(), expr.getName().getValue(), sourcePos); } throw new IllegalArgumentException("feature call " @@ -189,23 +196,27 @@ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { sourcePos); } } - + /** * @param target * @return */ private Type analyze(AbstractExpression target) { - //TODO proper analyzation - return GenericsUtil.typeRef(frontendTypes.typeForName(TypeSystem.OBJECT)); + // TODO proper analyzation + return GenericsUtil.typeRef(frontendTypes + .typeForName(TypeSystem.OBJECT)); } - private ExpressionBase createPropertyExpression(ExpressionBase target, Type type, String varName, - SourcePos sourcePos) { + private ExpressionBase createPropertyExpression(ExpressionBase target, + Type type, String varName, SourcePos sourcePos) { if (isCollectionType(type)) { - if (CollectionType.INSTANCE.getProperties().keySet().contains(varName)) - return new PropertyOnObjectExpression(target, varName, sourcePos); + if (CollectionType.INSTANCE.getProperties().keySet().contains( + varName)) + return new PropertyOnObjectExpression(target, varName, + sourcePos); else - return new PropertyOnCollectionExpression(target, varName, sourcePos); + return new PropertyOnCollectionExpression(target, varName, + sourcePos); } if (type.getDeclaredType().getName().equals(TypeSystem.OBJECT)) @@ -220,25 +231,7 @@ public class Expression2Backend extends ExpressionSwitch<ExpressionBase> { */ private boolean isCollectionType(Type type) { String name = type.getDeclaredType().getName(); - return name.equals(TypeSystem.COLLECTION) || name.equals(TypeSystem.SET) || name.equals(TypeSystem.LIST); + return name.equals(TypeSystem.COLLECTION) + || name.equals(TypeSystem.SET) || name.equals(TypeSystem.LIST); } - - /** - * @param name - * @return - */ - private BackendType backendTypeForName(Identifier name) { - DeclaredType dt = frontendTypes.typeForName(name.getValue()); - if (dt == null) { - handleTransformationError("Couldn't resolve type for name '" - + name.getValue() + "'", name); - } - BackendType backendType = backendTypes.findTypeForID(dt.getUniqueID()); - if (backendType == null) { - handleTransformationError("No backend type found for ID '" - + dt.getUniqueID() + "'", name); - } - return null; - } - } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Statement2Backend.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Statement2Backend.java new file mode 100644 index 00000000..9964c50b --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Statement2Backend.java @@ -0,0 +1,26 @@ +package org.eclipse.xpand3.middlend; + +import org.eclipse.xpand3.statement.util.StatementSwitch; +import org.eclipse.xtend.backend.common.ExpressionBase; + +/** + * + * @author Jan Köhnlein + * + */ +public class Statement2Backend extends StatementSwitch<ExpressionBase> { + + private Xpand3MiddleEnd xpand3MiddleEnd; + + public Statement2Backend(Xpand3MiddleEnd xpand3MiddleEnd) { + this.xpand3MiddleEnd = xpand3MiddleEnd; + } + + private Expression2Backend getExpression2Backend() { + return xpand3MiddleEnd.getExpression2Backend(); + } + + private Declaration2Backend getDeclaration2Backend() { + return xpand3MiddleEnd.getDeclaration2Backend(); + } +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Xpand3MiddleEnd.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Xpand3MiddleEnd.java new file mode 100644 index 00000000..db73068d --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Xpand3MiddleEnd.java @@ -0,0 +1,136 @@ +package org.eclipse.xpand3.middlend; + +import java.io.InputStream; + +import org.eclipse.xpand3.File; +import org.eclipse.xpand3.Identifier; +import org.eclipse.xpand3.ImportStatement; +import org.eclipse.xpand3.analyzation.TypeSystem; +import org.eclipse.xpand3.declaration.AbstractDeclaration; +import org.eclipse.xpand3.parser.ParseFacade; +import org.eclipse.xpand3.staticTypesystem.DeclaredType; +import org.eclipse.xpand3.util.LoaderFactory; +import org.eclipse.xpand3.util.Xpand3Util; +import org.eclipse.xtend.backend.aop.AroundAdvice; +import org.eclipse.xtend.backend.common.BackendType; +import org.eclipse.xtend.backend.common.BackendTypesystem; +import org.eclipse.xtend.backend.common.ExecutionContext; +import org.eclipse.xtend.backend.common.NamedFunction; +import org.eclipse.xtend.middleend.MiddleEnd; +import org.eclipse.xtend.middleend.plugins.ImportedResource; +import org.eclipse.xtend.middleend.plugins.LanguageSpecificMiddleEnd; +import org.eclipse.xtend.middleend.plugins.ParsedResource; + +/** + * + * @author Jan Köhnlein + * + */ +public class Xpand3MiddleEnd implements LanguageSpecificMiddleEnd { + + private ExecutionContext executionContext; + private TypeSystem frontendTypeSystem = null; + private MiddleEnd middleEnd; + private BackendTypesystem backendTypeSystem; + private Expression2Backend expression2Backend; + private Declaration2Backend declaration2Backend; + private Statement2Backend statement2Backend; + + public Xpand3MiddleEnd() { + } + + public boolean canHandle(String resourceName) { + // TODO Auto-generated method stub + return false; + } + + public String getName() { + // TODO Auto-generated method stub + return null; + } + + public ParsedResource parseResource(String xpandResourceName) { + try { + String normalizedXpandResourceName = Xpand3Util + .normalizeXpandResourceName(xpandResourceName); + InputStream resourceAsStream = LoaderFactory.getClassLoader( + executionContext).getResourceAsStream( + normalizedXpandResourceName); + File xpandFile = ParseFacade.parseFile(normalizedXpandResourceName, + resourceAsStream); + ParsedResource parsedResource = new ParsedResource(); + for (AbstractDeclaration declaration : xpandFile.getDeclarations()) { + Object beDeclaration = declaration2Backend + .doSwitch(declaration); + if (beDeclaration instanceof NamedFunction) { + if (declaration.isIsPrivate()) { + parsedResource.getPrivateFunctions().add( + (NamedFunction) beDeclaration); + } else { + parsedResource.getPublicFunctions().add( + (NamedFunction) beDeclaration); + } + } else if (beDeclaration instanceof AroundAdvice) { + parsedResource.getAdvice() + .add((AroundAdvice) beDeclaration); + } + } + for (ImportStatement importStmt : xpandFile.getImports()) { + ImportedResource beImportedResource = new ImportedResource( + importStmt.getImportedId().getValue(), importStmt + .isExported()); + parsedResource.getImports().add(beImportedResource); + } + return parsedResource; + } catch (Exception exc) { + handleParseError(exc); + return null; + } + } + + private void handleParseError(Exception exc) { + throw new RuntimeException(exc); + } + + public void setMiddleEnd(MiddleEnd middleEnd) { + this.middleEnd = middleEnd; + executionContext = middleEnd.getExecutionContext(); + backendTypeSystem = middleEnd.getTypesystem(); + expression2Backend = new Expression2Backend(this); + declaration2Backend = new Declaration2Backend(this); + statement2Backend = new Statement2Backend(this); + } + + public BackendType backendTypeForName(Identifier name) { + DeclaredType dt = frontendTypeSystem.typeForName(name.getValue()); + if (dt == null) { + handleTransformationError("Couldn't resolve type for name '" + + name.getValue() + "'", name); + } + BackendType backendType = null; + // TODO perform mapping + // backendTypeSystem.findTypeForID(dt.getUniqueID()); + if (backendType == null) { + handleTransformationError("No backend type found for ID '" + + dt.getUniqueID() + "'", name); + } + return null; + } + + public void handleTransformationError(String message, Identifier name) { + throw new RuntimeException(message); + } + + public Expression2Backend getExpression2Backend() { + return expression2Backend; + } + + public Declaration2Backend getDeclaration2Backend() { + return declaration2Backend; + } + + public Statement2Backend getStatement2Backend() { + return statement2Backend; + } + +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Xpand3MiddleEndFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Xpand3MiddleEndFactory.java new file mode 100644 index 00000000..4a5615bb --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/middlend/Xpand3MiddleEndFactory.java @@ -0,0 +1,22 @@ +package org.eclipse.xpand3.middlend; + +import org.eclipse.xtend.middleend.plugins.LanguageSpecificMiddleEnd; +import org.eclipse.xtend.middleend.plugins.LanguageSpecificMiddleEndFactory; + +public class Xpand3MiddleEndFactory implements LanguageSpecificMiddleEndFactory { + + private static final String XPAND3_MIDDLE_END = "Xpand3MiddleEnd"; + + public LanguageSpecificMiddleEnd create(Object specificData) { + return new Xpand3MiddleEnd(); + } + + public String getName() { + return XPAND3_MIDDLE_END; + } + + public int getPriority() { + return 0; + } + +} diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/ParseFacade.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/ParseFacade.java new file mode 100644 index 00000000..3416115f --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/ParseFacade.java @@ -0,0 +1,33 @@ +package org.eclipse.xpand3.parser; + +import java.io.IOException; +import java.io.InputStream; + +import org.antlr.runtime.ANTLRInputStream; +import org.antlr.runtime.ANTLRStringStream; +import org.antlr.runtime.CommonTokenStream; +import org.antlr.runtime.RecognitionException; +import org.eclipse.tmf.common.node.Node; +import org.eclipse.xpand3.File; +import org.eclipse.xpand3.parser.node2ast.Node2AstTransformer; +import org.eclipse.xpand3.parser.node2ast.TransformationException; + +public class ParseFacade { + + public static File parseFile(String fileName, InputStream is) + throws IOException, RecognitionException, TransformationException { + ANTLRStringStream stream = new ANTLRInputStream(is); + Xpand3NodeLexer lexer = new Xpand3NodeLexer(stream); + CommonTokenStream tokenStream = new CommonTokenStream(lexer); + Xpand3NodeParser xpand3NodeParser = new Xpand3NodeParser(tokenStream); + Node rootNode = xpand3NodeParser.r_file(); + if (rootNode == null) { + return null; + } + Node2AstTransformer node2AstTransformer = new Node2AstTransformer(); + node2AstTransformer.doSwitch(rootNode); + File file = (File) rootNode; + file.setFileName(fileName); + return file; + } +} diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java index 08516e1c..6a92be1b 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java @@ -433,6 +433,9 @@ public class Node2AstTransformer extends Extension extension; if (node.getCreate() != null) { extension = declarationFactory.createCreateExtensionStatement(); + createAndAddImplicitlyDeclaredThisParameter(node.getReturnType(), + extension.getParams()); + // TODO alternative identifier } else { extension = declarationFactory.createExtension(); } diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java index 2444eeee..2444eeee 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java index 6314deb8..6314deb8 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Xpand3Util.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Xpand3Util.java new file mode 100644 index 00000000..3b599061 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Xpand3Util.java @@ -0,0 +1,19 @@ +package org.eclipse.xpand3.util; + +public class Xpand3Util { + + public static final String TEMPLATE_EXTENSION = null; + + public static String normalizeXpandResourceName(String xpandName) { + if (xpandName == null) + return null; + + if (!xpandName.endsWith("." + TEMPLATE_EXTENSION)) + xpandName += "." + TEMPLATE_EXTENSION; + + xpandName = xpandName.replace(SyntaxConstants.NS_DELIM, "/"); + + return xpandName; + } + +} diff --git a/plugins/org.eclipse.xpand3/src/xpand3.ecore b/plugins/org.eclipse.xpand3/src/xpand3.ecore index 18c820d1..4c9b4578 100644 --- a/plugins/org.eclipse.xpand3/src/xpand3.ecore +++ b/plugins/org.eclipse.xpand3/src/xpand3.ecore @@ -229,11 +229,9 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="body" lowerBound="1" eType="#//expression/AbstractExpression" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AbstractAspect" abstract="true" eSuperTypes="#//SyntaxElement"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractAspect" abstract="true" eSuperTypes="#//declaration/AbstractDeclaration"> <eStructuralFeatures xsi:type="ecore:EReference" name="pointcut" eType="#//Identifier" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1" - eType="#//DeclaredParameter" containment="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="wildparams" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ExtensionAspect" eSuperTypes="#//declaration/AbstractAspect"> diff --git a/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF index d52e44df..634d2e58 100644 --- a/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF @@ -7,4 +7,5 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.xpand3.parser;bundle-version="1.0.0", org.junit;bundle-version="3.8.2", org.eclipse.tmf.common.runtime;bundle-version="1.0.0", - org.eclipse.tmf.common.treetest;bundle-version="1.0.0" + org.eclipse.tmf.common.treetest;bundle-version="1.0.0", + org.eclipse.xpand3 diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java index 53f3a0e0..fe24606e 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java @@ -29,9 +29,13 @@ public class StatementNodeParserTest extends AbstractXpand3NodeParserTest { CommonTokenStream tokenStream = new CommonTokenStream(lexer); Xpand3NodeParser xpand3NodeParser = new Xpand3NodeParser(tokenStream); - Node rootNode = xpand3NodeParser.r_file(); - if (rootNode == null) { + CompositeNode rootNode = xpand3NodeParser.r_file(); + if (rootNode.getChildren().size() == 1) { + rootNode = (CompositeNode) rootNode.getChildren().get(0); + } + if (rootNode.getChildren().size() == 0) { System.out.println("Nothing parsed."); + return null; } else { System.out.println(rootNode.toDebugString()); } 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 bdb8cfd8..2c3628c1 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 @@ -41,6 +41,11 @@ public class TreetestInterpreterTest extends AbstractEcoreTreeTestInterpreter { test("org/eclipse/xpand3/parser/node2ast/expression.ttst"); } + public void testDeclaration() throws Throwable { + parseExpression = false; + test("org/eclipse/xpand3/parser/node2ast/declaration.ttst"); + } + protected EObject parseAndTransform(String testExpressionBody) throws RecognitionException, UnsupportedEncodingException { System.out.println("Expression:" + testExpressionBody); diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/declaration.ttst b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/declaration.ttst new file mode 100644 index 00000000..0ae4895a --- /dev/null +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/declaration.ttst @@ -0,0 +1,86 @@ +testCase DeclarationTests +test firstTest +expr <# +foo(Object this, Object that): + this.toString()==that.toString(); #> +expected +File { + declarations=[ + Extension(cached="false", isPrivate="false") { + name=Identifier(value='foo') + params=[ + DeclaredParameter { + name=Identifier(value='this') + type=Identifier(value='Object') + }, + DeclaredParameter { + name=Identifier(value='that') + type=Identifier(value='Object') + }] + body=BinaryOperation{ + left=OperationCall { + name=Identifier(value="toString") + target=FeatureCall { + name=Identifier(value="this") + target=null + } + } + operator=Identifier(value="==") + right=OperationCall { + name=Identifier(value="toString") + target=FeatureCall { + name=Identifier(value="that") + target=null + } + } + } + } + ] +} + + +test testCheck +expr <# + context EObject if name=="jan" ERROR "XXX" + name: + x!=17; +#> +expected +File { + Check(errorSeverity="true") { + guard=BinaryOperation + msg=BinaryOperation + constraint=BinaryOperation + guard=BinaryOperation + params=[ + DeclaredParameter { + name=Identifier(value="this") + type=Identifier(value="EObject") + } + ] + } +} + +test testCreateExtension +expr <# + private create EObject doCreate(String name) : + this==1; +#> +expected +File { + CreateExtensionStatement(cached="false", isPrivate="true") { + name=Identifier(value="doCreate") + body=BinaryOperation + params=[ + DeclaredParameter { + name=Identifier(value="this") + type=Identifier(value="EObject") + }, + DeclaredParameter { + name=Identifier(value="name") + type=Identifier(value="String") + } + ] + } +} + + 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 b9d1bdc9..8b83e6b6 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 @@ -1,51 +1,17 @@ -testCase AstTests -test firstTest -expr <# -foo(Object this, Object that): - this.toString()==that.toString(); #> -expected - Extension { - name=Identifier(value='foo') - params=[ - DeclaredParameter { - name=Identifier(value='this') - type=Identifier(value='Object') - }, - DeclaredParameter { - name=Identifier(value='that') - type=Identifier(value='Object') - }] - body=BinaryOperation{ - left=OperationCall { - name=Identifier(value="toString") - target=FeatureCall { - name=Identifier(value="this") - target=null - } - } - operator=Identifier(value="==") - right=OperationCall { - name=Identifier(value="toString") - target=FeatureCall { - name=Identifier(value="that") - target=null - } - } - } - } - - +testCase StatementTests test testEmptyTemplate expr <# #> expected - null +File { +} test testSimpleDefine expr <# «DEFINE test FOR ecore::EClass»«ENDDEFINE» #> expected +File { Definition { name=Identifier(value="test") params=[ @@ -55,6 +21,7 @@ expected } ] } +} test testDoubleDefine expr <# @@ -94,6 +61,7 @@ expr <# «DEFINE test(ecore::EPackage a,String b) FOR ecore::EClass»«FILE name+".txt"»Text und so «name»«FOREACH eAllAttributes AS attr»Attribute : «attr.name»«ENDFOREACH»«ENDFILE»«ENDDEFINE» #> expected +File { Definition { name=Identifier(value="test") params=[ @@ -154,6 +122,7 @@ expected TextStatement(deleteLine="false", value="»«") ] } +} test testImportDeclaration @@ -177,6 +146,7 @@ expr <# «DEFINE test FOR ecore::EClass»«FILE "test.txt" ONCE»«ENDFILE»«ENDDEFINE» #> expected +File { Definition { body=[ TextStatement(value="»«"), @@ -187,12 +157,14 @@ expected } ] } +} test testIfStatement expr <# «DEFINE test FOR ecore::EClass»«IF !true»«ELSEIF false»«ELSE»«ENDIF»«ENDDEFINE» #> expected +File { Definition { name=Identifier(value="test") body=[ @@ -223,11 +195,13 @@ expected TextStatement ] } - - +} + + test testAroundStatement expr <# «AROUND test::* FOR ecore::EClass»«ERROR name + "x"»«ENDAROUND» #> expected + File { DefinitionAspect { pointcut=Identifier(value="test::*") params=[ @@ -247,6 +221,8 @@ expected TextStatement(value="»«") ] } +} + test testExpand expr <# @@ -255,6 +231,7 @@ expr <# «ENDDEFINE» #> expected +File { Definition { body=[ TextStatement, @@ -291,23 +268,4 @@ expected TextStatement ] } - - -test textCheck -expr <# - context EObject if name=="jan" ERROR "XXX" + name: - x!=17; -#> -expected - Check(errorSeverity="true") { - guard=BinaryOperation - msg=BinaryOperation - constraint=BinaryOperation - guard=BinaryOperation - params=[ - DeclaredParameter { - name=Identifier(value="this") - type=Identifier(value="EObject") - } - ] - }
\ No newline at end of file +} |