Remove all remaining DAE.TypeSource

sjoelund · OpenModelica-Hudson · commit 49dc8a6c0f6b · 2017-01-25T13:41:16.000+01:00
diff --git a/Compiler/BackEnd/EvaluateFunctions.mo b/Compiler/BackEnd/EvaluateFunctions.mo
@@ -1571,7 +1571,6 @@ algorithm
   typOut := matchcontinue(typIn,outputs,originOutputs)
     local
       DAE.FunctionAttributes atts;
-      DAE.TypeSource source;
       DAE.Type ty;
       list<DAE.Type> outTypeLst;
       list<DAE.FuncArg> inputs;
diff --git a/Compiler/FrontEnd/ComponentReference.mo b/Compiler/FrontEnd/ComponentReference.mo
@@ -1518,7 +1518,6 @@ algorithm
       DAE.Type tty;
       DAE.Dimensions ad;
       DAE.Exp es1;
-      DAE.TypeSource ts;
 
     case({},_) then false;
 
@@ -3108,7 +3107,6 @@ algorithm
     local
       DAE.Ident id;
       DAE.Type ty, basety,correctTy;
-      DAE.TypeSource source;
       list<DAE.Dimension> dims;
       list<DAE.Subscript> subs;
       DAE.ComponentRef cref;
diff --git a/Compiler/FrontEnd/DAE.mo b/Compiler/FrontEnd/DAE.mo
@@ -818,9 +818,6 @@ type EqualityConstraint = Option<tuple<Absyn.Path, Integer, InlineType>>
   "contains the path to the equalityConstraint function,
    the dimension of the output and the inline type of the function";
 
-public type TypeSource = list<Absyn.Path> "the class(es) where the type originated";
-public constant TypeSource emptyTypeSource = {} "an empty origin for the type";
-
 // default constants that can be used
 constant Type T_REAL_DEFAULT        = T_REAL({});
 constant Type T_INTEGER_DEFAULT     = T_INTEGER({});
@@ -916,7 +913,6 @@ public uniontype Type "models the different front-end and back-end types"
     list<Var> varLst "complexVarLst; The variables of a complex type! Should be empty, kept here to verify!";
     Type complexType "complexType; A complex type can be a subtype of another (primitive) type (through extends)";
     EqualityConstraint equalityConstraint;
-    TypeSource source;
   end T_SUBTYPE_BASIC;
 
   record T_FUNCTION
diff --git a/Compiler/FrontEnd/Expression.mo b/Compiler/FrontEnd/Expression.mo
@@ -523,7 +523,6 @@ algorithm
     local
       Type elt_tp;
       list<DAE.Dimension> dims;
-      DAE.TypeSource ts;
 
     case(DAE.T_ARRAY(elt_tp,dims),_)
       equation
@@ -1041,7 +1040,6 @@ algorithm
       Type tp,t;
       DAE.Dimension d;
       DAE.Dimensions ds;
-      DAE.TypeSource ts;
 
     case (DAE.T_ARRAY(ty = tp,dims = {_}))
       then tp;
@@ -1134,7 +1132,6 @@ algorithm
       Type ty_1,ty;
       DAE.Dimensions dims;
       DAE.Dimension dim;
-      DAE.TypeSource ts;
 
     case (DAE.T_ARRAY(ty,dims),dim)
       equation
@@ -1160,7 +1157,6 @@ algorithm
       Type ty;
       DAE.Dimensions dims;
       DAE.Dimension dim;
-      DAE.TypeSource ts;
 
     case (DAE.T_ARRAY(ty,dims),dim) then DAE.T_ARRAY(ty,dim::dims);
 
@@ -1178,7 +1174,6 @@ algorithm
     local
       Type ty;
       DAE.Dimensions dims;
-      DAE.TypeSource ts;
 
     case (_, {}) then inType;
 
@@ -1443,7 +1438,6 @@ algorithm
       list<DAE.Exp> expl;
       Integer dim;
       DAE.Dimensions dims;
