Option<ComponentRef> domainOpt; added to SCode.EQ_EQUALS.

Subsequent changes.

Author: Jan Šilar

Compiler/FrontEnd/InstBinding.mo

@@ -551,7 +551,7 @@ algorithm
         lhs := Expression.makeCrefExp(inComponentRef, t);
         acr := ComponentReference.unelabCref(inComponentRef);
         aexp1 := Absyn.CREF(acr);
-        scode := SCode.EQ_EQUALS(aexp1,aexp2,SCode.noComment,info);
+        scode := SCode.EQ_EQUALS(aexp1,aexp2,NONE(),SCode.noComment,info);
         source := DAEUtil.addSymbolicTransformation(inSource,DAE.FLATTEN(scode,NONE()));
         dae := InstSection.instEqEquation(lhs, DAE.PROP(inType,DAE.C_VAR()), e, prop2, source, SCode.NON_INITIAL(), inImpl);
       then

Compiler/FrontEnd/InstExtends.mo

@@ -1230,11 +1230,17 @@ algorithm
         (cache,eqll) = fixListList(cache,env,eqll,ht,fixEEquation);
         (cache,eql) = fixList(cache,env,eql,ht,fixEEquation);
       then (cache,SCode.EQ_IF(expl,eqll,eql,comment,info));
-    case (cache,env,SCode.EQ_EQUALS(exp1,exp2,comment,info),ht)
+    case (cache,env,SCode.EQ_EQUALS(exp1,exp2,NONE(),comment,info),ht)
       equation
         (cache,exp1) = fixExp(cache,env,exp1,ht);
         (cache,exp2) = fixExp(cache,env,exp2,ht);
-      then (cache,SCode.EQ_EQUALS(exp1,exp2,comment,info));
+      then (cache,SCode.EQ_EQUALS(exp1,exp2,NONE(),comment,info));
+    case (cache,env,SCode.EQ_EQUALS(exp1,exp2,SOME(cref),comment,info),ht)
+      equation
+        (cache,exp1) = fixExp(cache,env,exp1,ht);
+        (cache,exp2) = fixExp(cache,env,exp2,ht);
+        (cache,cref) = fixCref(cache,env,cref,ht);
+      then (cache,SCode.EQ_EQUALS(exp1,exp2,SOME(cref),comment,info));
     case (cache,env,SCode.EQ_CONNECT(cref1,cref2,comment,info),ht)
       equation
         (cache,cref1) = fixCref(cache,env,cref1,ht);

Compiler/FrontEnd/SCode.mo

@@ -270,6 +270,7 @@ uniontype EEquation
   record EQ_EQUALS "the equality equation"
     Absyn.Exp expLeft  "the expression on the left side of the operator";
     Absyn.Exp expRight "the expression on the right side of the operator";
+    Option<Absyn.ComponentRef> domainOpt "domain for PDEs" ;
     Comment comment;
     SourceInfo info;
   end EQ_EQUALS;
@@ -1460,13 +1461,21 @@ algorithm
       then
         true;
 
-    case(EQ_EQUALS(expLeft = e11, expRight = e12),EQ_EQUALS(expLeft = e21, expRight = e22))
+    case(EQ_EQUALS(expLeft = e11, expRight = e12, domainOpt = NONE()),EQ_EQUALS(expLeft = e21, expRight = e22, domainOpt = NONE()))
       equation
         true = Absyn.expEqual(e11,e21);
         true = Absyn.expEqual(e12,e22);
       then
         true;
 
+    case(EQ_EQUALS(expLeft = e11, expRight = e12, domainOpt = SOME(cr1)),EQ_EQUALS(expLeft = e21, expRight = e22, domainOpt = SOME(cr2)))
+      equation
+        true = Absyn.expEqual(e11,e21);
+        true = Absyn.expEqual(e12,e22);
+        true = Absyn.crefEqual(cr1,cr2);
+      then
+        true;
+
     case(EQ_CONNECT(crefLeft = cr11, crefRight = cr12),EQ_CONNECT(crefLeft = cr21, crefRight = cr22))
       equation
         true = Absyn.crefEqual(cr11,cr21);
@@ -2557,19 +2566,20 @@ algorithm
       SourceInfo info;
       Absyn.ComponentRef cr1, cr2;
       Ident index;
+      Option<Absyn.ComponentRef> domainOpt;
 
     case (EQ_IF(expl1, then_branch, else_branch, comment, info), traverser, arg)
       equation
         (expl1, arg) = Absyn.traverseExpList(expl1, traverser, arg);
       then
         (EQ_IF(expl1, then_branch, else_branch, comment, info), arg);
 
-    case (EQ_EQUALS(e1, e2, comment, info), traverser, arg)
+    case (EQ_EQUALS(e1, e2, domainOpt, comment, info), traverser, arg)
       equation
         (e1, arg) = traverser(e1, arg);
         (e2, arg) = traverser(e2, arg);
       then
-        (EQ_EQUALS(e1, e2, comment, info), arg);
+        (EQ_EQUALS(e1, e2, domainOpt, comment, info), arg);
 
     case (EQ_CONNECT(cr1, cr2, comment, info), _, _)
       equation

Compiler/FrontEnd/SCodeUtil.mo

@@ -1640,7 +1640,7 @@ algorithm
         SCode.EQ_WHEN(inEquation.whenExp, body, branches, inComment, inInfo);
 
     case Absyn.EQ_EQUALS()
-      then SCode.EQ_EQUALS(inEquation.leftSide, inEquation.rightSide, inComment, inInfo);
+      then SCode.EQ_EQUALS(inEquation.leftSide, inEquation.rightSide, inEquation.domainOpt, inComment, inInfo);
 
     case Absyn.EQ_CONNECT()
       algorithm

Compiler/Template/SCodeTV.mo

@@ -486,6 +486,7 @@ package SCode
     record EQ_EQUALS
       Absyn.Exp expLeft;
       Absyn.Exp expRight;
+      Option<ComponentRef> domainOpt;
       Comment comment;
       SourceInfo info;
     end EQ_EQUALS;

Compiler/Template/SimCodeTV.mo

@@ -2494,6 +2494,7 @@ uniontype EEquation
   record EQ_EQUALS "the equality equation"
     Absyn.Exp expLeft  "the expression on the left side of the operator";
     Absyn.Exp expRight "the expression on the right side of the operator";
+    Option<ComponentRef> domainOpt;
     Option<Comment> comment;
     builtin.SourceInfo info;
   end EQ_EQUALS;