cif/org.eclipse.escet.cif.documentation/images/language-reference/syntax/cif.bnf

@@ -282,8 +282,8 @@ Addressables : Addressable
              | Addressables "," Addressable
              ;
 
-Addressable : Identifier
-            | Identifier Projections
+Addressable : Name
+            | Name Projections
             | "(" Addressable "," Addressables ")"
             ;
 

cif/org.eclipse.escet.cif.parser/src-gen/org/eclipse/escet/cif/parser/CifParserHooks.skeleton

@@ -1169,13 +1169,13 @@ implements CifParser.Hooks
         // return null;
     }
 
-    @Override // Addressable : Identifier;
-    public AExpression parseAddressable1(AIdentifier a1) {
+    @Override // Addressable : Name;
+    public AExpression parseAddressable1(AName a1) {
         // return null;
     }
 
-    @Override // Addressable : Identifier Projections;
-    public AExpression parseAddressable2(AIdentifier a1, List<AProjectionExpression> l2) {
+    @Override // Addressable : Name Projections;
+    public AExpression parseAddressable2(AName a1, List<AProjectionExpression> l2) {
         // return null;
     }
 

cif/org.eclipse.escet.cif.parser/src/org/eclipse/escet/cif/parser/CifParserHooks.java

@@ -1365,14 +1365,14 @@ public final class CifParserHooks implements CifParser.Hooks {
         return l1;
     }
 
-    @Override // Addressable : Identifier;
-    public AExpression parseAddressable1(AIdentifier a1) {
-        return new ANameExpression(new AName(a1.id, a1.position), false, copyPosition(a1.position));
+    @Override // Addressable : Name;
+    public AExpression parseAddressable1(AName a1) {
+        return new ANameExpression(new AName(a1.name, a1.position), false, copyPosition(a1.position));
     }
 
-    @Override // Addressable : Identifier Projections;
-    public AExpression parseAddressable2(AIdentifier a1, List<AProjectionExpression> l2) {
-        AExpression refExpr = new ANameExpression(new AName(a1.id, a1.position), false, copyPosition(a1.position));
+    @Override // Addressable : Name Projections;
+    public AExpression parseAddressable2(AName a1, List<AProjectionExpression> l2) {
+        AExpression refExpr = new ANameExpression(new AName(a1.name, a1.position), false, copyPosition(a1.position));
         AProjectionExpression rslt = null;
         for (AProjectionExpression proj: l2) {
             if (rslt == null) {

cif/org.eclipse.escet.cif.parser/src/org/eclipse/escet/cif/parser/cif.setext

@@ -587,8 +587,8 @@ Addressables : Addressable
              ;
 
 {exprs.AExpression}
-Addressable : Identifier
-            | Identifier Projections
+Addressable : Name
+            | Name Projections
             | @PAROPENTK Addressable COMMATK Addressables PARCLOSETK
             ;
 

cif/org.eclipse.escet.cif.tests/tests/tchecker/asgn_non_local_var.cif

@@ -14,10 +14,20 @@
 group g:
   cont x1 = 1.0 der 2.0;
   cont x2 = 3.0 der 4.0;
+  cont x3 = 5.0 der 6.0;
+  cont x4 = 7.0 der 8.0;
 
   automaton p:
     location:
       initial;
-      edge do (x1, x2) := (3.0, 4.0);
+      edge do (x1, x2, .g.x3,   ^g.x4, q.x5) := (1.0, 2.0, 3.0, 4.0, 5.0);
+      edge do (        .g.q.x1, ^g.x2, q.x3) := (1.0, 2.0, 3.0);
+  end
+
+  automaton q:
+    cont x5 = 9.0 der 10.0;
+    disc real x1, x2, x3;
+    location:
+      initial;
   end
 end

cif/org.eclipse.escet.cif.tests/tests/tchecker/asgn_non_local_var.cif.compile.err

-ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 21, column 16: Cannot assign variable "g.x1", as it is not declared in automaton "g.p".
-ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 21, column 20: Cannot assign variable "g.x2", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 23, column 16: Cannot assign variable "g.x1", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 23, column 20: Cannot assign variable "g.x2", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 23, column 24: Cannot assign variable "g.x3", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 23, column 33: Cannot assign variable "g.x4", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 23, column 40: Cannot assign variable "g.q.x5", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 24, column 24: Cannot assign variable "g.q.x1", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 24, column 33: Cannot assign variable "g.x2", as it is not declared in automaton "g.p".
+ERROR: File "tchecker/asgn_non_local_var.cif": Semantic error at line 24, column 40: Cannot assign variable "g.q.x3", as it is not declared in automaton "g.p".
 ERROR: Failed to load CIF file "tchecker/asgn_non_local_var.cif": the file has errors.

cif/org.eclipse.escet.cif.typechecker/src/org/eclipse/escet/cif/typechecker/scopes/AutScope.java

@@ -962,12 +962,6 @@ public class AutScope extends ParentScope<Automaton> {
             Assert.check(varParent instanceof ComplexComponent);
             Automaton curAut = scope.getAutomaton();
             if (varParent != curAut) {
-                // This should actually hold by construction for discrete
-                // variables, as we can only specify an identifier in the
-                // ASCII syntax (not a general name), and ancestor scopes
-                // can't declare discrete variables. For continuous
-                // variables however, ancestor scopes can define them as
-                // well.
                 tchecker.addProblem(ErrMsg.ASGN_NON_LOCAL_VAR, expr.getPosition(), CifTextUtils.getAbsName(var),
                         CifTextUtils.getAbsName(curAut));
                 // Non-fatal error.