- Get rid of annoying types.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9304 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 16, 2011 · 08153c5 · 08153c5
1 parent eb8fd4c
commit 08153c5
Show file tree

Hide file tree

Showing 10 changed files with 185 additions and 185 deletions.
diff --git a/Compiler/FrontEnd/Algorithm.mo b/Compiler/FrontEnd/Algorithm.mo
@@ -151,7 +151,7 @@ algorithm
       DAE.Exp lhs,rhs;
       DAE.Properties lprop,rprop,lhprop,rhprop;
       DAE.ComponentRef cr;
-      tuple<DAE.TType, Option<Absyn.Path>> lt,rt;
+      DAE.Type lt,rt;
       Absyn.Direction direction;
 
     // assign to parameter in algorithm okay if record
@@ -334,7 +334,7 @@ algorithm
       list<DAE.Properties> lprop,lhprops;
       DAE.Exp rhs;
       DAE.Properties rprop;
-      list<tuple<DAE.TType, Option<Absyn.Path>>> lhrtypes,tpl;
+      list<DAE.Type> lhrtypes,tpl;
       list<DAE.TupleConst> clist;
 
     case (lhs,lprop,rhs,rprop,initial_,source)
@@ -405,7 +405,7 @@ protected function getPropExpType "function: getPropExpType
   input DAE.Properties p;
   output DAE.ExpType t;
 protected
-  tuple<DAE.TType, Option<Absyn.Path>> ty;
+  DAE.Type ty;
 algorithm
   ty := Types.getPropType(p);
   t := getTypeExpType(ty);
@@ -419,7 +419,7 @@ protected function getTypeExpType "function: getTypeExpType
 algorithm
   outType:=
   matchcontinue (inType)
-    local tuple<DAE.TType, Option<Absyn.Path>> t;
+    local DAE.Type t;
     case ((DAE.T_INTEGER(varLstInt = _),_)) then DAE.ET_INT();
     case ((DAE.T_REAL(varLstReal = _),_)) then DAE.ET_REAL();
     case ((DAE.T_STRING(varLstString = _),_)) then DAE.ET_STRING();
@@ -457,7 +457,7 @@ algorithm
       list<Statement> tb,fb;
       list<tuple<DAE.Exp, DAE.Properties, list<Statement>>> eib;
       Ident e_str,t_str;
-      tuple<DAE.TType, Option<Absyn.Path>> t;
+      DAE.Type t;
       DAE.Properties prop;
     case (DAE.BCONST(true),_,tb,eib,fb,source)
       then tb;
@@ -495,7 +495,7 @@ algorithm
       DAE.Exp e;
       list<tuple<DAE.Exp, DAE.Properties, list<Statement>>> xs;
       Ident e_str,t_str;
-      tuple<DAE.TType, Option<Absyn.Path>> t;
+      DAE.Type t;
     case ({},{}) then DAE.NOELSE();  /* This removes empty else branches */
     case ({},fb) then DAE.ELSE(fb);
     case (((DAE.BCONST(true),DAE.PROP(type_ = t),b) :: xs),fb) then DAE.ELSE(b);
@@ -533,7 +533,7 @@ algorithm
       DAE.ExpType et;
       Ident i,e_str,t_str;
       DAE.Exp e;
-      tuple<DAE.TType, Option<Absyn.Path>> t;
+      DAE.Type t;
       list<Statement> stmts;
     case (i,e,DAE.PROP(type_ = (DAE.T_ARRAY(arrayType = t),_)),stmts,source)
       equation
@@ -566,7 +566,7 @@ algorithm
       DAE.Exp e;
       list<Statement> stmts;
       Ident e_str,t_str;
-      tuple<DAE.TType, Option<Absyn.Path>> t;
+      DAE.Type t;
     case (e,DAE.PROP(type_ = (DAE.T_BOOL(varLstBool = _),_)),stmts,source) then DAE.STMT_WHILE(e,stmts,source);
     case (e,DAE.PROP(type_ = t),_,source)
       equation
