Adds Windows/MSVC support. (amazon-ion#91)

* Adds Windows/MSVC support.

* Adds appveyor config.

.appveyor.yml

@@ -0,0 +1,19 @@
+version: '1.0.{build}'
+
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+configuration:
+  - Debug
+
+install:
+  - git submodule update --init --recursive
+
+build_script:
+  - cmake -G "Visual Studio 15 2017 Win64" .
+  - cmake --build %APPVEYOR_BUILD_FOLDER% --config %CONFIGURATION%
+
+test_script:
+  - '%APPVEYOR_BUILD_FOLDER%\test\%CONFIGURATION%\all_tests.exe'

.gitignore

@@ -17,3 +17,5 @@ build/
 cmake-build-debug/
 cmake-build-release/
 install_manifest.txt
+.vs/
+CMakeSettings.json

CMakeLists.txt

@@ -2,9 +2,12 @@ cmake_minimum_required(VERSION 3.2)
 
 project(IonC)
 
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -Wall")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0 -Wall")
-set(BUILD_SHARED_LIBS ON)
+if (MSVC)
+else()
+    set(BUILD_SHARED_LIBS ON)
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -Wall")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0 -Wall")
+endif()
 
 add_subdirectory(decNumber)
 add_subdirectory(ionc)

ionc/CMakeLists.txt

@@ -29,9 +29,14 @@ set_property(TARGET ionc PROPERTY C_STANDARD 99)
 target_include_directories(ionc PUBLIC
   .
   inc/
-
 )
-target_link_libraries(ionc decNumber m)
+
+if (MSVC)
+    target_link_libraries(ionc decNumber)
+else()
+    # Unix requires linking against lib m explicitly.
+    target_link_libraries(ionc decNumber m)
+endif()
 
 install(TARGETS ionc
         DESTINATION lib)

ionc/ion_float.c

@@ -13,11 +13,8 @@
  */
 
 #include "ion.h"
-
-#define ION_FLOAT_NEG_ZERO_DOUBLE 0x8000000000000000
+#include <math.h>
 
 BOOL ion_float_is_negative_zero(double value) {
-    long neg_zero_bits = ION_FLOAT_NEG_ZERO_DOUBLE;
-    return !memcmp(&neg_zero_bits, &value, sizeof(double));
+    return value == 0.0 && signbit(value);
 }
-

test/CMakeLists.txt

@@ -1,13 +1,16 @@
 
 # Avoid macro definition collisions between ionc and googletest.
 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DGTEST_DONT_DEFINE_SUCCEED=1 -DGTEST_DONT_DEFINE_FAIL=1")
