- Added omc_msvc.h: A compatibility header that adds inf,nan and round macros for MSVC.

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

Author: sjoelund

Compiler/runtime/omc_msvc.h

@@ -0,0 +1,50 @@
+/*
+ * This file is part of OpenModelica.
+ *
+ * Copyright (c) 1998-2010, Linköpings University,
+ * Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden.
+ *
+ * All rights reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC
+ * LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+ * THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC
+ * PUBLIC LICENSE.
+ *
+ * The OpenModelica software and the Open Source Modelica
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained
+ * from Linköpings University, either from the above address,
+ * from the URL: http://www.ida.liu.se/projects/OpenModelica
+ * and in the OpenModelica distribution.
+ *
+ * This program is distributed  WITHOUT ANY WARRANTY; without
+ * even the implied warranty of  MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS
+ * OF OSMC-PL.
+ *
+ * See the full OSMC Public License conditions for more details.
+ *
+ */
+#ifndef __OPENMODELICA_MSVC_H
+#define __OPENMODELICA_MSVC_H
+
+/* Compatibility header for MSVC compiler */
+#if defined(_MSC_VER)
+
+union MSVC_FLOAT_HACK
+{
+   unsigned char Bytes[4];
+   float Value;
+};
+static union MSVC_FLOAT_HACK __INFINITY = {{0x00, 0x00, 0x80, 0x7F}};
+static union MSVC_FLOAT_HACK __NAN = {{0x00, 0x00, 0xC0, 0x7F}};
+#define INFINITY (__INFINITY.Value)
+#define NAN (__NAN.Value)
+
+#define round(dbl) (dbl >= 0.0 ? (int)(dbl + 0.5) : ((dbl - (double)(int)dbl) <= -0.5 ? (int)dbl : (int)(dbl - 0.5)))
+
+#endif
+
+#endif

Compiler/runtime/ptolemyio.cpp

@@ -50,6 +50,7 @@ extern "C"
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
+#include "omc_msvc.h" /* For INFINITY and NAN */
 void print_error_buf_impl(const char* str);
 
 /* Given a file name and an array of variables, return the RML datastructure
@@ -123,19 +124,19 @@ void * read_ptolemy_dataset(char*filename, int size,char**vars,int datasize)
 
       buf1 = values.substr(commapos+1).c_str();
       val = strtod(buf1,&buf2); // Second value after comma
-// INFINITY and NAN is not defined in the MSVC version of math.h., hence the exclusion of the code snippet below on MSVC.
-#if !defined(_MSC_VER)
+
       if (buf1 == buf2) {
         // We may be trying to parse Infinity on a Windows platform.
         // Don't we feel stupid expecting this to work?
-        // Let's do these extra tests on Linux as well to check for NaN
         if (0 == strncmp(buf1,"Inf",3)) val = INFINITY;
         else if (0 == strncmp(buf1,"-Inf",4)) val = -INFINITY;
         else if (0 == strncmp(buf1,"inf",3)) val = INFINITY;
         else if (0 == strncmp(buf1,"-inf",4)) val = -INFINITY;
+        // Don't put 0.0 if the value is undefined.
+        // NaN sends a clear signal to the user that he has a problem.
         else val = NAN;
       }
-#endif   
+
       lst = (void*)mk_cons(Values__REAL(mk_rcon(val)),lst);
       j++;
     }

Compiler/runtime/unitparser.cpp

@@ -28,14 +28,11 @@
  *
  */
 
-#if defined(_MSC_VER)
-#define round(dbl) (dbl >= 0.0 ? (int)(dbl + 0.5) : ((dbl - (double)(int)dbl) <= -0.5 ? (int)dbl : (int)(dbl - 0.5)))
-#endif
-
 #include "unitparser.h"
 #include <iostream>
 #include <sstream>
 #include <stack>
+#include "omc_msvc.h" /* For round() */
 #ifndef NO_LPLIB
 #include "lp_lib.h"
 #endif
@@ -282,6 +279,7 @@ void UnitParser::addPrefix(const string symbol, Rational exponent) {
 }
 
 void UnitParser::addBase(const string quantityName, const string unitName,
+
 		const string unitSymbol, bool prefixAllowed) {
 	if (_units.find(unitSymbol) == _units.end()) {
 		Base b(quantityName, unitName, unitSymbol, prefixAllowed);