Merge branch 'fix/compile-with-msvc' into 'develop'

Fixes for Windows compilation

See merge request njoy/tools!22

Author: amlewis1578

.gitignore

@@ -41,3 +41,7 @@ dependencies
 # python
 __pycache__
 *.pyc
+
+# visual studio
+.vs/
+.vscode/

CMakeLists.txt

@@ -137,3 +137,13 @@ if(tools.installation)
       include(CPack)
     endif()
 endif()
+
+########################################################################
+# Windows-specific setup
+########################################################################
+
+# enable Edit and Continue in Visual Studio (for debugging)
+if(MSVC)
+  target_compile_options(${PROJECT_NAME}  INTERFACE "/ZI")
+  target_link_options(${PROJECT_NAME} INTERFACE "/INCREMENTAL")
+endif()

src/tools/disco/FreeFormatInteger.hpp

@@ -38,15 +38,29 @@ class FreeFormatInteger : public BaseField {
 
     Representation value = 0;
 
+    // copy the start before find_if modifies iter
+    auto start = iter;
+
     iter = std::find_if( iter, end,
                          [] ( auto&& value )
                             { return ! std::isspace( value ); }  );
 
+    // if the value is not in the string, find_if returns the end of the range, in 
+    // which case msvc will not allow dereferencing iter. So, throw a runtime
+    // error here in that case:
+    if ( iter == end ) {
+
+        std::string message( &*start, &*std::prev( end ) + 1 );
+        message.insert( 0, "Could not read valid integer: \"" );
+        message += '\"';
+        throw std::runtime_error( message );
+    }
+
     // we are using fast_float::from_chars instead of std::from_chars since
     // not all standard c++ libraries implement the floating point version of
     // std::from_chars
     if ( *iter == '+' ) { ++iter; }
-    auto result = fast_float::from_chars( &*iter, &*end, value );
+    auto result = fast_float::from_chars( &*iter, &*std::prev( end ) + 1, value );
     if ( result.ec == std::errc() ) {
 
       auto advance = result.ptr - &*iter;

src/tools/disco/FreeFormatReal.hpp

@@ -38,17 +38,31 @@ class FreeFormatReal : public BaseField {
 
     Representation value = 0;
 
+    // copy the start before find_if modifies iter
+    auto start = iter;
+
     iter = std::find_if( iter, end,
                          [] ( auto&& value )
                             { return ! std::isspace( value ); }  );
 
+    // if the value is not in the string, find_if returns the end of the range, in 
+    // which case msvc will not allow dereferencing iter. So, throw a runtime
+    // error here in that case:
+    if ( iter == end ) {
+
+        std::string message( &*start, &*std::prev( end ) + 1 );
+        message.insert( 0, "Could not read valid real value: " );
+        message += '\"';
+        throw std::runtime_error( message );
+    }
+
     // we are using fast_float::from_chars_advanced instead of std::from_chars
     // since not all standard c++ libraries implement the floating point version
     // of std::from_chars and because this allows us to read fortran formatted
     // floats
     if ( *iter == '+' ) { ++iter; }
     fast_float::parse_options options{ fast_float::chars_format::fortran };
-    auto result = fast_float::from_chars_advanced( &*iter, &*end, value, options );
+    auto result = fast_float::from_chars_advanced( &*iter, &*std::prev( end ) + 1, value, options );
     if ( result.ec == std::errc() ) {
 
       auto advance = result.ptr - &*iter;

src/tools/disco/Integer.hpp

@@ -44,11 +44,16 @@ class Integer : public BaseFixedWidthField< Width > {
   static Representation read( Iterator& iter, const Iterator& end ) {
 
     unsigned int position = 0;
+
+    // this will fail for msvc if the string length is 
+    // less than the stated width
     const auto final = iter + Width;
+
     Representation value = 0;
 
     skipSpaces( iter, position );
-    if ( isNewLine( iter ) || Width == position || iter >= end ) {
+
+    if ( iter >= end || isNewLine( iter ) || Width == position ) {
 
       return value;
     }
@@ -62,7 +67,7 @@ class Integer : public BaseFixedWidthField< Width > {
     // we are using fast_float::from_chars instead of std::from_chars since
     // not all standard c++ libraries implement the floating point version of
     // std::from_chars
-    auto result = fast_float::from_chars( &*iter, &*final, value );
+    auto result = fast_float::from_chars( &*iter, &*std::prev( final ) + 1, value );
     if ( result.ec == std::errc() ) {
 
       auto advance = result.ptr - &*iter;

src/tools/disco/Integer/test/Integer.test.cpp

@@ -79,7 +79,7 @@ SCENARIO( "Integer" ) {
       CHECK( -123 == Integer< 10 >::read< int >( begin, end ) );
       CHECK( begin == end );
 
-      string = "    +123\n";
+      string = "     +123\n";
       begin = string.begin();
       end = string.end();
       CHECK( 123 == Integer< 10 >::read< int >( begin, end ) );

src/tools/disco/Real.hpp

@@ -36,11 +36,15 @@ class Real : public BaseFixedWidthField< Width > {
   static Representation read( Iterator& iter, const Iterator& end ) {
 
     unsigned int position = 0;
+
+    // this will fail for msvc if the string length is 
+    // less than the stated width
     const auto final = iter + Width;
+
     Representation value = 0.0;
 
     skipSpaces( iter, position );
-    if ( isNewLine( iter ) || Width == position || iter >= end ) {
+    if ( iter >= end || isNewLine( iter ) || Width == position ) {
 
       return value;
     }
@@ -56,7 +60,7 @@ class Real : public BaseFixedWidthField< Width > {
     // of std::from_chars and because this allows us to read fortran formatted
     // floats
     fast_float::parse_options options{ fast_float::chars_format::fortran };
-    auto result = fast_float::from_chars_advanced( &*iter, &*final, value, options );
+    auto result = fast_float::from_chars_advanced( &*iter, &*std::prev( final ) + 1, value, options );
     if ( result.ec == std::errc() ) {
 
       auto advance = result.ptr - &*iter;

src/tools/disco/Real/test/Real.test.cpp

@@ -213,7 +213,7 @@ SCENARIO( "Real" ) {
       CHECK_THAT( 100, WithinRel( Real< 10 >::read< double >( begin, end ) ) );
       CHECK( begin == end );
 
-      string = "    +123\n";
+      string = "     +123\n";
       begin = string.begin();
       end = string.end();
       CHECK_THAT( 123, WithinRel( Real< 10 >::read< double >( begin, end ) ) );