- fix function rem (#2279)

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

Author: lochel

Compiler/FrontEnd/ModelicaBuiltin.mo

@@ -776,15 +776,17 @@ package Internal "Contains internal implementations, e.g. overloaded builtin fun
     input Integer x;
     input Integer y;
     output Integer z;
-  external "builtin" z=rem(x,y);
+  algorithm
+    z := x - (div(x, y) * y);
   annotation(preferredView="text");
   end intRem;
 
   function realRem
     input Real x;
     input Real y;
     output Real z;
-  external "builtin" z=rem(x,y);
+  algorithm
+    z := x - (div(x, y) * y);
   annotation(preferredView="text");
   end realRem;
 

Compiler/Template/CodegenC.tpl

@@ -7527,12 +7527,6 @@ template daeExpCall(Exp call, Context context, Text &preExp /*BUFP*/, Text &varD
     let var2 = daeExp(e2, context, &preExp, &varDecls)
     'modelica_mod_<%expTypeShort(ty)%>(<%var1%>,<%var2%>)'
 
-  case CALL(path=IDENT(name="rem"), expLst={e1, e2}) then
-    let var1 = daeExp(e1, context, &preExp, &varDecls)
-    let var2 = daeExp(e2, context, &preExp, &varDecls)
-    let typeStr = expTypeFromExpShort(e1)
-    'modelica_rem_<%typeStr%>(<%var1%>,<%var2%>)'
-
   case CALL(path=IDENT(name="max"), attr=CALL_ATTR(ty = ty), expLst={array}) then
     let expVar = daeExp(array, context, &preExp /*BUFC*/, &varDecls /*BUFD*/)
     let arr_tp_str = '<%expTypeArray(ty)%>'

SimulationRuntime/c/util/utility.h

@@ -89,17 +89,6 @@ static inline modelica_integer modelica_mod_integer(modelica_integer x, modelica
 }
 
 
-static inline modelica_real modelica_rem_real(modelica_real x, modelica_real y)
-{
-  return x - (y * (modelica_div(x,y)));
-}
-
-static inline modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y)
-{
-  return x - (y * ((x / y)));
-}
-
-
 static inline modelica_integer modelica_integer_min(modelica_integer x,modelica_integer y)
 {
   return (x < y) ? x : y;