@@ -595,7 +595,7 @@ algorithm
       list<Statement> stmts;
       Option<Statement> elsew;
       Ident e_str,t_str;
-      tuple<DAE.TType, Option<Absyn.Path>> t;
+      DAE.Type t;
     case (e,DAE.PROP(type_ = (DAE.T_BOOL(varLstBool = _),_)),stmts,elsew,source) then DAE.STMT_WHEN(e,stmts,elsew,{},source);
     case (e,DAE.PROP(type_ = (DAE.T_ARRAY(arrayType = (DAE.T_BOOL(varLstBool = _),_)),_)),stmts,elsew,source) then DAE.STMT_WHEN(e,stmts,elsew,{},source);
     case (e,DAE.PROP(type_ = t),_,_,source)

diff --git a/Compiler/FrontEnd/Ceval.mo b/Compiler/FrontEnd/Ceval.mo
@@ -4605,7 +4605,7 @@ algorithm
   (outCache,outValue,outInteractiveInteractiveSymbolTableOption) :=
   matchcontinue (inCache,inEnv,inExp,inBoolean,inInteractiveInteractiveSymbolTableOption,inMsg)
     local
-      tuple<DAE.TType, Option<Absyn.Path>> tp;
+      DAE.Type tp;
       list<Integer> sizelst;
       Values.Value v;
       Env.Env env;
@@ -5087,7 +5087,7 @@ algorithm
     local
       DAE.ComponentRef cr_1,cr,e1;
       list<DAE.Subscript> subsc;
-      tuple<DAE.TType, Option<Absyn.Path>> tp;
+      DAE.Type tp;
       list<Integer> sizelst;
       Values.Value res,v,e_val;
       list<Env.Frame> env;

diff --git a/Compiler/FrontEnd/DAEDump.mo b/Compiler/FrontEnd/DAEDump.mo
@@ -492,7 +492,7 @@ algorithm
       SCode.Stream st;
       SCode.Variability var;
       Absyn.Direction dir;
-      tuple<DAE.TType, Option<Absyn.Path>> ty;
+      DAE.Type ty;
       DAE.Exp exp,dim;
       DAE.Attributes attr;
 

diff --git a/Compiler/FrontEnd/Env.mo b/Compiler/FrontEnd/Env.mo
@@ -624,7 +624,7 @@ public function extendFrameT "function: extendFrameT
 algorithm
   outEnv := matchcontinue (inEnv,inIdent,inType)
     local
-      list<tuple<DAE.TType, Option<Absyn.Path>>> tps;
+      list<DAE.Type> tps;
       AvlTree httypes_1,httypes;
       AvlTree ht;
       Option<Ident> sid;
@@ -634,7 +634,7 @@ algorithm
       tuple<list<DAE.ComponentRef>,DAE.ComponentRef> crs;
       SCode.Encapsulated encflag;
       Ident n;
-      tuple<DAE.TType, Option<Absyn.Path>> t;
+      DAE.Type t;
       list<SCode.Element> defineUnits;
 
     case ((FRAME(sid,st,ht,httypes,imps,crs,encflag,defineUnits) :: fs),n,t)
@@ -1127,14 +1127,14 @@ algorithm
       Ident s,elt_str,tp_str,var_str,frame_str,bind_str,res,n,lenstr;
       DAE.Var tv;
       SCode.Variability var;
-      tuple<DAE.TType, Option<Absyn.Path>> tp;
+      DAE.Type tp;
       DAE.Binding bind,bnd;
       SCode.Element elt;
       InstStatus i;
       Frame compframe;
       Env env;
       Integer len;
-      list<tuple<DAE.TType, Option<Absyn.Path>>> lst;
+      list<DAE.Type> lst;
       Absyn.Import imp;
 
     case ((n,VAR(instantiated = (tv as DAE.TYPES_VAR(attributes = DAE.ATTR(variability = var),ty = tp,binding = bind)),declaration = SOME((elt,_)),instStatus = i,env = (compframe :: _))))