#3 Changed from action to block (syntax benefit)

arminzavada · Apr 1, 2021 · 7a41765 · 7a41765
1 parent 4a19624
commit 7a41765
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...mit.gamma.activity.language/src/hu/bme/mit/gamma/activity/language/ActivityLanguage.xtext b/...mit.gamma.activity.language/src/hu/bme/mit/gamma/activity/language/ActivityLanguage.xtext
@@ -42,9 +42,7 @@ ActivityDefinition returns ActivityDefinition:
 
 ActionDefinition returns ActionDefinition:
 	'[' 'language' '=' 'action' ']'
-	'{'
-		action = Action
-	'}'
+	action = Block
 ;
 
 

diff --git a/plugins/core/hu.bme.mit.gamma.activity.model/model/activity.ecore b/plugins/core/hu.bme.mit.gamma.activity.model/model/activity.ecore
@@ -44,7 +44,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="InputPin" eSuperTypes="#//Pin"/>
   <eClassifiers xsi:type="ecore:EClass" name="ActionDefinition" eSuperTypes="#//Definition">
     <eStructuralFeatures xsi:type="ecore:EReference" name="action" lowerBound="1"
-        eType="ecore:EClass ../../hu.bme.mit.gamma.action.model/model/action.ecore#//Action"
+        eType="ecore:EClass ../../hu.bme.mit.gamma.action.model/model/action.ecore#//Block"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Definition" abstract="true"/>

diff --git a/...e.mit.gamma.activity.model/src/hu/bme/mit/gamma/activity/util/ActivityModelValidator.java b/...e.mit.gamma.activity.model/src/hu/bme/mit/gamma/activity/util/ActivityModelValidator.java
@@ -2,16 +2,20 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
+import hu.bme.mit.gamma.action.model.AssignmentStatement;
 import hu.bme.mit.gamma.action.util.ActionModelValidator;
 import hu.bme.mit.gamma.activity.model.ActivityDeclaration;
 import hu.bme.mit.gamma.activity.model.ActivityDefinition;
 import hu.bme.mit.gamma.activity.model.ActivityNode;
 import hu.bme.mit.gamma.activity.model.ActivityPackage;
 import hu.bme.mit.gamma.activity.model.NamedActivityDeclaration;
 import hu.bme.mit.gamma.activity.model.Pin;
+import hu.bme.mit.gamma.activity.model.PinReference;
 import hu.bme.mit.gamma.expression.model.ExpressionModelPackage;
 import hu.bme.mit.gamma.expression.model.NamedElement;
+import hu.bme.mit.gamma.expression.util.ExpressionModelValidator.ValidationResultMessage;
 
 public class ActivityModelValidator extends ActionModelValidator {
 	// Singleton
@@ -64,4 +68,13 @@ public <T> Collection<ValidationResultMessage> checkDirectNames(Collection<T> el
 		return validationResultMessages;
 	}
 
+	@Override
+	public 	Collection<ValidationResultMessage> checkAssignmentActions(AssignmentStatement assignment) {
+		if (assignment.getLhs() instanceof PinReference) {
+			return Collections.emptyList();
+		}
+
+		return super.checkAssignmentActions(assignment);
+	}
+
 }