- small fixes so that OMC bootstrapping works!

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8266 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 17, 2011 · 53d870f · 53d870f
1 parent 8b85235
commit 53d870f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -3537,7 +3537,9 @@ protected function createDiffListMeta
   partial function FuncExpType
     input tuple<DAE.Exp, DAE.ComponentRef, Option<Type_a>> inTplExpTypeA;
     output DAE.Exp outTplExpTypeA;
+    replaceable type Type_a subtypeof Any;
   end FuncExpType;
+  replaceable type Type_a subtypeof Any;
 algorithm 
    outExpList := matchcontinue (inExp, indiffVars, func, inTypeA)  
    local
@@ -3575,6 +3577,7 @@ end createDiffListMeta;
 protected function diffInt
   input tuple<DAE.Exp, DAE.ComponentRef, Option<Type_a>> inTplExpTypeA;
   output DAE.Exp outTplExpTypeA;
+  replaceable type Type_a subtypeof Any;
 algorithm
   outTplExpTypeA := matchcontinue(inTplExpTypeA)
     case(_) then DAE.ICONST(0);
@@ -3584,6 +3587,7 @@ end diffInt;
 protected function diffRealZero
   input tuple<DAE.Exp, DAE.ComponentRef, Option<Type_a>> inTplExpTypeA;
   output DAE.Exp outTplExpTypeA;
+  replaceable type Type_a subtypeof Any;
 algorithm
   outTplExpTypeA := matchcontinue(inTplExpTypeA)
     case(_) then DAE.RCONST(0.0);
@@ -3593,6 +3597,7 @@ end diffRealZero;
 protected function diffCrefVar
   input tuple<DAE.Exp, DAE.ComponentRef, Option<Type_a>> inTplExpTypeA;
   output DAE.Exp outTplExpTypeA;
+  replaceable type Type_a subtypeof Any;
 algorithm
   outTplExpTypeA := matchcontinue(inTplExpTypeA)
   local
@@ -3674,6 +3679,7 @@ end diffCref;
 protected function diffDerCref
   input tuple<DAE.Exp, DAE.ComponentRef, Option<Type_a>> inTplExpTypeA;
   output DAE.Exp outTplExpTypeA;
+  replaceable type Type_a subtypeof Any;
 algorithm
   outTplExpTypeA := matchcontinue(inTplExpTypeA)
   local

diff --git a/Compiler/Template/TplMain.mo b/Compiler/Template/TplMain.mo
@@ -16,7 +16,7 @@ public import TplCodegen;
 
 protected
 constant Tpl.Text emptyTxt = Tpl.MEM_TEXT({}, {}); 
-constant SourceInfo dsi = TplAbsyn.dummySourceInfo;
+constant TplAbsyn.SourceInfo dsi = TplAbsyn.dummySourceInfo;
 
 
 public function main

diff --git a/Compiler/Util/Util.mo b/Compiler/Util/Util.mo
@@ -2293,15 +2293,15 @@ algorithm
   outLst:=
   matchcontinue (lst,func,a1,a2,a3,a4,a5,a6,a7,a8)
     local
-      list<Type_i> f_1;
-      list<Type_i> r_1;
+      list<Type_j> f_1;
+      list<list<Type_j>> r_1;
       Type_a f;
       list<Type_a> r;
 
     case ({},_,_,_,_,_,_,_,_,_) then {};
     case ((f :: r),func,a1,a2,a3,a4,a5,a6,a7,a8)
       equation
-        f_1 = func(f, a1,a2,a3,a4,a5,a6,a7,a8);
+        f_1 = func(f,a1,a2,a3,a4,a5,a6,a7,a8);
         r_1 = listMap8list(r, func, a1,a2,a3,a4,a5,a6,a7,a8);
       then
         (f_1 :: r_1);