-
-# Disable verbose parameterized test names in debug configuration. These don't always integrate well with IDEs
-# (e.g. CLion), but are nice to have from the command line.
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -Wall")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0 -Wall")
-
-add_subdirectory(googletest)
+# Verbose parameterized names are disabled in debug configuration and on Windows. These don't
+# always integrate well with IDEs (e.g. CLion), but are nice to have from the command line.
+if (MSVC)
+    # Prevent googletest from linking against different versions of the C Runtime Library on
+    # Windows.
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+else()
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -Wall")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0 -Wall")
+endif()
 
 add_executable(all_tests
     gather_vectors.cpp
@@ -21,6 +24,8 @@ add_executable(all_tests
     test_ion_extractor.cpp
 )
 
+add_subdirectory(googletest)
+
 include_directories(
     .
     googletest/googletest/include/gtest

test/gather_vectors.cpp

@@ -12,17 +12,17 @@
  * language governing permissions and limitations under the License.
  */
 
+#include "gather_vectors.h"
+#include "ion_helpers.h"
+#include <cstdarg>
+#include <sys/stat.h>
+
 #ifdef ION_PLATFORM_WINDOWS
 #include <io.h>
 #else
 #include <dirent.h>
 #endif
 
-#include "gather_vectors.h"
-#include "ion_helpers.h"
-#include <cstdarg>
-#include <sys/stat.h>
-
 //============================================================================
 // File handling utilities
 
@@ -269,7 +269,7 @@ typedef struct _dir {
 #define DIR_CLOSE(pdir) win_close(pdir)
 void win_close(DIR *pdir);
 
-char *win_fixname(char *pname)
+char *win_fixname(const char *pname)
 {
     char    *cp, *fixedname;
     int32_t  len;
@@ -278,7 +278,7 @@ char *win_fixname(char *pname)
     len = strlen(pname);
     if (len < 0) return NULL;
 
-    fixedname = malloc(len + 5); // + 5 for: '/' "*.*"  '\0'
+    fixedname = (char *)malloc(len + 5); // + 5 for: '/' "*.*"  '\0'
     if (!fixedname) return NULL;
 
     memcpy(fixedname, pname, len + 1);
@@ -289,7 +289,7 @@ char *win_fixname(char *pname)
     return fixedname;
 }
 
-DIR *win_open(char *pname)
+DIR *win_open(const char *pname)
 {
     char    *fixedname = win_fixname(pname);
     DIR     *pdir      = (DIR *)malloc(sizeof(DIR));

test/ion_assert.h

@@ -52,17 +52,17 @@
 #define ION_EXPECT_DOUBLE_EQ(x, y) { \
     switch (assertion_type) { \
         case ASSERTION_TYPE_NORMAL: \
-            EXPECT_TRUE(!(isnan(x) ^ isnan(y))); \
-            if (isnan(x) || isnan(y)) break; \
+            EXPECT_TRUE(!(std::isnan(x) ^ std::isnan(y))); \
+            if (std::isnan(x) || std::isnan(y)) break; \
             EXPECT_TRUE(!(ion_float_is_negative_zero(x) ^ ion_float_is_negative_zero(y))); \
             if (ion_float_is_negative_zero(x) || ion_float_is_negative_zero(y)) break; \
             EXPECT_DOUBLE_EQ(x, y) << "Test: " << g_CurrentTest; \
             break; \
         case ASSERTION_TYPE_SET_FLAG: \
-            if (isnan(x) ^ isnan(y)) { \
+            if (std::isnan(x) ^ std::isnan(y)) { \
                 return FALSE; \
             } \
-            if (isnan(x)) break; \
+            if (std::isnan(x)) break; \
             if (ion_float_is_negative_zero(x) ^ ion_float_is_negative_zero(y)) { \
                 return FALSE; \
             } \

test/test_vectors.cpp

@@ -12,6 +12,7 @@
  * language governing permissions and limitations under the License.
  */
 
+#include "ion_platform_config.h"
 #include "gather_vectors.h"
 #include "ion_event_stream.h"
 #include "ion_assert.h"
@@ -224,6 +225,17 @@ TEST_P(GoodBasicVector, GoodBasic) {
     }
 }
 
+#ifdef ION_PLATFORM_WINDOWS
+INSTANTIATE_TEST_CASE_P(
+    TestVectors,
+    GoodBasicVector,
+    ::testing::Combine(
+        ::testing::ValuesIn(gather(FILETYPE_ALL, CLASSIFICATION_GOOD_BASIC)),
+        ::testing::Values(READ, ROUNDTRIP_TEXT, ROUNDTRIP_BINARY),
+        ::testing::Values(STREAM, BUFFER)
+    )
+);
+#else
 INSTANTIATE_TEST_CASE_P(
         TestVectors,
         GoodBasicVector,
@@ -236,6 +248,7 @@ INSTANTIATE_TEST_CASE_P(
         , GoodVectorToString()
 #endif
 );
+#endif
 
 
 typedef void (*COMPARISON_FN)(IonEventStream *stream, size_t index_expected, size_t index_actual);
@@ -371,6 +384,17 @@ TEST_P(GoodEquivsVector, GoodEquivs) {
     }
 }
 
+#ifdef ION_PLATFORM_WINDOWS
+INSTANTIATE_TEST_CASE_P(
+    TestVectors,
+    GoodEquivsVector,
+    ::testing::Combine(
+        ::testing::ValuesIn(gather(FILETYPE_ALL, CLASSIFICATION_GOOD_EQUIVS)),
+        ::testing::Values(READ, ROUNDTRIP_TEXT, ROUNDTRIP_BINARY),
+        ::testing::Values(STREAM, BUFFER)
+    )
+);
+#else
 INSTANTIATE_TEST_CASE_P(
         TestVectors,
         GoodEquivsVector,
@@ -383,6 +407,7 @@ INSTANTIATE_TEST_CASE_P(
         , GoodVectorToString()
 #endif
 );
+#endif
 
 /**
  * Exercises good vectors with equivTimeline semantics. This means that timestamps are compared for instant equivalence
@@ -403,6 +428,17 @@ TEST_P(GoodTimestampEquivTimelineVector, GoodTimestampEquivTimeline) {
     }
 }
 
+#ifdef ION_PLATFORM_WINDOWS
+INSTANTIATE_TEST_CASE_P(
+    TestVectors,
+    GoodTimestampEquivTimelineVector,
+    ::testing::Combine(
+        ::testing::ValuesIn(gather(FILETYPE_ALL, CLASSIFICATION_GOOD_TIMESTAMP_EQUIVTIMELINE)),
+        ::testing::Values(READ, ROUNDTRIP_TEXT, ROUNDTRIP_BINARY),
+        ::testing::Values(STREAM, BUFFER)
+    )
+);
+#else
 INSTANTIATE_TEST_CASE_P(
         TestVectors,
         GoodTimestampEquivTimelineVector,
@@ -415,6 +451,7 @@ INSTANTIATE_TEST_CASE_P(
         , GoodVectorToString()
 #endif
 );
+#endif
 
 /**
  * Exercises good vectors with nonequivs semantics.
@@ -433,6 +470,17 @@ TEST_P(GoodNonequivsVector, GoodNonequivs) {
     }
 }
 
+#ifdef ION_PLATFORM_WINDOWS
+INSTANTIATE_TEST_CASE_P(
+    TestVectors,
+    GoodNonequivsVector,
+    ::testing::Combine(
+        ::testing::ValuesIn(gather(FILETYPE_ALL, CLASSIFICATION_GOOD_NONEQUIVS)),
+        ::testing::Values(READ, ROUNDTRIP_TEXT, ROUNDTRIP_BINARY),
+        ::testing::Values(STREAM, BUFFER)
+    )
+);
+#else
 INSTANTIATE_TEST_CASE_P(
         TestVectors,
         GoodNonequivsVector,
@@ -445,6 +493,7 @@ INSTANTIATE_TEST_CASE_P(
         , GoodVectorToString()
 #endif
 );
+#endif
 
 /**
  * Exercises bad vectors. Bad vectors must fail to parse in order to succeed the test.
@@ -454,6 +503,16 @@ TEST_P(BadVector, Bad) {
     EXPECT_NE(IERR_OK, status) << test_name << " FAILED" << std::endl;
 }
 
+#ifdef ION_PLATFORM_WINDOWS
+INSTANTIATE_TEST_CASE_P(
+    TestVectors,
+    BadVector,
+    ::testing::Combine(
+        ::testing::ValuesIn(gather(FILETYPE_ALL, CLASSIFICATION_BAD)),
+        ::testing::Values(STREAM, BUFFER)
+    )
+);
+#else
 INSTANTIATE_TEST_CASE_P(
         TestVectors,
         BadVector,
@@ -465,3 +524,4 @@ INSTANTIATE_TEST_CASE_P(
         , BadVectorToString()
 #endif
 );
+#endif

tools/ionizer/CMakeLists.txt

@@ -8,5 +8,11 @@ set_property(TARGET ionizer PROPERTY C_STANDARD 99)
 target_include_directories(ionizer PRIVATE
   .
 )
-target_link_libraries(ionizer ionc m)
+
+if (MSVC)
+    target_link_libraries(ionizer ionc)
+else()
+    # Unix requires linking against lib m explicitly.
+    target_link_libraries(ionizer ionc)
+endif()