Fixed better error message when failing to connect variables of incon…

…sistent types. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2448 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 11, 2006 · cc5a6a8 · cc5a6a8
1 parent b8cf227
commit cc5a6a8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Compiler/Error.mo b/Compiler/Error.mo
@@ -381,7 +381,7 @@ protected constant list<tuple<Integer, MessageType, Severity, String>> errorTabl
           (CONNECT_FLOW_TO_NONFLOW,TRANSLATION(),ERROR(),
           "Cannot connect flow component %s to non-flow component %s"),
           (INVALID_CONNECTOR_VARIABLE,TRANSLATION(),ERROR(),
-          "The type of variable %s (%s) is not allowed in connectors"),
+          "The type of variables %s (%s) are inconsistent in connect equations"),
           (TYPE_ERROR,TRANSLATION(),ERROR(),
           "Wrong type on %s, expected %s"),
           (MODIFY_PROTECTED,TRANSLATION(),ERROR(),

diff --git a/Compiler/Inst.mo b/Compiler/Inst.mo
@@ -7781,7 +7781,7 @@ algorithm
       list<DAE.Element> dae;
       list<Types.Var> l1,l2;
       Boolean flow_;
-      String c1_str,t1_str;
+      String c1_str,t1_str,t2_str,c2_str;
       Env.Cache cache;
 
       /* flow - with a subtype of Real */ 
@@ -7855,11 +7855,20 @@ algorithm
         sets_1 = Connect.addArrayEqu(sets, c1_1, c2_1, dim1);
       then
         (cache,sets_1,{});
-    case (cache,sets,env,pre,c1,f1,(Types.T_COMPLEX(complexVarLst = l1,complexTypeOption = SOME(bc_tp1)),_),c2,f2,(Types.T_COMPLEX(complexVarLst = l2,complexTypeOption = SOME(bc_tp2)),_),flow_) /* Complex types extending basetype */ 
+
+        /* Complex types extending basetype */ 
+    case (cache,sets,env,pre,c1,f1,(Types.T_COMPLEX(complexVarLst = l1,complexTypeOption = SOME(bc_tp1)),_),c2,f2,t2,flow_) 
       equation 
-        (cache,sets_1,dae) = connectComponents(cache,sets, env, pre, c1, f1, bc_tp1, c2, f2, bc_tp2, flow_);
+        (cache,sets_1,dae) = connectComponents(cache,sets, env, pre, c1, f1, bc_tp1, c2, f2, t2, flow_);
       then
         (cache,sets_1,dae);
+        /* Complex types extending basetype */ 
+    case (cache,sets,env,pre,c1,f1,t1,c2,f2,(Types.T_COMPLEX(complexVarLst = l1,complexTypeOption = SOME(bc_tp2)),_),flow_) 
+      equation 
+        (cache,sets_1,dae) = connectComponents(cache,sets, env, pre, c1, f1, t1, c2, f2, bc_tp2, flow_);
+      then
+        (cache,sets_1,dae);
+
     case (cache,sets,env,pre,c1,f1,(Types.T_COMPLEX(complexVarLst = l1),_),c2,f2,(Types.T_COMPLEX(complexVarLst = l2),_),_) /* Complex types */ 
       equation 
         c1_1 = Prefix.prefixCref(pre, c1);
@@ -7873,6 +7882,10 @@ algorithm
         c2_1 = Prefix.prefixCref(pre, c2);
         c1_str = Exp.printComponentRefStr(c1);
         t1_str = Types.unparseType(t1);
+        c2_str = Exp.printComponentRefStr(c2);
+        t2_str = Types.unparseType(t2);
+        c1_str = Util.stringAppendList({c1_str," and ",c2_str});
+        t1_str = Util.stringAppendList({t1_str," and ",t2_str});
         Error.addMessage(Error.INVALID_CONNECTOR_VARIABLE, {c1_str,t1_str});
       then
         fail();
@@ -7930,6 +7943,8 @@ algorithm
         dae_1 = listAppend(dae, dae2);
       then
         (cache,sets_2,dae_1);
+
+
   end matchcontinue;
 end connectVars;