diff options
| author | Ed Willink | 2016-09-09 13:32:09 +0000 |
|---|---|---|
| committer | Ed Willink | 2016-09-19 11:17:50 +0000 |
| commit | 7c1e9701e34454e74621231a72d8a334b8fd5406 (patch) | |
| tree | bbe6bfce6f2e2f598375575cbb76321c0586fafc /plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext | |
| parent | 86bbccc8277eedd12170c2f25615e20193b59cd5 (diff) | |
| download | org.eclipse.qvtd-7c1e9701e34454e74621231a72d8a334b8fd5406.tar.gz org.eclipse.qvtd-7c1e9701e34454e74621231a72d8a334b8fd5406.tar.xz org.eclipse.qvtd-7c1e9701e34454e74621231a72d8a334b8fd5406.zip | |
[500369] Merge ConnectionAssignment/Statement as AddStatement
Diffstat (limited to 'plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext')
| -rw-r--r-- | plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext index ad67e2d55..5b1d4b78c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext @@ -23,7 +23,9 @@ TopLevelCS: ownedImports+=ImportCS* (ownedPackages+=QualifiedPackageCS | ownedTransformations+=TransformationCS | ownedMappings+=MappingCS | ownedQueries+=QueryCS)* ; - + +AddStatementCS returns ConnectionStatementCS: 'add' targetVariable=[pivot::Variable|UnrestrictedName] '+=' ownedExpression=ExpCS ';'; + BottomPatternCS: // Bug 466385 explains the redundancy below ( '{' (ownedUnrealizedVariables+=UnrealizedVariableCS | ownedRealizedVariables+=RealizedVariableCS) @@ -40,10 +42,8 @@ BottomPatternCS: // Bug 466385 explains the redundancy below ; BottomStatementCS returns StatementCS: SetStatementCS; - -ConnectionStatementCS: targetVariable=[pivot::Variable|UnrestrictedName] '+=' ownedExpression=ExpCS ';'; -ControlStatementCS returns MappingStatementCS: ConnectionStatementCS | MappingCallCS | MappingLoopCS; +ControlStatementCS returns MappingStatementCS: AddStatementCS | MappingCallCS | MappingLoopCS; DirectionCS: {DirectionCS} name=UnrestrictedName? 'imports' imports+=[pivot::Package|UnrestrictedName] (',' imports+=[pivot::Package|UnrestrictedName])* @@ -124,7 +124,7 @@ PredicateCS: ownedCondition=ExpCS ';'; //Predicate ::= BooleanOCLExpr //Assignement ::= [�default�] SlotOwnerOCLExpr�.�PropertyName �:=� ValueOCLExpr -PredicateOrAssignmentCS: isDefault?='default'? ownedTarget=ExpCS ((':='|isAccumulate?='+=') ownedInitExpression=ExpCS)? ';'; +PredicateOrAssignmentCS: ownedTarget=ExpCS (':=' ownedInitExpression=ExpCS)? ';'; QueryCS: isTransient?='transient'? 'query' ownedPathName=ScopeNameCS name=UnrestrictedName '(' (ownedParameters+=ParamDeclarationCS (',' ownedParameters+=ParamDeclarationCS)*)? ')' |