Fixed elaboration of built-in function 'integer' when the argument is an

Integer.


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

Compiler/Static.mo

@@ -4932,10 +4932,12 @@ algorithm
       Env.Cache cache;
       DAE.Properties prop;
       DAE.DAElist dae;
-
+      DAE.Type ty;
+			String exp_str;
     case (cache,env,{s1},_,impl) 
       equation 
-        (cache,s1_1,prop,dae) = verifyBuiltInHandlerType(cache,env,{s1},impl,Types.isRealOrSubTypeReal,"integer");
+        (cache,s1_1,prop,dae) =
+					verifyBuiltInHandlerType(cache,env,{s1},impl,Types.isIntegerOrRealOrSubTypeOfEither,"integer");
       then
         (cache,s1_1,prop,dae);
   end matchcontinue;

Compiler/Types.mo

@@ -597,6 +597,18 @@ algorithm b := matchcontinue(inType)
 end matchcontinue; 
 end isIntegerOrSubTypeInteger;
 
+public function isIntegerOrRealOrSubTypeOfEither
+	"Checks if a type is either some Integer or Real type."
+	input Type t;
+	output Boolean b;
+algorithm
+	b := matchcontinue(t)
+		case(_) equation true = isRealOrSubTypeReal(t); then true;
+		case(_) equation true = isIntegerOrSubTypeInteger(t); then true;
+		case(_) then false;
+	end matchcontinue;
+end isIntegerOrRealOrSubTypeOfEither;
+
 public function isInteger "Returns true if type is Integer"
 input Type tp;
 output Boolean res;