Use the file info from the binding when generating an error about type mismatch in the binding (since it is very hard to know where the binding is coming from compared to finding out the type of the declared component)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21916 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/FrontEnd/InstBinding.mo

@@ -948,10 +948,9 @@ Unless it is a complex var that not inherites a basic type. In that case DAE.Equ
   input DAE.Const const;
   input Prefix.Prefix pre;
   input String name;
-  input DAE.ElementSource source;
   output Option<DAE.Exp> eOpt;
 algorithm
-  eOpt := matchcontinue(tp,mod,const,pre,name,source)
+  eOpt := matchcontinue(tp,mod,const,pre,name)
     local
       DAE.Exp e,e1;
       DAE.Properties p;
@@ -963,37 +962,36 @@ algorithm
       Absyn.Info info;
 
     case (DAE.T_COMPLEX(complexClassType=ClassInf.EXTERNAL_OBJ(_)),
-        DAE.MOD(eqModOption = SOME(DAE.TYPED(modifierAsExp = e))),_,_,_,_)
+        DAE.MOD(eqModOption = SOME(DAE.TYPED(modifierAsExp = e))),_,_,_)
       then
         SOME(e);
 
-    case(_,_,c,pr,n,_)
+    case(_,_,c,pr,n)
       equation
-        SOME(DAE.TYPED(e,_,p,_,_)) = Mod.modEquation(mod);
+        SOME(DAE.TYPED(modifierAsExp=e,properties=p,info=info)) = Mod.modEquation(mod);
         (e1,DAE.PROP(_,c1)) = Types.matchProp(e,p,DAE.PROP(tp,c),true);
-        InstUtil.checkHigherVariability(c,c1,pr,n,e,source);
+        InstUtil.checkHigherVariability(c,c1,pr,n,e,info);
       then
         SOME(e1);
 
     // An empty array such as x[:] = {} will cause Types.matchProp to fail, but we
     // shouldn't print an error.
-    case (_, _, _, _, _, _)
+    case (_, _, _, _, _)
       equation
         SOME(DAE.TYPED(_,_,DAE.PROP(type_ = bt),_,_)) = Mod.modEquation(mod);
         true = Types.isEmptyArray(bt);
       then
         NONE();
 
     // If Types.matchProp fails, print an error.
-    case (_, _, c, _, n, _)
+    case (_, _, c, _, n)
       equation
-        SOME(DAE.TYPED(e,_,p as DAE.PROP(type_ = bt),_,_)) = Mod.modEquation(mod);
+        SOME(DAE.TYPED(modifierAsExp=e,properties=p as DAE.PROP(type_ = bt),info=info)) = Mod.modEquation(mod);
         failure((_,DAE.PROP(_,_)) = Types.matchProp(e, p, DAE.PROP(tp, c), true));
         v_str = n;
         b_str = ExpressionDump.printExpStr(e);
         et_str = Types.unparseType(tp);
         bt_str = Types.unparseType(bt);
-        info = DAEUtil.getElementSourceFileInfo(source);
         Types.typeErrorSanityCheck(et_str, bt_str, info);
         Error.addSourceMessage(Error.VARIABLE_BINDING_TYPE_MISMATCH,
         {v_str, b_str, et_str, bt_str}, info);

Compiler/FrontEnd/InstUtil.mo

@@ -3664,9 +3664,9 @@ Helper to makeVariableBinding. Author -- alleb"
   input Prefix.Prefix pre;
   input String name;
   input DAE.Exp binding;
-  input DAE.ElementSource source;
+  input Absyn.Info info;
 algorithm
-  _ := matchcontinue(compConst,bindConst,pre,name,binding,source)
+  _ := matchcontinue(compConst,bindConst,pre,name,binding,info)
   local
     DAE.Const c,c1;
     Ident n;
@@ -3692,7 +3692,7 @@ algorithm
       sc = DAEUtil.constStr(c);
       sc1 = DAEUtil.constStr(c1);
       se = ExpressionDump.printExpStr(e);
-      Error.addSourceMessage(Error.HIGHER_VARIABILITY_BINDING,{sn,sc,se,sc1}, DAEUtil.getElementSourceFileInfo(source));
+      Error.addSourceMessage(Error.HIGHER_VARIABILITY_BINDING,{sn,sc,se,sc1}, info);
     then
       fail();
   end matchcontinue;

Compiler/FrontEnd/InstVar.mo

@@ -581,7 +581,7 @@ algorithm
         false = Types.isExternalObject(Types.arrayElementType(ty));
         false = Types.isComplexType(Types.arrayElementType(ty));
         (dims as _::_) = Types.getDimensions(ty);
-        SOME(exp) = InstBinding.makeVariableBinding(ty, mod, const, pre, n, source);
+        SOME(exp) = InstBinding.makeVariableBinding(ty, mod, const, pre, n);
         cr = ComponentReference.makeCrefIdent(n,ty,{});
         (cache,cr) = PrefixUtil.prefixCref(inCache,inEnv,inIH,pre,cr);
         eq = DAE.ARRAY_EQUATION(dims, DAE.CREF(cr,ty), exp, source);
@@ -1002,7 +1002,7 @@ algorithm
 
         // Instantiate the components binding.
         mod = Util.if_(List.isNotEmpty(inSubscripts) and not SCode.isParameterOrConst(vt) and not ClassInf.isFunctionOrRecord(inState) and not Types.isComplexType(Types.arrayElementType(ty)) and not Types.isExternalObject(Types.arrayElementType(ty)) and not Config.scalarizeBindings(),DAE.NOMOD(),inMod);
-        opt_binding = InstBinding.makeVariableBinding(ty, mod, NFInstUtil.toConst(vt), inPrefix, inName, source);
+        opt_binding = InstBinding.makeVariableBinding(ty, mod, NFInstUtil.toConst(vt), inPrefix, inName);
         start = InstBinding.instStartBindingExp(inMod /* Yup, let's keep the start-binding. It seems sane. */, ty, vt);
 
         // Propagate the final prefix from the modifier.