-      DAE.TypeSource ts;
 
     case (_, DAE.ARRAY(
         DAE.T_ARRAY(ty = ty, dims = DAE.DIM_INTEGER(dim) :: dims),
@@ -1475,7 +1469,6 @@ algorithm
     local
       DAE.Type ty;
       DAE.Dimensions rest_dims;
-      DAE.TypeSource ts;
 
     case (DAE.T_ARRAY(ty = ty, dims = _ :: rest_dims), _)
       then DAE.T_ARRAY(ty, dimension :: rest_dims);
@@ -2334,7 +2327,6 @@ algorithm
     local
       Type ty,ty1;
       DAE.Dimensions dims;
-      DAE.TypeSource source;
     case DAE.T_ARRAY(ty=ty,dims=dims)
       equation
         _ = typeofRelation(ty);
@@ -4833,7 +4825,6 @@ algorithm
       DAE.Type et;
       DAE.Dimension dim1, dim2;
       DAE.Dimensions dims1, dims2;
-      DAE.TypeSource ts;
 
     case (DAE.T_ARRAY(ty = et, dims = dim1 :: dims1), DAE.T_ARRAY(dims = dim2 :: _))
       equation
@@ -6033,7 +6024,6 @@ algorithm
     local
       DAE.Type ty, new_ty;
       list<DAE.Dimension> dims, new_dims;
-      DAE.TypeSource src;
       ArgT arg;
       Boolean changed;
       ClassInf.State state;
@@ -6047,10 +6037,10 @@ algorithm
       then
         (ty, arg);
 
-    case DAE.T_SUBTYPE_BASIC(state, vars, ty, ec, src)
+    case DAE.T_SUBTYPE_BASIC(state, vars, ty, ec)
       equation
         (new_ty, arg) = traverseExpTypeDims(ty, inFunc, inArg);
-        ty = if referenceEq(new_ty, ty) then inType else DAE.T_SUBTYPE_BASIC(state, vars, ty, ec, src);
+        ty = if referenceEq(new_ty, ty) then inType else DAE.T_SUBTYPE_BASIC(state, vars, ty, ec);
       then
         (ty, arg);
 
diff --git a/Compiler/FrontEnd/ExpressionSimplify.mo b/Compiler/FrontEnd/ExpressionSimplify.mo
@@ -1053,7 +1053,6 @@ algorithm
       Real r1;
       array<array<DAE.Exp>> marr;
       String name;
-      DAE.TypeSource source;
 
     // If the argument to min/max is an array, try to flatten it.
     case (DAE.CALL(path=Absyn.IDENT(name),expLst={e as DAE.ARRAY()},
@@ -1479,7 +1478,6 @@ algorithm
       Integer i1,i2,i;
       list<list<DAE.Exp>> ms1,ms2,mss;
       Boolean sc;
-      DAE.TypeSource ts;
 
     case (_,{},_,true) then listReverse(acc);
 
@@ -2457,7 +2455,6 @@ algorithm
       DAE.Dimension n, m, p;
       list<DAE.Exp> expl1, expl2;
       DAE.Type ty, row_ty;
-      DAE.TypeSource tp;
       list<list<DAE.Exp>> matrix;
       DAE.Exp zero;
       list<DAE.Dimension> dims;
diff --git a/Compiler/FrontEnd/InstBinding.mo b/Compiler/FrontEnd/InstBinding.mo
@@ -316,7 +316,6 @@ algorithm
       Option<DAE.Distribution> distribution_value;
       FCore.Graph env;
       DAE.Mod mod;
-      DAE.TypeSource ts;
       list<Integer> index_list;
       DAE.Type enumtype;
       FCore.Cache cache;
diff --git a/Compiler/FrontEnd/InstFunction.mo b/Compiler/FrontEnd/InstFunction.mo
@@ -799,7 +799,6 @@ algorithm
       list<DAE.Var> vars, inputs, locals;
       list<DAE.FuncArg> fargs;
       DAE.EqualityConstraint eqCo;
-      DAE.TypeSource src;
       String name, newName;
 
       case(_, _, _)
@@ -873,7 +872,6 @@ algorithm
       list<DAE.Var> vars, inputs, locals;
       DAE.Type ty,recType,fixedTy,funcTy;
       DAE.EqualityConstraint eqCo;
-      DAE.TypeSource src;
       FCore.Cache cache;
       Absyn.Path path;
       SCode.Element recordCl;
diff --git a/Compiler/FrontEnd/InstSection.mo b/Compiler/FrontEnd/InstSection.mo
@@ -3131,7 +3131,6 @@ algorithm
     local
       DAE.Type ty;
       DAE.Dimensions dims;
-      DAE.TypeSource source;
       ClassInf.State ci_state;
       list<DAE.Var> vars;
       DAE.EqualityConstraint ec;
diff --git a/Compiler/FrontEnd/InstUtil.mo b/Compiler/FrontEnd/InstUtil.mo
@@ -3255,7 +3255,6 @@ algorithm
       DAE.Type ty,ty_1;
       Integer i;
       DAE.Dimensions xs;
-      DAE.TypeSource ts;
       DAE.Type tty;
       DAE.Dimension dim;
 
@@ -5484,7 +5483,6 @@ algorithm
       ClassInf.State classState;
       DAE.EqualityConstraint equalityConstraint;
       DAE.FunctionAttributes funcattr;
-      DAE.TypeSource ts;
       String pstr;
       SourceInfo info;
 
@@ -5534,9 +5532,7 @@ algorithm
       equation
         classState = arrayTTypeToClassInfState(arrayType);
         resType = mktype(inPath, classState, inTypesVarLst, inTypesTypeOption, inEqualityConstraint, inClass);
-        somep = getOptPath(p);
-        ts = Types.mkTypeSource(somep);
-        resType = DAE.T_SUBTYPE_BASIC(inState,{},resType,inEqualityConstraint,ts);
+        resType = DAE.T_SUBTYPE_BASIC(inState,{},resType,inEqualityConstraint);
       then
         resType;
 
@@ -5565,10 +5561,7 @@ algorithm
     case (p,st,l,SOME(bc),equalityConstraint,_)
       equation
         failure(ClassInf.META_UNIONTYPE(_) = st);
-        somep = getOptPath(p);
-        ts = Types.mkTypeSource(somep);
-      then
-        DAE.T_SUBTYPE_BASIC(st,l,bc,equalityConstraint,ts);
+      then DAE.T_SUBTYPE_BASIC(st,l,bc,equalityConstraint);
   end matchcontinue;
 end mktype;
 
@@ -5617,7 +5610,6 @@ algorithm
       SCode.Element cl;
       DAE.Type bc;
       DAE.FunctionAttributes funcattr;
-      DAE.TypeSource ts;
 
     case (_,ci,_,SOME(tp),_)
       equation
@@ -5666,11 +5658,7 @@ algorithm
       then DAE.T_COMPLEX(st,l,NONE()); // adrpo: TODO! check equalityConstraint!
 
     case (p,st,l,SOME(bc),_)
-      equation
-        somep = getOptPath(p);
-        ts = Types.mkTypeSource(somep);
-      then
-        DAE.T_SUBTYPE_BASIC(st,l,bc,NONE(),ts);
+      then DAE.T_SUBTYPE_BASIC(st,l,bc,NONE());
 
     else
       equation
diff --git a/Compiler/FrontEnd/Lookup.mo b/Compiler/FrontEnd/Lookup.mo
@@ -262,7 +262,6 @@ algorithm
       list<String> names;
       ClassInf.State ci_state;
       SCode.Encapsulated encflag;
-      DAE.TypeSource ts;
       DAE.Mod mod;
 
     // Record constructors
@@ -290,7 +289,6 @@ algorithm
         Types.checkEnumDuplicateLiterals(names, c.info);
         // generate the enumeration type
         path = FGraph.getGraphName(env_3);
-        ts = Types.mkTypeSource(SOME(path));
         t = DAE.T_ENUMERATION(NONE(), path, names, types, {});
         env_3 = FGraph.mkTypeNode(env_3, id, t);
       then
@@ -2975,7 +2973,6 @@ algorithm
     local
       DAE.Type t,t_1;
       DAE.Dimension dim;
-      DAE.TypeSource ts;
       DAE.Subscript sub;
       list<DAE.Subscript> ys,s;
       Integer sz,ind,dim_int,step;
@@ -3522,7 +3519,6 @@ protected
   list<DAE.Var> varlst;
   list<SCode.Element> els;
   Boolean singleton;
-  DAE.TypeSource ts;
   FCore.Cache cache;
   list<DAE.Type> typeVarsType;
   list<String> typeVars;
diff --git a/Compiler/FrontEnd/MetaUtil.mo b/Compiler/FrontEnd/MetaUtil.mo
@@ -299,7 +299,6 @@ algorithm
       list<Absyn.Path> paths;
       list<DAE.Type> typeVarsTypes;
       list<String> names, typeVars;
-      DAE.TypeSource ts;
       DAE.EvaluateSingletonType singletonType;
       SCode.Element c;
       FCore.Graph env_1;
diff --git a/Compiler/FrontEnd/PrefixUtil.mo b/Compiler/FrontEnd/PrefixUtil.mo
@@ -1258,7 +1258,6 @@ protected function prefixArrayDimensions
 algorithm
   (oty,otpl) := match (oty,tpl)
     local
-      DAE.TypeSource ts;
       FCore.Cache cache;
       FCore.Graph env;
       InnerOuter.InstHierarchy ih;
diff --git a/Compiler/FrontEnd/Static.mo b/Compiler/FrontEnd/Static.mo
@@ -2105,7 +2105,6 @@ algorithm
       DAE.Type ty;
       DAE.Dimension dim;
       Option<Absyn.Path> path;
-      DAE.TypeSource ts;
 
     case DAE.T_UNKNOWN() then expType;
 
@@ -2963,7 +2962,6 @@ protected
   DAE.Dimension dim, dim1, dim2;
   DAE.Dimensions dim_rest;
   list<DAE.Exp> expl, expl1, expl2;
-  DAE.TypeSource ts;
 algorithm
   DAE.ARRAY(DAE.T_ARRAY(ety, dim1 :: dim_rest), at, expl1) := inArray1;
   DAE.ARRAY(ty = DAE.T_ARRAY(dims = dim2 :: _), array = expl2) := inArray2;
@@ -6676,7 +6674,6 @@ algorithm
       DAE.Type ety;
       DAE.Dimension dim1, dim2;
       Boolean scalar;
-      DAE.TypeSource ts;
 
     // Scalar
     case _ guard(Types.isSimpleType(inType))
@@ -6723,7 +6720,6 @@ algorithm
       DAE.Dimension dim;
       DAE.Dimensions dims;
       list<list<DAE.Exp>> matrix_expl;
-      DAE.TypeSource ts;
 
     case DAE.ARRAY(ty = DAE.T_ARRAY(ety, dim :: _),scalar = scalar, array = expl)
       algorithm
@@ -7486,7 +7482,6 @@ algorithm
     local
       tuple<FCore.Cache,FCore.Graph> tpl;
       DAE.Dimensions dims;
-      DAE.TypeSource source;
     case (DAE.T_ARRAY(),tpl)
       algorithm
         (dims,tpl) := List.mapFold(oty.dims,elabCallArgsEvaluateArrayLength3,tpl);
@@ -9411,7 +9406,6 @@ algorithm
   outType := matchcontinue inType
     local
       DAE.Type ty;
-      DAE.TypeSource ts;
       Integer n;
       DAE.Dimension dim;
       list<DAE.Type> tys;
@@ -9452,7 +9446,6 @@ protected function createActualFunctype
 algorithm
   outTp := match(outTp, checkTypes)
     local
-      DAE.TypeSource ts;
       list<DAE.FuncArg> slotParams,params;
       DAE.Type restype;
       DAE.FunctionAttributes functionAttributes;
@@ -10615,7 +10608,6 @@ algorithm
     local
       DAE.ComponentRef c_1;
       DAE.Const const,const1,const2,constCref,constSubs;
-      DAE.TypeSource tySource;
       DAE.Type t,origt, sub_ty;
       DAE.Type tt;
       DAE.Exp exp,exp1,exp2,crefExp,expASUB;
@@ -10907,7 +10899,6 @@ algorithm
       Absyn.Path p;
       list<String> n;
       list<DAE.Var> v, al;
-      DAE.TypeSource ts;
 
     case DAE.T_ENUMERATION(index = SOME(_), path = p, names = n, literalVarLst = v, attributeLst = al)
       then DAE.T_ENUMERATION(NONE(), p, n, v, al);
@@ -12395,7 +12386,6 @@ algorithm
       DAE.Type t,t_1;
       list<DAE.Subscript> subs;
       DAE.Dimension dim;
-      DAE.TypeSource ts;
 
     case (t,{}) then t;
 
diff --git a/Compiler/FrontEnd/Types.mo b/Compiler/FrontEnd/Types.mo
diff --git a/Compiler/FrontEnd/UnitAbsynBuilder.mo b/Compiler/FrontEnd/UnitAbsynBuilder.mo
diff --git a/Compiler/NFFrontEnd/NFFunc.mo b/Compiler/NFFrontEnd/NFFunc.mo
diff --git a/Compiler/NFFrontEnd/NFRecord.mo b/Compiler/NFFrontEnd/NFRecord.mo
diff --git a/Compiler/Template/DAEDumpTV.mo b/Compiler/Template/DAEDumpTV.mo
diff --git a/Compiler/Template/SimCodeTV.mo b/Compiler/Template/SimCodeTV.mo
