summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkohnlein2008-03-07 04:39:38 (EST)
committerjkohnlein2008-03-07 04:39:38 (EST)
commit354e78f465d4e99ab519bda799c813e4c60c9a9b (patch)
tree98ad2bc7e2f256d98b93991bf3f3a5d4c8ee25dd
parent7a3773aedfcb0c9de19432b3af64c2e74406ffa9 (diff)
downloadorg.eclipse.xpand-354e78f465d4e99ab519bda799c813e4c60c9a9b.zip
org.eclipse.xpand-354e78f465d4e99ab519bda799c813e4c60c9a9b.tar.gz
org.eclipse.xpand-354e78f465d4e99ab519bda799c813e4c60c9a9b.tar.bz2
Regenerated with oAW 4.2.1
fixed ref to node model
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java22
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java6
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java3
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java17
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java6
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java4
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java48
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java11
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java209
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java45
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java6
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java45
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java205
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java44
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java38
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java12
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NsImportNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java6
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java119
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java6
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java13
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java108
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java20
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java25
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java7
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java17
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java10
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java10
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java5
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore192
-rw-r--r--plugins/org.eclipse.xpand3.parser/model/Xpand3Node.genmodel2
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node.g327
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java190
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java4590
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3Node__.g42
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/debugMeWithAntLR.g339
-rw-r--r--plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java14
-rw-r--r--plugins/org.eclipse.xpand3.parser/text/description.txt24
180 files changed, 3413 insertions, 3698 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java
index 9f43171..2afab0a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AdditiveExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: AdditiveExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java
index 845972c..80313a4 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: AndExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java
index e352b72..ea4ae66 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AroundNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: AroundNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java
index 5b24aa9..a08c417 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: BooleanLiteralNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: BooleanLiteralNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java
deleted file mode 100644
index 2798135..0000000
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanOperatorNode.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BooleanOperatorNode.java,v 1.1 2008/03/06 15:25:17 jkohnlein Exp $
- */
-package org.eclipse.xpand3.internal.parser.xpand3node;
-
-import org.eclipse.tmf.common.node.CompositeNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Operator Node</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getBooleanOperatorNode()
- * @model
- * @generated
- */
-public interface BooleanOperatorNode extends CompositeNode {
-} // BooleanOperatorNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java
index 72726f5..8f71ef8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CasePartNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: CasePartNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java
index 27ad23b..16b4fe9 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: CastedExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java
index 342ee95..7acb6f9 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ChainExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java
index 31c17d1..57f831d 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: CheckNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java
index 80876f8..1869604 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.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: CollectionExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java
index 59584e3..6e36a0a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CollectionTypeNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: CollectionTypeNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java
index ff487f6..8ebe02d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ConstructorCallNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ConstructorCallNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
index 0fa4308..697c783 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
@@ -2,11 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterListNode.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: DeclaredParameterListNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -26,7 +27,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface DeclaredParameterListNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Params</b></em>' reference list.
* The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
@@ -42,4 +42,5 @@ public interface DeclaredParameterListNode extends CompositeNode {
* @generated
*/
EList<CompositeNode> getParams();
+
} // DeclaredParameterListNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
index cf896c8..059b5f0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
+ * $Id: DeclaredParameterNode.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -16,8 +16,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}</li>
* </ul>
* </p>
*
@@ -26,7 +26,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface DeclaredParameterNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Name</b></em>' reference.
* <!-- begin-user-doc -->
@@ -78,4 +77,5 @@ public interface DeclaredParameterNode extends CompositeNode {
* @generated
*/
void setPtype(CompositeNode value);
+
} // DeclaredParameterNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java
index cabd70e..4792c07 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: DefinitionAroundNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java
index 27d30f7..f38dd73 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.2 2008/03/06 15:25:15 jkohnlein Exp $
+ * $Id: DefinitionNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -25,7 +25,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface DefinitionNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Name</b></em>' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java
index 3a30c69..c3b6e40 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ElseIfStatementNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java
index 9366476..78f05e0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ElseStatementNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: ElseStatementNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java
index be8d5df..d494757 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ErrorStatementNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ErrorStatementNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java
index d30d370..2443387 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ExpandStatementNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java
index 8531673..cb766e3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java
index 193c863..076f8d3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpressionStmtNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ExpressionStmtNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java
index 422c2a6..08f5bb6 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,11 +2,10 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionNode.java,v 1.2 2008/03/06 15:25:16 jkohnlein Exp $
+ * $Id: ExtensionNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
-import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.LeafNode;
@@ -18,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#getCreate <em>Create</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>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#getJavaReturnType <em>Java Return Type</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</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#getExtendBody <em>Extend Body</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#getParamList <em>Param List</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}</li>
* </ul>
* </p>
*
@@ -35,7 +34,6 @@ import org.eclipse.tmf.common.node.LeafNode;
* @generated
*/
public interface ExtensionNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Create</b></em>' reference.
* <!-- begin-user-doc -->
@@ -269,4 +267,5 @@ public interface ExtensionNode extends CompositeNode {
* @generated
*/
void setName(CompositeNode value);
+
} // ExtensionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java
index 7987512..65fbec7 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.2 2008/03/06 15:25:14 jkohnlein Exp $
+ * $Id: FeatureCallNode.java,v 1.3 2008/03/07 09:39:41 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.FeatureCallNode#getName <em>Name</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>
*
@@ -26,7 +26,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface FeatureCallNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Name</b></em>' reference.
* <!-- begin-user-doc -->
@@ -78,4 +77,5 @@ public interface FeatureCallNode extends CompositeNode {
* @generated
*/
void setParamList(CompositeNode value);
+
} // FeatureCallNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java
index f5cc1f9..4a38d4e 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: FileNode.java,v 1.2 2008/03/07 09:39:41 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#getDecl <em>Decl</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getImp <em>Imp</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getDecl <em>Decl</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java
index 3f5a9c9..49f3695 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FileStatementNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: FileStatementNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java
index 4c366e4..f7449dd 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ForeachStatementNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java
index 0d78315..7b5d4d7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GlobalVarExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: GlobalVarExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java
index 8735d69..6f1e00a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IdentifierNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: IdentifierNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java
index 9b7fe1e..b47a96c 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.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: IfExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java
index 2de4bd3..85f8079 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: IfStatementNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java
index 3219b3c..c1f8bef 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ImpliesExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java
index 33c904c..a4ffee1 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,11 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: InfixExpressionNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
+ * $Id: InfixExpressionNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -27,7 +28,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface InfixExpressionNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Calls</b></em>' reference list.
* The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
@@ -69,4 +69,5 @@ public interface InfixExpressionNode extends CompositeNode {
* @generated
*/
void setTarget(CompositeNode value);
+
} // InfixExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java
index 026b207..9f2e6a2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: JavaTypeNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: JavaTypeNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java
index 1a3d9dc..6ab46bc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: LetExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: LetExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java
index 6829029..0137695 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: LetStatementNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java
index b160b2d..9a34e91 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ListLiteralNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ListLiteralNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java
index 77674e2..8ae2364 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: MultiplicativeExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java
index 3840a8c..25fb4b4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NsImportNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NsImportNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: NsImportNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java
index a6d46dd..2a36439 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NullLiteralNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: NullLiteralNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java
index 63dfad7..88450a5 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NumberLiteralNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: NumberLiteralNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java
index e862821..7403c36 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: OrExpressionNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: OrExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
index 2f079a8..e6de76a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
@@ -2,11 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterListNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
+ * $Id: ParameterListNode.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -26,7 +27,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface ParameterListNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Params</b></em>' reference list.
* The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
@@ -42,4 +42,5 @@ public interface ParameterListNode extends CompositeNode {
* @generated
*/
EList<CompositeNode> getParams();
+
} // ParameterListNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java
index 169445d..3121391 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ParanthesizedExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ParanthesizedExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java
index 170bd33..db2f863 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PointcutNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: PointcutNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java
index e3f23f4..370b43c 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: ProtectStatementNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
index eccc557..ce69294 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: RelationalExpressionNode.java,v 1.2 2008/03/06 15:25:16 jkohnlein Exp $
+ * $Id: RelationalExpressionNode.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -17,9 +17,9 @@ import org.eclipse.tmf.common.node.LeafNode;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}</li>
* </ul>
* </p>
*
@@ -28,58 +28,57 @@ import org.eclipse.tmf.common.node.LeafNode;
* @generated
*/
public interface RelationalExpressionNode extends CompositeNode {
-
/**
- * Returns the value of the '<em><b>Right Operand</b></em>' reference.
+ * Returns the value of the '<em><b>Operator</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Right Operand</em>' reference isn't clear,
+ * If the meaning of the '<em>Operator</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Right Operand</em>' reference.
- * @see #setRightOperand(CompositeNode)
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_RightOperand()
+ * @return the value of the '<em>Operator</em>' reference.
+ * @see #setOperator(LeafNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Operator()
* @model
* @generated
*/
- CompositeNode getRightOperand();
+ LeafNode getOperator();
/**
- * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Right Operand</em>' reference.
- * @see #getRightOperand()
+ * @param value the new value of the '<em>Operator</em>' reference.
+ * @see #getOperator()
* @generated
*/
- void setRightOperand(CompositeNode value);
+ void setOperator(LeafNode value);
/**
- * Returns the value of the '<em><b>Operator</b></em>' reference.
+ * Returns the value of the '<em><b>Right Operand</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Operator</em>' reference isn't clear,
+ * If the meaning of the '<em>Right Operand</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Operator</em>' reference.
- * @see #setOperator(CompositeNode)
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Operator()
+ * @return the value of the '<em>Right Operand</em>' reference.
+ * @see #setRightOperand(CompositeNode)
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_RightOperand()
* @model
* @generated
*/
- CompositeNode getOperator();
+ CompositeNode getRightOperand();
/**
- * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Operator</em>' reference.
- * @see #getOperator()
+ * @param value the new value of the '<em>Right Operand</em>' reference.
+ * @see #getRightOperand()
* @generated
*/
- void setOperator(CompositeNode value);
+ void setRightOperand(CompositeNode value);
/**
* Returns the value of the '<em><b>Left Operand</b></em>' reference.
@@ -106,4 +105,5 @@ public interface RelationalExpressionNode extends CompositeNode {
* @generated
*/
void setLeftOperand(CompositeNode value);
+
} // RelationalExpressionNode
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 bd55f94..96cb89f 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: SequenceNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
index 25e56fb..882a8a3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
@@ -2,11 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: SimpleTypeNode.java,v 1.2 2008/03/06 15:25:15 jkohnlein Exp $
+ * $Id: SimpleTypeNode.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.tmf.common.node.CompositeNode;
/**
@@ -26,7 +27,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
* @generated
*/
public interface SimpleTypeNode extends CompositeNode {
-
/**
* Returns the value of the '<em><b>Names</b></em>' reference list.
* The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
@@ -42,4 +42,5 @@ public interface SimpleTypeNode extends CompositeNode {
* @generated
*/
EList<CompositeNode> getNames();
+
} // SimpleTypeNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java
index ca0608b..7a22799 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StringLiteralNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: StringLiteralNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java
index 176d8c7..e6026a2 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.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: SwitchExpressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java
index 20220d7..853f149 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Test_expressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: Test_expressionNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java
index ae9b159..90bac8a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TextNode.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: TextNode.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java
index 328f022..5823008 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TextSequenceNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: TextSequenceNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java
index 9c7a254..a6f09d4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: UnaryExpressionNode.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: UnaryExpressionNode.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
index 275f9b7..3829747 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeFactory.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: Xpand3nodeFactory.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -332,15 +332,6 @@ public interface Xpand3nodeFactory extends EFactory {
RelationalExpressionNode createRelationalExpressionNode();
/**
- * Returns a new object of class '<em>Boolean Operator Node</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Boolean Operator Node</em>'.
- * @generated
- */
- BooleanOperatorNode createBooleanOperatorNode();
-
- /**
* Returns a new object of class '<em>Additive Expression Node</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java
index b9a2f86..8674d91 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.2 2008/03/06 15:25:15 jkohnlein Exp $
+ * $Id: Xpand3nodePackage.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node;
@@ -107,22 +107,22 @@ public interface Xpand3nodePackage extends EPackage {
int FILE_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
- * The feature id for the '<em><b>Decl</b></em>' reference list.
+ * The feature id for the '<em><b>Imp</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int FILE_NODE__DECL = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int FILE_NODE__IMP = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Imp</b></em>' reference list.
+ * The feature id for the '<em><b>Decl</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int FILE_NODE__IMP = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+ int FILE_NODE__DECL = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>File Node</em>' class.
@@ -1243,85 +1243,85 @@ public interface Xpand3nodePackage extends EPackage {
int EXTENSION_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
- * The feature id for the '<em><b>Create</b></em>' reference.
+ * The feature id for the '<em><b>Return Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EXTENSION_NODE__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int EXTENSION_NODE__RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Private</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__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+ int EXTENSION_NODE__CACHED = 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>Java Name</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+ int EXTENSION_NODE__JAVA_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Extend Body</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__EXTEND_BODY = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+ int EXTENSION_NODE__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Cached</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__CACHED = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
+ int EXTENSION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Java Return Type</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__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
+ int EXTENSION_NODE__EXTEND_BODY = 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>Create</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__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6;
/**
- * 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 + 7;
+ int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 7;
/**
- * The feature id for the '<em><b>Name</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__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8;
+ int EXTENSION_NODE__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8;
/**
* The number of structural features of the '<em>Extension Node</em>' class.
@@ -2039,13 +2039,13 @@ public interface Xpand3nodePackage extends EPackage {
int RELATIONAL_EXPRESSION_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
- * The feature id for the '<em><b>Left Operand</b></em>' reference.
+ * The feature id for the '<em><b>Right Operand</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Operator</b></em>' reference.
@@ -2057,13 +2057,13 @@ public interface Xpand3nodePackage extends EPackage {
int RELATIONAL_EXPRESSION_NODE__OPERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Right Operand</b></em>' reference.
+ * The feature id for the '<em><b>Left Operand</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+ int RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
/**
* The number of structural features of the '<em>Relational Expression Node</em>' class.
@@ -2075,61 +2075,6 @@ public interface Xpand3nodePackage extends EPackage {
int RELATIONAL_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl <em>Boolean Operator Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl
- * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanOperatorNode()
- * @generated
- */
- int BOOLEAN_OPERATOR_NODE = 34;
-
- /**
- * The feature id for the '<em><b>Alias</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_OPERATOR_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_OPERATOR_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
-
- /**
- * The feature id for the '<em><b>Rule</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_OPERATOR_NODE__RULE = NodePackage.COMPOSITE_NODE__RULE;
-
- /**
- * The feature id for the '<em><b>Rule ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_OPERATOR_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
-
- /**
- * The number of structural features of the '<em>Boolean Operator Node</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_OPERATOR_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
-
- /**
* The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2137,7 +2082,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode()
* @generated
*/
- int ADDITIVE_EXPRESSION_NODE = 35;
+ int ADDITIVE_EXPRESSION_NODE = 34;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2192,7 +2137,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode()
* @generated
*/
- int MULTIPLICATIVE_EXPRESSION_NODE = 36;
+ int MULTIPLICATIVE_EXPRESSION_NODE = 35;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2247,7 +2192,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode()
* @generated
*/
- int UNARY_EXPRESSION_NODE = 37;
+ int UNARY_EXPRESSION_NODE = 36;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2302,7 +2247,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode()
* @generated
*/
- int INFIX_EXPRESSION_NODE = 38;
+ int INFIX_EXPRESSION_NODE = 37;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2375,7 +2320,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode()
* @generated
*/
- int STRING_LITERAL_NODE = 39;
+ int STRING_LITERAL_NODE = 38;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2430,7 +2375,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode()
* @generated
*/
- int PARANTHESIZED_EXPRESSION_NODE = 40;
+ int PARANTHESIZED_EXPRESSION_NODE = 39;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2485,7 +2430,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode()
* @generated
*/
- int GLOBAL_VAR_EXPRESSION_NODE = 41;
+ int GLOBAL_VAR_EXPRESSION_NODE = 40;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2540,7 +2485,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode()
* @generated
*/
- int FEATURE_CALL_NODE = 42;
+ int FEATURE_CALL_NODE = 41;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2579,22 +2524,22 @@ public interface Xpand3nodePackage extends EPackage {
int FEATURE_CALL_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
- * The feature id for the '<em><b>Name</b></em>' reference.
+ * The feature id for the '<em><b>Param List</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int FEATURE_CALL_NODE__PARAM_LIST = 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 FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+ int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Feature Call Node</em>' class.
@@ -2613,7 +2558,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode()
* @generated
*/
- int LIST_LITERAL_NODE = 43;
+ int LIST_LITERAL_NODE = 42;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2668,7 +2613,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode()
* @generated
*/
- int CONSTRUCTOR_CALL_NODE = 44;
+ int CONSTRUCTOR_CALL_NODE = 43;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2723,7 +2668,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode()
* @generated
*/
- int BOOLEAN_LITERAL_NODE = 45;
+ int BOOLEAN_LITERAL_NODE = 44;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2778,7 +2723,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode()
* @generated
*/
- int NULL_LITERAL_NODE = 46;
+ int NULL_LITERAL_NODE = 45;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2833,7 +2778,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode()
* @generated
*/
- int NUMBER_LITERAL_NODE = 47;
+ int NUMBER_LITERAL_NODE = 46;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2888,7 +2833,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode()
* @generated
*/
- int COLLECTION_EXPRESSION_NODE = 48;
+ int COLLECTION_EXPRESSION_NODE = 47;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2943,7 +2888,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode()
* @generated
*/
- int DECLARED_PARAMETER_LIST_NODE = 49;
+ int DECLARED_PARAMETER_LIST_NODE = 48;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3007,7 +2952,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode()
* @generated
*/
- int DECLARED_PARAMETER_NODE = 50;
+ int DECLARED_PARAMETER_NODE = 49;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3046,22 +2991,22 @@ public interface Xpand3nodePackage extends EPackage {
int DECLARED_PARAMETER_NODE__RULE_ID = NodePackage.COMPOSITE_NODE__RULE_ID;
/**
- * The feature id for the '<em><b>Name</b></em>' reference.
+ * The feature id for the '<em><b>Ptype</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+ int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Ptype</b></em>' reference.
+ * The feature id for the '<em><b>Name</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+ int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Declared Parameter Node</em>' class.
@@ -3080,7 +3025,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode()
* @generated
*/
- int PARAMETER_LIST_NODE = 51;
+ int PARAMETER_LIST_NODE = 50;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3144,7 +3089,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode()
* @generated
*/
- int COLLECTION_TYPE_NODE = 52;
+ int COLLECTION_TYPE_NODE = 51;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3199,7 +3144,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode()
* @generated
*/
- int SIMPLE_TYPE_NODE = 53;
+ int SIMPLE_TYPE_NODE = 52;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3263,7 +3208,7 @@ public interface Xpand3nodePackage extends EPackage {
* @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode()
* @generated
*/
- int IDENTIFIER_NODE = 54;
+ int IDENTIFIER_NODE = 53;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -3795,36 +3740,26 @@ public interface Xpand3nodePackage extends EPackage {
EClass getRelationalExpressionNode();
/**
- * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Right Operand</em>'.
- * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand()
+ * @return the meta object for the reference '<em>Operator</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator()
* @see #getRelationalExpressionNode()
* @generated
*/
- EReference getRelationalExpressionNode_RightOperand();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode <em>Boolean Operator Node</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Boolean Operator Node</em>'.
- * @see org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode
- * @generated
- */
- EClass getBooleanOperatorNode();
+ EReference getRelationalExpressionNode_Operator();
/**
- * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator <em>Operator</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand <em>Right Operand</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Operator</em>'.
- * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getOperator()
+ * @return the meta object for the reference '<em>Right Operand</em>'.
+ * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getRightOperand()
* @see #getRelationalExpressionNode()
* @generated
*/
- EReference getRelationalExpressionNode_Operator();
+ EReference getRelationalExpressionNode_RightOperand();
/**
* Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getLeftOperand <em>Left Operand</em>}'.
@@ -4603,30 +4538,20 @@ public interface Xpand3nodePackage extends EPackage {
EClass RELATIONAL_EXPRESSION_NODE = eINSTANCE.getRelationalExpressionNode();
/**
- * The meta object literal for the '<em><b>Right Operand</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = eINSTANCE.getRelationalExpressionNode_RightOperand();
-
- /**
- * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl <em>Boolean Operator Node</em>}' class.
+ * The meta object literal for the '<em><b>Operator</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanOperatorNodeImpl
- * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanOperatorNode()
* @generated
*/
- EClass BOOLEAN_OPERATOR_NODE = eINSTANCE.getBooleanOperatorNode();
+ EReference RELATIONAL_EXPRESSION_NODE__OPERATOR = eINSTANCE.getRelationalExpressionNode_Operator();
/**
- * The meta object literal for the '<em><b>Operator</b></em>' reference feature.
+ * The meta object literal for the '<em><b>Right Operand</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference RELATIONAL_EXPRESSION_NODE__OPERATOR = eINSTANCE.getRelationalExpressionNode_Operator();
+ EReference RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND = eINSTANCE.getRelationalExpressionNode_RightOperand();
/**
* The meta object literal for the '<em><b>Left Operand</b></em>' reference feature.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java
index 94c5e49..483697f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AdditiveExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: AdditiveExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java
index 78af3fd..b1729af 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: AndExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java
index 2552aeb..6d1eb59 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AroundNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: AroundNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java
index 3574bf2..f34fa8a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: BooleanLiteralNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: BooleanLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java
deleted file mode 100644
index 614ff9d..0000000
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanOperatorNodeImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BooleanOperatorNodeImpl.java,v 1.1 2008/03/06 15:25:17 jkohnlein Exp $
- */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
-
-import org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Operator Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class BooleanOperatorNodeImpl extends CompositeNodeImpl implements BooleanOperatorNode {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected BooleanOperatorNodeImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return Xpand3nodePackage.Literals.BOOLEAN_OPERATOR_NODE;
- }
-
-} //BooleanOperatorNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java
index 1f0f0de..2e37298 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CasePartNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: CasePartNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java
index 1562486..3edfc41 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: CastedExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java
index c851cb9..473c2af 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ChainExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java
index a1c4a5d..2f94728 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: CheckNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java
index d6141f4..54cacf9 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: CollectionExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java
index faed79c..b962b43 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CollectionTypeNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: CollectionTypeNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java
index 2225245..d05b699 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ConstructorCallNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ConstructorCallNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
index fc7960e..0251aa5 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
@@ -2,16 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterListNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: DeclaredParameterListNodeImpl.java,v 1.3 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import java.util.Collection;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
import org.eclipse.tmf.common.node.CompositeNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
index c07a068..41f94ee 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
@@ -2,16 +2,19 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: DeclaredParameterNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.tmf.common.node.CompositeNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode;
@@ -24,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getPtype <em>Ptype</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getName <em>Name</em>}</li>
* </ul>
* </p>
*
@@ -33,23 +36,25 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
*/
public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements DeclaredParameterNode {
/**
- * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+ * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
+ * @see #getPtype()
* @generated
* @ordered
*/
- protected CompositeNode name;
+ protected CompositeNode ptype;
+
/**
- * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference.
+ * The cached value of the '{@link #getName() <em>Name</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getPtype()
+ * @see #getName()
* @generated
* @ordered
*/
- protected CompositeNode ptype;
+ protected CompositeNode name;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -153,12 +158,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
- if (resolve) return getName();
- return basicGetName();
case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
if (resolve) return getPtype();
return basicGetPtype();
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ if (resolve) return getName();
+ return basicGetName();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -171,12 +176,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
- setName((CompositeNode)newValue);
- return;
case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
setPtype((CompositeNode)newValue);
return;
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ setName((CompositeNode)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -189,12 +194,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
- setName((CompositeNode)null);
- return;
case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
setPtype((CompositeNode)null);
return;
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ setName((CompositeNode)null);
+ return;
}
super.eUnset(featureID);
}
@@ -207,10 +212,10 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
- return name != null;
case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
return ptype != null;
+ case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
+ return name != null;
}
return super.eIsSet(featureID);
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java
index f9d05ef..081e195 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.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: DefinitionAroundNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java
index e3beb3e..4a00a2e 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: DefinitionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java
index 81a3a2d..3b6bb9b 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ElseIfStatementNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java
index 71627f4..92d9950 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ElseStatementNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ElseStatementNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java
index 0594aa1..ce87b5f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ErrorStatementNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ErrorStatementNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java
index 0caeb9b..4b69a41 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ExpandStatementNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java
index e97f07e..73a927e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java
index 6f205e7..e3355dd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpressionStmtNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ExpressionStmtNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java
index dd04b15..3f82a5c 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,20 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: ExtensionNodeImpl.java,v 1.3 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
-import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.LeafNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode;
@@ -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#getCreate <em>Create</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getParamList <em>Param List</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getExtendBody <em>Extend Body</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>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#getJavaReturnType <em>Java Return Type</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaName <em>Java Name</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>Return Type</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</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#getExtendBody <em>Extend Body</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#getParamList <em>Param List</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaReturnType <em>Java Return Type</em>}</li>
* </ul>
* </p>
*
@@ -44,86 +44,94 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
*/
public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNode {
/**
- * The cached value of the '{@link #getCreate() <em>Create</em>}' reference.
+ * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getCreate()
+ * @see #getReturnType()
* @generated
* @ordered
*/
- protected LeafNode create;
+ protected CompositeNode returnType;
+
/**
- * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference.
+ * The cached value of the '{@link #getCached() <em>Cached</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getPrivate()
+ * @see #getCached()
* @generated
* @ordered
*/
- protected LeafNode private_;
+ protected LeafNode cached;
+
/**
- * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
+ * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getParamList()
+ * @see #getJavaName()
* @generated
* @ordered
*/
- protected CompositeNode paramList;
+ protected CompositeNode javaName;
+
/**
- * The cached value of the '{@link #getExtendBody() <em>Extend Body</em>}' reference.
+ * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getExtendBody()
+ * @see #getPrivate()
* @generated
* @ordered
*/
- protected CompositeNode extendBody;
+ protected LeafNode private_;
+
/**
- * The cached value of the '{@link #getCached() <em>Cached</em>}' reference.
+ * The cached value of the '{@link #getName() <em>Name</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getCached()
+ * @see #getName()
* @generated
* @ordered
*/
- protected LeafNode cached;
+ protected CompositeNode name;
+
/**
- * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference.
+ * The cached value of the '{@link #getExtendBody() <em>Extend Body</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getJavaReturnType()
+ * @see #getExtendBody()
* @generated
* @ordered
*/
- protected CompositeNode javaReturnType;
+ protected CompositeNode extendBody;
+
/**
- * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference.
+ * The cached value of the '{@link #getCreate() <em>Create</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getJavaName()
+ * @see #getCreate()
* @generated
* @ordered
*/
- protected CompositeNode javaName;
+ protected LeafNode create;
+
/**
- * 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 #getName() <em>Name</em>}' reference.
+ * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
+ * @see #getJavaReturnType()
* @generated
* @ordered
*/
- protected CompositeNode name;
+ protected CompositeNode javaReturnType;
/**
* <!-- begin-user-doc -->
@@ -494,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__CREATE:
- if (resolve) return getCreate();
- return basicGetCreate();
- case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
- if (resolve) return getPrivate();
- return basicGetPrivate();
- case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
- if (resolve) return getParamList();
- return basicGetParamList();
- case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
- if (resolve) return getExtendBody();
- return basicGetExtendBody();
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ if (resolve) return getReturnType();
+ return basicGetReturnType();
case Xpand3nodePackage.EXTENSION_NODE__CACHED:
if (resolve) return getCached();
return basicGetCached();
- case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
- if (resolve) return getJavaReturnType();
- return basicGetJavaReturnType();
case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
if (resolve) return getJavaName();
return basicGetJavaName();
- case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
- if (resolve) return getReturnType();
- return basicGetReturnType();
+ case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
+ if (resolve) return getPrivate();
+ return basicGetPrivate();
case Xpand3nodePackage.EXTENSION_NODE__NAME:
if (resolve) return getName();
return basicGetName();
+ case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
+ if (resolve) return getExtendBody();
+ return basicGetExtendBody();
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ if (resolve) return getCreate();
+ return basicGetCreate();
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ if (resolve) return getParamList();
+ return basicGetParamList();
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
+ if (resolve) return getJavaReturnType();
+ return basicGetJavaReturnType();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -530,37 +538,36 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case Xpand3nodePackage.EXTENSION_NODE__CREATE:
- setCreate((LeafNode)newValue);
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ setReturnType((CompositeNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__CACHED:
+ setCached((LeafNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
+ setJavaName((CompositeNode)newValue);
return;
case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
setPrivate((LeafNode)newValue);
return;
- case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
- setParamList((CompositeNode)newValue);
+ case Xpand3nodePackage.EXTENSION_NODE__NAME:
+ setName((CompositeNode)newValue);
return;
case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
setExtendBody((CompositeNode)newValue);
return;
- case Xpand3nodePackage.EXTENSION_NODE__CACHED:
- setCached((LeafNode)newValue);
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ setCreate((LeafNode)newValue);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ setParamList((CompositeNode)newValue);
return;
case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
setJavaReturnType((CompositeNode)newValue);
return;
- case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
- setJavaName((CompositeNode)newValue);
- return;
- case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
- setReturnType((CompositeNode)newValue);
- return;
- case Xpand3nodePackage.EXTENSION_NODE__NAME:
- setName((CompositeNode)newValue);
- return;
}
super.eSet(featureID, newValue);
}
@@ -573,33 +580,33 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case Xpand3nodePackage.EXTENSION_NODE__CREATE:
- setCreate((LeafNode)null);
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ setReturnType((CompositeNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__CACHED:
+ setCached((LeafNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
+ setJavaName((CompositeNode)null);
return;
case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
setPrivate((LeafNode)null);
return;
- case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
- setParamList((CompositeNode)null);
+ case Xpand3nodePackage.EXTENSION_NODE__NAME:
+ setName((CompositeNode)null);
return;
case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
setExtendBody((CompositeNode)null);
return;
- case Xpand3nodePackage.EXTENSION_NODE__CACHED:
- setCached((LeafNode)null);
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ setCreate((LeafNode)null);
+ return;
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ setParamList((CompositeNode)null);
return;
case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
setJavaReturnType((CompositeNode)null);
return;
- case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
- setJavaName((CompositeNode)null);
- return;
- case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
- setReturnType((CompositeNode)null);
- return;
- case Xpand3nodePackage.EXTENSION_NODE__NAME:
- setName((CompositeNode)null);
- return;
}
super.eUnset(featureID);
}
@@ -612,24 +619,24 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case Xpand3nodePackage.EXTENSION_NODE__CREATE:
- return create != null;
- case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
- return private_ != null;
- case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
- return paramList != null;
- case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
- return extendBody != null;
+ case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
+ return returnType != null;
case Xpand3nodePackage.EXTENSION_NODE__CACHED:
return cached != null;
- case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
- return javaReturnType != null;
case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
return javaName != null;
- case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
- return returnType != null;
+ case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
+ return private_ != null;
case Xpand3nodePackage.EXTENSION_NODE__NAME:
return name != null;
+ case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
+ return extendBody != null;
+ case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+ return create != null;
+ case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+ return paramList != null;
+ case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
+ return javaReturnType != 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 c0c3052..4bf0bb1 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,16 +2,19 @@
* <copyright>
* </copyright>
*
- * $Id: FeatureCallNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: FeatureCallNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.tmf.common.node.CompositeNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode;
@@ -24,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.FeatureCallNodeImpl#getName <em>Name</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>
*
@@ -33,23 +36,24 @@ 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 #getParamList() <em>Param List</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
+ * @see #getParamList()
* @generated
* @ordered
*/
- protected CompositeNode name;
+ 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 -->
@@ -154,12 +158,12 @@ 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__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);
}
@@ -172,12 +176,12 @@ 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__PARAM_LIST:
setParamList((CompositeNode)newValue);
return;
+ case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
+ setName((CompositeNode)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -190,12 +194,12 @@ 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__PARAM_LIST:
setParamList((CompositeNode)null);
return;
+ case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
+ setName((CompositeNode)null);
+ return;
}
super.eUnset(featureID);
}
@@ -208,10 +212,10 @@ 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__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 8e7d046..ca9ac1c 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: FileNodeImpl.java,v 1.2 2008/03/07 09:39:41 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#getDecl <em>Decl</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl#getImp <em>Imp</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl#getDecl <em>Decl</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 #getDecl() <em>Decl</em>}' reference list.
+ * The cached value of the '{@link #getImp() <em>Imp</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getDecl()
+ * @see #getImp()
* @generated
* @ordered
*/
- protected EList<CompositeNode> decl;
+ protected EList<CompositeNode> imp;
/**
- * The cached value of the '{@link #getImp() <em>Imp</em>}' reference list.
+ * The cached value of the '{@link #getDecl() <em>Decl</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getImp()
+ * @see #getDecl()
* @generated
* @ordered
*/
- protected EList<CompositeNode> imp;
+ protected EList<CompositeNode> decl;
/**
* <!-- 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__DECL:
- return getDecl();
case Xpand3nodePackage.FILE_NODE__IMP:
return getImp();
+ case Xpand3nodePackage.FILE_NODE__DECL:
+ return getDecl();
}
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__DECL:
- getDecl().clear();
- getDecl().addAll((Collection<? extends CompositeNode>)newValue);
- return;
case Xpand3nodePackage.FILE_NODE__IMP:
getImp().clear();
getImp().addAll((Collection<? extends CompositeNode>)newValue);
return;
+ case Xpand3nodePackage.FILE_NODE__DECL:
+ getDecl().clear();
+ getDecl().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__DECL:
- getDecl().clear();
- return;
case Xpand3nodePackage.FILE_NODE__IMP:
getImp().clear();
return;
+ case Xpand3nodePackage.FILE_NODE__DECL:
+ getDecl().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__DECL:
- return decl != null && !decl.isEmpty();
case Xpand3nodePackage.FILE_NODE__IMP:
return imp != null && !imp.isEmpty();
+ case Xpand3nodePackage.FILE_NODE__DECL:
+ return decl != null && !decl.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java
index d97975e..f9655b0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FileStatementNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: FileStatementNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java
index b0d2d40..729c300 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ForeachStatementNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java
index 5097c0f..7e6cba0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GlobalVarExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: GlobalVarExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java
index baaf6a9..275fb47 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IdentifierNodeImpl.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: IdentifierNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java
index 98d20c7..46efcaa 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: IfExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java
index a4cccc6..418101d 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: IfStatementNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java
index 7e904f7..047f216 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ImpliesExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java
index 6d7e66c..ce8eb9c 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,19 +2,25 @@
* <copyright>
* </copyright>
*
- * $Id: InfixExpressionNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: InfixExpressionNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import java.util.Collection;
+
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
import org.eclipse.tmf.common.node.CompositeNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode;
@@ -44,6 +50,7 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE
* @ordered
*/
protected EList<CompositeNode> calls;
+
/**
* The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
* <!-- begin-user-doc -->
@@ -53,6 +60,7 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE
* @ordered
*/
protected CompositeNode target;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java
index 3c1a6ae..64b389e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: JavaTypeNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: JavaTypeNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java
index 0f4e067..371c234 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: LetExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: LetExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java
index d6f406a..42e18e4 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: LetStatementNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java
index dc5ec13..ecc007c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ListLiteralNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ListLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java
index 25c3283..3ffe011 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: MultiplicativeExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NsImportNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NsImportNodeImpl.java
index 936c612..2d80ad2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NsImportNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NsImportNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NsImportNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: NsImportNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java
index f0b0db0..8fae487 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NullLiteralNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: NullLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java
index 1f84508..54c1023 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NumberLiteralNodeImpl.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: NumberLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java
index 127399c..a18dd2d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: OrExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: OrExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
index 7e99668..7bb193e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
@@ -2,16 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterListNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: ParameterListNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import java.util.Collection;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
import org.eclipse.tmf.common.node.CompositeNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java
index 2863e27..e6624a7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ParanthesizedExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ParanthesizedExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java
index cf4218f..cdab8c1 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PointcutNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: PointcutNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java
index c75c479..33d9252 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: ProtectStatementNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
index 0e6482f..24aa47a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
@@ -2,17 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: RelationalExpressionNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: RelationalExpressionNodeImpl.java,v 1.3 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.LeafNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode;
@@ -25,9 +28,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.RelationalExpressionNodeImpl#getLeftOperand <em>Left Operand</em>}</li>
- * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getOperator <em>Operator</em>}</li>
* <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getRightOperand <em>Right Operand</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getOperator <em>Operator</em>}</li>
+ * <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getLeftOperand <em>Left Operand</em>}</li>
* </ul>
* </p>
*
@@ -35,14 +38,15 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
*/
public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements RelationalExpressionNode {
/**
- * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' reference.
+ * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getLeftOperand()
+ * @see #getRightOperand()
* @generated
* @ordered
*/
- protected CompositeNode leftOperand;
+ protected CompositeNode rightOperand;
+
/**
* The cached value of the '{@link #getOperator() <em>Operator</em>}' reference.
* <!-- begin-user-doc -->
@@ -51,16 +55,17 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* @generated
* @ordered
*/
- protected CompositeNode operator;
+ protected LeafNode operator;
+
/**
- * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' reference.
+ * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getRightOperand()
+ * @see #getLeftOperand()
* @generated
* @ordered
*/
- protected CompositeNode rightOperand;
+ protected CompositeNode leftOperand;
/**
* <!-- begin-user-doc -->
@@ -86,16 +91,16 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* <!-- end-user-doc -->
* @generated
*/
- public CompositeNode getRightOperand() {
- if (rightOperand != null && rightOperand.eIsProxy()) {
- InternalEObject oldRightOperand = (InternalEObject)rightOperand;
- rightOperand = (CompositeNode)eResolveProxy(oldRightOperand);
- if (rightOperand != oldRightOperand) {
+ public LeafNode getOperator() {
+ if (operator != null && operator.eIsProxy()) {
+ InternalEObject oldOperator = (InternalEObject)operator;
+ operator = (LeafNode)eResolveProxy(oldOperator);
+ if (operator != oldOperator) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND, oldRightOperand, rightOperand));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR, oldOperator, operator));
}
}
- return rightOperand;
+ return operator;
}
/**
@@ -103,8 +108,8 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* <!-- end-user-doc -->
* @generated
*/
- public CompositeNode basicGetRightOperand() {
- return rightOperand;
+ public LeafNode basicGetOperator() {
+ return operator;
}
/**
@@ -112,11 +117,11 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* <!-- end-user-doc -->
* @generated
*/
- public void setRightOperand(CompositeNode newRightOperand) {
- CompositeNode oldRightOperand = rightOperand;
- rightOperand = newRightOperand;
+ public void setOperator(LeafNode newOperator) {
+ LeafNode oldOperator = operator;
+ operator = newOperator;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND, oldRightOperand, rightOperand));
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR, oldOperator, operator));
}
/**
@@ -124,16 +129,16 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* <!-- end-user-doc -->
* @generated
*/
- public CompositeNode getOperator() {
- if (operator != null && operator.eIsProxy()) {
- InternalEObject oldOperator = (InternalEObject)operator;
- operator = (CompositeNode)eResolveProxy(oldOperator);
- if (operator != oldOperator) {
+ public CompositeNode getRightOperand() {
+ if (rightOperand != null && rightOperand.eIsProxy()) {
+ InternalEObject oldRightOperand = (InternalEObject)rightOperand;
+ rightOperand = (CompositeNode)eResolveProxy(oldRightOperand);
+ if (rightOperand != oldRightOperand) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR, oldOperator, operator));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND, oldRightOperand, rightOperand));
}
}
- return operator;
+ return rightOperand;
}
/**
@@ -141,8 +146,8 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* <!-- end-user-doc -->
* @generated
*/
- public CompositeNode basicGetOperator() {
- return operator;
+ public CompositeNode basicGetRightOperand() {
+ return rightOperand;
}
/**
@@ -150,11 +155,11 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
* <!-- end-user-doc -->
* @generated
*/
- public void setOperator(CompositeNode newOperator) {
- CompositeNode oldOperator = operator;
- operator = newOperator;
+ public void setRightOperand(CompositeNode newRightOperand) {
+ CompositeNode oldRightOperand = rightOperand;
+ rightOperand = newRightOperand;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR, oldOperator, operator));
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND, oldRightOperand, rightOperand));
}
/**
@@ -203,15 +208,15 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
- if (resolve) return getLeftOperand();
- return basicGetLeftOperand();
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
- if (resolve) return getOperator();
- return basicGetOperator();
case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
if (resolve) return getRightOperand();
return basicGetRightOperand();
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
+ if (resolve) return getOperator();
+ return basicGetOperator();
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ if (resolve) return getLeftOperand();
+ return basicGetLeftOperand();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -224,14 +229,14 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
- setLeftOperand((CompositeNode)newValue);
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
+ setRightOperand((CompositeNode)newValue);
return;
case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
- setOperator((CompositeNode)newValue);
+ setOperator((LeafNode)newValue);
return;
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
- setRightOperand((CompositeNode)newValue);
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ setLeftOperand((CompositeNode)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -245,14 +250,14 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
- setLeftOperand((CompositeNode)null);
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
+ setRightOperand((CompositeNode)null);
return;
case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
- setOperator((CompositeNode)null);
+ setOperator((LeafNode)null);
return;
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
- setRightOperand((CompositeNode)null);
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ setLeftOperand((CompositeNode)null);
return;
}
super.eUnset(featureID);
@@ -266,12 +271,12 @@ public class RelationalExpressionNodeImpl extends CompositeNodeImpl implements R
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
- return leftOperand != null;
- case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
- return operator != null;
case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND:
return rightOperand != null;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__OPERATOR:
+ return operator != null;
+ case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND:
+ return leftOperand != 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 5a9bca7..7611847 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: SequenceNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
index c079f93..60481dd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
@@ -2,16 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: SimpleTypeNodeImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: SimpleTypeNodeImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
import java.util.Collection;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
import org.eclipse.tmf.common.node.CompositeNode;
+
import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
import org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java
index 51d29bf..3cd5ba0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StringLiteralNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: StringLiteralNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java
index 18f85db..b2216db 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.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: SwitchExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java
index cec4ff6..fba440e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Test_expressionNodeImpl.java,v 1.1 2008/03/06 08:55:15 jkohnlein Exp $
+ * $Id: Test_expressionNodeImpl.java,v 1.2 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java
index 8afd20c..6ef98bc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TextNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: TextNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java
index e641ecc..f96aa47 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TextSequenceNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: TextSequenceNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java
index 52505a0..aa1938f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: UnaryExpressionNodeImpl.java,v 1.1 2008/03/06 08:55:16 jkohnlein Exp $
+ * $Id: UnaryExpressionNodeImpl.java,v 1.2 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
index 1e7a303..0521143 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeFactoryImpl.java,v 1.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: Xpand3nodeFactoryImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
@@ -94,7 +94,6 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac
case Xpand3nodePackage.AND_EXPRESSION_NODE: return createAndExpressionNode();
case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE: return createImpliesExpressionNode();
case Xpand3nodePackage.RELATIONAL_EXPRESSION_NODE: return createRelationalExpressionNode();
- case Xpand3nodePackage.BOOLEAN_OPERATOR_NODE: return createBooleanOperatorNode();
case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: return createAdditiveExpressionNode();
case Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE: return createMultiplicativeExpressionNode();
case Xpand3nodePackage.UNARY_EXPRESSION_NODE: return createUnaryExpressionNode();
@@ -465,16 +464,6 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac
* <!-- end-user-doc -->
* @generated
*/
- public BooleanOperatorNode createBooleanOperatorNode() {
- BooleanOperatorNodeImpl booleanOperatorNode = new BooleanOperatorNodeImpl();
- return booleanOperatorNode;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public AdditiveExpressionNode createAdditiveExpressionNode() {
AdditiveExpressionNodeImpl additiveExpressionNode = new AdditiveExpressionNodeImpl();
return additiveExpressionNode;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java
index 4e8d29b..781ab24 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.2 2008/03/06 15:25:17 jkohnlein Exp $
+ * $Id: Xpand3nodePackageImpl.java,v 1.3 2008/03/07 09:39:41 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.impl;
@@ -18,7 +18,6 @@ import org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode;
import org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode;
import org.eclipse.xpand3.internal.parser.xpand3node.AroundNode;
import org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode;
import org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode;
import org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode;
import org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode;
@@ -322,13 +321,6 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
- private EClass booleanOperatorNodeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EClass additiveExpressionNodeEClass = null;
/**
@@ -550,7 +542,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getFileNode_Decl() {
- return (EReference)fileNodeEClass.getEStructuralFeatures().get(0);
+ return (EReference)fileNodeEClass.getEStructuralFeatures().get(1);
}
/**
@@ -559,7 +551,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getFileNode_Imp() {
- return (EReference)fileNodeEClass.getEStructuralFeatures().get(1);
+ return (EReference)fileNodeEClass.getEStructuralFeatures().get(0);
}
/**
@@ -766,7 +758,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_Create() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6);
}
/**
@@ -775,7 +767,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_Private() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3);
}
/**
@@ -784,7 +776,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_ParamList() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7);
}
/**
@@ -793,7 +785,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_ExtendBody() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5);
}
/**
@@ -802,7 +794,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_Cached() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1);
}
/**
@@ -811,7 +803,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_JavaReturnType() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8);
}
/**
@@ -820,7 +812,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_JavaName() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2);
}
/**
@@ -829,7 +821,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_ReturnType() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0);
}
/**
@@ -838,7 +830,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getExtensionNode_Name() {
- return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8);
+ return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4);
}
/**
@@ -963,17 +955,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRelationalExpressionNode_RightOperand() {
- return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getBooleanOperatorNode() {
- return booleanOperatorNodeEClass;
+ public EReference getRelationalExpressionNode_Operator() {
+ return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(1);
}
/**
@@ -981,8 +964,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* <!-- end-user-doc -->
* @generated
*/
- public EReference getRelationalExpressionNode_Operator() {
- return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(1);
+ public EReference getRelationalExpressionNode_RightOperand() {
+ return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(0);
}
/**
@@ -991,7 +974,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getRelationalExpressionNode_LeftOperand() {
- return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(0);
+ return (EReference)relationalExpressionNodeEClass.getEStructuralFeatures().get(2);
}
/**
@@ -1090,7 +1073,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getFeatureCallNode_Name() {
- return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0);
+ return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1);
}
/**
@@ -1099,7 +1082,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getFeatureCallNode_ParamList() {
- return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1);
+ return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0);
}
/**
@@ -1189,7 +1172,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getDeclaredParameterNode_Name() {
- return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(0);
+ return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(1);
}
/**
@@ -1198,7 +1181,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
* @generated
*/
public EReference getDeclaredParameterNode_Ptype() {
- return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(1);
+ return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(0);
}
/**
@@ -1284,8 +1267,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
// Create classes and their features
fileNodeEClass = createEClass(FILE_NODE);
- createEReference(fileNodeEClass, FILE_NODE__DECL);
createEReference(fileNodeEClass, FILE_NODE__IMP);
+ createEReference(fileNodeEClass, FILE_NODE__DECL);
nsImportNodeEClass = createEClass(NS_IMPORT_NODE);
createEReference(nsImportNodeEClass, NS_IMPORT_NODE__NS);
@@ -1328,15 +1311,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
pointcutNodeEClass = createEClass(POINTCUT_NODE);
extensionNodeEClass = createEClass(EXTENSION_NODE);
- createEReference(extensionNodeEClass, EXTENSION_NODE__CREATE);
- createEReference(extensionNodeEClass, EXTENSION_NODE__PRIVATE);
- createEReference(extensionNodeEClass, EXTENSION_NODE__PARAM_LIST);
- createEReference(extensionNodeEClass, EXTENSION_NODE__EXTEND_BODY);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__RETURN_TYPE);
createEReference(extensionNodeEClass, EXTENSION_NODE__CACHED);
- createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_RETURN_TYPE);
createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_NAME);
- createEReference(extensionNodeEClass, EXTENSION_NODE__RETURN_TYPE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__PRIVATE);
createEReference(extensionNodeEClass, EXTENSION_NODE__NAME);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__EXTEND_BODY);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__CREATE);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__PARAM_LIST);
+ createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_RETURN_TYPE);
javaTypeNodeEClass = createEClass(JAVA_TYPE_NODE);
@@ -1363,11 +1346,9 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
impliesExpressionNodeEClass = createEClass(IMPLIES_EXPRESSION_NODE);
relationalExpressionNodeEClass = createEClass(RELATIONAL_EXPRESSION_NODE);
- createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND);
- createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__OPERATOR);
createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__RIGHT_OPERAND);
-
- booleanOperatorNodeEClass = createEClass(BOOLEAN_OPERATOR_NODE);
+ createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__OPERATOR);
+ createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__LEFT_OPERAND);
additiveExpressionNodeEClass = createEClass(ADDITIVE_EXPRESSION_NODE);
@@ -1386,8 +1367,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
globalVarExpressionNodeEClass = createEClass(GLOBAL_VAR_EXPRESSION_NODE);
featureCallNodeEClass = createEClass(FEATURE_CALL_NODE);
- createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME);
createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__PARAM_LIST);
+ createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME);
listLiteralNodeEClass = createEClass(LIST_LITERAL_NODE);
@@ -1405,8 +1386,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
createEReference(declaredParameterListNodeEClass, DECLARED_PARAMETER_LIST_NODE__PARAMS);
declaredParameterNodeEClass = createEClass(DECLARED_PARAMETER_NODE);
- createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__NAME);
createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__PTYPE);
+ createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__NAME);
parameterListNodeEClass = createEClass(PARAMETER_LIST_NODE);
createEReference(parameterListNodeEClass, PARAMETER_LIST_NODE__PARAMS);
@@ -1484,7 +1465,6 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
andExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
impliesExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
relationalExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
- booleanOperatorNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
additiveExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
multiplicativeExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
unaryExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
@@ -1508,8 +1488,8 @@ 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_Decl(), theNodePackage.getCompositeNode(), null, "decl", 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_Imp(), theNodePackage.getCompositeNode(), null, "imp", 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_Decl(), theNodePackage.getCompositeNode(), null, "decl", 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(nsImportNodeEClass, NsImportNode.class, "NsImportNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getNsImportNode_Ns(), theNodePackage.getCompositeNode(), null, "ns", null, 0, 1, NsImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1552,15 +1532,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(pointcutNodeEClass, PointcutNode.class, "PointcutNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(extensionNodeEClass, ExtensionNode.class, "ExtensionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getExtensionNode_Create(), theNodePackage.getLeafNode(), null, "create", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExtensionNode_Private(), theNodePackage.getLeafNode(), null, "private", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExtensionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExtensionNode_ExtendBody(), theNodePackage.getCompositeNode(), null, "extendBody", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_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_Cached(), theNodePackage.getLeafNode(), null, "cached", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExtensionNode_JavaReturnType(), theNodePackage.getCompositeNode(), null, "javaReturnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getExtensionNode_JavaName(), theNodePackage.getCompositeNode(), null, "javaName", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExtensionNode_ReturnType(), theNodePackage.getCompositeNode(), null, "returnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExtensionNode_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_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_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_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_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_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);
initEClass(javaTypeNodeEClass, JavaTypeNode.class, "JavaTypeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1587,11 +1567,9 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(impliesExpressionNodeEClass, ImpliesExpressionNode.class, "ImpliesExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(relationalExpressionNodeEClass, RelationalExpressionNode.class, "RelationalExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getRelationalExpressionNode_LeftOperand(), theNodePackage.getCompositeNode(), null, "leftOperand", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRelationalExpressionNode_Operator(), theNodePackage.getCompositeNode(), null, "operator", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getRelationalExpressionNode_RightOperand(), theNodePackage.getCompositeNode(), null, "rightOperand", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(booleanOperatorNodeEClass, BooleanOperatorNode.class, "BooleanOperatorNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getRelationalExpressionNode_Operator(), theNodePackage.getLeafNode(), null, "operator", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRelationalExpressionNode_LeftOperand(), theNodePackage.getCompositeNode(), null, "leftOperand", null, 0, 1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(additiveExpressionNodeEClass, AdditiveExpressionNode.class, "AdditiveExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1610,8 +1588,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEClass(globalVarExpressionNodeEClass, GlobalVarExpressionNode.class, "GlobalVarExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(featureCallNodeEClass, FeatureCallNode.class, "FeatureCallNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getFeatureCallNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getFeatureCallNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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);
@@ -1629,8 +1607,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
initEReference(getDeclaredParameterListNode_Params(), theNodePackage.getCompositeNode(), null, "params", null, 0, -1, DeclaredParameterListNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(declaredParameterNodeEClass, DeclaredParameterNode.class, "DeclaredParameterNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getDeclaredParameterNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getDeclaredParameterNode_Ptype(), theNodePackage.getCompositeNode(), null, "ptype", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDeclaredParameterNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(parameterListNodeEClass, ParameterListNode.class, "ParameterListNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getParameterListNode_Params(), theNodePackage.getCompositeNode(), null, "params", null, 0, -1, ParameterListNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
index 30bf3e1..57d35b3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeAdapterFactory.java,v 1.2 2008/03/06 15:25:13 jkohnlein Exp $
+ * $Id: Xpand3nodeAdapterFactory.java,v 1.3 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.util;
@@ -211,10 +211,6 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
return createRelationalExpressionNodeAdapter();
}
@Override
- public Adapter caseBooleanOperatorNode(BooleanOperatorNode object) {
- return createBooleanOperatorNodeAdapter();
- }
- @Override
public Adapter caseAdditiveExpressionNode(AdditiveExpressionNode object) {
return createAdditiveExpressionNodeAdapter();
}
@@ -799,20 +795,6 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode <em>Boolean Operator Node</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode
- * @generated
- */
- public Adapter createBooleanOperatorNodeAdapter() {
- return null;
- }
-
- /**
* Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
index b699bed..2e62388 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3nodeSwitch.java,v 1.2 2008/03/06 15:25:13 jkohnlein Exp $
+ * $Id: Xpand3nodeSwitch.java,v 1.3 2008/03/07 09:39:42 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.util;
@@ -362,14 +362,6 @@ public class Xpand3nodeSwitch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case Xpand3nodePackage.BOOLEAN_OPERATOR_NODE: {
- BooleanOperatorNode booleanOperatorNode = (BooleanOperatorNode)theEObject;
- T result = caseBooleanOperatorNode(booleanOperatorNode);
- if (result == null) result = caseCompositeNode(booleanOperatorNode);
- if (result == null) result = caseNode(booleanOperatorNode);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
case Xpand3nodePackage.ADDITIVE_EXPRESSION_NODE: {
AdditiveExpressionNode additiveExpressionNode = (AdditiveExpressionNode)theEObject;
T result = caseAdditiveExpressionNode(additiveExpressionNode);
@@ -1045,21 +1037,6 @@ public class Xpand3nodeSwitch<T> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Boolean Operator Node</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Boolean Operator Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseBooleanOperatorNode(BooleanOperatorNode object) {
- return null;
- }
-
- /**
* Returns the result of interpreting the object as an instance of '<em>Additive Expression Node</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java
index e7de1de..28eb917 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AdditiveExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: AdditiveExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java
index 63946ea..7c3592c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AndExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: AndExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java
index f61a310..705d5f0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AroundNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: AroundNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java
index 48599f7..23d26e8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: BooleanLiteralNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: BooleanLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java
deleted file mode 100644
index 84b955e..0000000
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanOperatorNodeValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BooleanOperatorNodeValidator.java,v 1.1 2008/03/06 15:25:08 jkohnlein Exp $
- */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanOperatorNode}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface BooleanOperatorNodeValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java
index 2555f3d..b35fd78 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CasePartNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: CasePartNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java
index 0d2a08a..d7b5591 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CastedExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: CastedExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java
index b54904e..6c54846 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ChainExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ChainExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java
index 861c8ae..89df576 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CheckNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: CheckNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java
index 1582b75..a57e10f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CollectionExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: CollectionExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java
index e2f2f52..df4d973 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CollectionTypeNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: CollectionTypeNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java
index 5013432..5488b5a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ConstructorCallNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ConstructorCallNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
index 3015c44..c896829 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
@@ -2,13 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterListNodeValidator.java,v 1.2 2008/03/06 15:25:09 jkohnlein Exp $
+ * $Id: DeclaredParameterListNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.CompositeNode;
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode}.
@@ -20,5 +20,4 @@ public interface DeclaredParameterListNodeValidator {
boolean validate();
boolean validateParams(EList<CompositeNode> value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
index b774f29..7c7053a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
@@ -2,13 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
+ * $Id: DeclaredParameterNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.tmf.common.node.CompositeNode;
-
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode}.
* This doesn't really do anything, and it's not a real EMF artifact.
@@ -19,9 +18,5 @@ public interface DeclaredParameterNodeValidator {
boolean validate();
boolean validateName(CompositeNode value);
-
boolean validatePtype(CompositeNode value);
-
- boolean validateType(CompositeNode value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java
index 291ecf0..c8d0b1b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DefinitionAroundNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: DefinitionAroundNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java
index 1bd9a09..d27b9cb 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DefinitionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: DefinitionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java
index e4db74b..889592e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ElseIfStatementNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ElseIfStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java
index 4081d10..2f99909 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ElseStatementNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: ElseStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java
index 51e8bba..a8f1f86 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ErrorStatementNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: ErrorStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java
index a2cf2b3..65a5bc5 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpandStatementNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ExpandStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java
index 10f195a..98db70d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java
index 38c32a4..d67434b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExpressionStmtNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: ExpressionStmtNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
index 1e0287f..c3b721d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
@@ -2,15 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
+ * $Id: ExtensionNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
-import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.LeafNode;
-
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode}.
* This doesn't really do anything, and it's not a real EMF artifact.
@@ -21,25 +19,12 @@ public interface ExtensionNodeValidator {
boolean validate();
boolean validateCreate(LeafNode value);
-
boolean validatePrivate(LeafNode value);
-
boolean validateParamList(CompositeNode value);
-
boolean validateExtendBody(CompositeNode value);
-
- boolean validateParams(CompositeNode value);
-
- boolean validateParams(EList<CompositeNode> value);
-
boolean validateCached(LeafNode value);
-
boolean validateJavaReturnType(CompositeNode value);
-
boolean validateJavaName(CompositeNode value);
-
boolean validateReturnType(CompositeNode value);
-
boolean validateName(CompositeNode value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
index 78ecf04..fa6d849 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
@@ -2,13 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: FeatureCallNodeValidator.java,v 1.2 2008/03/06 15:25:09 jkohnlein Exp $
+ * $Id: FeatureCallNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.tmf.common.node.CompositeNode;
-
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode}.
* This doesn't really do anything, and it's not a real EMF artifact.
@@ -19,7 +18,5 @@ public interface FeatureCallNodeValidator {
boolean validate();
boolean validateName(CompositeNode value);
-
boolean validateParamList(CompositeNode value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java
index ff8451f..d6faf39 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FileNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: FileNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java
index 05a4d2e..cf69c65 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FileStatementNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: FileStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java
index 1ac1b59..8cd8a42 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ForeachStatementNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ForeachStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java
index 41d540c..719370b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GlobalVarExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: GlobalVarExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java
index 044c538..a9222e7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IdentifierNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: IdentifierNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java
index f580ca7..f184d14 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IfExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: IfExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java
index 4dd8fd5..1a581c0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IfStatementNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: IfStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java
index 8715378..4da45b2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ImpliesExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: ImpliesExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
index 0c4428a..e768675 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
@@ -2,13 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: InfixExpressionNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
+ * $Id: InfixExpressionNodeValidator.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.CompositeNode;
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode}.
@@ -20,11 +20,5 @@ public interface InfixExpressionNodeValidator {
boolean validate();
boolean validateCalls(EList<CompositeNode> value);
-
boolean validateTarget(CompositeNode value);
-
- boolean validateCall(CompositeNode value);
-
- boolean validatePrimary(CompositeNode value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java
index 1ca2aad..a65aad9 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: JavaTypeNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: JavaTypeNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java
index cac5001..a897666 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: LetExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: LetExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java
index 016bd02..71d3dfd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: LetStatementNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: LetStatementNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java
index 0fc1ad2..ec1757e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ListLiteralNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: ListLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java
index 015fe81..e6854a2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: MultiplicativeExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: MultiplicativeExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java
index a79fd7d..93ef5ea 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NsImportNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NsImportNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: NsImportNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java
index f499f50..84048fb 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NullLiteralNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: NullLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java
index b9cba2d..f91aefc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: NumberLiteralNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: NumberLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java
index 63e1d01..aa81002 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: OrExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: OrExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
index 39d537c..dc1b5af 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
@@ -2,13 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterListNodeValidator.java,v 1.2 2008/03/06 15:25:12 jkohnlein Exp $
+ * $Id: ParameterListNodeValidator.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.CompositeNode;
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode}.
@@ -20,5 +20,4 @@ public interface ParameterListNodeValidator {
boolean validate();
boolean validateParams(EList<CompositeNode> value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java
index 1e5fc93..a87b6f7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ParanthesizedExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: ParanthesizedExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java
index 16feaa3..ba822ef 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PointcutNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: PointcutNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java
index d0b3d76..73b8675 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ProtectStatementNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: ProtectStatementNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
index d8a526f..5e54a35 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
@@ -2,14 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: RelationalExpressionNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
+ * $Id: RelationalExpressionNodeValidator.java,v 1.3 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.LeafNode;
-
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode}.
* This doesn't really do anything, and it's not a real EMF artifact.
@@ -19,12 +18,7 @@ import org.eclipse.tmf.common.node.LeafNode;
public interface RelationalExpressionNodeValidator {
boolean validate();
- boolean validateRightOperand(CompositeNode value);
-
boolean validateOperator(LeafNode value);
-
+ boolean validateRightOperand(CompositeNode value);
boolean validateLeftOperand(CompositeNode value);
-
- boolean validateOperator(CompositeNode value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java
index c830f8f..4e634f0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: SequenceNodeValidator.java,v 1.1 2008/03/06 08:55:14 jkohnlein Exp $
+ * $Id: SequenceNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
index 01ff5fa..1ca48d7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
@@ -2,13 +2,13 @@
* <copyright>
* </copyright>
*
- * $Id: SimpleTypeNodeValidator.java,v 1.2 2008/03/06 15:25:08 jkohnlein Exp $
+ * $Id: SimpleTypeNodeValidator.java,v 1.3 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.tmf.common.node.CompositeNode;
+import org.eclipse.tmf.common.node.CompositeNode;
/**
* A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode}.
@@ -20,5 +20,4 @@ public interface SimpleTypeNodeValidator {
boolean validate();
boolean validateNames(EList<CompositeNode> value);
-
}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java
index 98d5510..564772f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StringLiteralNodeValidator.java,v 1.1 2008/03/06 08:55:11 jkohnlein Exp $
+ * $Id: StringLiteralNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java
index 6f48010..88b19b7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: SwitchExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: SwitchExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java
index 574ea32..7e94093 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Test_expressionNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: Test_expressionNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java
index a155043..9459971 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TextNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: TextNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java
index e68d1ac..845453c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TextSequenceNodeValidator.java,v 1.1 2008/03/06 08:55:13 jkohnlein Exp $
+ * $Id: TextSequenceNodeValidator.java,v 1.2 2008/03/07 09:39:40 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java
index 7586bff..5558e4d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: UnaryExpressionNodeValidator.java,v 1.1 2008/03/06 08:55:12 jkohnlein Exp $
+ * $Id: UnaryExpressionNodeValidator.java,v 1.2 2008/03/07 09:39:39 jkohnlein Exp $
*/
package org.eclipse.xpand3.internal.parser.xpand3node.validation;
diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
index 8c3656f..a0801bb 100644
--- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
+++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
@@ -1,240 +1,240 @@
<?xml version="1.0" encoding="ASCII"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="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/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="decl" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="imp" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="decl" 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="NsImportNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ns">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="DefinitionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="DefinitionAroundNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SequenceNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TextSequenceNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TextNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ErrorStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExpandStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExpressionStmtNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FileStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ForeachStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IfStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ElseIfStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ElseStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LetStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ProtectStatementNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CheckNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AroundNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PointcutNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExtensionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="create">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="private">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ <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>
- <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures 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="extendBody">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="cached">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ <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="javaReturnType">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="javaName">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="create">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="returnType">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures 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/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="JavaTypeNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Test_expressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LetExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CastedExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ChainExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IfExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SwitchExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CasePartNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="OrExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AndExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ImpliesExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RelationalExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="operator">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
- </eStructuralFeatures>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="operator">
+ <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="leftOperand">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="AdditiveExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MultiplicativeExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="UnaryExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InfixExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="StringLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ParanthesizedExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GlobalVarExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeatureCallNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
+ <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">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ConstructorCallNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="BooleanLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NullLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NumberLiteralNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CollectionExpressionNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredParameterListNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="DeclaredParameterNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ptype">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="ParameterListNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="CollectionTypeNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SimpleTypeNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="names" upperBound="-1">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <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="IdentifierNode">
- <eSuperTypes href="platform:/resource/org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.genmodel b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.genmodel
index 885ff99..bf3c06e 100644
--- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.genmodel
+++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.genmodel
@@ -3,7 +3,7 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xpand3.parser/emf-gen"
modelPluginID="org.eclipse.xpand3.parser" modelName="Xpand3Node" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.tmf.common/src/org/eclipse/tmf/common/node/node.genmodel#//node">
+ complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.genmodel#//node">
<foreignModel>Xpand3Node.ecore</foreignModel>
<genPackages prefix="Xpand3node" basePackage="org.eclipse.xpand3.internal.parser"
disposableProviderFactory="true" ecorePackage="Xpand3Node.ecore#/">
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 29ad3de..8c719cc 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
@@ -26,333 +26,328 @@ package org.eclipse.xpand3.parser;
private boolean xpandMode = false;
}
-file returns [CompositeNode cn]
+r_file returns [CompositeNode cn]
@init{ cn = factory.createFileNode();
}
@after{ cn = normalize(cn); } :
- (((imp=nsImport { addToChildren(cn, imp); ((FileNode) cn).getImp().add(imp); })))* (((decl=abstractDeclaration { addToChildren(cn, decl); ((FileNode) cn).getDecl().add(decl); })))* (EOF)
+ (((imp=r_nsImport { addToChildren(cn, imp); ((FileNode) cn).getImp().add(imp); })))* (((decl=r_abstractDeclaration { addToChildren(cn, decl); ((FileNode) cn).getDecl().add(decl); })))* (EOF)
;
-nsImport returns [CompositeNode cn]
+r_nsImport returns [CompositeNode cn]
@init{ cn = factory.createNsImportNode();
} :
- (LG { addLeafNodeForToken($cn, null); }) ('IMPORT' { addLeafNodeForToken($cn, null); }) (ns=simpleType { addToChildren(cn, ns); ((NsImportNode) cn).setNs(ns); }) (RG { addLeafNodeForToken($cn, null); })
- | (LG { addLeafNodeForToken($cn, null); }) ('EXTENSION' { addLeafNodeForToken($cn, null); }) (ns=simpleType { addToChildren(cn, ns); ((NsImportNode) cn).setNs(ns); }) (RG { addLeafNodeForToken($cn, null); })
- | ('import' { addLeafNodeForToken($cn, null); }) (unnamed0=type { addToChildren(cn, unnamed0); }) (';' { addLeafNodeForToken($cn, null); })
- | ('extension' { addLeafNodeForToken($cn, null); }) (unnamed1=type { addToChildren(cn, unnamed1); }) ((('reexport' { addLeafNodeForToken($cn, null); })))? (';' { addLeafNodeForToken($cn, null); })
+ (LG { addLeafNodeForToken($cn, null); }) ('IMPORT' { addLeafNodeForToken($cn, null); }) (ns=r_simpleType { addToChildren(cn, ns); ((NsImportNode) cn).setNs(ns); }) (RG { addLeafNodeForToken($cn, null); })
+ | (LG { addLeafNodeForToken($cn, null); }) ('EXTENSION' { addLeafNodeForToken($cn, null); }) (ns=r_simpleType { addToChildren(cn, ns); ((NsImportNode) cn).setNs(ns); }) (RG { addLeafNodeForToken($cn, null); })
+ | ('import' { addLeafNodeForToken($cn, null); }) (unnamed0=r_type { addToChildren(cn, unnamed0); }) (';' { addLeafNodeForToken($cn, null); })
+ | ('extension' { addLeafNodeForToken($cn, null); }) (unnamed1=r_type { addToChildren(cn, unnamed1); }) ((('reexport' { addLeafNodeForToken($cn, null); })))? (';' { addLeafNodeForToken($cn, null); })
;
-abstractDeclaration returns [CompositeNode cn] :
- (check { $cn = $check.cn; })
- | (around { $cn = $around.cn; })
- | (extension { $cn = $extension.cn; })
- | (definition { $cn = $definition.cn; })
- | (definitionAround { $cn = $definitionAround.cn; })
+r_abstractDeclaration returns [CompositeNode cn] :
+ (r_check { $cn = $r_check.cn; })
+ | (r_around { $cn = $r_around.cn; })
+ | (r_extension { $cn = $r_extension.cn; })
+ | (r_definition { $cn = $r_definition.cn; })
+ | (r_definitionAround { $cn = $r_definitionAround.cn; })
;
-definition returns [CompositeNode cn]
+r_definition returns [CompositeNode cn]
@init{ cn = factory.createDefinitionNode();
} :
- (LG { addLeafNodeForToken($cn, null); }) (DEFINE { addLeafNodeForToken($cn, null); }) (name=identifier { addToChildren(cn, name); ((DefinitionNode) cn).setName(name); }) ((('(' { addLeafNodeForToken($cn, null); }) (((unnamed2=declaredParameterList { addToChildren(cn, unnamed2); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
- | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); })))? ('FOR' { addLeafNodeForToken($cn, null); }) (unnamed3=type { addToChildren(cn, unnamed3); }) (unnamed4=sequence { addToChildren(cn, unnamed4); }) (ENDDEFINE { addLeafNodeForToken($cn, null); }) (RG { addLeafNodeForToken($cn, null); })
+ (LG { addLeafNodeForToken($cn, null); }) (DEFINE { addLeafNodeForToken($cn, null); }) (name=r_identifier { addToChildren(cn, name); ((DefinitionNode) cn).setName(name); }) ((('(' { addLeafNodeForToken($cn, null); }) (((unnamed2=r_declaredParameterList { addToChildren(cn, unnamed2); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
+ | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); })))? ('FOR' { addLeafNodeForToken($cn, null); }) (unnamed3=r_type { addToChildren(cn, unnamed3); }) (unnamed4=r_sequence { addToChildren(cn, unnamed4); }) (ENDDEFINE { addLeafNodeForToken($cn, null); }) (RG { addLeafNodeForToken($cn, null); })
;
-definitionAround returns [CompositeNode cn]
+r_definitionAround returns [CompositeNode cn]
@init{ cn = factory.createDefinitionAroundNode();
} :
- (LG { addLeafNodeForToken($cn, null); }) (AROUND { addLeafNodeForToken($cn, null); }) (unnamed5=pointcut { addToChildren(cn, unnamed5); }) ((('(' { addLeafNodeForToken($cn, null); }) (((unnamed6=declaredParameterList { addToChildren(cn, unnamed6); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
- | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); })))? ('FOR' { addLeafNodeForToken($cn, null); }) (unnamed7=type { addToChildren(cn, unnamed7); }) (unnamed8=sequence { addToChildren(cn, unnamed8); }) (ENDAROUND { addLeafNodeForToken($cn, null); }) (RG { addLeafNodeForToken($cn, null); })
+ (LG { addLeafNodeForToken($cn, null); }) (AROUND { addLeafNodeForToken($cn, null); }) (unnamed5=r_pointcut { addToChildren(cn, unnamed5); }) ((('(' { addLeafNodeForToken($cn, null); }) (((unnamed6=r_declaredParameterList { addToChildren(cn, unnamed6); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
+ | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); })))? ('FOR' { addLeafNodeForToken($cn, null); }) (unnamed7=r_type { addToChildren(cn, unnamed7); }) (unnamed8=r_sequence { addToChildren(cn, unnamed8); }) (ENDAROUND { addLeafNodeForToken($cn, null); }) (RG { addLeafNodeForToken($cn, null); })
;
-sequence returns [CompositeNode cn]
+r_sequence returns [CompositeNode cn]
@init{ cn = factory.createSequenceNode();
} :
- (unnamed9=textSequence { addToChildren(cn, unnamed9); }) (((unnamed10=statement { addToChildren(cn, unnamed10); }) (unnamed11=textSequence { addToChildren(cn, unnamed11); })))*
+ (unnamed9=r_textSequence { addToChildren(cn, unnamed9); }) (((unnamed10=r_statement { addToChildren(cn, unnamed10); }) (unnamed11=r_textSequence { addToChildren(cn, unnamed11); })))*
;
-statement returns [CompositeNode cn] :
- (simpleStatement { $cn = $simpleStatement.cn; })
- | (fileStatement { $cn = $fileStatement.cn; })
- | (foreachStatement { $cn = $foreachStatement.cn; })
- | (ifStatement { $cn = $ifStatement.cn; })
- | (letStatement { $cn = $letStatement.cn; })
- | (protectStatement { $cn = $protectStatement.cn; })
+r_statement returns [CompositeNode cn] :
+ (r_simpleStatement { $cn = $r_simpleStatement.cn; })
+ | (r_fileStatement { $cn = $r_fileStatement.cn; })
+ | (r_foreachStatement { $cn = $r_foreachStatement.cn; })
+ | (r_ifStatement { $cn = $r_ifStatement.cn; })
+ | (r_letStatement { $cn = $r_letStatement.cn; })
+ | (r_protectStatement { $cn = $r_protectStatement.cn; })
;
-textSequence returns [CompositeNode cn]
+r_textSequence returns [CompositeNode cn]
@init{ cn = factory.createTextSequenceNode();
}
@after{ cn = normalize(cn); } :
- (unnamed12=text { addToChildren(cn, unnamed12); }) (((unnamed13=text { addToChildren(cn, unnamed13); })))*
+ (unnamed12=r_text { addToChildren(cn, unnamed12); }) (((unnamed13=r_text { addToChildren(cn, unnamed13); })))*
;
-text returns [CompositeNode cn]
+r_text returns [CompositeNode cn]
@init{ cn = factory.createTextNode();
} :
('-' { addLeafNodeForToken($cn, null); })? (TEXT { addLeafNodeForToken($cn, null); })
;
-simpleStatement returns [CompositeNode cn] :
- (errorStatement { $cn = $errorStatement.cn; })
- | (expandStatement { $cn = $expandStatement.cn; })
- | (expressionStmt { $cn = $expressionStmt.cn; })
+r_simpleStatement returns [CompositeNode cn] :
+ (r_errorStatement { $cn = $r_errorStatement.cn; })
+ | (r_expandStatement { $cn = $r_expandStatement.cn; })
+ | (r_expressionStmt { $cn = $r_expressionStmt.cn; })
;
-errorStatement returns [CompositeNode cn]
+r_errorStatement returns [CompositeNode cn]
@init{ cn = factory.createErrorStatementNode();
} :
- ('ERROR' { addLeafNodeForToken($cn, null); }) (unnamed14=expression { addToChildren(cn, unnamed14); })
+ ('ERROR' { addLeafNodeForToken($cn, null); }) (unnamed14=r_expression { addToChildren(cn, unnamed14); })
;
-expandStatement returns [CompositeNode cn]
+r_expandStatement returns [CompositeNode cn]
@init{ cn = factory.createExpandStatementNode();
} :
- ('EXPAND' { addLeafNodeForToken($cn, null); }) (unnamed15=simpleType { addToChildren(cn, unnamed15); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed16=parameterList { addToChildren(cn, unnamed16); }) (')' { addLeafNodeForToken($cn, null); })))? ((((('FOR' { addLeafNodeForToken($cn, null); }) (unnamed17=expression { addToChildren(cn, unnamed17); })))
- | ((('FOREACH' { addLeafNodeForToken($cn, null); }) (unnamed18=expression { addToChildren(cn, unnamed18); }) ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (unnamed19=expression { addToChildren(cn, unnamed19); })))?))))?
+ ('EXPAND' { addLeafNodeForToken($cn, null); }) (unnamed15=r_simpleType { addToChildren(cn, unnamed15); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed16=r_parameterList { addToChildren(cn, unnamed16); }) (')' { addLeafNodeForToken($cn, null); })))? ((((('FOR' { addLeafNodeForToken($cn, null); }) (unnamed17=r_expression { addToChildren(cn, unnamed17); })))
+ | ((('FOREACH' { addLeafNodeForToken($cn, null); }) (unnamed18=r_expression { addToChildren(cn, unnamed18); }) ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (unnamed19=r_expression { addToChildren(cn, unnamed19); })))?))))?
;
-expressionStmt returns [CompositeNode cn]
+r_expressionStmt returns [CompositeNode cn]
@init{ cn = factory.createExpressionStmtNode();
} :
- (unnamed20=expression { addToChildren(cn, unnamed20); })
+ (unnamed20=r_expression { addToChildren(cn, unnamed20); })
;
-fileStatement returns [CompositeNode cn]
+r_fileStatement returns [CompositeNode cn]
@init{ cn = factory.createFileStatementNode();
} :
- ('FILE' { addLeafNodeForToken($cn, null); }) (unnamed21=expression { addToChildren(cn, unnamed21); }) (((unnamed22=identifier { addToChildren(cn, unnamed22); })))? (unnamed23=sequence { addToChildren(cn, unnamed23); }) ('ENDFILE' { addLeafNodeForToken($cn, null); })
+ ('FILE' { addLeafNodeForToken($cn, null); }) (unnamed21=r_expression { addToChildren(cn, unnamed21); }) (((unnamed22=r_identifier { addToChildren(cn, unnamed22); })))? (unnamed23=r_sequence { addToChildren(cn, unnamed23); }) ('ENDFILE' { addLeafNodeForToken($cn, null); })
;
-foreachStatement returns [CompositeNode cn]
+r_foreachStatement returns [CompositeNode cn]
@init{ cn = factory.createForeachStatementNode();
} :
- ('FOREACH' { addLeafNodeForToken($cn, null); }) (unnamed24=expression { addToChildren(cn, unnamed24); }) ('AS' { addLeafNodeForToken($cn, null); }) (unnamed25=identifier { addToChildren(cn, unnamed25); }) ((('ITERATOR' { addLeafNodeForToken($cn, null); }) (unnamed26=identifier { addToChildren(cn, unnamed26); })))? ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (unnamed27=expression { addToChildren(cn, unnamed27); })))? (unnamed28=sequence { addToChildren(cn, unnamed28); }) ('ENDFOREACH' { addLeafNodeForToken($cn, null); })
+ ('FOREACH' { addLeafNodeForToken($cn, null); }) (unnamed24=r_expression { addToChildren(cn, unnamed24); }) ('AS' { addLeafNodeForToken($cn, null); }) (unnamed25=r_identifier { addToChildren(cn, unnamed25); }) ((('ITERATOR' { addLeafNodeForToken($cn, null); }) (unnamed26=r_identifier { addToChildren(cn, unnamed26); })))? ((('SEPARATOR' { addLeafNodeForToken($cn, null); }) (unnamed27=r_expression { addToChildren(cn, unnamed27); })))? (unnamed28=r_sequence { addToChildren(cn, unnamed28); }) ('ENDFOREACH' { addLeafNodeForToken($cn, null); })
;
-ifStatement returns [CompositeNode cn]
+r_ifStatement returns [CompositeNode cn]
@init{ cn = factory.createIfStatementNode();
} :
- ('IF' { addLeafNodeForToken($cn, null); }) (unnamed29=expression { addToChildren(cn, unnamed29); }) (unnamed30=sequence { addToChildren(cn, unnamed30); }) (unnamed31=elseIfStatement { addToChildren(cn, unnamed31); })* (unnamed32=elseStatement { addToChildren(cn, unnamed32); })? ('ENDIF' { addLeafNodeForToken($cn, null); })
+ ('IF' { addLeafNodeForToken($cn, null); }) (unnamed29=r_expression { addToChildren(cn, unnamed29); }) (unnamed30=r_sequence { addToChildren(cn, unnamed30); }) (unnamed31=r_elseIfStatement { addToChildren(cn, unnamed31); })* (unnamed32=r_elseStatement { addToChildren(cn, unnamed32); })? ('ENDIF' { addLeafNodeForToken($cn, null); })
;
-elseIfStatement returns [CompositeNode cn]
+r_elseIfStatement returns [CompositeNode cn]
@init{ cn = factory.createElseIfStatementNode();
} :
- ('ELSEIF' { addLeafNodeForToken($cn, null); }) (unnamed33=expression { addToChildren(cn, unnamed33); }) (unnamed34=sequence { addToChildren(cn, unnamed34); })
+ ('ELSEIF' { addLeafNodeForToken($cn, null); }) (unnamed33=r_expression { addToChildren(cn, unnamed33); }) (unnamed34=r_sequence { addToChildren(cn, unnamed34); })
;
-elseStatement returns [CompositeNode cn]
+r_elseStatement returns [CompositeNode cn]
@init{ cn = factory.createElseStatementNode();
} :
- ('ELSE' { addLeafNodeForToken($cn, null); }) (unnamed35=sequence { addToChildren(cn, unnamed35); })
+ ('ELSE' { addLeafNodeForToken($cn, null); }) (unnamed35=r_sequence { addToChildren(cn, unnamed35); })
;
-letStatement returns [CompositeNode cn]
+r_letStatement returns [CompositeNode cn]
@init{ cn = factory.createLetStatementNode();
} :
- ('LET' { addLeafNodeForToken($cn, null); }) (unnamed36=expression { addToChildren(cn, unnamed36); }) ('AS' { addLeafNodeForToken($cn, null); }) (unnamed37=identifier { addToChildren(cn, unnamed37); }) (unnamed38=sequence { addToChildren(cn, unnamed38); }) ('ENDLET' { addLeafNodeForToken($cn, null); })
+ ('LET' { addLeafNodeForToken($cn, null); }) (unnamed36=r_expression { addToChildren(cn, unnamed36); }) ('AS' { addLeafNodeForToken($cn, null); }) (unnamed37=r_identifier { addToChildren(cn, unnamed37); }) (unnamed38=r_sequence { addToChildren(cn, unnamed38); }) ('ENDLET' { addLeafNodeForToken($cn, null); })
;
-protectStatement returns [CompositeNode cn]
+r_protectStatement returns [CompositeNode cn]
@init{ cn = factory.createProtectStatementNode();
} :
- ('PROTECT' { addLeafNodeForToken($cn, null); }) ('CSTART' { addLeafNodeForToken($cn, null); }) (unnamed39=expression { addToChildren(cn, unnamed39); }) ('CEND' { addLeafNodeForToken($cn, null); }) (unnamed40=expression { addToChildren(cn, unnamed40); }) ('ID' { addLeafNodeForToken($cn, null); }) (unnamed41=expression { addToChildren(cn, unnamed41); }) ('DISABLE' { addLeafNodeForToken($cn, null); })? (unnamed42=sequence { addToChildren(cn, unnamed42); }) ('ENDPROTECT' { addLeafNodeForToken($cn, null); })
+ ('PROTECT' { addLeafNodeForToken($cn, null); }) ('CSTART' { addLeafNodeForToken($cn, null); }) (unnamed39=r_expression { addToChildren(cn, unnamed39); }) ('CEND' { addLeafNodeForToken($cn, null); }) (unnamed40=r_expression { addToChildren(cn, unnamed40); }) ('ID' { addLeafNodeForToken($cn, null); }) (unnamed41=r_expression { addToChildren(cn, unnamed41); }) ('DISABLE' { addLeafNodeForToken($cn, null); })? (unnamed42=r_sequence { addToChildren(cn, unnamed42); }) ('ENDPROTECT' { addLeafNodeForToken($cn, null); })
;
-check returns [CompositeNode cn]
+r_check returns [CompositeNode cn]
@init{ cn = factory.createCheckNode();
} :
- ('context' { addLeafNodeForToken($cn, null); }) (unnamed43=type { addToChildren(cn, unnamed43); }) ((('if' { addLeafNodeForToken($cn, null); }) (unnamed44=expression { addToChildren(cn, unnamed44); })))? ((('ERROR' { addLeafNodeForToken($cn, null); })
- | ('WARNING' { addLeafNodeForToken($cn, null); }))) (unnamed45=expression { addToChildren(cn, unnamed45); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed46=expression { addToChildren(cn, unnamed46); }) (';' { addLeafNodeForToken($cn, null); })
+ ('context' { addLeafNodeForToken($cn, null); }) (unnamed43=r_type { addToChildren(cn, unnamed43); }) ((('if' { addLeafNodeForToken($cn, null); }) (unnamed44=r_expression { addToChildren(cn, unnamed44); })))? ((('ERROR' { addLeafNodeForToken($cn, null); })
+ | ('WARNING' { addLeafNodeForToken($cn, null); }))) (unnamed45=r_expression { addToChildren(cn, unnamed45); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed46=r_expression { addToChildren(cn, unnamed46); }) (';' { addLeafNodeForToken($cn, null); })
;
-around returns [CompositeNode cn]
+r_around returns [CompositeNode cn]
@init{ cn = factory.createAroundNode();
} :
- ('around' { addLeafNodeForToken($cn, null); }) (unnamed47=pointcut { addToChildren(cn, unnamed47); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed48=declaredParameterList { addToChildren(cn, unnamed48); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
- | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed49=expression { addToChildren(cn, unnamed49); }) (';' { addLeafNodeForToken($cn, null); })
+ ('around' { addLeafNodeForToken($cn, null); }) (unnamed47=r_pointcut { addToChildren(cn, unnamed47); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed48=r_declaredParameterList { addToChildren(cn, unnamed48); }) (((',' { addLeafNodeForToken($cn, null); })? ('*' { addLeafNodeForToken($cn, null); })))?
+ | ('*' { addLeafNodeForToken($cn, null); })))? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed49=r_expression { addToChildren(cn, unnamed49); }) (';' { addLeafNodeForToken($cn, null); })
;
-pointcut returns [CompositeNode cn]
+r_pointcut returns [CompositeNode cn]
@init{ cn = factory.createPointcutNode();
} :
((('*' { addLeafNodeForToken($cn, null); })
- | (unnamed50=identifier { addToChildren(cn, unnamed50); }))) ((('*' { addLeafNodeForToken($cn, null); })
- | (unnamed51=identifier { addToChildren(cn, unnamed51); })
+ | (unnamed50=r_identifier { addToChildren(cn, unnamed50); }))) ((('*' { addLeafNodeForToken($cn, null); })
+ | (unnamed51=r_identifier { addToChildren(cn, unnamed51); })
| ('::' { addLeafNodeForToken($cn, null); })))*
;
-extension returns [CompositeNode cn]
+r_extension returns [CompositeNode cn]
@init{ cn = factory.createExtensionNode();
} :
((('private' { addLeafNodeForToken($cn, "private"); })
| ('cached' { addLeafNodeForToken($cn, "cached"); })
- | ('create' { addLeafNodeForToken($cn, "create"); })))* (returnType=type { addToChildren(cn, returnType); ((ExtensionNode) cn).setReturnType(returnType); })? (name=identifier { addToChildren(cn, name); ((ExtensionNode) cn).setName(name); }) ('(' { addLeafNodeForToken($cn, null); }) (paramList=declaredParameterList { addToChildren(cn, paramList); ((ExtensionNode) cn).setParamList(paramList); })? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) ((('JAVA' { addLeafNodeForToken($cn, null); }) (javaReturnType=javaType { addToChildren(cn, javaReturnType); ((ExtensionNode) cn).setJavaReturnType(javaReturnType); }) ('.' { addLeafNodeForToken($cn, null); }) (javaName=identifier { addToChildren(cn, javaName); ((ExtensionNode) cn).setJavaName(javaName); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed52=javaType { addToChildren(cn, unnamed52); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed53=javaType { addToChildren(cn, unnamed53); })))*))? (')' { addLeafNodeForToken($cn, null); })
- | (extendBody=expression { addToChildren(cn, extendBody); ((ExtensionNode) cn).setExtendBody(extendBody); }))) (';' { addLeafNodeForToken($cn, null); })
+ | ('create' { addLeafNodeForToken($cn, "create"); })))* (returnType=r_type { addToChildren(cn, returnType); ((ExtensionNode) cn).setReturnType(returnType); })? (name=r_identifier { addToChildren(cn, name); ((ExtensionNode) cn).setName(name); }) ('(' { addLeafNodeForToken($cn, null); }) (paramList=r_declaredParameterList { addToChildren(cn, paramList); ((ExtensionNode) cn).setParamList(paramList); })? (')' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) ((('JAVA' { addLeafNodeForToken($cn, null); }) (javaReturnType=r_javaType { addToChildren(cn, javaReturnType); ((ExtensionNode) cn).setJavaReturnType(javaReturnType); }) ('.' { addLeafNodeForToken($cn, null); }) (javaName=r_identifier { addToChildren(cn, javaName); ((ExtensionNode) cn).setJavaName(javaName); }) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed52=r_javaType { addToChildren(cn, unnamed52); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed53=r_javaType { addToChildren(cn, unnamed53); })))*))? (')' { addLeafNodeForToken($cn, null); })
+ | (extendBody=r_expression { addToChildren(cn, extendBody); ((ExtensionNode) cn).setExtendBody(extendBody); }))) (';' { addLeafNodeForToken($cn, null); })
;
-javaType returns [CompositeNode cn]
+r_javaType returns [CompositeNode cn]
@init{ cn = factory.createJavaTypeNode();
} :
- (unnamed54=identifier { addToChildren(cn, unnamed54); }) ((('.' { addLeafNodeForToken($cn, null); }) (((unnamed55=identifier { addToChildren(cn, unnamed55); })
+ (unnamed54=r_identifier { addToChildren(cn, unnamed54); }) ((('.' { addLeafNodeForToken($cn, null); }) (((unnamed55=r_identifier { addToChildren(cn, unnamed55); })
| ('Collection' { addLeafNodeForToken($cn, null); })
| ('List' { addLeafNodeForToken($cn, null); })
| ('Set' { addLeafNodeForToken($cn, null); })))))*
;
-test_expression returns [CompositeNode cn]
+r_test_expression returns [CompositeNode cn]
@init{ cn = factory.createTest_expressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed56=expression { addToChildren(cn, unnamed56); }) (EOF)
+ (unnamed56=r_expression { addToChildren(cn, unnamed56); }) (EOF)
;
-expression returns [CompositeNode cn]
+r_expression returns [CompositeNode cn]
@init{ cn = factory.createExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed57=letExpression { addToChildren(cn, unnamed57); })
+ (unnamed57=r_letExpression { addToChildren(cn, unnamed57); })
;
-letExpression returns [CompositeNode cn]
+r_letExpression returns [CompositeNode cn]
@init{ cn = factory.createLetExpressionNode();
}
@after{ cn = normalize(cn); } :
- ('let' { addLeafNodeForToken($cn, null); }) (unnamed58=identifier { addToChildren(cn, unnamed58); }) ('=' { addLeafNodeForToken($cn, null); }) (unnamed59=castedExpression { addToChildren(cn, unnamed59); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed60=expression { addToChildren(cn, unnamed60); })
- | (unnamed61=castedExpression { addToChildren(cn, unnamed61); })
+ ('let' { addLeafNodeForToken($cn, null); }) (unnamed58=r_identifier { addToChildren(cn, unnamed58); }) ('=' { addLeafNodeForToken($cn, null); }) (unnamed59=r_castedExpression { addToChildren(cn, unnamed59); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed60=r_expression { addToChildren(cn, unnamed60); })
+ | (unnamed61=r_castedExpression { addToChildren(cn, unnamed61); })
;
-castedExpression returns [CompositeNode cn]
+r_castedExpression returns [CompositeNode cn]
@init{ cn = factory.createCastedExpressionNode();
}
@after{ cn = normalize(cn); } :
- ('(' type ')' chainExpression)=>(('(' { addLeafNodeForToken($cn, null); }) (unnamed62=type { addToChildren(cn, unnamed62); }) (')' { addLeafNodeForToken($cn, null); }) (unnamed63=chainExpression { addToChildren(cn, unnamed63); }))
- | (unnamed64=chainExpression { addToChildren(cn, unnamed64); })
+ ('(' r_type ')' r_chainExpression)=>(('(' { addLeafNodeForToken($cn, null); }) (unnamed62=r_type { addToChildren(cn, unnamed62); }) (')' { addLeafNodeForToken($cn, null); }) (unnamed63=r_chainExpression { addToChildren(cn, unnamed63); }))
+ | (unnamed64=r_chainExpression { addToChildren(cn, unnamed64); })
;
-chainExpression returns [CompositeNode cn]
+r_chainExpression returns [CompositeNode cn]
@init{ cn = factory.createChainExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed65=ifExpression { addToChildren(cn, unnamed65); }) ((('->' { addLeafNodeForToken($cn, null); }) (unnamed66=ifExpression { addToChildren(cn, unnamed66); })))*
+ (unnamed65=r_ifExpression { addToChildren(cn, unnamed65); }) ((('->' { addLeafNodeForToken($cn, null); }) (unnamed66=r_ifExpression { addToChildren(cn, unnamed66); })))*
;
-ifExpression returns [CompositeNode cn]
+r_ifExpression returns [CompositeNode cn]
@init{ cn = factory.createIfExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed67=switchExpression { addToChildren(cn, unnamed67); }) ((('?' { addLeafNodeForToken($cn, null); }) (unnamed68=expression { addToChildren(cn, unnamed68); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed69=switchExpression { addToChildren(cn, unnamed69); })))?
- | ('if' { addLeafNodeForToken($cn, null); }) (unnamed70=expression { addToChildren(cn, unnamed70); }) ('then' { addLeafNodeForToken($cn, null); }) (unnamed71=switchExpression { addToChildren(cn, unnamed71); }) ((('else' { addLeafNodeForToken($cn, null); }) (unnamed72=switchExpression { addToChildren(cn, unnamed72); })))?
+ (unnamed67=r_switchExpression { addToChildren(cn, unnamed67); }) ((('?' { addLeafNodeForToken($cn, null); }) (unnamed68=r_expression { addToChildren(cn, unnamed68); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed69=r_switchExpression { addToChildren(cn, unnamed69); })))?
+ | ('if' { addLeafNodeForToken($cn, null); }) (unnamed70=r_expression { addToChildren(cn, unnamed70); }) ('then' { addLeafNodeForToken($cn, null); }) (unnamed71=r_switchExpression { addToChildren(cn, unnamed71); }) ((('else' { addLeafNodeForToken($cn, null); }) (unnamed72=r_switchExpression { addToChildren(cn, unnamed72); })))?
;
-switchExpression returns [CompositeNode cn]
+r_switchExpression returns [CompositeNode cn]
@init{ cn = factory.createSwitchExpressionNode();
}
@after{ cn = normalize(cn); } :
- ('switch' { addLeafNodeForToken($cn, null); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed73=orExpression { addToChildren(cn, unnamed73); }) (')' { addLeafNodeForToken($cn, null); })))? ('{' { addLeafNodeForToken($cn, null); }) (unnamed74=casePart { addToChildren(cn, unnamed74); })* ('default' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed75=orExpression { addToChildren(cn, unnamed75); }) ('}' { addLeafNodeForToken($cn, null); })
- | (unnamed76=orExpression { addToChildren(cn, unnamed76); })
+ ('switch' { addLeafNodeForToken($cn, null); }) ((('(' { addLeafNodeForToken($cn, null); }) (unnamed73=r_orExpression { addToChildren(cn, unnamed73); }) (')' { addLeafNodeForToken($cn, null); })))? ('{' { addLeafNodeForToken($cn, null); }) (unnamed74=r_casePart { addToChildren(cn, unnamed74); })* ('default' { addLeafNodeForToken($cn, null); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed75=r_orExpression { addToChildren(cn, unnamed75); }) ('}' { addLeafNodeForToken($cn, null); })
+ | (unnamed76=r_orExpression { addToChildren(cn, unnamed76); })
;
-casePart returns [CompositeNode cn]
+r_casePart returns [CompositeNode cn]
@init{ cn = factory.createCasePartNode();
} :
- ('case' { addLeafNodeForToken($cn, null); }) (unnamed77=expression { addToChildren(cn, unnamed77); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed78=expression { addToChildren(cn, unnamed78); })
+ ('case' { addLeafNodeForToken($cn, null); }) (unnamed77=r_expression { addToChildren(cn, unnamed77); }) (':' { addLeafNodeForToken($cn, null); }) (unnamed78=r_expression { addToChildren(cn, unnamed78); })
;
-orExpression returns [CompositeNode cn]
+r_orExpression returns [CompositeNode cn]
@init{ cn = factory.createOrExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed79=andExpression { addToChildren(cn, unnamed79); }) ((('||' { addLeafNodeForToken($cn, null); }) (unnamed80=andExpression { addToChildren(cn, unnamed80); })))*
+ (unnamed79=r_andExpression { addToChildren(cn, unnamed79); }) ((('||' { addLeafNodeForToken($cn, null); }) (unnamed80=r_andExpression { addToChildren(cn, unnamed80); })))*
;
-andExpression returns [CompositeNode cn]
+r_andExpression returns [CompositeNode cn]
@init{ cn = factory.createAndExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed81=impliesExpression { addToChildren(cn, unnamed81); }) ((('&&' { addLeafNodeForToken($cn, null); }) (unnamed82=impliesExpression { addToChildren(cn, unnamed82); })))*
+ (unnamed81=r_impliesExpression { addToChildren(cn, unnamed81); }) ((('&&' { addLeafNodeForToken($cn, null); }) (unnamed82=r_impliesExpression { addToChildren(cn, unnamed82); })))*
;
-impliesExpression returns [CompositeNode cn]
+r_impliesExpression returns [CompositeNode cn]
@init{ cn = factory.createImpliesExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed83=relationalExpression { addToChildren(cn, unnamed83); }) ((('implies' { addLeafNodeForToken($cn, null); }) (unnamed84=relationalExpression { addToChildren(cn, unnamed84); })))*
+ (unnamed83=r_relationalExpression { addToChildren(cn, unnamed83); }) ((('implies' { addLeafNodeForToken($cn, null); }) (unnamed84=r_relationalExpression { addToChildren(cn, unnamed84); })))*
;
-relationalExpression returns [CompositeNode cn]
+r_relationalExpression returns [CompositeNode cn]
@init{ cn = factory.createRelationalExpressionNode();
}
@after{ cn = normalize(cn); } :
- (leftOperand=additiveExpression { addToChildren(cn, leftOperand); ((RelationalExpressionNode) cn).setLeftOperand(leftOperand); }) (((operator=booleanOperator { addToChildren(cn, operator); ((RelationalExpressionNode) cn).setOperator(operator); }) (rightOperand=additiveExpression { addToChildren(cn, rightOperand); ((RelationalExpressionNode) cn).setRightOperand(rightOperand); })))*
-;
-booleanOperator returns [CompositeNode cn]
- @init{ cn = factory.createBooleanOperatorNode();
- } :
- ('==' { addLeafNodeForToken($cn, null); })
- | ('!=' { addLeafNodeForToken($cn, null); })
- | ('>=' { addLeafNodeForToken($cn, null); })
- | ('<=' { addLeafNodeForToken($cn, null); })
- | ('>' { addLeafNodeForToken($cn, null); })
- | ('<' { addLeafNodeForToken($cn, null); })
-;
-additiveExpression returns [CompositeNode cn]
+ (leftOperand=r_additiveExpression { addToChildren(cn, leftOperand); ((RelationalExpressionNode) cn).setLeftOperand(leftOperand); }) ((((('==' { addLeafNodeForToken($cn, "operator"); })
+ | ('!=' { addLeafNodeForToken($cn, "operator"); })
+ | ('>=' { addLeafNodeForToken($cn, "operator"); })
+ | ('<=' { addLeafNodeForToken($cn, "operator"); })
+ | ('>' { addLeafNodeForToken($cn, "operator"); })
+ | ('<' { addLeafNodeForToken($cn, "operator"); }))) (rightOperand=r_additiveExpression { addToChildren(cn, rightOperand); ((RelationalExpressionNode) cn).setRightOperand(rightOperand); })))*
+;
+r_additiveExpression returns [CompositeNode cn]
@init{ cn = factory.createAdditiveExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed85=multiplicativeExpression { addToChildren(cn, unnamed85); }) ((((('+' { addLeafNodeForToken($cn, null); })
- | ('-' { addLeafNodeForToken($cn, null); }))) (unnamed86=multiplicativeExpression { addToChildren(cn, unnamed86); })))*
+ (unnamed85=r_multiplicativeExpression { addToChildren(cn, unnamed85); }) ((((('+' { addLeafNodeForToken($cn, null); })
+ | ('-' { addLeafNodeForToken($cn, null); }))) (unnamed86=r_multiplicativeExpression { addToChildren(cn, unnamed86); })))*
;
-multiplicativeExpression returns [CompositeNode cn]
+r_multiplicativeExpression returns [CompositeNode cn]
@init{ cn = factory.createMultiplicativeExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed87=unaryExpression { addToChildren(cn, unnamed87); }) ((((('*' { addLeafNodeForToken($cn, null); })
- | ('/' { addLeafNodeForToken($cn, null); }))) (unnamed88=unaryExpression { addToChildren(cn, unnamed88); })))*
+ (unnamed87=r_unaryExpression { addToChildren(cn, unnamed87); }) ((((('*' { addLeafNodeForToken($cn, null); })
+ | ('/' { addLeafNodeForToken($cn, null); }))) (unnamed88=r_unaryExpression { addToChildren(cn, unnamed88); })))*
;
-unaryExpression returns [CompositeNode cn]
+r_unaryExpression returns [CompositeNode cn]
@init{ cn = factory.createUnaryExpressionNode();
}
@after{ cn = normalize(cn); } :
- (unnamed89=infixExpression { addToChildren(cn, unnamed89); })
- | ('!' { addLeafNodeForToken($cn, null); }) (unnamed90=infixExpression { addToChildren(cn, unnamed90); })
- | ('-' { addLeafNodeForToken($cn, null); }) (unnamed91=infixExpression { addToChildren(cn, unnamed91); })
+ (unnamed89=r_infixExpression { addToChildren(cn, unnamed89); })
+ | ('!' { addLeafNodeForToken($cn, null); }) (unnamed90=r_infixExpression { addToChildren(cn, unnamed90); })
+ | ('-' { addLeafNodeForToken($cn, null); }) (unnamed91=r_infixExpression { addToChildren(cn, unnamed91); })
;
-infixExpression returns [CompositeNode cn]
+r_infixExpression returns [CompositeNode cn]
@init{ cn = factory.createInfixExpressionNode();
}
@after{ cn = normalize(cn); } :
- (target=primaryExpression { addToChildren(cn, target); ((InfixExpressionNode) cn).setTarget(target); }) ((('.' { addLeafNodeForToken($cn, null); }) (calls=featureCall { addToChildren(cn, calls); ((InfixExpressionNode) cn).getCalls().add(calls); })))*
-;
-primaryExpression returns [CompositeNode cn] :
- (stringLiteral { $cn = $stringLiteral.cn; })
- | (featureCall { $cn = $featureCall.cn; })
- | (booleanLiteral { $cn = $booleanLiteral.cn; })
- | (numberLiteral { $cn = $numberLiteral.cn; })
- | (nullLiteral { $cn = $nullLiteral.cn; })
- | (listLiteral { $cn = $listLiteral.cn; })
- | (constructorCall { $cn = $constructorCall.cn; })
- | (globalVarExpression { $cn = $globalVarExpression.cn; })
- | (paranthesizedExpression { $cn = $paranthesizedExpression.cn; })
-;
-stringLiteral returns [CompositeNode cn]
+ (target=r_primaryExpression { addToChildren(cn, target); ((InfixExpressionNode) cn).setTarget(target); }) ((('.' { addLeafNodeForToken($cn, null); }) (calls=r_featureCall { addToChildren(cn, calls); ((InfixExpressionNode) cn).getCalls().add(calls); })))*
+;
+r_primaryExpression returns [CompositeNode cn] :
+ (r_stringLiteral { $cn = $r_stringLiteral.cn; })
+ | (r_featureCall { $cn = $r_featureCall.cn; })
+ | (r_booleanLiteral { $cn = $r_booleanLiteral.cn; })
+ | (r_numberLiteral { $cn = $r_numberLiteral.cn; })
+ | (r_nullLiteral { $cn = $r_nullLiteral.cn; })
+ | (r_listLiteral { $cn = $r_listLiteral.cn; })
+ | (r_constructorCall { $cn = $r_constructorCall.cn; })
+ | (r_globalVarExpression { $cn = $r_globalVarExpression.cn; })
+ | (r_paranthesizedExpression { $cn = $r_paranthesizedExpression.cn; })
+;
+r_stringLiteral returns [CompositeNode cn]
@init{ cn = factory.createStringLiteralNode();
} :
(StringLiteral { addLeafNodeForToken($cn, null); })
;
-paranthesizedExpression returns [CompositeNode cn]
+r_paranthesizedExpression returns [CompositeNode cn]
@init{ cn = factory.createParanthesizedExpressionNode();
} :
- ('(' { addLeafNodeForToken($cn, null); }) (unnamed92=expression { addToChildren(cn, unnamed92); }) (')' { addLeafNodeForToken($cn, null); })
+ ('(' { addLeafNodeForToken($cn, null); }) (unnamed92=r_expression { addToChildren(cn, unnamed92); }) (')' { addLeafNodeForToken($cn, null); })
;
-globalVarExpression returns [CompositeNode cn]
+r_globalVarExpression returns [CompositeNode cn]
@init{ cn = factory.createGlobalVarExpressionNode();
} :
- ('GLOBALVAR' { addLeafNodeForToken($cn, null); }) (unnamed93=identifier { addToChildren(cn, unnamed93); })
+ ('GLOBALVAR' { addLeafNodeForToken($cn, null); }) (unnamed93=r_identifier { addToChildren(cn, unnamed93); })
;
-featureCall returns [CompositeNode cn]
+r_featureCall returns [CompositeNode cn]
@init{ cn = factory.createFeatureCallNode();
}
@after{ cn = normalize(cn); } :
- (name=identifier { addToChildren(cn, name); ((FeatureCallNode) cn).setName(name); }) ('(' { addLeafNodeForToken($cn, null); }) (((paramList=parameterList { addToChildren(cn, paramList); ((FeatureCallNode) cn).setParamList(paramList); })))? (')' { addLeafNodeForToken($cn, null); })
- | (unnamed94=type { addToChildren(cn, unnamed94); })
- | (unnamed95=collectionExpression { addToChildren(cn, unnamed95); })
+ (name=r_identifier { addToChildren(cn, name); ((FeatureCallNode) cn).setName(name); }) ('(' { addLeafNodeForToken($cn, null); }) (((paramList=r_parameterList { addToChildren(cn, paramList); ((FeatureCallNode) cn).setParamList(paramList); })))? (')' { addLeafNodeForToken($cn, null); })
+ | (unnamed94=r_type { addToChildren(cn, unnamed94); })
+ | (unnamed95=r_collectionExpression { addToChildren(cn, unnamed95); })
;
-listLiteral returns [CompositeNode cn]
+r_listLiteral returns [CompositeNode cn]
@init{ cn = factory.createListLiteralNode();
} :
- ('{' { addLeafNodeForToken($cn, null); }) (((unnamed96=expression { addToChildren(cn, unnamed96); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed97=expression { addToChildren(cn, unnamed97); })))*))? ('}' { addLeafNodeForToken($cn, null); })
+ ('{' { addLeafNodeForToken($cn, null); }) (((unnamed96=r_expression { addToChildren(cn, unnamed96); }) (((',' { addLeafNodeForToken($cn, null); }) (unnamed97=r_expression { addToChildren(cn, unnamed97); })))*))? ('}' { addLeafNodeForToken($cn, null); })
;
-constructorCall returns [CompositeNode cn]
+r_constructorCall returns [CompositeNode cn]
@init{ cn = factory.createConstructorCallNode();
} :
- ('new' { addLeafNodeForToken($cn, null); }) (unnamed98=simpleType { addToChildren(cn, unnamed98); })
+ ('new' { addLeafNodeForToken($cn, null); }) (unnamed98=r_simpleType { addToChildren(cn, unnamed98); })
;
-booleanLiteral returns [CompositeNode cn]
+r_booleanLiteral returns [CompositeNode cn]
@init{ cn = factory.createBooleanLiteralNode();
} :
('false' { addLeafNodeForToken($cn, null); })
| ('true' { addLeafNodeForToken($cn, null); })
;
-nullLiteral returns [CompositeNode cn]
+r_nullLiteral returns [CompositeNode cn]
@init{ cn = factory.createNullLiteralNode();
} :
('null' { addLeafNodeForToken($cn, null); })
;
-numberLiteral returns [CompositeNode cn]
+r_numberLiteral returns [CompositeNode cn]
@init{ cn = factory.createNumberLiteralNode();
} :
(IntLiteral { addLeafNodeForToken($cn, null); })
| (IntLiteral { addLeafNodeForToken($cn, null); }) ('.' { addLeafNodeForToken($cn, null); }) (IntLiteral { addLeafNodeForToken($cn, null); })
;
-collectionExpression returns [CompositeNode cn]
+r_collectionExpression returns [CompositeNode cn]
@init{ cn = factory.createCollectionExpressionNode();
} :
- ('typeSelect' { addLeafNodeForToken($cn, null); }) ('(' { addLeafNodeForToken($cn, null); }) (unnamed99=type { addToChildren(cn, unnamed99); }) (')' { addLeafNodeForToken($cn, null); })
+ ('typeSelect' { addLeafNodeForToken($cn, null); }) ('(' { addLeafNodeForToken($cn, null); }) (unnamed99=r_type { addToChildren(cn, unnamed99); }) (')' { addLeafNodeForToken($cn, null); })
| ((('collect' { addLeafNodeForToken($cn, null); })
| ('select' { addLeafNodeForToken($cn, null); })
| ('selectFirst' { addLeafNodeForToken($cn, null); })
@@ -360,40 +355,40 @@ collectionExpression returns [CompositeNode cn]
| ('exists' { addLeafNodeForToken($cn, null); })
| ('notExists' { addLeafNodeForToken($cn, null); })
| ('sortBy' { addLeafNodeForToken($cn, null); })
- | ('forAll' { addLeafNodeForToken($cn, null); }))) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed100=identifier { addToChildren(cn, unnamed100); }) ('|' { addLeafNodeForToken($cn, null); })))? (unnamed101=expression { addToChildren(cn, unnamed101); }) (')' { addLeafNodeForToken($cn, null); })
+ | ('forAll' { addLeafNodeForToken($cn, null); }))) ('(' { addLeafNodeForToken($cn, null); }) (((unnamed100=r_identifier { addToChildren(cn, unnamed100); }) ('|' { addLeafNodeForToken($cn, null); })))? (unnamed101=r_expression { addToChildren(cn, unnamed101); }) (')' { addLeafNodeForToken($cn, null); })
;
-declaredParameterList returns [CompositeNode cn]
+r_declaredParameterList returns [CompositeNode cn]
@init{ cn = factory.createDeclaredParameterListNode();
} :
- (params=declaredParameter { addToChildren(cn, params); ((DeclaredParameterListNode) cn).getParams().add(params); }) (((',' { addLeafNodeForToken($cn, null); }) (params=declaredParameter { addToChildren(cn, params); ((DeclaredParameterListNode) cn).getParams().add(params); })))*
+ (params=r_declaredParameter { addToChildren(cn, params); ((DeclaredParameterListNode) cn).getParams().add(params); }) (((',' { addLeafNodeForToken($cn, null); }) (params=r_declaredParameter { addToChildren(cn, params); ((DeclaredParameterListNode) cn).getParams().add(params); })))*
;
-declaredParameter returns [CompositeNode cn]
+r_declaredParameter returns [CompositeNode cn]
@init{ cn = factory.createDeclaredParameterNode();
} :
- (ptype=type { addToChildren(cn, ptype); ((DeclaredParameterNode) cn).setPtype(ptype); }) (name=identifier { addToChildren(cn, name); ((DeclaredParameterNode) cn).setName(name); })
+ (ptype=r_type { addToChildren(cn, ptype); ((DeclaredParameterNode) cn).setPtype(ptype); }) (name=r_identifier { addToChildren(cn, name); ((DeclaredParameterNode) cn).setName(name); })
;
-parameterList returns [CompositeNode cn]
+r_parameterList returns [CompositeNode cn]
@init{ cn = factory.createParameterListNode();
} :
- (params=expression { addToChildren(cn, params); ((ParameterListNode) cn).getParams().add(params); }) (((',' { addLeafNodeForToken($cn, null); }) (params=expression { addToChildren(cn, params); ((ParameterListNode) cn).getParams().add(params); })))*
+ (params=r_expression { addToChildren(cn, params); ((ParameterListNode) cn).getParams().add(params); }) (((',' { addLeafNodeForToken($cn, null); }) (params=r_expression { addToChildren(cn, params); ((ParameterListNode) cn).getParams().add(params); })))*
;
-type returns [CompositeNode cn] :
- (collectionType { $cn = $collectionType.cn; })
- | (simpleType { $cn = $simpleType.cn; })
+r_type returns [CompositeNode cn] :
+ (r_collectionType { $cn = $r_collectionType.cn; })
+ | (r_simpleType { $cn = $r_simpleType.cn; })
;
-collectionType returns [CompositeNode cn]
+r_collectionType returns [CompositeNode cn]
@init{ cn = factory.createCollectionTypeNode();
} :
((('Collection' { addLeafNodeForToken($cn, null); })
| ('List' { addLeafNodeForToken($cn, null); })
- | ('Set' { addLeafNodeForToken($cn, null); }))) ((('[' { addLeafNodeForToken($cn, null); }) (unnamed102=simpleType { addToChildren(cn, unnamed102); }) (']' { addLeafNodeForToken($cn, null); })))?
+ | ('Set' { addLeafNodeForToken($cn, null); }))) ((('[' { addLeafNodeForToken($cn, null); }) (unnamed102=r_simpleType { addToChildren(cn, unnamed102); }) (']' { addLeafNodeForToken($cn, null); })))?
;
-simpleType returns [CompositeNode cn]
+r_simpleType returns [CompositeNode cn]
@init{ cn = factory.createSimpleTypeNode();
} :
- (names=identifier { addToChildren(cn, names); ((SimpleTypeNode) cn).getNames().add(names); }) ((('::' { addLeafNodeForToken($cn, null); }) (names=identifier { addToChildren(cn, names); ((SimpleTypeNode) cn).getNames().add(names); })))*
+ (names=r_identifier { addToChildren(cn, names); ((SimpleTypeNode) cn).getNames().add(names); }) ((('::' { addLeafNodeForToken($cn, null); }) (names=r_identifier { addToChildren(cn, names); ((SimpleTypeNode) cn).getNames().add(names); })))*
;
-identifier returns [CompositeNode cn]
+r_identifier returns [CompositeNode cn]
@init{ cn = factory.createIdentifierNode();
} :
(Identifier { addLeafNodeForToken($cn, null); })
diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java
index 153fffd..228cd84 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-06 16:05:47
+// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-07 10:28:47
package org.eclipse.xpand3.parser;
@@ -1765,10 +1765,10 @@ public class Xpand3NodeLexer extends Lexer {
public void mIntLiteral() throws RecognitionException {
try {
int _type = IntLiteral;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:3: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -1780,23 +1780,23 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("403:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input);
+ new NoViableAltException("398:3: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input);
throw nvae;
}
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:4: '0'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:4: '0'
{
match('0');
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:10: '1' .. '9' ( '0' .. '9' )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:10: '1' .. '9' ( '0' .. '9' )*
{
matchRange('1','9');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:19: ( '0' .. '9' )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:19: ( '0' .. '9' )*
loop1:
do {
int alt1=2;
@@ -1809,7 +1809,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:19: '0' .. '9'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:398:19: '0' .. '9'
{
matchRange('0','9');
@@ -1841,7 +1841,7 @@ public class Xpand3NodeLexer extends Lexer {
public void mStringLiteral() throws RecognitionException {
try {
int _type = StringLiteral;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:402:3: ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -1853,16 +1853,16 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("406:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input);
+ new NoViableAltException("401:1: StringLiteral : ( '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input);
throw nvae;
}
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:402:3: '\\\"' ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )* '\\\"'
{
match('\"');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:402:8: ( EscapeSequence | ~ ( '\\\\' | '\\\"' ) )*
loop3:
do {
int alt3=3;
@@ -1878,14 +1878,14 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:10: EscapeSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:402:10: EscapeSequence
{
mEscapeSequence();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:27: ~ ( '\\\\' | '\\\"' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:402:27: ~ ( '\\\\' | '\\\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1911,10 +1911,10 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\''
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )*
loop4:
do {
int alt4=3;
@@ -1930,14 +1930,14 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:15: EscapeSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:15: EscapeSequence
{
mEscapeSequence();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:32: ~ ( '\\'' | '\\\\' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:403:32: ~ ( '\\'' | '\\\\' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1974,7 +1974,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start EscapeSequence
public void mEscapeSequence() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:412:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape )
int alt6=3;
int LA6_0 = input.LA(1);
@@ -2011,7 +2011,7 @@ public class Xpand3NodeLexer extends Lexer {
break;
default:
NoViableAltException nvae =
- new NoViableAltException("411:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input);
+ new NoViableAltException("406:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input);
throw nvae;
}
@@ -2019,13 +2019,13 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("411:10: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input);
+ new NoViableAltException("406: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:412:3: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:407:3: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -2042,14 +2042,14 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:9: UnicodeEscape
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:408:9: UnicodeEscape
{
mUnicodeEscape();
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:9: OctalEscape
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:409:9: OctalEscape
{
mOctalEscape();
@@ -2066,7 +2066,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start OctalEscape
public void mOctalEscape() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
int alt7=3;
int LA7_0 = input.LA(1);
@@ -2099,38 +2099,38 @@ public class Xpand3NodeLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("417:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input);
+ new NoViableAltException("412: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("417:10: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input);
+ new NoViableAltException("412: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:418:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:3: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
{
match('\\');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:8: ( '0' .. '3' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:9: '0' .. '3'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:8: ( '0' .. '3' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:9: '0' .. '3'
{
matchRange('0','3');
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:19: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:20: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:19: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:20: '0' .. '7'
{
matchRange('0','7');
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:30: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:418:31: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:30: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:413:31: '0' .. '7'
{
matchRange('0','7');
@@ -2140,18 +2140,18 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
{
match('\\');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:14: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:15: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:14: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:15: '0' .. '7'
{
matchRange('0','7');
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:25: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:26: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:25: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:414:26: '0' .. '7'
{
matchRange('0','7');
@@ -2161,11 +2161,11 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:9: '\\\\' ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:9: '\\\\' ( '0' .. '7' )
{
match('\\');
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:14: ( '0' .. '7' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:420:15: '0' .. '7'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:14: ( '0' .. '7' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:415:15: '0' .. '7'
{
matchRange('0','7');
@@ -2185,8 +2185,8 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start UnicodeEscape
public void mUnicodeEscape() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:424:3: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:3: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:419:3: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
{
match('\\');
match('u');
@@ -2206,8 +2206,8 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start HexDigit
public void mHexDigit() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:428:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:428:3: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:423:3: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:423:3: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
input.consume();
@@ -2232,8 +2232,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mDEFINE() throws RecognitionException {
try {
int _type = DEFINE;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:3: ( 'DEFINE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:432:3: 'DEFINE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:3: ( 'DEFINE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:427:3: 'DEFINE'
{
xpandMode=true;
match("DEFINE");
@@ -2252,8 +2252,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mENDDEFINE() throws RecognitionException {
try {
int _type = ENDDEFINE;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:3: ( 'ENDDEFINE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:436:3: 'ENDDEFINE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:431:3: ( 'ENDDEFINE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:431:3: 'ENDDEFINE'
{
match("ENDDEFINE");
@@ -2272,8 +2272,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mAROUND() throws RecognitionException {
try {
int _type = AROUND;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:440:3: ( 'AROUND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:440:3: 'AROUND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:435:3: ( 'AROUND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:435:3: 'AROUND'
{
xpandMode=true;
match("AROUND");
@@ -2292,8 +2292,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mENDAROUND() throws RecognitionException {
try {
int _type = ENDAROUND;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: ( 'ENDAROUND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:444:3: 'ENDAROUND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:439:3: ( 'ENDAROUND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:439:3: 'ENDAROUND'
{
match("ENDAROUND");
@@ -2312,10 +2312,10 @@ public class Xpand3NodeLexer extends Lexer {
public void mIdentifier() throws RecognitionException {
try {
int _type = Identifier;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:3: ( '^' )? Letter ( Letter | JavaIDDigit )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:3: ( ( '^' )? Letter ( Letter | JavaIDDigit )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:3: ( '^' )? Letter ( Letter | JavaIDDigit )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:3: ( '^' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:3: ( '^' )?
int alt8=2;
int LA8_0 = input.LA(1);
@@ -2324,7 +2324,7 @@ public class Xpand3NodeLexer extends Lexer {
}
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:4: '^'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:4: '^'
{
match('^');
@@ -2334,7 +2334,7 @@ public class Xpand3NodeLexer extends Lexer {
}
mLetter();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:448:17: ( Letter | JavaIDDigit )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:443:17: ( Letter | JavaIDDigit )*
loop9:
do {
int alt9=2;
@@ -2381,7 +2381,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start Letter
public void mLetter() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:452:3: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:447:3: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:
{
if ( input.LA(1)=='$'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00D6')||(input.LA(1)>='\u00D8' && input.LA(1)<='\u00F6')||(input.LA(1)>='\u00F8' && input.LA(1)<='\u1FFF')||(input.LA(1)>='\u3040' && input.LA(1)<='\u318F')||(input.LA(1)>='\u3300' && input.LA(1)<='\u337F')||(input.LA(1)>='\u3400' && input.LA(1)<='\u3D2D')||(input.LA(1)>='\u4E00' && input.LA(1)<='\u9FFF')||(input.LA(1)>='\uF900' && input.LA(1)<='\uFAFF') ) {
@@ -2406,7 +2406,7 @@ public class Xpand3NodeLexer extends Lexer {
// $ANTLR start JavaIDDigit
public void mJavaIDDigit() throws RecognitionException {
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:469:8: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:464:8: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='\u0660' && input.LA(1)<='\u0669')||(input.LA(1)>='\u06F0' && input.LA(1)<='\u06F9')||(input.LA(1)>='\u0966' && input.LA(1)<='\u096F')||(input.LA(1)>='\u09E6' && input.LA(1)<='\u09EF')||(input.LA(1)>='\u0A66' && input.LA(1)<='\u0A6F')||(input.LA(1)>='\u0AE6' && input.LA(1)<='\u0AEF')||(input.LA(1)>='\u0B66' && input.LA(1)<='\u0B6F')||(input.LA(1)>='\u0BE7' && input.LA(1)<='\u0BEF')||(input.LA(1)>='\u0C66' && input.LA(1)<='\u0C6F')||(input.LA(1)>='\u0CE6' && input.LA(1)<='\u0CEF')||(input.LA(1)>='\u0D66' && input.LA(1)<='\u0D6F')||(input.LA(1)>='\u0E50' && input.LA(1)<='\u0E59')||(input.LA(1)>='\u0ED0' && input.LA(1)<='\u0ED9')||(input.LA(1)>='\u1040' && input.LA(1)<='\u1049') ) {
@@ -2432,8 +2432,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mWS() throws RecognitionException {
try {
int _type = WS;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:488:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:488:3: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:3: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:483:3: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||(input.LA(1)>='\f' && input.LA(1)<='\r')||input.LA(1)==' ' ) {
input.consume();
@@ -2460,12 +2460,12 @@ public class Xpand3NodeLexer extends Lexer {
public void mCOMMENT() throws RecognitionException {
try {
int _type = COMMENT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:3: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:3: '/*' ( options {greedy=false; } : . )* '*/'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:487:3: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:487:3: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:8: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:487:8: ( options {greedy=false; } : . )*
loop10:
do {
int alt10=2;
@@ -2490,7 +2490,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:492:36: .
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:487:36: .
{
matchAny();
@@ -2519,12 +2519,12 @@ public class Xpand3NodeLexer extends Lexer {
public void mLINE_COMMENT() throws RecognitionException {
try {
int _type = LINE_COMMENT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:3: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:3: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF )
{
match("//");
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:8: (~ ( '\\n' | '\\r' ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:8: (~ ( '\\n' | '\\r' ) )*
loop11:
do {
int alt11=2;
@@ -2537,7 +2537,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:8: ~ ( '\\n' | '\\r' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:8: ~ ( '\\n' | '\\r' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -2558,7 +2558,7 @@ public class Xpand3NodeLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:22: ( ( '\\r' )? '\\n' | EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:22: ( ( '\\r' )? '\\n' | EOF )
int alt13=2;
int LA13_0 = input.LA(1);
@@ -2569,9 +2569,9 @@ public class Xpand3NodeLexer extends Lexer {
alt13=2;}
switch (alt13) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:23: ( '\\r' )? '\\n'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:23: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:23: ( '\\r' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:23: ( '\\r' )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -2580,7 +2580,7 @@ public class Xpand3NodeLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:23: '\\r'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:23: '\\r'
{
match('\r');
@@ -2594,7 +2594,7 @@ public class Xpand3NodeLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:496:34: EOF
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:491:34: EOF
{
match(EOF);
@@ -2618,8 +2618,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mREM_COMMENT_OUT() throws RecognitionException {
try {
int _type = REM_COMMENT_OUT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:3: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:495:3: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:495:3: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG
{
if ( !(!xpandMode) ) {
throw new FailedPredicateException(input, "REM_COMMENT_OUT", "!xpandMode");
@@ -2628,7 +2628,7 @@ public class Xpand3NodeLexer extends Lexer {
match("REM");
mRG();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:31: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:495:31: ( options {greedy=false; } : . )*
loop14:
do {
int alt14=2;
@@ -2707,7 +2707,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt14) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:500:59: .
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:495:59: .
{
matchAny();
@@ -2737,8 +2737,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mREM_COMMENT() throws RecognitionException {
try {
int _type = REM_COMMENT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:3: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:499:3: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:499:3: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM'
{
if ( !(xpandMode) ) {
throw new FailedPredicateException(input, "REM_COMMENT", "xpandMode");
@@ -2746,7 +2746,7 @@ public class Xpand3NodeLexer extends Lexer {
match("REM");
mRG();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:27: ( options {greedy=false; } : . )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:499:27: ( options {greedy=false; } : . )*
loop15:
do {
int alt15=2;
@@ -2816,7 +2816,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt15) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:504:55: .
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:499:55: .
{
matchAny();
@@ -2845,14 +2845,14 @@ public class Xpand3NodeLexer extends Lexer {
public void mTEXT() throws RecognitionException {
try {
int _type = TEXT;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: ({...}? => RG (~ ( LG ) )* ( LG )? )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:3: {...}? => RG (~ ( LG ) )* ( LG )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:3: ({...}? => RG (~ ( LG ) )* ( LG )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:3: {...}? => RG (~ ( LG ) )* ( LG )?
{
if ( !(xpandMode) ) {
throw new FailedPredicateException(input, "TEXT", "xpandMode");
}
mRG();
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:21: (~ ( LG ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:21: (~ ( LG ) )*
loop16:
do {
int alt16=2;
@@ -2865,7 +2865,7 @@ public class Xpand3NodeLexer extends Lexer {
switch (alt16) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:21: ~ ( LG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:21: ~ ( LG )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -2886,7 +2886,7 @@ public class Xpand3NodeLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:28: ( LG )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:28: ( LG )?
int alt17=2;
int LA17_0 = input.LA(1);
@@ -2895,7 +2895,7 @@ public class Xpand3NodeLexer extends Lexer {
}
switch (alt17) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:508:29: LG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:503:29: LG
{
mLG();
@@ -2918,8 +2918,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mLG() throws RecognitionException {
try {
int _type = LG;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: ( '\\u00AB' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:512:3: '\\u00AB'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:507:3: ( '\\u00AB' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:507:3: '\\u00AB'
{
match('\u00AB');
@@ -2936,8 +2936,8 @@ public class Xpand3NodeLexer extends Lexer {
public void mRG() throws RecognitionException {
try {
int _type = RG;
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:516:3: ( '\\u00BB' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:516:3: '\\u00BB'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:511:3: ( '\\u00BB' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:511: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 49044cc..96545a6 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/parser/Xpand3NodeParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-06 16:05:46
+// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g 2008-03-07 10:28:46
package org.eclipse.xpand3.parser;
@@ -42,7 +42,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
public Xpand3NodeParser(TokenStream input) {
super(input);
- ruleMemo = new HashMap[61+1];
+ ruleMemo = new HashMap[60+1];
}
@@ -54,9 +54,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
- // $ANTLR start file
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:29:1: file returns [CompositeNode cn] : ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF ) ;
- public CompositeNode file() throws RecognitionException {
+ // $ANTLR start r_file
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:29:1: r_file returns [CompositeNode cn] : ( ( (imp= r_nsImport ) ) )* ( ( (decl= r_abstractDeclaration ) ) )* ( EOF ) ;
+ public CompositeNode r_file() throws RecognitionException {
CompositeNode cn = null;
CompositeNode imp = null;
@@ -67,10 +67,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createFileNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (imp= nsImport ) ) )* ( ( (decl= abstractDeclaration ) ) )* ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( ( (imp= r_nsImport ) ) )* ( ( (decl= r_abstractDeclaration ) ) )* ( EOF ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (imp= r_nsImport ) ) )* ( ( (decl= r_abstractDeclaration ) ) )* ( EOF )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (imp= nsImport ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:2: ( ( (imp= r_nsImport ) ) )*
loop1:
do {
int alt1=2;
@@ -92,16 +92,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (imp= nsImport ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (imp= r_nsImport ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (imp= nsImport ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (imp= nsImport )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:3: ( (imp= r_nsImport ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (imp= r_nsImport )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (imp= nsImport )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:5: imp= nsImport
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:4: (imp= r_nsImport )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:5: imp= r_nsImport
{
- pushFollow(FOLLOW_nsImport_in_file80);
- imp=nsImport();
+ pushFollow(FOLLOW_r_nsImport_in_r_file80);
+ imp=r_nsImport();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -122,7 +122,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:85: ( ( (decl= abstractDeclaration ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:87: ( ( (decl= r_abstractDeclaration ) ) )*
loop2:
do {
int alt2=2;
@@ -135,16 +135,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:86: ( (decl= abstractDeclaration ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:88: ( (decl= r_abstractDeclaration ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:86: ( (decl= abstractDeclaration ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:87: (decl= abstractDeclaration )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:88: ( (decl= r_abstractDeclaration ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:89: (decl= r_abstractDeclaration )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:87: (decl= abstractDeclaration )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:88: decl= abstractDeclaration
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:89: (decl= r_abstractDeclaration )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:90: decl= r_abstractDeclaration
{
- pushFollow(FOLLOW_abstractDeclaration_in_file93);
- decl=abstractDeclaration();
+ pushFollow(FOLLOW_r_abstractDeclaration_in_r_file93);
+ decl=r_abstractDeclaration();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -165,10 +165,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:183: ( EOF )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:184: EOF
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:187: ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:33:188: EOF
{
- match(input,EOF,FOLLOW_EOF_in_file102); if (failed) return cn;
+ match(input,EOF,FOLLOW_EOF_in_r_file102); if (failed) return cn;
}
@@ -187,12 +187,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end file
+ // $ANTLR end r_file
- // $ANTLR start nsImport
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:35:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );
- public CompositeNode nsImport() throws RecognitionException {
+ // $ANTLR start r_nsImport
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:35:1: r_nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= r_simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= r_simpleType ) ( RG ) | ( 'import' ) (unnamed0= r_type ) ( ';' ) | ( 'extension' ) (unnamed1= r_type ) ( ( ( 'reexport' ) ) )? ( ';' ) );
+ public CompositeNode r_nsImport() throws RecognitionException {
CompositeNode cn = null;
CompositeNode ns = null;
@@ -205,7 +205,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createNsImportNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( ( LG ) ( 'IMPORT' ) (ns= r_simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= r_simpleType ) ( RG ) | ( 'import' ) (unnamed0= r_type ) ( ';' ) | ( 'extension' ) (unnamed1= r_type ) ( ( ( 'reexport' ) ) )? ( ';' ) )
int alt4=4;
switch ( input.LA(1) ) {
case LG:
@@ -221,7 +221,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("35:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 1, input);
+ new NoViableAltException("35:1: r_nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= r_simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= r_simpleType ) ( RG ) | ( 'import' ) (unnamed0= r_type ) ( ';' ) | ( 'extension' ) (unnamed1= r_type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 1, input);
throw nvae;
}
@@ -240,19 +240,19 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("35:1: nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG ) | ( 'import' ) (unnamed0= type ) ( ';' ) | ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 0, input);
+ new NoViableAltException("35:1: r_nsImport returns [CompositeNode cn] : ( ( LG ) ( 'IMPORT' ) (ns= r_simpleType ) ( RG ) | ( LG ) ( 'EXTENSION' ) (ns= r_simpleType ) ( RG ) | ( 'import' ) (unnamed0= r_type ) ( ';' ) | ( 'extension' ) (unnamed1= r_type ) ( ( ( 'reexport' ) ) )? ( ';' ) );", 4, 0, input);
throw nvae;
}
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( LG ) ( 'IMPORT' ) (ns= simpleType ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( LG ) ( 'IMPORT' ) (ns= r_simpleType ) ( RG )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:2: ( LG )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:3: LG
{
- match(input,LG,FOLLOW_LG_in_nsImport123); if (failed) return cn;
+ match(input,LG,FOLLOW_LG_in_r_nsImport123); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -262,18 +262,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:43: ( 'IMPORT' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:44: 'IMPORT'
{
- match(input,25,FOLLOW_25_in_nsImport129); if (failed) return cn;
+ match(input,25,FOLLOW_25_in_r_nsImport129); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:90: (ns= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:91: ns= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:90: (ns= r_simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:91: ns= r_simpleType
{
- pushFollow(FOLLOW_simpleType_in_nsImport137);
- ns=simpleType();
+ pushFollow(FOLLOW_r_simpleType_in_r_nsImport137);
+ ns=r_simpleType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -282,10 +282,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:164: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:165: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:166: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:38:167: RG
{
- match(input,RG,FOLLOW_RG_in_nsImport143); if (failed) return cn;
+ match(input,RG,FOLLOW_RG_in_r_nsImport143); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -296,12 +296,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( LG ) ( 'EXTENSION' ) (ns= simpleType ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( LG ) ( 'EXTENSION' ) (ns= r_simpleType ) ( RG )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:4: ( LG )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:5: LG
{
- match(input,LG,FOLLOW_LG_in_nsImport152); if (failed) return cn;
+ match(input,LG,FOLLOW_LG_in_r_nsImport152); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -311,18 +311,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:45: ( 'EXTENSION' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:46: 'EXTENSION'
{
- match(input,26,FOLLOW_26_in_nsImport158); if (failed) return cn;
+ match(input,26,FOLLOW_26_in_r_nsImport158); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:95: (ns= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:96: ns= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:95: (ns= r_simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:96: ns= r_simpleType
{
- pushFollow(FOLLOW_simpleType_in_nsImport166);
- ns=simpleType();
+ pushFollow(FOLLOW_r_simpleType_in_r_nsImport166);
+ ns=r_simpleType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -331,10 +331,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:169: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:170: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:171: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:39:172: RG
{
- match(input,RG,FOLLOW_RG_in_nsImport172); if (failed) return cn;
+ match(input,RG,FOLLOW_RG_in_r_nsImport172); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -345,23 +345,23 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:4: ( 'import' ) (unnamed0= type ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:4: ( 'import' ) (unnamed0= r_type ) ( ';' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:4: ( 'import' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:5: 'import'
{
- match(input,27,FOLLOW_27_in_nsImport181); if (failed) return cn;
+ match(input,27,FOLLOW_27_in_r_nsImport181); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:51: (unnamed0= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:52: unnamed0= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:51: (unnamed0= r_type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:52: unnamed0= r_type
{
- pushFollow(FOLLOW_type_in_nsImport189);
- unnamed0=type();
+ pushFollow(FOLLOW_r_type_in_r_nsImport189);
+ unnamed0=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -370,10 +370,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:100: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:101: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:102: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:40:103: ';'
{
- match(input,28,FOLLOW_28_in_nsImport195); if (failed) return cn;
+ match(input,28,FOLLOW_28_in_r_nsImport195); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -384,23 +384,23 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:4: ( 'extension' ) (unnamed1= type ) ( ( ( 'reexport' ) ) )? ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:4: ( 'extension' ) (unnamed1= r_type ) ( ( ( 'reexport' ) ) )? ( ';' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:4: ( 'extension' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:5: 'extension'
{
- match(input,29,FOLLOW_29_in_nsImport204); if (failed) return cn;
+ match(input,29,FOLLOW_29_in_r_nsImport204); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:54: (unnamed1= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:55: unnamed1= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:54: (unnamed1= r_type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:55: unnamed1= r_type
{
- pushFollow(FOLLOW_type_in_nsImport212);
- unnamed1=type();
+ pushFollow(FOLLOW_r_type_in_r_nsImport212);
+ unnamed1=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -409,7 +409,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:103: ( ( ( 'reexport' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:105: ( ( ( 'reexport' ) ) )?
int alt3=2;
int LA3_0 = input.LA(1);
@@ -418,15 +418,15 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:104: ( ( 'reexport' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:106: ( ( 'reexport' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:104: ( ( 'reexport' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:105: ( 'reexport' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:106: ( ( 'reexport' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:107: ( 'reexport' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:105: ( 'reexport' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:106: 'reexport'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:107: ( 'reexport' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:108: 'reexport'
{
- match(input,30,FOLLOW_30_in_nsImport220); if (failed) return cn;
+ match(input,30,FOLLOW_30_in_r_nsImport220); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -442,10 +442,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:157: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:158: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:159: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:41:160: ';'
{
- match(input,28,FOLLOW_28_in_nsImport229); if (failed) return cn;
+ match(input,28,FOLLOW_28_in_r_nsImport229); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -466,27 +466,27 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end nsImport
+ // $ANTLR end r_nsImport
- // $ANTLR start abstractDeclaration
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );
- public CompositeNode abstractDeclaration() throws RecognitionException {
+ // $ANTLR start r_abstractDeclaration
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:43: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;
- CompositeNode check1 = null;
+ CompositeNode r_check1 = null;
- CompositeNode around2 = null;
+ CompositeNode r_around2 = null;
- CompositeNode extension3 = null;
+ CompositeNode r_extension3 = null;
- CompositeNode definition4 = null;
+ CompositeNode r_definition4 = null;
- CompositeNode definitionAround5 = null;
+ CompositeNode r_definitionAround5 = null;
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) )
int alt5=5;
switch ( input.LA(1) ) {
case 58:
@@ -514,16 +514,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
{
int LA5_4 = input.LA(2);
- if ( (LA5_4==DEFINE) ) {
- alt5=4;
- }
- else if ( (LA5_4==AROUND) ) {
+ if ( (LA5_4==AROUND) ) {
alt5=5;
}
+ else if ( (LA5_4==DEFINE) ) {
+ alt5=4;
+ }
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("43:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );", 5, 4, input);
+ new NoViableAltException("43:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) );", 5, 4, input);
throw nvae;
}
@@ -532,24 +532,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("43:1: abstractDeclaration returns [CompositeNode cn] : ( ( check ) | ( around ) | ( extension ) | ( definition ) | ( definitionAround ) );", 5, 0, input);
+ new NoViableAltException("43:1: r_abstractDeclaration returns [CompositeNode cn] : ( ( r_check ) | ( r_around ) | ( r_extension ) | ( r_definition ) | ( r_definitionAround ) );", 5, 0, input);
throw nvae;
}
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( check )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( r_check )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( check )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:3: check
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:2: ( r_check )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:44:3: r_check
{
- pushFollow(FOLLOW_check_in_abstractDeclaration247);
- check1=check();
+ pushFollow(FOLLOW_r_check_in_r_abstractDeclaration247);
+ r_check1=r_check();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = check1;
+ cn = r_check1;
}
}
@@ -558,17 +558,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( around )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( r_around )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( around )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:5: around
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:4: ( r_around )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:45:5: r_around
{
- pushFollow(FOLLOW_around_in_abstractDeclaration256);
- around2=around();
+ pushFollow(FOLLOW_r_around_in_r_abstractDeclaration256);
+ r_around2=r_around();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = around2;
+ cn = r_around2;
}
}
@@ -577,17 +577,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( extension )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( r_extension )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( extension )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:5: extension
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:4: ( r_extension )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:46:5: r_extension
{
- pushFollow(FOLLOW_extension_in_abstractDeclaration265);
- extension3=extension();
+ pushFollow(FOLLOW_r_extension_in_r_abstractDeclaration265);
+ r_extension3=r_extension();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = extension3;
+ cn = r_extension3;
}
}
@@ -596,17 +596,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:4: ( definition )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:4: ( r_definition )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:4: ( definition )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:5: definition
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:4: ( r_definition )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:47:5: r_definition
{
- pushFollow(FOLLOW_definition_in_abstractDeclaration274);
- definition4=definition();
+ pushFollow(FOLLOW_r_definition_in_r_abstractDeclaration274);
+ r_definition4=r_definition();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = definition4;
+ cn = r_definition4;
}
}
@@ -615,17 +615,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 5 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:4: ( definitionAround )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:4: ( r_definitionAround )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:4: ( definitionAround )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:5: definitionAround
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:4: ( r_definitionAround )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:48:5: r_definitionAround
{
- pushFollow(FOLLOW_definitionAround_in_abstractDeclaration283);
- definitionAround5=definitionAround();
+ pushFollow(FOLLOW_r_definitionAround_in_r_abstractDeclaration283);
+ r_definitionAround5=r_definitionAround();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = definitionAround5;
+ cn = r_definitionAround5;
}
}
@@ -644,12 +644,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end abstractDeclaration
+ // $ANTLR end r_abstractDeclaration
- // $ANTLR start definition
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:1: definition returns [CompositeNode cn] : ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG ) ;
- public CompositeNode definition() throws RecognitionException {
+ // $ANTLR start r_definition
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:50:1: r_definition returns [CompositeNode cn] : ( LG ) ( DEFINE ) (name= r_identifier ) ( ( ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= r_type ) (unnamed4= r_sequence ) ( ENDDEFINE ) ( RG ) ;
+ public CompositeNode r_definition() throws RecognitionException {
CompositeNode cn = null;
CompositeNode name = null;
@@ -664,13 +664,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createDefinitionNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( LG ) ( DEFINE ) (name= identifier ) ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= type ) (unnamed4= sequence ) ( ENDDEFINE ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( ( LG ) ( DEFINE ) (name= r_identifier ) ( ( ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= r_type ) (unnamed4= r_sequence ) ( ENDDEFINE ) ( RG ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( LG ) ( DEFINE ) (name= r_identifier ) ( ( ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed3= r_type ) (unnamed4= r_sequence ) ( ENDDEFINE ) ( RG )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:2: ( LG )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:3: LG
{
- match(input,LG,FOLLOW_LG_in_definition306); if (failed) return cn;
+ match(input,LG,FOLLOW_LG_in_r_definition306); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -680,18 +680,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:43: ( DEFINE )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:44: DEFINE
{
- match(input,DEFINE,FOLLOW_DEFINE_in_definition312); if (failed) return cn;
+ match(input,DEFINE,FOLLOW_DEFINE_in_r_definition312); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:88: (name= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:89: name= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:88: (name= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:89: name= r_identifier
{
- pushFollow(FOLLOW_identifier_in_definition320);
- name=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_definition320);
+ name=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -700,7 +700,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:172: ( ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:174: ( ( ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -709,22 +709,22 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:173: ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:175: ( ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:173: ( ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:174: ( '(' ) ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:175: ( ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:176: ( '(' ) ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:174: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:175: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:176: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:177: '('
{
- match(input,31,FOLLOW_31_in_definition328); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_definition328); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:216: ( ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:218: ( ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -733,9 +733,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:219: ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:219: ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -748,19 +748,19 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("53:217: ( (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 8, 0, input);
+ new NoViableAltException("53:219: ( (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 8, 0, input);
throw nvae;
}
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:218: (unnamed2= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:220: (unnamed2= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:218: (unnamed2= declaredParameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:219: unnamed2= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:220: (unnamed2= r_declaredParameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:221: unnamed2= r_declaredParameterList
{
- pushFollow(FOLLOW_declaredParameterList_in_definition338);
- unnamed2=declaredParameterList();
+ pushFollow(FOLLOW_r_declaredParameterList_in_r_definition338);
+ unnamed2=r_declaredParameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -769,7 +769,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:284: ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:288: ( ( ( ',' )? ( '*' ) ) )?
int alt7=2;
int LA7_0 = input.LA(1);
@@ -778,12 +778,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:285: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:289: ( ( ',' )? ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:285: ( ( ',' )? ( '*' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:286: ( ',' )? ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:289: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:290: ( ',' )? ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:286: ( ',' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:290: ( ',' )?
int alt6=2;
int LA6_0 = input.LA(1);
@@ -792,9 +792,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:287: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:291: ','
{
- match(input,32,FOLLOW_32_in_definition346); if (failed) return cn;
+ match(input,32,FOLLOW_32_in_r_definition346); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -804,10 +804,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:329: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:330: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:333: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:53:334: '*'
{
- match(input,33,FOLLOW_33_in_definition353); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_definition353); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -832,7 +832,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:4: ( '*' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:5: '*'
{
- match(input,33,FOLLOW_33_in_definition365); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_definition365); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -854,7 +854,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:49: ( ')' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:50: ')'
{
- match(input,34,FOLLOW_34_in_definition374); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_definition374); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -873,18 +873,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:94: ( 'FOR' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:95: 'FOR'
{
- match(input,35,FOLLOW_35_in_definition383); if (failed) return cn;
+ match(input,35,FOLLOW_35_in_r_definition383); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:138: (unnamed3= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:139: unnamed3= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:138: (unnamed3= r_type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:139: unnamed3= r_type
{
- pushFollow(FOLLOW_type_in_definition391);
- unnamed3=type();
+ pushFollow(FOLLOW_r_type_in_r_definition391);
+ unnamed3=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -893,11 +893,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:187: (unnamed4= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:188: unnamed4= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:189: (unnamed4= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:190: unnamed4= r_sequence
{
- pushFollow(FOLLOW_sequence_in_definition399);
- unnamed4=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_definition399);
+ unnamed4=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -906,20 +906,20 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:240: ( ENDDEFINE )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:241: ENDDEFINE
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:244: ( ENDDEFINE )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:245: ENDDEFINE
{
- match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_definition405); if (failed) return cn;
+ match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_r_definition405); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:288: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:289: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:292: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:54:293: RG
{
- match(input,RG,FOLLOW_RG_in_definition411); if (failed) return cn;
+ match(input,RG,FOLLOW_RG_in_r_definition411); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -938,12 +938,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end definition
+ // $ANTLR end r_definition
- // $ANTLR start definitionAround
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:1: definitionAround returns [CompositeNode cn] : ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG ) ;
- public CompositeNode definitionAround() throws RecognitionException {
+ // $ANTLR start r_definitionAround
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:56:1: r_definitionAround returns [CompositeNode cn] : ( LG ) ( AROUND ) (unnamed5= r_pointcut ) ( ( ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= r_type ) (unnamed8= r_sequence ) ( ENDAROUND ) ( RG ) ;
+ public CompositeNode r_definitionAround() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed5 = null;
@@ -958,13 +958,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createDefinitionAroundNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( LG ) ( AROUND ) (unnamed5= pointcut ) ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= type ) (unnamed8= sequence ) ( ENDAROUND ) ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( ( LG ) ( AROUND ) (unnamed5= r_pointcut ) ( ( ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= r_type ) (unnamed8= r_sequence ) ( ENDAROUND ) ( RG ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( LG ) ( AROUND ) (unnamed5= r_pointcut ) ( ( ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )? ( 'FOR' ) (unnamed7= r_type ) (unnamed8= r_sequence ) ( ENDAROUND ) ( RG )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:2: ( LG )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:3: LG
{
- match(input,LG,FOLLOW_LG_in_definitionAround434); if (failed) return cn;
+ match(input,LG,FOLLOW_LG_in_r_definitionAround434); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -974,18 +974,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:43: ( AROUND )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:44: AROUND
{
- match(input,AROUND,FOLLOW_AROUND_in_definitionAround440); if (failed) return cn;
+ match(input,AROUND,FOLLOW_AROUND_in_r_definitionAround440); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:88: (unnamed5= pointcut )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:89: unnamed5= pointcut
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:88: (unnamed5= r_pointcut )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:89: unnamed5= r_pointcut
{
- pushFollow(FOLLOW_pointcut_in_definitionAround448);
- unnamed5=pointcut();
+ pushFollow(FOLLOW_r_pointcut_in_r_definitionAround448);
+ unnamed5=r_pointcut();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -994,7 +994,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:141: ( ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:143: ( ( ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ) )?
int alt15=2;
int LA15_0 = input.LA(1);
@@ -1003,22 +1003,22 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt15) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:142: ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:144: ( ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:142: ( ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:143: ( '(' ) ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:144: ( ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:145: ( '(' ) ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:143: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:144: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:145: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:146: '('
{
- match(input,31,FOLLOW_31_in_definitionAround456); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_definitionAround456); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:185: ( ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:187: ( ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
int alt14=2;
int LA14_0 = input.LA(1);
@@ -1027,9 +1027,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt14) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:188: ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:188: ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
int alt13=2;
int LA13_0 = input.LA(1);
@@ -1042,19 +1042,19 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("59:186: ( (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 13, 0, input);
+ new NoViableAltException("59:188: ( (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 13, 0, input);
throw nvae;
}
switch (alt13) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:187: (unnamed6= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:189: (unnamed6= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:187: (unnamed6= declaredParameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:188: unnamed6= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:189: (unnamed6= r_declaredParameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:190: unnamed6= r_declaredParameterList
{
- pushFollow(FOLLOW_declaredParameterList_in_definitionAround466);
- unnamed6=declaredParameterList();
+ pushFollow(FOLLOW_r_declaredParameterList_in_r_definitionAround466);
+ unnamed6=r_declaredParameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1063,7 +1063,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:253: ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:257: ( ( ( ',' )? ( '*' ) ) )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1072,12 +1072,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:254: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:258: ( ( ',' )? ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:254: ( ( ',' )? ( '*' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:255: ( ',' )? ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:258: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:259: ( ',' )? ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:255: ( ',' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:259: ( ',' )?
int alt11=2;
int LA11_0 = input.LA(1);
@@ -1086,9 +1086,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:256: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:260: ','
{
- match(input,32,FOLLOW_32_in_definitionAround474); if (failed) return cn;
+ match(input,32,FOLLOW_32_in_r_definitionAround474); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1098,10 +1098,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:298: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:299: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:302: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:59:303: '*'
{
- match(input,33,FOLLOW_33_in_definitionAround481); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_definitionAround481); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1126,7 +1126,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:4: ( '*' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:5: '*'
{
- match(input,33,FOLLOW_33_in_definitionAround493); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_definitionAround493); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1148,7 +1148,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:49: ( ')' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:50: ')'
{
- match(input,34,FOLLOW_34_in_definitionAround502); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_definitionAround502); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1167,18 +1167,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:94: ( 'FOR' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:95: 'FOR'
{
- match(input,35,FOLLOW_35_in_definitionAround511); if (failed) return cn;
+ match(input,35,FOLLOW_35_in_r_definitionAround511); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:138: (unnamed7= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:139: unnamed7= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:138: (unnamed7= r_type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:139: unnamed7= r_type
{
- pushFollow(FOLLOW_type_in_definitionAround519);
- unnamed7=type();
+ pushFollow(FOLLOW_r_type_in_r_definitionAround519);
+ unnamed7=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1187,11 +1187,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:187: (unnamed8= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:188: unnamed8= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:189: (unnamed8= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:190: unnamed8= r_sequence
{
- pushFollow(FOLLOW_sequence_in_definitionAround527);
- unnamed8=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_definitionAround527);
+ unnamed8=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1200,20 +1200,20 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:240: ( ENDAROUND )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:241: ENDAROUND
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:244: ( ENDAROUND )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:245: ENDAROUND
{
- match(input,ENDAROUND,FOLLOW_ENDAROUND_in_definitionAround533); if (failed) return cn;
+ match(input,ENDAROUND,FOLLOW_ENDAROUND_in_r_definitionAround533); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:288: ( RG )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:289: RG
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:292: ( RG )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:60:293: RG
{
- match(input,RG,FOLLOW_RG_in_definitionAround539); if (failed) return cn;
+ match(input,RG,FOLLOW_RG_in_r_definitionAround539); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1232,12 +1232,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end definitionAround
+ // $ANTLR end r_definitionAround
- // $ANTLR start sequence
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:62:1: sequence returns [CompositeNode cn] : (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )* ;
- public CompositeNode sequence() throws RecognitionException {
+ // $ANTLR start r_sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:62:1: r_sequence returns [CompositeNode cn] : (unnamed9= r_textSequence ) ( ( (unnamed10= r_statement ) (unnamed11= r_textSequence ) ) )* ;
+ public CompositeNode r_sequence() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed9 = null;
@@ -1250,14 +1250,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createSequenceNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: ( (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: (unnamed9= textSequence ) ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: ( (unnamed9= r_textSequence ) ( ( (unnamed10= r_statement ) (unnamed11= r_textSequence ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: (unnamed9= r_textSequence ) ( ( (unnamed10= r_statement ) (unnamed11= r_textSequence ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: (unnamed9= textSequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:3: unnamed9= textSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:2: (unnamed9= r_textSequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:3: unnamed9= r_textSequence
{
- pushFollow(FOLLOW_textSequence_in_sequence564);
- unnamed9=textSequence();
+ pushFollow(FOLLOW_r_textSequence_in_r_sequence564);
+ unnamed9=r_textSequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1266,7 +1266,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:59: ( ( (unnamed10= statement ) (unnamed11= textSequence ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:61: ( ( (unnamed10= r_statement ) (unnamed11= r_textSequence ) ) )*
loop16:
do {
int alt16=2;
@@ -1279,16 +1279,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt16) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:60: ( (unnamed10= statement ) (unnamed11= textSequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:62: ( (unnamed10= r_statement ) (unnamed11= r_textSequence ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:60: ( (unnamed10= statement ) (unnamed11= textSequence ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:61: (unnamed10= statement ) (unnamed11= textSequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:62: ( (unnamed10= r_statement ) (unnamed11= r_textSequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:63: (unnamed10= r_statement ) (unnamed11= r_textSequence )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:61: (unnamed10= statement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:62: unnamed10= statement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:63: (unnamed10= r_statement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:64: unnamed10= r_statement
{
- pushFollow(FOLLOW_statement_in_sequence574);
- unnamed10=statement();
+ pushFollow(FOLLOW_r_statement_in_r_sequence574);
+ unnamed10=r_statement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1297,11 +1297,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:117: (unnamed11= textSequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:118: unnamed11= textSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:121: (unnamed11= r_textSequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:65:122: unnamed11= r_textSequence
{
- pushFollow(FOLLOW_textSequence_in_sequence582);
- unnamed11=textSequence();
+ pushFollow(FOLLOW_r_textSequence_in_r_sequence582);
+ unnamed11=r_textSequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1334,29 +1334,29 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end sequence
+ // $ANTLR end r_sequence
- // $ANTLR start statement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67:1: statement returns [CompositeNode cn] : ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) );
- public CompositeNode statement() throws RecognitionException {
+ // $ANTLR start r_statement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:67: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;
- CompositeNode simpleStatement6 = null;
+ CompositeNode r_simpleStatement6 = null;
- CompositeNode fileStatement7 = null;
+ CompositeNode r_fileStatement7 = null;
- CompositeNode foreachStatement8 = null;
+ CompositeNode r_foreachStatement8 = null;
- CompositeNode ifStatement9 = null;
+ CompositeNode r_ifStatement9 = null;
- CompositeNode letStatement10 = null;
+ CompositeNode r_letStatement10 = null;
- CompositeNode protectStatement11 = null;
+ CompositeNode r_protectStatement11 = null;
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) )
int alt17=6;
switch ( input.LA(1) ) {
case StringLiteral:
@@ -1420,24 +1420,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("67:1: statement returns [CompositeNode cn] : ( ( simpleStatement ) | ( fileStatement ) | ( foreachStatement ) | ( ifStatement ) | ( letStatement ) | ( protectStatement ) );", 17, 0, input);
+ new NoViableAltException("67:1: r_statement returns [CompositeNode cn] : ( ( r_simpleStatement ) | ( r_fileStatement ) | ( r_foreachStatement ) | ( r_ifStatement ) | ( r_letStatement ) | ( r_protectStatement ) );", 17, 0, input);
throw nvae;
}
switch (alt17) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( simpleStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( r_simpleStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( simpleStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:3: simpleStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:2: ( r_simpleStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:68:3: r_simpleStatement
{
- pushFollow(FOLLOW_simpleStatement_in_statement603);
- simpleStatement6=simpleStatement();
+ pushFollow(FOLLOW_r_simpleStatement_in_r_statement603);
+ r_simpleStatement6=r_simpleStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = simpleStatement6;
+ cn = r_simpleStatement6;
}
}
@@ -1446,17 +1446,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:4: ( fileStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:4: ( r_fileStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:4: ( fileStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:5: fileStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:4: ( r_fileStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:69:5: r_fileStatement
{
- pushFollow(FOLLOW_fileStatement_in_statement612);
- fileStatement7=fileStatement();
+ pushFollow(FOLLOW_r_fileStatement_in_r_statement612);
+ r_fileStatement7=r_fileStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = fileStatement7;
+ cn = r_fileStatement7;
}
}
@@ -1465,17 +1465,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:4: ( foreachStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:4: ( r_foreachStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:4: ( foreachStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:5: foreachStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:4: ( r_foreachStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:70:5: r_foreachStatement
{
- pushFollow(FOLLOW_foreachStatement_in_statement621);
- foreachStatement8=foreachStatement();
+ pushFollow(FOLLOW_r_foreachStatement_in_r_statement621);
+ r_foreachStatement8=r_foreachStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = foreachStatement8;
+ cn = r_foreachStatement8;
}
}
@@ -1484,17 +1484,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 4 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:4: ( ifStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:4: ( r_ifStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:4: ( ifStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:5: ifStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:4: ( r_ifStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:71:5: r_ifStatement
{
- pushFollow(FOLLOW_ifStatement_in_statement630);
- ifStatement9=ifStatement();
+ pushFollow(FOLLOW_r_ifStatement_in_r_statement630);
+ r_ifStatement9=r_ifStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = ifStatement9;
+ cn = r_ifStatement9;
}
}
@@ -1503,17 +1503,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 5 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:4: ( letStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:4: ( r_letStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:4: ( letStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:5: letStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:4: ( r_letStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:72:5: r_letStatement
{
- pushFollow(FOLLOW_letStatement_in_statement639);
- letStatement10=letStatement();
+ pushFollow(FOLLOW_r_letStatement_in_r_statement639);
+ r_letStatement10=r_letStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = letStatement10;
+ cn = r_letStatement10;
}
}
@@ -1522,17 +1522,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 6 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( protectStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( r_protectStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( protectStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:5: protectStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:4: ( r_protectStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:73:5: r_protectStatement
{
- pushFollow(FOLLOW_protectStatement_in_statement648);
- protectStatement11=protectStatement();
+ pushFollow(FOLLOW_r_protectStatement_in_r_statement648);
+ r_protectStatement11=r_protectStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = protectStatement11;
+ cn = r_protectStatement11;
}
}
@@ -1551,12 +1551,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end statement
+ // $ANTLR end r_statement
- // $ANTLR start textSequence
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:75:1: textSequence returns [CompositeNode cn] : (unnamed12= text ) ( ( (unnamed13= text ) ) )* ;
- public CompositeNode textSequence() throws RecognitionException {
+ // $ANTLR start r_textSequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:75:1: r_textSequence returns [CompositeNode cn] : (unnamed12= r_text ) ( ( (unnamed13= r_text ) ) )* ;
+ public CompositeNode r_textSequence() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed12 = null;
@@ -1567,14 +1567,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createTextSequenceNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: ( (unnamed12= text ) ( ( (unnamed13= text ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (unnamed12= text ) ( ( (unnamed13= text ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: ( (unnamed12= r_text ) ( ( (unnamed13= r_text ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (unnamed12= r_text ) ( ( (unnamed13= r_text ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (unnamed12= text )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:3: unnamed12= text
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:2: (unnamed12= r_text )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:3: unnamed12= r_text
{
- pushFollow(FOLLOW_text_in_textSequence678);
- unnamed12=text();
+ pushFollow(FOLLOW_r_text_in_r_textSequence678);
+ unnamed12=r_text();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1583,7 +1583,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:53: ( ( (unnamed13= text ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:55: ( ( (unnamed13= r_text ) ) )*
loop18:
do {
int alt18=2;
@@ -1605,16 +1605,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt18) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:54: ( (unnamed13= text ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:56: ( (unnamed13= r_text ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:54: ( (unnamed13= text ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:55: (unnamed13= text )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:56: ( (unnamed13= r_text ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:57: (unnamed13= r_text )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:55: (unnamed13= text )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:56: unnamed13= text
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:57: (unnamed13= r_text )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:79:58: unnamed13= r_text
{
- pushFollow(FOLLOW_text_in_textSequence688);
- unnamed13=text();
+ pushFollow(FOLLOW_r_text_in_r_textSequence688);
+ unnamed13=r_text();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1650,12 +1650,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end textSequence
+ // $ANTLR end r_textSequence
- // $ANTLR start text
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:81:1: text returns [CompositeNode cn] : ( '-' )? ( TEXT ) ;
- public CompositeNode text() throws RecognitionException {
+ // $ANTLR start r_text
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:81:1: r_text returns [CompositeNode cn] : ( '-' )? ( TEXT ) ;
+ public CompositeNode r_text() throws RecognitionException {
CompositeNode cn = null;
cn = factory.createTextNode();
@@ -1675,7 +1675,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
case 1 :
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:3: '-'
{
- match(input,36,FOLLOW_36_in_text714); if (failed) return cn;
+ match(input,36,FOLLOW_36_in_r_text714); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1688,7 +1688,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:45: ( TEXT )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:84:46: TEXT
{
- match(input,TEXT,FOLLOW_TEXT_in_text721); if (failed) return cn;
+ match(input,TEXT,FOLLOW_TEXT_in_r_text721); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -1707,23 +1707,23 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end text
+ // $ANTLR end r_text
- // $ANTLR start simpleStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:1: simpleStatement returns [CompositeNode cn] : ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) );
- public CompositeNode simpleStatement() throws RecognitionException {
+ // $ANTLR start r_simpleStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:86:1: r_simpleStatement returns [CompositeNode cn] : ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) );
+ public CompositeNode r_simpleStatement() throws RecognitionException {
CompositeNode cn = null;
- CompositeNode errorStatement12 = null;
+ CompositeNode r_errorStatement12 = null;
- CompositeNode expandStatement13 = null;
+ CompositeNode r_expandStatement13 = null;
- CompositeNode expressionStmt14 = null;
+ CompositeNode r_expressionStmt14 = null;
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) )
int alt20=3;
switch ( input.LA(1) ) {
case 37:
@@ -1770,24 +1770,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("86:1: simpleStatement returns [CompositeNode cn] : ( ( errorStatement ) | ( expandStatement ) | ( expressionStmt ) );", 20, 0, input);
+ new NoViableAltException("86:1: r_simpleStatement returns [CompositeNode cn] : ( ( r_errorStatement ) | ( r_expandStatement ) | ( r_expressionStmt ) );", 20, 0, input);
throw nvae;
}
switch (alt20) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( errorStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( r_errorStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( errorStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:3: errorStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:2: ( r_errorStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:87:3: r_errorStatement
{
- pushFollow(FOLLOW_errorStatement_in_simpleStatement739);
- errorStatement12=errorStatement();
+ pushFollow(FOLLOW_r_errorStatement_in_r_simpleStatement739);
+ r_errorStatement12=r_errorStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = errorStatement12;
+ cn = r_errorStatement12;
}
}
@@ -1796,17 +1796,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( expandStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( r_expandStatement )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( expandStatement )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:5: expandStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:4: ( r_expandStatement )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:88:5: r_expandStatement
{
- pushFollow(FOLLOW_expandStatement_in_simpleStatement748);
- expandStatement13=expandStatement();
+ pushFollow(FOLLOW_r_expandStatement_in_r_simpleStatement748);
+ r_expandStatement13=r_expandStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = expandStatement13;
+ cn = r_expandStatement13;
}
}
@@ -1815,17 +1815,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 3 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( expressionStmt )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( r_expressionStmt )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( expressionStmt )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:5: expressionStmt
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:4: ( r_expressionStmt )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:89:5: r_expressionStmt
{
- pushFollow(FOLLOW_expressionStmt_in_simpleStatement757);
- expressionStmt14=expressionStmt();
+ pushFollow(FOLLOW_r_expressionStmt_in_r_simpleStatement757);
+ r_expressionStmt14=r_expressionStmt();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
- cn = expressionStmt14;
+ cn = r_expressionStmt14;
}
}
@@ -1844,12 +1844,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end simpleStatement
+ // $ANTLR end r_simpleStatement
- // $ANTLR start errorStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:1: errorStatement returns [CompositeNode cn] : ( 'ERROR' ) (unnamed14= expression ) ;
- public CompositeNode errorStatement() throws RecognitionException {
+ // $ANTLR start r_errorStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:91:1: r_errorStatement returns [CompositeNode cn] : ( 'ERROR' ) (unnamed14= r_expression ) ;
+ public CompositeNode r_errorStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed14 = null;
@@ -1858,24 +1858,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createErrorStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( ( 'ERROR' ) (unnamed14= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( 'ERROR' ) (unnamed14= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( ( 'ERROR' ) (unnamed14= r_expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( 'ERROR' ) (unnamed14= r_expression )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:2: ( 'ERROR' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:3: 'ERROR'
{
- match(input,37,FOLLOW_37_in_errorStatement780); if (failed) return cn;
+ match(input,37,FOLLOW_37_in_r_errorStatement780); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:48: (unnamed14= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:49: unnamed14= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:48: (unnamed14= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:94:49: unnamed14= r_expression
{
- pushFollow(FOLLOW_expression_in_errorStatement788);
- unnamed14=expression();
+ pushFollow(FOLLOW_r_expression_in_r_errorStatement788);
+ unnamed14=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1896,12 +1896,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end errorStatement
+ // $ANTLR end r_errorStatement
- // $ANTLR start expandStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:1: expandStatement returns [CompositeNode cn] : ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )? ;
- public CompositeNode expandStatement() throws RecognitionException {
+ // $ANTLR start r_expandStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:96:1: r_expandStatement returns [CompositeNode cn] : ( 'EXPAND' ) (unnamed15= r_simpleType ) ( ( ( '(' ) (unnamed16= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) ) )? ;
+ public CompositeNode r_expandStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed15 = null;
@@ -1918,24 +1918,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createExpandStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )? )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'EXPAND' ) (unnamed15= simpleType ) ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( ( 'EXPAND' ) (unnamed15= r_simpleType ) ( ( ( '(' ) (unnamed16= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) ) )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'EXPAND' ) (unnamed15= r_simpleType ) ( ( ( '(' ) (unnamed16= r_parameterList ) ( ')' ) ) )? ( ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) ) )?
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:2: ( 'EXPAND' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:3: 'EXPAND'
{
- match(input,38,FOLLOW_38_in_expandStatement811); if (failed) return cn;
+ match(input,38,FOLLOW_38_in_r_expandStatement811); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:49: (unnamed15= simpleType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:50: unnamed15= simpleType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:49: (unnamed15= r_simpleType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:50: unnamed15= r_simpleType
{
- pushFollow(FOLLOW_simpleType_in_expandStatement819);
- unnamed15=simpleType();
+ pushFollow(FOLLOW_r_simpleType_in_r_expandStatement819);
+ unnamed15=r_simpleType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1944,7 +1944,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:106: ( ( ( '(' ) (unnamed16= parameterList ) ( ')' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:108: ( ( ( '(' ) (unnamed16= r_parameterList ) ( ')' ) ) )?
int alt21=2;
int LA21_0 = input.LA(1);
@@ -1953,26 +1953,26 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt21) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:107: ( ( '(' ) (unnamed16= parameterList ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:109: ( ( '(' ) (unnamed16= r_parameterList ) ( ')' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:107: ( ( '(' ) (unnamed16= parameterList ) ( ')' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:108: ( '(' ) (unnamed16= parameterList ) ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:109: ( ( '(' ) (unnamed16= r_parameterList ) ( ')' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:110: ( '(' ) (unnamed16= r_parameterList ) ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:108: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:109: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:110: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:111: '('
{
- match(input,31,FOLLOW_31_in_expandStatement827); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_expandStatement827); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:150: (unnamed16= parameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:151: unnamed16= parameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:152: (unnamed16= r_parameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:153: unnamed16= r_parameterList
{
- pushFollow(FOLLOW_parameterList_in_expandStatement835);
- unnamed16=parameterList();
+ pushFollow(FOLLOW_r_parameterList_in_r_expandStatement835);
+ unnamed16=r_parameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -1981,10 +1981,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:210: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:211: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:214: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:215: ')'
{
- match(input,34,FOLLOW_34_in_expandStatement841); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_expandStatement841); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -2000,7 +2000,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:255: ( ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:259: ( ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) ) )?
int alt24=2;
int LA24_0 = input.LA(1);
@@ -2009,9 +2009,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt24) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:260: ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:260: ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) )
int alt23=2;
int LA23_0 = input.LA(1);
@@ -2024,35 +2024,35 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("99:256: ( ( ( ( 'FOR' ) (unnamed17= expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) ) )", 23, 0, input);
+ new NoViableAltException("99:260: ( ( ( ( 'FOR' ) (unnamed17= r_expression ) ) ) | ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) ) )", 23, 0, input);
throw nvae;
}
switch (alt23) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:257: ( ( ( 'FOR' ) (unnamed17= expression ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:261: ( ( ( 'FOR' ) (unnamed17= r_expression ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:257: ( ( ( 'FOR' ) (unnamed17= expression ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:258: ( ( 'FOR' ) (unnamed17= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:261: ( ( ( 'FOR' ) (unnamed17= r_expression ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:262: ( ( 'FOR' ) (unnamed17= r_expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:258: ( ( 'FOR' ) (unnamed17= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:259: ( 'FOR' ) (unnamed17= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:262: ( ( 'FOR' ) (unnamed17= r_expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:263: ( 'FOR' ) (unnamed17= r_expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:259: ( 'FOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:260: 'FOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:263: ( 'FOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:264: 'FOR'
{
- match(input,35,FOLLOW_35_in_expandStatement854); if (failed) return cn;
+ match(input,35,FOLLOW_35_in_r_expandStatement854); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:303: (unnamed17= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:304: unnamed17= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:307: (unnamed17= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:99:308: unnamed17= r_expression
{
- pushFollow(FOLLOW_expression_in_expandStatement862);
- unnamed17=expression();
+ pushFollow(FOLLOW_r_expression_in_r_expandStatement862);
+ unnamed17=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2071,29 +2071,29 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:4: ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:4: ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:4: ( ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:5: ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:4: ( ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:5: ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:5: ( ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )? )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:6: ( 'FOREACH' ) (unnamed18= expression ) ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:5: ( ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )? )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:6: ( 'FOREACH' ) (unnamed18= r_expression ) ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )?
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:6: ( 'FOREACH' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:7: 'FOREACH'
{
- match(input,39,FOLLOW_39_in_expandStatement875); if (failed) return cn;
+ match(input,39,FOLLOW_39_in_r_expandStatement875); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:54: (unnamed18= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:55: unnamed18= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:54: (unnamed18= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:55: unnamed18= r_expression
{
- pushFollow(FOLLOW_expression_in_expandStatement883);
- unnamed18=expression();
+ pushFollow(FOLLOW_r_expression_in_r_expandStatement883);
+ unnamed18=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2102,7 +2102,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:111: ( ( ( 'SEPARATOR' ) (unnamed19= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:113: ( ( ( 'SEPARATOR' ) (unnamed19= r_expression ) ) )?
int alt22=2;
int LA22_0 = input.LA(1);
@@ -2111,26 +2111,26 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt22) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:112: ( ( 'SEPARATOR' ) (unnamed19= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:114: ( ( 'SEPARATOR' ) (unnamed19= r_expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:112: ( ( 'SEPARATOR' ) (unnamed19= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:113: ( 'SEPARATOR' ) (unnamed19= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:114: ( ( 'SEPARATOR' ) (unnamed19= r_expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:115: ( 'SEPARATOR' ) (unnamed19= r_expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:113: ( 'SEPARATOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:114: 'SEPARATOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:115: ( 'SEPARATOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:116: 'SEPARATOR'
{
- match(input,40,FOLLOW_40_in_expandStatement891); if (failed) return cn;
+ match(input,40,FOLLOW_40_in_r_expandStatement891); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:163: (unnamed19= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:164: unnamed19= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:165: (unnamed19= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:100:166: unnamed19= r_expression
{
- pushFollow(FOLLOW_expression_in_expandStatement899);
- unnamed19=expression();
+ pushFollow(FOLLOW_r_expression_in_r_expandStatement899);
+ unnamed19=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2178,12 +2178,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end expandStatement
+ // $ANTLR end r_expandStatement
- // $ANTLR start expressionStmt
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:1: expressionStmt returns [CompositeNode cn] : (unnamed20= expression ) ;
- public CompositeNode expressionStmt() throws RecognitionException {
+ // $ANTLR start r_expressionStmt
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:102:1: r_expressionStmt returns [CompositeNode cn] : (unnamed20= r_expression ) ;
+ public CompositeNode r_expressionStmt() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed20 = null;
@@ -2192,14 +2192,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createExpressionStmtNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: ( (unnamed20= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: (unnamed20= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: ( (unnamed20= r_expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: (unnamed20= r_expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: (unnamed20= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:3: unnamed20= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:2: (unnamed20= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:105:3: unnamed20= r_expression
{
- pushFollow(FOLLOW_expression_in_expressionStmt932);
- unnamed20=expression();
+ pushFollow(FOLLOW_r_expression_in_r_expressionStmt932);
+ unnamed20=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2220,12 +2220,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end expressionStmt
+ // $ANTLR end r_expressionStmt
- // $ANTLR start fileStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:1: fileStatement returns [CompositeNode cn] : ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' ) ;
- public CompositeNode fileStatement() throws RecognitionException {
+ // $ANTLR start r_fileStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:107:1: r_fileStatement returns [CompositeNode cn] : ( 'FILE' ) (unnamed21= r_expression ) ( ( (unnamed22= r_identifier ) ) )? (unnamed23= r_sequence ) ( 'ENDFILE' ) ;
+ public CompositeNode r_fileStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed21 = null;
@@ -2238,24 +2238,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createFileStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( 'FILE' ) (unnamed21= expression ) ( ( (unnamed22= identifier ) ) )? (unnamed23= sequence ) ( 'ENDFILE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( ( 'FILE' ) (unnamed21= r_expression ) ( ( (unnamed22= r_identifier ) ) )? (unnamed23= r_sequence ) ( 'ENDFILE' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( 'FILE' ) (unnamed21= r_expression ) ( ( (unnamed22= r_identifier ) ) )? (unnamed23= r_sequence ) ( 'ENDFILE' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:2: ( 'FILE' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:3: 'FILE'
{
- match(input,41,FOLLOW_41_in_fileStatement955); if (failed) return cn;
+ match(input,41,FOLLOW_41_in_r_fileStatement955); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:47: (unnamed21= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:48: unnamed21= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:47: (unnamed21= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:48: unnamed21= r_expression
{
- pushFollow(FOLLOW_expression_in_fileStatement963);
- unnamed21=expression();
+ pushFollow(FOLLOW_r_expression_in_r_fileStatement963);
+ unnamed21=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2264,7 +2264,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:104: ( ( (unnamed22= identifier ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:106: ( ( (unnamed22= r_identifier ) ) )?
int alt25=2;
int LA25_0 = input.LA(1);
@@ -2273,16 +2273,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt25) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:105: ( (unnamed22= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:107: ( (unnamed22= r_identifier ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:105: ( (unnamed22= identifier ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:106: (unnamed22= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:107: ( (unnamed22= r_identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:108: (unnamed22= r_identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:106: (unnamed22= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:107: unnamed22= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:108: (unnamed22= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:109: unnamed22= r_identifier
{
- pushFollow(FOLLOW_identifier_in_fileStatement973);
- unnamed22=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_fileStatement973);
+ unnamed22=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2300,11 +2300,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:166: (unnamed23= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:167: unnamed23= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:170: (unnamed23= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:171: unnamed23= r_sequence
{
- pushFollow(FOLLOW_sequence_in_fileStatement984);
- unnamed23=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_fileStatement984);
+ unnamed23=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2313,10 +2313,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:221: ( 'ENDFILE' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:222: 'ENDFILE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:227: ( 'ENDFILE' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:110:228: 'ENDFILE'
{
- match(input,42,FOLLOW_42_in_fileStatement990); if (failed) return cn;
+ match(input,42,FOLLOW_42_in_r_fileStatement990); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -2335,12 +2335,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end fileStatement
+ // $ANTLR end r_fileStatement
- // $ANTLR start foreachStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:112:1: foreachStatement returns [CompositeNode cn] : ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' ) ;
- public CompositeNode foreachStatement() throws RecognitionException {
+ // $ANTLR start r_foreachStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:112:1: r_foreachStatement returns [CompositeNode cn] : ( 'FOREACH' ) (unnamed24= r_expression ) ( 'AS' ) (unnamed25= r_identifier ) ( ( ( 'ITERATOR' ) (unnamed26= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= r_expression ) ) )? (unnamed28= r_sequence ) ( 'ENDFOREACH' ) ;
+ public CompositeNode r_foreachStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed24 = null;
@@ -2357,24 +2357,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createForeachStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'FOREACH' ) (unnamed24= expression ) ( 'AS' ) (unnamed25= identifier ) ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )? (unnamed28= sequence ) ( 'ENDFOREACH' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( ( 'FOREACH' ) (unnamed24= r_expression ) ( 'AS' ) (unnamed25= r_identifier ) ( ( ( 'ITERATOR' ) (unnamed26= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= r_expression ) ) )? (unnamed28= r_sequence ) ( 'ENDFOREACH' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'FOREACH' ) (unnamed24= r_expression ) ( 'AS' ) (unnamed25= r_identifier ) ( ( ( 'ITERATOR' ) (unnamed26= r_identifier ) ) )? ( ( ( 'SEPARATOR' ) (unnamed27= r_expression ) ) )? (unnamed28= r_sequence ) ( 'ENDFOREACH' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:2: ( 'FOREACH' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:3: 'FOREACH'
{
- match(input,39,FOLLOW_39_in_foreachStatement1013); if (failed) return cn;
+ match(input,39,FOLLOW_39_in_r_foreachStatement1013); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:50: (unnamed24= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:51: unnamed24= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:50: (unnamed24= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:51: unnamed24= r_expression
{
- pushFollow(FOLLOW_expression_in_foreachStatement1021);
- unnamed24=expression();
+ pushFollow(FOLLOW_r_expression_in_r_foreachStatement1021);
+ unnamed24=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2383,21 +2383,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:107: ( 'AS' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:108: 'AS'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:109: ( 'AS' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:110: 'AS'
{
- match(input,43,FOLLOW_43_in_foreachStatement1027); if (failed) return cn;
+ match(input,43,FOLLOW_43_in_r_foreachStatement1027); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:150: (unnamed25= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:151: unnamed25= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:152: (unnamed25= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:153: unnamed25= r_identifier
{
- pushFollow(FOLLOW_identifier_in_foreachStatement1035);
- unnamed25=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_foreachStatement1035);
+ unnamed25=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2406,7 +2406,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:207: ( ( ( 'ITERATOR' ) (unnamed26= identifier ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:211: ( ( ( 'ITERATOR' ) (unnamed26= r_identifier ) ) )?
int alt26=2;
int LA26_0 = input.LA(1);
@@ -2415,26 +2415,26 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt26) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:208: ( ( 'ITERATOR' ) (unnamed26= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:212: ( ( 'ITERATOR' ) (unnamed26= r_identifier ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:208: ( ( 'ITERATOR' ) (unnamed26= identifier ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:209: ( 'ITERATOR' ) (unnamed26= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:212: ( ( 'ITERATOR' ) (unnamed26= r_identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:213: ( 'ITERATOR' ) (unnamed26= r_identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:209: ( 'ITERATOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:210: 'ITERATOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:213: ( 'ITERATOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:214: 'ITERATOR'
{
- match(input,44,FOLLOW_44_in_foreachStatement1043); if (failed) return cn;
+ match(input,44,FOLLOW_44_in_r_foreachStatement1043); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:258: (unnamed26= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:259: unnamed26= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:262: (unnamed26= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:263: unnamed26= r_identifier
{
- pushFollow(FOLLOW_identifier_in_foreachStatement1051);
- unnamed26=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_foreachStatement1051);
+ unnamed26=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2452,7 +2452,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:318: ( ( ( 'SEPARATOR' ) (unnamed27= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:324: ( ( ( 'SEPARATOR' ) (unnamed27= r_expression ) ) )?
int alt27=2;
int LA27_0 = input.LA(1);
@@ -2461,26 +2461,26 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt27) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:319: ( ( 'SEPARATOR' ) (unnamed27= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:325: ( ( 'SEPARATOR' ) (unnamed27= r_expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:319: ( ( 'SEPARATOR' ) (unnamed27= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:320: ( 'SEPARATOR' ) (unnamed27= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:325: ( ( 'SEPARATOR' ) (unnamed27= r_expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:326: ( 'SEPARATOR' ) (unnamed27= r_expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:320: ( 'SEPARATOR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:321: 'SEPARATOR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:326: ( 'SEPARATOR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:327: 'SEPARATOR'
{
- match(input,40,FOLLOW_40_in_foreachStatement1062); if (failed) return cn;
+ match(input,40,FOLLOW_40_in_r_foreachStatement1062); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:370: (unnamed27= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:371: unnamed27= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:376: (unnamed27= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:377: unnamed27= r_expression
{
- pushFollow(FOLLOW_expression_in_foreachStatement1070);
- unnamed27=expression();
+ pushFollow(FOLLOW_r_expression_in_r_foreachStatement1070);
+ unnamed27=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2498,11 +2498,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:430: (unnamed28= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:431: unnamed28= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:438: (unnamed28= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:439: unnamed28= r_sequence
{
- pushFollow(FOLLOW_sequence_in_foreachStatement1081);
- unnamed28=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_foreachStatement1081);
+ unnamed28=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2511,10 +2511,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:485: ( 'ENDFOREACH' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:486: 'ENDFOREACH'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:495: ( 'ENDFOREACH' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:115:496: 'ENDFOREACH'
{
- match(input,45,FOLLOW_45_in_foreachStatement1087); if (failed) return cn;
+ match(input,45,FOLLOW_45_in_r_foreachStatement1087); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -2533,12 +2533,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end foreachStatement
+ // $ANTLR end r_foreachStatement
- // $ANTLR start ifStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:117:1: ifStatement returns [CompositeNode cn] : ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' ) ;
- public CompositeNode ifStatement() throws RecognitionException {
+ // $ANTLR start r_ifStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:117:1: r_ifStatement returns [CompositeNode cn] : ( 'IF' ) (unnamed29= r_expression ) (unnamed30= r_sequence ) (unnamed31= r_elseIfStatement )* (unnamed32= r_elseStatement )? ( 'ENDIF' ) ;
+ public CompositeNode r_ifStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed29 = null;
@@ -2553,24 +2553,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createIfStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'IF' ) (unnamed29= expression ) (unnamed30= sequence ) (unnamed31= elseIfStatement )* (unnamed32= elseStatement )? ( 'ENDIF' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( ( 'IF' ) (unnamed29= r_expression ) (unnamed30= r_sequence ) (unnamed31= r_elseIfStatement )* (unnamed32= r_elseStatement )? ( 'ENDIF' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'IF' ) (unnamed29= r_expression ) (unnamed30= r_sequence ) (unnamed31= r_elseIfStatement )* (unnamed32= r_elseStatement )? ( 'ENDIF' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:2: ( 'IF' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:3: 'IF'
{
- match(input,46,FOLLOW_46_in_ifStatement1110); if (failed) return cn;
+ match(input,46,FOLLOW_46_in_r_ifStatement1110); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:45: (unnamed29= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:46: unnamed29= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:45: (unnamed29= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:46: unnamed29= r_expression
{
- pushFollow(FOLLOW_expression_in_ifStatement1118);
- unnamed29=expression();
+ pushFollow(FOLLOW_r_expression_in_r_ifStatement1118);
+ unnamed29=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2579,11 +2579,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:102: (unnamed30= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:103: unnamed30= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:104: (unnamed30= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:105: unnamed30= r_sequence
{
- pushFollow(FOLLOW_sequence_in_ifStatement1126);
- unnamed30=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_ifStatement1126);
+ unnamed30=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2592,7 +2592,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:157: (unnamed31= elseIfStatement )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:161: (unnamed31= r_elseIfStatement )*
loop28:
do {
int alt28=2;
@@ -2605,10 +2605,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt28) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:158: unnamed31= elseIfStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:162: unnamed31= r_elseIfStatement
{
- pushFollow(FOLLOW_elseIfStatement_in_ifStatement1134);
- unnamed31=elseIfStatement();
+ pushFollow(FOLLOW_r_elseIfStatement_in_r_ifStatement1134);
+ unnamed31=r_elseIfStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2623,7 +2623,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:220: (unnamed32= elseStatement )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:226: (unnamed32= r_elseStatement )?
int alt29=2;
int LA29_0 = input.LA(1);
@@ -2632,10 +2632,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt29) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:221: unnamed32= elseStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:227: unnamed32= r_elseStatement
{
- pushFollow(FOLLOW_elseStatement_in_ifStatement1143);
- unnamed32=elseStatement();
+ pushFollow(FOLLOW_r_elseStatement_in_r_ifStatement1143);
+ unnamed32=r_elseStatement();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2647,10 +2647,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:281: ( 'ENDIF' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:282: 'ENDIF'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:289: ( 'ENDIF' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:120:290: 'ENDIF'
{
- match(input,47,FOLLOW_47_in_ifStatement1150); if (failed) return cn;
+ match(input,47,FOLLOW_47_in_r_ifStatement1150); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -2669,12 +2669,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end ifStatement
+ // $ANTLR end r_ifStatement
- // $ANTLR start elseIfStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:122:1: elseIfStatement returns [CompositeNode cn] : ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence ) ;
- public CompositeNode elseIfStatement() throws RecognitionException {
+ // $ANTLR start r_elseIfStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:122:1: r_elseIfStatement returns [CompositeNode cn] : ( 'ELSEIF' ) (unnamed33= r_expression ) (unnamed34= r_sequence ) ;
+ public CompositeNode r_elseIfStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed33 = null;
@@ -2685,24 +2685,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createElseIfStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( 'ELSEIF' ) (unnamed33= expression ) (unnamed34= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( ( 'ELSEIF' ) (unnamed33= r_expression ) (unnamed34= r_sequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( 'ELSEIF' ) (unnamed33= r_expression ) (unnamed34= r_sequence )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:2: ( 'ELSEIF' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:3: 'ELSEIF'
{
- match(input,48,FOLLOW_48_in_elseIfStatement1173); if (failed) return cn;
+ match(input,48,FOLLOW_48_in_r_elseIfStatement1173); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:49: (unnamed33= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:50: unnamed33= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:49: (unnamed33= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:50: unnamed33= r_expression
{
- pushFollow(FOLLOW_expression_in_elseIfStatement1181);
- unnamed33=expression();
+ pushFollow(FOLLOW_r_expression_in_r_elseIfStatement1181);
+ unnamed33=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2711,11 +2711,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:106: (unnamed34= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:107: unnamed34= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:108: (unnamed34= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:125:109: unnamed34= r_sequence
{
- pushFollow(FOLLOW_sequence_in_elseIfStatement1189);
- unnamed34=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_elseIfStatement1189);
+ unnamed34=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2736,12 +2736,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end elseIfStatement
+ // $ANTLR end r_elseIfStatement
- // $ANTLR start elseStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:1: elseStatement returns [CompositeNode cn] : ( 'ELSE' ) (unnamed35= sequence ) ;
- public CompositeNode elseStatement() throws RecognitionException {
+ // $ANTLR start r_elseStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:127:1: r_elseStatement returns [CompositeNode cn] : ( 'ELSE' ) (unnamed35= r_sequence ) ;
+ public CompositeNode r_elseStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed35 = null;
@@ -2750,24 +2750,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createElseStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( ( 'ELSE' ) (unnamed35= sequence ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( 'ELSE' ) (unnamed35= sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( ( 'ELSE' ) (unnamed35= r_sequence ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( 'ELSE' ) (unnamed35= r_sequence )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:2: ( 'ELSE' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:3: 'ELSE'
{
- match(input,49,FOLLOW_49_in_elseStatement1212); if (failed) return cn;
+ match(input,49,FOLLOW_49_in_r_elseStatement1212); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:47: (unnamed35= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:48: unnamed35= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:47: (unnamed35= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:130:48: unnamed35= r_sequence
{
- pushFollow(FOLLOW_sequence_in_elseStatement1220);
- unnamed35=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_elseStatement1220);
+ unnamed35=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2788,12 +2788,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end elseStatement
+ // $ANTLR end r_elseStatement
- // $ANTLR start letStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:1: letStatement returns [CompositeNode cn] : ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' ) ;
- public CompositeNode letStatement() throws RecognitionException {
+ // $ANTLR start r_letStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:132:1: r_letStatement returns [CompositeNode cn] : ( 'LET' ) (unnamed36= r_expression ) ( 'AS' ) (unnamed37= r_identifier ) (unnamed38= r_sequence ) ( 'ENDLET' ) ;
+ public CompositeNode r_letStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed36 = null;
@@ -2806,24 +2806,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createLetStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( 'LET' ) (unnamed36= expression ) ( 'AS' ) (unnamed37= identifier ) (unnamed38= sequence ) ( 'ENDLET' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( ( 'LET' ) (unnamed36= r_expression ) ( 'AS' ) (unnamed37= r_identifier ) (unnamed38= r_sequence ) ( 'ENDLET' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( 'LET' ) (unnamed36= r_expression ) ( 'AS' ) (unnamed37= r_identifier ) (unnamed38= r_sequence ) ( 'ENDLET' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:2: ( 'LET' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:3: 'LET'
{
- match(input,50,FOLLOW_50_in_letStatement1243); if (failed) return cn;
+ match(input,50,FOLLOW_50_in_r_letStatement1243); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:46: (unnamed36= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:47: unnamed36= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:46: (unnamed36= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:47: unnamed36= r_expression
{
- pushFollow(FOLLOW_expression_in_letStatement1251);
- unnamed36=expression();
+ pushFollow(FOLLOW_r_expression_in_r_letStatement1251);
+ unnamed36=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2832,21 +2832,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:103: ( 'AS' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:104: 'AS'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:105: ( 'AS' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:106: 'AS'
{
- match(input,43,FOLLOW_43_in_letStatement1257); if (failed) return cn;
+ match(input,43,FOLLOW_43_in_r_letStatement1257); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:146: (unnamed37= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:147: unnamed37= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:148: (unnamed37= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:149: unnamed37= r_identifier
{
- pushFollow(FOLLOW_identifier_in_letStatement1265);
- unnamed37=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_letStatement1265);
+ unnamed37=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2855,11 +2855,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:203: (unnamed38= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:204: unnamed38= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:207: (unnamed38= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:208: unnamed38= r_sequence
{
- pushFollow(FOLLOW_sequence_in_letStatement1273);
- unnamed38=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_letStatement1273);
+ unnamed38=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2868,10 +2868,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:258: ( 'ENDLET' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:259: 'ENDLET'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:264: ( 'ENDLET' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:135:265: 'ENDLET'
{
- match(input,51,FOLLOW_51_in_letStatement1279); if (failed) return cn;
+ match(input,51,FOLLOW_51_in_r_letStatement1279); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -2890,12 +2890,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end letStatement
+ // $ANTLR end r_letStatement
- // $ANTLR start protectStatement
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:1: protectStatement returns [CompositeNode cn] : ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' ) ;
- public CompositeNode protectStatement() throws RecognitionException {
+ // $ANTLR start r_protectStatement
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:137:1: r_protectStatement returns [CompositeNode cn] : ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= r_expression ) ( 'CEND' ) (unnamed40= r_expression ) ( 'ID' ) (unnamed41= r_expression ) ( 'DISABLE' )? (unnamed42= r_sequence ) ( 'ENDPROTECT' ) ;
+ public CompositeNode r_protectStatement() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed39 = null;
@@ -2910,13 +2910,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createProtectStatementNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= expression ) ( 'CEND' ) (unnamed40= expression ) ( 'ID' ) (unnamed41= expression ) ( 'DISABLE' )? (unnamed42= sequence ) ( 'ENDPROTECT' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= r_expression ) ( 'CEND' ) (unnamed40= r_expression ) ( 'ID' ) (unnamed41= r_expression ) ( 'DISABLE' )? (unnamed42= r_sequence ) ( 'ENDPROTECT' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( 'PROTECT' ) ( 'CSTART' ) (unnamed39= r_expression ) ( 'CEND' ) (unnamed40= r_expression ) ( 'ID' ) (unnamed41= r_expression ) ( 'DISABLE' )? (unnamed42= r_sequence ) ( 'ENDPROTECT' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:2: ( 'PROTECT' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:3: 'PROTECT'
{
- match(input,52,FOLLOW_52_in_protectStatement1302); if (failed) return cn;
+ match(input,52,FOLLOW_52_in_r_protectStatement1302); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -2926,18 +2926,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:50: ( 'CSTART' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:51: 'CSTART'
{
- match(input,53,FOLLOW_53_in_protectStatement1308); if (failed) return cn;
+ match(input,53,FOLLOW_53_in_r_protectStatement1308); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:97: (unnamed39= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:98: unnamed39= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:97: (unnamed39= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:98: unnamed39= r_expression
{
- pushFollow(FOLLOW_expression_in_protectStatement1316);
- unnamed39=expression();
+ pushFollow(FOLLOW_r_expression_in_r_protectStatement1316);
+ unnamed39=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2946,21 +2946,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:154: ( 'CEND' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:155: 'CEND'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:156: ( 'CEND' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:157: 'CEND'
{
- match(input,54,FOLLOW_54_in_protectStatement1322); if (failed) return cn;
+ match(input,54,FOLLOW_54_in_r_protectStatement1322); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:199: (unnamed40= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:200: unnamed40= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:201: (unnamed40= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:202: unnamed40= r_expression
{
- pushFollow(FOLLOW_expression_in_protectStatement1330);
- unnamed40=expression();
+ pushFollow(FOLLOW_r_expression_in_r_protectStatement1330);
+ unnamed40=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2969,21 +2969,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:256: ( 'ID' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:257: 'ID'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:260: ( 'ID' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:261: 'ID'
{
- match(input,55,FOLLOW_55_in_protectStatement1336); if (failed) return cn;
+ match(input,55,FOLLOW_55_in_r_protectStatement1336); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:299: (unnamed41= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:300: unnamed41= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:303: (unnamed41= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:304: unnamed41= r_expression
{
- pushFollow(FOLLOW_expression_in_protectStatement1344);
- unnamed41=expression();
+ pushFollow(FOLLOW_r_expression_in_r_protectStatement1344);
+ unnamed41=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -2992,7 +2992,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:356: ( 'DISABLE' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:362: ( 'DISABLE' )?
int alt30=2;
int LA30_0 = input.LA(1);
@@ -3001,9 +3001,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt30) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:357: 'DISABLE'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:363: 'DISABLE'
{
- match(input,56,FOLLOW_56_in_protectStatement1350); if (failed) return cn;
+ match(input,56,FOLLOW_56_in_r_protectStatement1350); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3013,11 +3013,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:405: (unnamed42= sequence )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:406: unnamed42= sequence
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:411: (unnamed42= r_sequence )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:412: unnamed42= r_sequence
{
- pushFollow(FOLLOW_sequence_in_protectStatement1359);
- unnamed42=sequence();
+ pushFollow(FOLLOW_r_sequence_in_r_protectStatement1359);
+ unnamed42=r_sequence();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3026,10 +3026,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:460: ( 'ENDPROTECT' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:461: 'ENDPROTECT'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:468: ( 'ENDPROTECT' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:140:469: 'ENDPROTECT'
{
- match(input,57,FOLLOW_57_in_protectStatement1365); if (failed) return cn;
+ match(input,57,FOLLOW_57_in_r_protectStatement1365); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3048,12 +3048,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end protectStatement
+ // $ANTLR end r_protectStatement
- // $ANTLR start check
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:142:1: check returns [CompositeNode cn] : ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' ) ;
- public CompositeNode check() throws RecognitionException {
+ // $ANTLR start r_check
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:142:1: r_check returns [CompositeNode cn] : ( 'context' ) (unnamed43= r_type ) ( ( ( 'if' ) (unnamed44= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= r_expression ) ( ':' ) (unnamed46= r_expression ) ( ';' ) ;
+ public CompositeNode r_check() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed43 = null;
@@ -3068,24 +3068,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createCheckNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'context' ) (unnamed43= type ) ( ( ( 'if' ) (unnamed44= expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= expression ) ( ':' ) (unnamed46= expression ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( ( 'context' ) (unnamed43= r_type ) ( ( ( 'if' ) (unnamed44= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= r_expression ) ( ':' ) (unnamed46= r_expression ) ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'context' ) (unnamed43= r_type ) ( ( ( 'if' ) (unnamed44= r_expression ) ) )? ( ( ( 'ERROR' ) | ( 'WARNING' ) ) ) (unnamed45= r_expression ) ( ':' ) (unnamed46= r_expression ) ( ';' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:2: ( 'context' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:3: 'context'
{
- match(input,58,FOLLOW_58_in_check1388); if (failed) return cn;
+ match(input,58,FOLLOW_58_in_r_check1388); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:50: (unnamed43= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:51: unnamed43= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:50: (unnamed43= r_type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:51: unnamed43= r_type
{
- pushFollow(FOLLOW_type_in_check1396);
- unnamed43=type();
+ pushFollow(FOLLOW_r_type_in_r_check1396);
+ unnamed43=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3094,7 +3094,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:101: ( ( ( 'if' ) (unnamed44= expression ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:103: ( ( ( 'if' ) (unnamed44= r_expression ) ) )?
int alt31=2;
int LA31_0 = input.LA(1);
@@ -3103,26 +3103,26 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt31) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:102: ( ( 'if' ) (unnamed44= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:104: ( ( 'if' ) (unnamed44= r_expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:102: ( ( 'if' ) (unnamed44= expression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:103: ( 'if' ) (unnamed44= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:104: ( ( 'if' ) (unnamed44= r_expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:105: ( 'if' ) (unnamed44= r_expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:103: ( 'if' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:104: 'if'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:105: ( 'if' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:106: 'if'
{
- match(input,59,FOLLOW_59_in_check1404); if (failed) return cn;
+ match(input,59,FOLLOW_59_in_r_check1404); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:146: (unnamed44= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:147: unnamed44= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:148: (unnamed44= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:149: unnamed44= r_expression
{
- pushFollow(FOLLOW_expression_in_check1412);
- unnamed44=expression();
+ pushFollow(FOLLOW_r_expression_in_r_check1412);
+ unnamed44=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3140,10 +3140,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:206: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:207: ( ( 'ERROR' ) | ( 'WARNING' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:210: ( ( ( 'ERROR' ) | ( 'WARNING' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:211: ( ( 'ERROR' ) | ( 'WARNING' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:207: ( ( 'ERROR' ) | ( 'WARNING' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:211: ( ( 'ERROR' ) | ( 'WARNING' ) )
int alt32=2;
int LA32_0 = input.LA(1);
@@ -3156,18 +3156,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("145:207: ( ( 'ERROR' ) | ( 'WARNING' ) )", 32, 0, input);
+ new NoViableAltException("145:211: ( ( 'ERROR' ) | ( 'WARNING' ) )", 32, 0, input);
throw nvae;
}
switch (alt32) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:208: ( 'ERROR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:212: ( 'ERROR' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:208: ( 'ERROR' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:209: 'ERROR'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:212: ( 'ERROR' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:145:213: 'ERROR'
{
- match(input,37,FOLLOW_37_in_check1423); if (failed) return cn;
+ match(input,37,FOLLOW_37_in_r_check1423); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3183,7 +3183,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:4: ( 'WARNING' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:5: 'WARNING'
{
- match(input,60,FOLLOW_60_in_check1432); if (failed) return cn;
+ match(input,60,FOLLOW_60_in_r_check1432); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3199,11 +3199,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:54: (unnamed45= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:55: unnamed45= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:54: (unnamed45= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:55: unnamed45= r_expression
{
- pushFollow(FOLLOW_expression_in_check1442);
- unnamed45=expression();
+ pushFollow(FOLLOW_r_expression_in_r_check1442);
+ unnamed45=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3212,21 +3212,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:111: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:112: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:113: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:114: ':'
{
- match(input,61,FOLLOW_61_in_check1448); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_r_check1448); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:153: (unnamed46= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:154: unnamed46= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:155: (unnamed46= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:156: unnamed46= r_expression
{
- pushFollow(FOLLOW_expression_in_check1456);
- unnamed46=expression();
+ pushFollow(FOLLOW_r_expression_in_r_check1456);
+ unnamed46=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3235,10 +3235,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:210: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:211: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:214: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:146:215: ';'
{
- match(input,28,FOLLOW_28_in_check1462); if (failed) return cn;
+ match(input,28,FOLLOW_28_in_r_check1462); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3257,12 +3257,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end check
+ // $ANTLR end r_check
- // $ANTLR start around
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:148:1: around returns [CompositeNode cn] : ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' ) ;
- public CompositeNode around() throws RecognitionException {
+ // $ANTLR start r_around
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:148:1: r_around returns [CompositeNode cn] : ( 'around' ) (unnamed47= r_pointcut ) ( '(' ) ( ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= r_expression ) ( ';' ) ;
+ public CompositeNode r_around() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed47 = null;
@@ -3275,24 +3275,24 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createAroundNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'around' ) (unnamed47= pointcut ) ( '(' ) ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= expression ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( ( 'around' ) (unnamed47= r_pointcut ) ( '(' ) ( ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= r_expression ) ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'around' ) (unnamed47= r_pointcut ) ( '(' ) ( ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )? ( ')' ) ( ':' ) (unnamed49= r_expression ) ( ';' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:2: ( 'around' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:3: 'around'
{
- match(input,62,FOLLOW_62_in_around1485); if (failed) return cn;
+ match(input,62,FOLLOW_62_in_r_around1485); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:49: (unnamed47= pointcut )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:50: unnamed47= pointcut
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:49: (unnamed47= r_pointcut )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:50: unnamed47= r_pointcut
{
- pushFollow(FOLLOW_pointcut_in_around1493);
- unnamed47=pointcut();
+ pushFollow(FOLLOW_r_pointcut_in_r_around1493);
+ unnamed47=r_pointcut();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3301,17 +3301,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:104: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:105: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:106: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:107: '('
{
- match(input,31,FOLLOW_31_in_around1499); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_around1499); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:146: ( ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:148: ( ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) ) )?
int alt36=2;
int LA36_0 = input.LA(1);
@@ -3320,9 +3320,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt36) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:149: ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:149: ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )
int alt35=2;
int LA35_0 = input.LA(1);
@@ -3335,19 +3335,19 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("151:147: ( (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 35, 0, input);
+ new NoViableAltException("151:149: ( (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )? | ( '*' ) )", 35, 0, input);
throw nvae;
}
switch (alt35) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:148: (unnamed48= declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:150: (unnamed48= r_declaredParameterList ) ( ( ( ',' )? ( '*' ) ) )?
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:148: (unnamed48= declaredParameterList )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:149: unnamed48= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:150: (unnamed48= r_declaredParameterList )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:151: unnamed48= r_declaredParameterList
{
- pushFollow(FOLLOW_declaredParameterList_in_around1509);
- unnamed48=declaredParameterList();
+ pushFollow(FOLLOW_r_declaredParameterList_in_r_around1509);
+ unnamed48=r_declaredParameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3356,7 +3356,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:216: ( ( ( ',' )? ( '*' ) ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:220: ( ( ( ',' )? ( '*' ) ) )?
int alt34=2;
int LA34_0 = input.LA(1);
@@ -3365,12 +3365,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt34) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:217: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:221: ( ( ',' )? ( '*' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:217: ( ( ',' )? ( '*' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:218: ( ',' )? ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:221: ( ( ',' )? ( '*' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:222: ( ',' )? ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:218: ( ',' )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:222: ( ',' )?
int alt33=2;
int LA33_0 = input.LA(1);
@@ -3379,9 +3379,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt33) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:219: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:223: ','
{
- match(input,32,FOLLOW_32_in_around1517); if (failed) return cn;
+ match(input,32,FOLLOW_32_in_r_around1517); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3391,10 +3391,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:261: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:262: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:265: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:151:266: '*'
{
- match(input,33,FOLLOW_33_in_around1524); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_around1524); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3419,7 +3419,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:4: ( '*' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:5: '*'
{
- match(input,33,FOLLOW_33_in_around1536); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_around1536); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3441,7 +3441,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:49: ( ')' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:50: ')'
{
- match(input,34,FOLLOW_34_in_around1545); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_around1545); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3451,18 +3451,18 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:91: ( ':' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:92: ':'
{
- match(input,61,FOLLOW_61_in_around1551); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_r_around1551); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:133: (unnamed49= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:134: unnamed49= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:133: (unnamed49= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:134: unnamed49= r_expression
{
- pushFollow(FOLLOW_expression_in_around1559);
- unnamed49=expression();
+ pushFollow(FOLLOW_r_expression_in_r_around1559);
+ unnamed49=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3471,10 +3471,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:190: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:191: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:192: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:152:193: ';'
{
- match(input,28,FOLLOW_28_in_around1565); if (failed) return cn;
+ match(input,28,FOLLOW_28_in_r_around1565); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3493,12 +3493,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end around
+ // $ANTLR end r_around
- // $ANTLR start pointcut
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:1: pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )* ;
- public CompositeNode pointcut() throws RecognitionException {
+ // $ANTLR start r_pointcut
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:154:1: r_pointcut returns [CompositeNode cn] : ( ( ( '*' ) | (unnamed50= r_identifier ) ) ) ( ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) ) )* ;
+ public CompositeNode r_pointcut() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed50 = null;
@@ -3509,13 +3509,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createPointcutNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( '*' ) | (unnamed50= identifier ) ) ) ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( ( '*' ) | (unnamed50= r_identifier ) ) ) ( ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( '*' ) | (unnamed50= r_identifier ) ) ) ( ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( '*' ) | (unnamed50= identifier ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: ( ( '*' ) | (unnamed50= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:2: ( ( ( '*' ) | (unnamed50= r_identifier ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: ( ( '*' ) | (unnamed50= r_identifier ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: ( ( '*' ) | (unnamed50= identifier ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:3: ( ( '*' ) | (unnamed50= r_identifier ) )
int alt37=2;
int LA37_0 = input.LA(1);
@@ -3528,7 +3528,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("157:3: ( ( '*' ) | (unnamed50= identifier ) )", 37, 0, input);
+ new NoViableAltException("157:3: ( ( '*' ) | (unnamed50= r_identifier ) )", 37, 0, input);
throw nvae;
}
@@ -3539,7 +3539,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:4: ( '*' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:157:5: '*'
{
- match(input,33,FOLLOW_33_in_pointcut1590); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_pointcut1590); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3550,13 +3550,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:4: (unnamed50= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:4: (unnamed50= r_identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:4: (unnamed50= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:5: unnamed50= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:4: (unnamed50= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:5: unnamed50= r_identifier
{
- pushFollow(FOLLOW_identifier_in_pointcut1601);
- unnamed50=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_pointcut1601);
+ unnamed50=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3574,7 +3574,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:63: ( ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:65: ( ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) ) )*
loop39:
do {
int alt39=2;
@@ -3587,9 +3587,9 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt39) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:66: ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:66: ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) )
int alt38=3;
switch ( input.LA(1) ) {
case 33:
@@ -3610,19 +3610,19 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("158:64: ( ( '*' ) | (unnamed51= identifier ) | ( '::' ) )", 38, 0, input);
+ new NoViableAltException("158:66: ( ( '*' ) | (unnamed51= r_identifier ) | ( '::' ) )", 38, 0, input);
throw nvae;
}
switch (alt38) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:65: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:67: ( '*' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:65: ( '*' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:66: '*'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:67: ( '*' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:158:68: '*'
{
- match(input,33,FOLLOW_33_in_pointcut1611); if (failed) return cn;
+ match(input,33,FOLLOW_33_in_r_pointcut1611); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3633,13 +3633,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:4: (unnamed51= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:4: (unnamed51= r_identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:4: (unnamed51= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:5: unnamed51= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:4: (unnamed51= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:159:5: unnamed51= r_identifier
{
- pushFollow(FOLLOW_identifier_in_pointcut1622);
- unnamed51=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_pointcut1622);
+ unnamed51=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3657,7 +3657,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:160:4: ( '::' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:160:5: '::'
{
- match(input,63,FOLLOW_63_in_pointcut1631); if (failed) return cn;
+ match(input,63,FOLLOW_63_in_r_pointcut1631); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -3691,12 +3691,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end pointcut
+ // $ANTLR end r_pointcut
- // $ANTLR start extension
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:1: extension returns [CompositeNode cn] : ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= type )? (name= identifier ) ( '(' ) (paramList= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) ) ( ';' ) ;
- public CompositeNode extension() throws RecognitionException {
+ // $ANTLR start r_extension
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:162:1: r_extension returns [CompositeNode cn] : ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= r_type )? (name= r_identifier ) ( '(' ) (paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) ) ) ( ';' ) ;
+ public CompositeNode r_extension() throws RecognitionException {
CompositeNode cn = null;
CompositeNode returnType = null;
@@ -3719,8 +3719,8 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createExtensionNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= type )? (name= identifier ) ( '(' ) (paramList= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) ) ( ';' ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= type )? (name= identifier ) ( '(' ) (paramList= declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) ) ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= r_type )? (name= r_identifier ) ( '(' ) (paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) ) ) ( ';' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )* (returnType= r_type )? (name= r_identifier ) ( '(' ) (paramList= r_declaredParameterList )? ( ')' ) ( ':' ) ( ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) ) ) ( ';' )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:2: ( ( ( 'private' ) | ( 'cached' ) | ( 'create' ) ) )*
loop41:
@@ -3770,7 +3770,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:4: ( 'private' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:165:5: 'private'
{
- match(input,64,FOLLOW_64_in_extension1659); if (failed) return cn;
+ match(input,64,FOLLOW_64_in_r_extension1659); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, "private");
}
@@ -3786,7 +3786,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:4: ( 'cached' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:166:5: 'cached'
{
- match(input,65,FOLLOW_65_in_extension1668); if (failed) return cn;
+ match(input,65,FOLLOW_65_in_r_extension1668); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, "cached");
}
@@ -3802,7 +3802,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:4: ( 'create' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:5: 'create'
{
- match(input,66,FOLLOW_66_in_extension1677); if (failed) return cn;
+ match(input,66,FOLLOW_66_in_r_extension1677); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, "create");
}
@@ -3824,7 +3824,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
} while (true);
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:58: (returnType= type )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:58: (returnType= r_type )?
int alt42=2;
int LA42_0 = input.LA(1);
@@ -3840,10 +3840,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt42) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:59: returnType= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:59: returnType= r_type
{
- pushFollow(FOLLOW_type_in_extension1688);
- returnType=type();
+ pushFollow(FOLLOW_r_type_in_r_extension1688);
+ returnType=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3855,11 +3855,11 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:160: (name= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:161: name= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:162: (name= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:163: name= r_identifier
{
- pushFollow(FOLLOW_identifier_in_extension1697);
- name=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_extension1697);
+ name=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3868,17 +3868,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:243: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:244: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:247: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:248: '('
{
- match(input,31,FOLLOW_31_in_extension1703); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_extension1703); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:285: (paramList= declaredParameterList )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:289: (paramList= r_declaredParameterList )?
int alt43=2;
int LA43_0 = input.LA(1);
@@ -3887,10 +3887,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt43) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:286: paramList= declaredParameterList
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:290: paramList= r_declaredParameterList
{
- pushFollow(FOLLOW_declaredParameterList_in_extension1711);
- paramList=declaredParameterList();
+ pushFollow(FOLLOW_r_declaredParameterList_in_r_extension1711);
+ paramList=r_declaredParameterList();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3902,30 +3902,30 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:400: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:401: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:406: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:407: ')'
{
- match(input,34,FOLLOW_34_in_extension1718); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_extension1718); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:442: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:443: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:448: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:449: ':'
{
- match(input,61,FOLLOW_61_in_extension1724); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_r_extension1724); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:484: ( ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:485: ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:490: ( ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:491: ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:485: ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:491: ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) )
int alt46=2;
int LA46_0 = input.LA(1);
@@ -3938,29 +3938,29 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("167:485: ( ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' ) | (extendBody= expression ) )", 46, 0, input);
+ new NoViableAltException("167:491: ( ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' ) | (extendBody= r_expression ) )", 46, 0, input);
throw nvae;
}
switch (alt46) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:486: ( 'JAVA' ) (javaReturnType= javaType ) ( '.' ) (javaName= identifier ) ( '(' ) ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )? ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:492: ( 'JAVA' ) (javaReturnType= r_javaType ) ( '.' ) (javaName= r_identifier ) ( '(' ) ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )? ( ')' )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:486: ( 'JAVA' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:487: 'JAVA'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:492: ( 'JAVA' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:493: 'JAVA'
{
- match(input,67,FOLLOW_67_in_extension1732); if (failed) return cn;
+ match(input,67,FOLLOW_67_in_r_extension1732); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:531: (javaReturnType= javaType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:532: javaReturnType= javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:537: (javaReturnType= r_javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:538: javaReturnType= r_javaType
{
- pushFollow(FOLLOW_javaType_in_extension1740);
- javaReturnType=javaType();
+ pushFollow(FOLLOW_r_javaType_in_r_extension1740);
+ javaReturnType=r_javaType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3969,21 +3969,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:652: ( '.' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:653: '.'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:660: ( '.' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:661: '.'
{
- match(input,68,FOLLOW_68_in_extension1746); if (failed) return cn;
+ match(input,68,FOLLOW_68_in_r_extension1746); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:694: (javaName= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:695: javaName= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:702: (javaName= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:703: javaName= r_identifier
{
- pushFollow(FOLLOW_identifier_in_extension1754);
- javaName=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_extension1754);
+ javaName=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -3992,17 +3992,17 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:793: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:794: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:803: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:804: '('
{
- match(input,31,FOLLOW_31_in_extension1760); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_extension1760); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:835: ( ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* ) )?
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:845: ( ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* ) )?
int alt45=2;
int LA45_0 = input.LA(1);
@@ -4011,16 +4011,16 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
switch (alt45) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:836: ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:846: ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:836: ( (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:837: (unnamed52= javaType ) ( ( ( ',' ) (unnamed53= javaType ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:846: ( (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:847: (unnamed52= r_javaType ) ( ( ( ',' ) (unnamed53= r_javaType ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:837: (unnamed52= javaType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:838: unnamed52= javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:847: (unnamed52= r_javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:848: unnamed52= r_javaType
{
- pushFollow(FOLLOW_javaType_in_extension1770);
- unnamed52=javaType();
+ pushFollow(FOLLOW_r_javaType_in_r_extension1770);
+ unnamed52=r_javaType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4029,7 +4029,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:892: ( ( ( ',' ) (unnamed53= javaType ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:904: ( ( ( ',' ) (unnamed53= r_javaType ) ) )*
loop44:
do {
int alt44=2;
@@ -4042,26 +4042,26 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt44) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:893: ( ( ',' ) (unnamed53= javaType ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:905: ( ( ',' ) (unnamed53= r_javaType ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:893: ( ( ',' ) (unnamed53= javaType ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:894: ( ',' ) (unnamed53= javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:905: ( ( ',' ) (unnamed53= r_javaType ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:906: ( ',' ) (unnamed53= r_javaType )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:894: ( ',' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:895: ','
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:906: ( ',' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:907: ','
{
- match(input,32,FOLLOW_32_in_extension1778); if (failed) return cn;
+ match(input,32,FOLLOW_32_in_r_extension1778); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:936: (unnamed53= javaType )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:937: unnamed53= javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:948: (unnamed53= r_javaType )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:949: unnamed53= r_javaType
{
- pushFollow(FOLLOW_javaType_in_extension1786);
- unnamed53=javaType();
+ pushFollow(FOLLOW_r_javaType_in_r_extension1786);
+ unnamed53=r_javaType();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4091,10 +4091,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:997: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:998: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:1011: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:167:1012: ')'
{
- match(input,34,FOLLOW_34_in_extension1798); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_extension1798); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4105,13 +4105,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:4: (extendBody= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:4: (extendBody= r_expression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:4: (extendBody= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:5: extendBody= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:4: (extendBody= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:5: extendBody= r_expression
{
- pushFollow(FOLLOW_expression_in_extension1809);
- extendBody=expression();
+ pushFollow(FOLLOW_r_expression_in_r_extension1809);
+ extendBody=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4129,10 +4129,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:113: ( ';' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:114: ';'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:115: ( ';' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:168:116: ';'
{
- match(input,28,FOLLOW_28_in_extension1817); if (failed) return cn;
+ match(input,28,FOLLOW_28_in_r_extension1817); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4151,12 +4151,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end extension
+ // $ANTLR end r_extension
- // $ANTLR start javaType
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:170:1: javaType returns [CompositeNode cn] : (unnamed54= identifier ) ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ;
- public CompositeNode javaType() throws RecognitionException {
+ // $ANTLR start r_javaType
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:170:1: r_javaType returns [CompositeNode cn] : (unnamed54= r_identifier ) ( ( ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* ;
+ public CompositeNode r_javaType() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed54 = null;
@@ -4167,14 +4167,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createJavaTypeNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: ( (unnamed54= identifier ) ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: (unnamed54= identifier ) ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: ( (unnamed54= r_identifier ) ( ( ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )* )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: (unnamed54= r_identifier ) ( ( ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: (unnamed54= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:3: unnamed54= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:2: (unnamed54= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:3: unnamed54= r_identifier
{
- pushFollow(FOLLOW_identifier_in_javaType1842);
- unnamed54=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_javaType1842);
+ unnamed54=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4183,7 +4183,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:59: ( ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:61: ( ( ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) ) )*
loop48:
do {
int alt48=2;
@@ -4211,25 +4211,25 @@ public class Xpand3NodeParser extends AbstractNodeParser {
switch (alt48) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:60: ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:62: ( ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:60: ( ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:61: ( '.' ) ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:62: ( ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:63: ( '.' ) ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:61: ( '.' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:62: '.'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:63: ( '.' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:64: '.'
{
- match(input,68,FOLLOW_68_in_javaType1850); if (failed) return cn;
+ match(input,68,FOLLOW_68_in_r_javaType1850); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:103: ( ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:104: ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:105: ( ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:106: ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:104: ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:106: ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
int alt47=4;
switch ( input.LA(1) ) {
case Identifier:
@@ -4255,20 +4255,20 @@ public class Xpand3NodeParser extends AbstractNodeParser {
default:
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("173:104: ( (unnamed55= identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 47, 0, input);
+ new NoViableAltException("173:106: ( (unnamed55= r_identifier ) | ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )", 47, 0, input);
throw nvae;
}
switch (alt47) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:105: (unnamed55= identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:107: (unnamed55= r_identifier )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:105: (unnamed55= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:106: unnamed55= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:107: (unnamed55= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:173:108: unnamed55= r_identifier
{
- pushFollow(FOLLOW_identifier_in_javaType1860);
- unnamed55=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_javaType1860);
+ unnamed55=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4286,7 +4286,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:4: ( 'Collection' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:174:5: 'Collection'
{
- match(input,69,FOLLOW_69_in_javaType1869); if (failed) return cn;
+ match(input,69,FOLLOW_69_in_r_javaType1869); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4302,7 +4302,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:4: ( 'List' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:175:5: 'List'
{
- match(input,70,FOLLOW_70_in_javaType1878); if (failed) return cn;
+ match(input,70,FOLLOW_70_in_r_javaType1878); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4318,7 +4318,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:4: ( 'Set' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:176:5: 'Set'
{
- match(input,71,FOLLOW_71_in_javaType1887); if (failed) return cn;
+ match(input,71,FOLLOW_71_in_r_javaType1887); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
@@ -4358,12 +4358,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end javaType
+ // $ANTLR end r_javaType
- // $ANTLR start test_expression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:178:1: test_expression returns [CompositeNode cn] : (unnamed56= expression ) ( EOF ) ;
- public CompositeNode test_expression() throws RecognitionException {
+ // $ANTLR start r_test_expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:178:1: r_test_expression returns [CompositeNode cn] : (unnamed56= r_expression ) ( EOF ) ;
+ public CompositeNode r_test_expression() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed56 = null;
@@ -4372,14 +4372,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createTest_expressionNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( (unnamed56= expression ) ( EOF ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: (unnamed56= expression ) ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: ( (unnamed56= r_expression ) ( EOF ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: (unnamed56= r_expression ) ( EOF )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: (unnamed56= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:3: unnamed56= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:2: (unnamed56= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:3: unnamed56= r_expression
{
- pushFollow(FOLLOW_expression_in_test_expression1922);
- unnamed56=expression();
+ pushFollow(FOLLOW_r_expression_in_r_test_expression1922);
+ unnamed56=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4388,10 +4388,10 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:59: ( EOF )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:60: EOF
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:61: ( EOF )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:182:62: EOF
{
- match(input,EOF,FOLLOW_EOF_in_test_expression1928); if (failed) return cn;
+ match(input,EOF,FOLLOW_EOF_in_r_test_expression1928); if (failed) return cn;
}
@@ -4410,12 +4410,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end test_expression
+ // $ANTLR end r_test_expression
- // $ANTLR start expression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:184:1: expression returns [CompositeNode cn] : (unnamed57= letExpression ) ;
- public CompositeNode expression() throws RecognitionException {
+ // $ANTLR start r_expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:184:1: r_expression returns [CompositeNode cn] : (unnamed57= r_letExpression ) ;
+ public CompositeNode r_expression() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed57 = null;
@@ -4424,14 +4424,14 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createExpressionNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: ( (unnamed57= letExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: (unnamed57= letExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: ( (unnamed57= r_letExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: (unnamed57= r_letExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: (unnamed57= letExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:3: unnamed57= letExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:2: (unnamed57= r_letExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:188:3: unnamed57= r_letExpression
{
- pushFollow(FOLLOW_letExpression_in_expression1956);
- unnamed57=letExpression();
+ pushFollow(FOLLOW_r_letExpression_in_r_expression1956);
+ unnamed57=r_letExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4455,12 +4455,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end expression
+ // $ANTLR end r_expression
- // $ANTLR start letExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:1: letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression ) | (unnamed61= castedExpression ) );
- public CompositeNode letExpression() throws RecognitionException {
+ // $ANTLR start r_letExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:190:1: r_letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed58= r_identifier ) ( '=' ) (unnamed59= r_castedExpression ) ( ':' ) (unnamed60= r_expression ) | (unnamed61= r_castedExpression ) );
+ public CompositeNode r_letExpression() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed58 = null;
@@ -4475,7 +4475,7 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createLetExpressionNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression ) | (unnamed61= castedExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( ( 'let' ) (unnamed58= r_identifier ) ( '=' ) (unnamed59= r_castedExpression ) ( ':' ) (unnamed60= r_expression ) | (unnamed61= r_castedExpression ) )
int alt49=2;
int LA49_0 = input.LA(1);
@@ -4488,29 +4488,29 @@ public class Xpand3NodeParser extends AbstractNodeParser {
else {
if (backtracking>0) {failed=true; return cn;}
NoViableAltException nvae =
- new NoViableAltException("190:1: letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression ) | (unnamed61= castedExpression ) );", 49, 0, input);
+ new NoViableAltException("190:1: r_letExpression returns [CompositeNode cn] : ( ( 'let' ) (unnamed58= r_identifier ) ( '=' ) (unnamed59= r_castedExpression ) ( ':' ) (unnamed60= r_expression ) | (unnamed61= r_castedExpression ) );", 49, 0, input);
throw nvae;
}
switch (alt49) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( 'let' ) (unnamed58= identifier ) ( '=' ) (unnamed59= castedExpression ) ( ':' ) (unnamed60= expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( 'let' ) (unnamed58= r_identifier ) ( '=' ) (unnamed59= r_castedExpression ) ( ':' ) (unnamed60= r_expression )
{
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:2: ( 'let' )
// ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:3: 'let'
{
- match(input,72,FOLLOW_72_in_letExpression1984); if (failed) return cn;
+ match(input,72,FOLLOW_72_in_r_letExpression1984); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:46: (unnamed58= identifier )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:47: unnamed58= identifier
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:46: (unnamed58= r_identifier )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:47: unnamed58= r_identifier
{
- pushFollow(FOLLOW_identifier_in_letExpression1992);
- unnamed58=identifier();
+ pushFollow(FOLLOW_r_identifier_in_r_letExpression1992);
+ unnamed58=r_identifier();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4519,21 +4519,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:103: ( '=' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:104: '='
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:105: ( '=' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:106: '='
{
- match(input,73,FOLLOW_73_in_letExpression1998); if (failed) return cn;
+ match(input,73,FOLLOW_73_in_r_letExpression1998); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:145: (unnamed59= castedExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:146: unnamed59= castedExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:147: (unnamed59= r_castedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:148: unnamed59= r_castedExpression
{
- pushFollow(FOLLOW_castedExpression_in_letExpression2006);
- unnamed59=castedExpression();
+ pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2006);
+ unnamed59=r_castedExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4542,21 +4542,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:208: ( ':' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:209: ':'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:212: ( ':' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:213: ':'
{
- match(input,61,FOLLOW_61_in_letExpression2012); if (failed) return cn;
+ match(input,61,FOLLOW_61_in_r_letExpression2012); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:250: (unnamed60= expression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:251: unnamed60= expression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:254: (unnamed60= r_expression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:194:255: unnamed60= r_expression
{
- pushFollow(FOLLOW_expression_in_letExpression2020);
- unnamed60=expression();
+ pushFollow(FOLLOW_r_expression_in_r_letExpression2020);
+ unnamed60=r_expression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4569,13 +4569,13 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:4: (unnamed61= castedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:4: (unnamed61= r_castedExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:4: (unnamed61= castedExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:5: unnamed61= castedExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:4: (unnamed61= r_castedExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:195:5: unnamed61= r_castedExpression
{
- pushFollow(FOLLOW_castedExpression_in_letExpression2031);
- unnamed61=castedExpression();
+ pushFollow(FOLLOW_r_castedExpression_in_r_letExpression2031);
+ unnamed61=r_castedExpression();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4601,12 +4601,12 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
return cn;
}
- // $ANTLR end letExpression
+ // $ANTLR end r_letExpression
- // $ANTLR start castedExpression
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:1: castedExpression returns [CompositeNode cn] : ( ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) ) | (unnamed64= chainExpression ) );
- public CompositeNode castedExpression() throws RecognitionException {
+ // $ANTLR start r_castedExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:197:1: r_castedExpression returns [CompositeNode cn] : ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (unnamed62= r_type ) ( ')' ) (unnamed63= r_chainExpression ) ) | (unnamed64= r_chainExpression ) );
+ public CompositeNode r_castedExpression() throws RecognitionException {
CompositeNode cn = null;
CompositeNode unnamed62 = null;
@@ -4619,31 +4619,31 @@ public class Xpand3NodeParser extends AbstractNodeParser {
cn = factory.createCastedExpressionNode();
try {
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:2: ( ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) ) | (unnamed64= chainExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:2: ( ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (unnamed62= r_type ) ( ')' ) (unnamed63= r_chainExpression ) ) | (unnamed64= r_chainExpression ) )
int alt50=2;
alt50 = dfa50.predict(input);
switch (alt50) {
case 1 :
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:2: ( '(' type ')' chainExpression )=> ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:2: ( '(' r_type ')' r_chainExpression )=> ( ( '(' ) (unnamed62= r_type ) ( ')' ) (unnamed63= r_chainExpression ) )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:34: ( ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression ) )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:35: ( '(' ) (unnamed62= type ) ( ')' ) (unnamed63= chainExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:38: ( ( '(' ) (unnamed62= r_type ) ( ')' ) (unnamed63= r_chainExpression ) )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:39: ( '(' ) (unnamed62= r_type ) ( ')' ) (unnamed63= r_chainExpression )
{
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:35: ( '(' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:36: '('
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:39: ( '(' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:40: '('
{
- match(input,31,FOLLOW_31_in_castedExpression2070); if (failed) return cn;
+ match(input,31,FOLLOW_31_in_r_castedExpression2070); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:77: (unnamed62= type )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:78: unnamed62= type
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:81: (unnamed62= r_type )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:82: unnamed62= r_type
{
- pushFollow(FOLLOW_type_in_castedExpression2078);
- unnamed62=type();
+ pushFollow(FOLLOW_r_type_in_r_castedExpression2078);
+ unnamed62=r_type();
_fsp--;
if (failed) return cn;
if ( backtracking==0 ) {
@@ -4652,21 +4652,21 @@ public class Xpand3NodeParser extends AbstractNodeParser {
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:128: ( ')' )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:129: ')'
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:134: ( ')' )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:135: ')'
{
- match(input,34,FOLLOW_34_in_castedExpression2084); if (failed) return cn;
+ match(input,34,FOLLOW_34_in_r_castedExpression2084); if (failed) return cn;
if ( backtracking==0 ) {
addLeafNodeForToken(cn, null);
}
}
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:170: (unnamed63= chainExpression )
- // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:171: unnamed63= chainExpression
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:176: (unnamed63= r_chainExpression )
+ // ./src-gen/org/eclipse/xpand3/parser/Xpand3Node.g:201:177: unnamed63= r_chainExpression
{
-