From d18af2e18d7cb029b1e583dc714fb5d79914039b Mon Sep 17 00:00:00 2001
From: MelReyCG <melvin.rey@capgemini.com>
Date: Thu, 23 Mar 2023 11:52:50 +0100
Subject: [PATCH 1/4] stringToArray now throws exceptions instead of errors

---
 src/Macros.hpp |  6 +++++
 src/input.hpp  | 59 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/Macros.hpp b/src/Macros.hpp
index aa8fe6f4..544f5e19 100644
--- a/src/Macros.hpp
+++ b/src/Macros.hpp
@@ -180,6 +180,12 @@
     } \
   } while( false )
 
+/**
+ * @brief Throw an exception.
+ * @param MSG The message to associate with the error, can be anything streamable to a std::ostream.
+ */
+#define LVARRAY_THROW( MSG, TYPE ) LVARRAY_THROW_IF( true, MSG, TYPE )
+
 /// Assert @p EXP is true with no message.
 #define LVARRAY_ASSERT( EXP ) LVARRAY_ASSERT_MSG( EXP, "" )
 
diff --git a/src/input.hpp b/src/input.hpp
index fde15d56..69ae7acb 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -62,9 +62,10 @@ struct StringToArrayHelper
   {
     inputStream >> arrayValue;
 
-    LVARRAY_ERROR_IF( inputStream.fail(),
+    LVARRAY_THROW_IF( inputStream.fail(),
                       "Invalid value of type " << typeid(T).name() << " in: " <<
-                      ( inputStream.eof()  ?  "" : inputStream.str().substr( inputStream.tellg() ) ) );
+                      ( inputStream.eof()  ?  "" : inputStream.str().substr( inputStream.tellg() ) ),
+                      std::invalid_argument );
   }
 
   /**
@@ -79,7 +80,8 @@ struct StringToArrayHelper
         INDEX_TYPE const * const dims,
         std::istringstream & inputStream )
   {
-    LVARRAY_ERROR_IF( inputStream.peek() != '{', "opening { not found for input array: "<<inputStream.str() );
+    LVARRAY_THROW_IF( inputStream.peek() != '{', "opening { not found for input array: "<<inputStream.str(),
+                      std::invalid_argument );
     inputStream.ignore();
 
     for( int i=0; i<(*dims); ++i )
@@ -89,7 +91,8 @@ struct StringToArrayHelper
     }
 
     skipDelimiters( inputStream );
-    LVARRAY_ERROR_IF( inputStream.peek() != '}', "closing } not found for input array: "<<inputStream.str() );
+    LVARRAY_THROW_IF( inputStream.peek() != '}', "closing } not found for input array: "<<inputStream.str(),
+                      std::invalid_argument );
     inputStream.ignore();
   }
 };
@@ -136,7 +139,8 @@ static void stringToArray( Array< T, NDIM, PERMUTATION, INDEX_TYPE, BUFFER_TYPE
       {
         if( valueOnLeft && spaceOnLeft )
         {
-          LVARRAY_ERROR( "Array value sequence specified without ',' delimiter: "<<valueString );
+          LVARRAY_THROW( "Array value sequence specified without ',' delimiter: "<<valueString,
+                         std::invalid_argument );
         }
       }
 
@@ -174,31 +178,36 @@ static void stringToArray( Array< T, NDIM, PERMUTATION, INDEX_TYPE, BUFFER_TYPE
   }
 
   // checking for various formatting errors
-  LVARRAY_ERROR_IF( valueString.find( "}{" ) != std::string::npos,
-                    "Sub arrays not separated by ',' delimiter: "<<valueString );
+  LVARRAY_THROW_IF( valueString.find( "}{" ) != std::string::npos,
+                    "Sub arrays not separated by ',' delimiter: "<<valueString,
+                    std::invalid_argument );
 
-  LVARRAY_ERROR_IF( valueString[0]!='{',
-                    "First non-space character of input string for an array must be {. Given string is: \n"<<valueString );
+  LVARRAY_THROW_IF( valueString[0]!='{',
+                    "First non-space character of input string for an array must be {. Given string is: \n"<<valueString,
+                    std::invalid_argument );
 
   size_t const numOpen = std::count( valueString.begin(), valueString.end(), '{' );
   size_t const numClose = std::count( valueString.begin(), valueString.end(), '}' );
 
-  LVARRAY_ERROR_IF( numOpen != numClose,
+  LVARRAY_THROW_IF( numOpen != numClose,
                     "Number of opening { not equal to number of } in processing of string for filling"
-                    " an Array. Given string is: \n"<<valueString );
+                    " an Array. Given string is: \n"<<valueString,
+                    std::invalid_argument );
 
 
   // after allowing for the null input, disallow a sub-array null input
-  LVARRAY_ERROR_IF( valueString.find( "{}" )!=std::string::npos,
+  LVARRAY_THROW_IF( valueString.find( "{}" )!=std::string::npos,
                     "Cannot have an empty sub-dimension of an array, i.e. { { 0, 1}, {} }. "
-                    "The input is"<<valueString );
+                    "The input is"<<valueString,
+                    std::invalid_argument );
 
   // get the number of dimensions from the number of { characters that begin the input string
   int const ndims = LvArray::integerConversion< int >( valueString.find_first_not_of( '{' ));
-  LVARRAY_ERROR_IF( ndims!=NDIM,
+  LVARRAY_THROW_IF( ndims!=NDIM,
                     "number of dimensions in string ("<<ndims<<
                     ") does not match dimensions of array("<<NDIM<<
-                    "). String is:/n"<<valueString );
+                    "). String is:/n"<<valueString,
+                    std::invalid_argument );
 
 
   // now get the number of dimensions, and the size of each dimension.
@@ -235,27 +244,30 @@ static void stringToArray( Array< T, NDIM, PERMUTATION, INDEX_TYPE, BUFFER_TYPE
     {
       // } means that we are closing a dimension. That means we know the size of this dimLevel
       dimSet[dimLevel] = true;
-      LVARRAY_ERROR_IF( dims[dimLevel]!=currentDims[dimLevel],
+      LVARRAY_THROW_IF( dims[dimLevel]!=currentDims[dimLevel],
                         "Dimension "<<dimLevel<<" is inconsistent across the expression. "
                                                 "The first set value of the dimension is "<<dims[dimLevel]<<
                         " while the current value of the dimension is"<<currentDims[dimLevel]<<
                         ". The values that have been parsed prior to the error are:\n"<<
-                        valueString.substr( 0, charCount+1 ) );
+                        valueString.substr( 0, charCount+1 ),
+                        std::invalid_argument );
 
       // reset currentDims and drop dimLevel for post-closure parsing
       currentDims[dimLevel] = 1;
       --dimLevel;
-      LVARRAY_ERROR_IF( dimLevel<0 && charCount<(valueString.size()-1),
+      LVARRAY_THROW_IF( dimLevel<0 && charCount<(valueString.size()-1),
                         "In parsing the input string, the current dimension of the array has dropped "
                         "below 0. This means that there are more '}' than '{' at some point in the"
                         " parsing. The values that have been parsed prior to the error are:\n"<<
-                        valueString.substr( 0, charCount+1 ) );
+                        valueString.substr( 0, charCount+1 ),
+                        std::invalid_argument );
 
     }
     else if( c==',' ) // we are counting the dimension sizes because there is a delimiter.
     {
-      LVARRAY_ERROR_IF( lastChar=='{' || lastChar==',',
-                        "character of ',' follows '"<<lastChar<<"'. Comma must follow an array value." );
+      LVARRAY_THROW_IF( lastChar=='{' || lastChar==',',
+                        "character of ',' follows '"<<lastChar<<"'. Comma must follow an array value.",
+                        std::invalid_argument );
       if( dimSet[dimLevel]==false )
       {
         ++(dims[dimLevel]);
@@ -264,9 +276,10 @@ static void stringToArray( Array< T, NDIM, PERMUTATION, INDEX_TYPE, BUFFER_TYPE
     }
     lastChar = c;
   }
-  LVARRAY_ERROR_IF( dimLevel!=-1,
+  LVARRAY_THROW_IF( dimLevel!=-1,
                     "Expression fails to close all '{' with a corresponding '}'. Check your input:"<<
-                    valueString );
+                    valueString,
+                    std::invalid_argument );
 
   array.resize( NDIM, dims );
 

From 5441f359495df9b0afc7446bddde1391ef552319 Mon Sep 17 00:00:00 2001
From: MelReyCG <melvin.rey@capgemini.com>
Date: Thu, 23 Mar 2023 12:16:13 +0100
Subject: [PATCH 2/4] Adding missing quotemarks to stringToArray errors.

---
 src/input.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input.hpp b/src/input.hpp
index 69ae7acb..ad97edc8 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -80,7 +80,7 @@ struct StringToArrayHelper
         INDEX_TYPE const * const dims,
         std::istringstream & inputStream )
   {
-    LVARRAY_THROW_IF( inputStream.peek() != '{', "opening { not found for input array: "<<inputStream.str(),
+    LVARRAY_THROW_IF( inputStream.peek() != '{', "Opening '{' not found for input array: "<<inputStream.str(),
                       std::invalid_argument );
     inputStream.ignore();
 
@@ -91,7 +91,7 @@ struct StringToArrayHelper
     }
 
     skipDelimiters( inputStream );
-    LVARRAY_THROW_IF( inputStream.peek() != '}', "closing } not found for input array: "<<inputStream.str(),
+    LVARRAY_THROW_IF( inputStream.peek() != '}', "Closing '}' not found for input array: "<<inputStream.str(),
                       std::invalid_argument );
     inputStream.ignore();
   }
@@ -183,14 +183,14 @@ static void stringToArray( Array< T, NDIM, PERMUTATION, INDEX_TYPE, BUFFER_TYPE
                     std::invalid_argument );
 
   LVARRAY_THROW_IF( valueString[0]!='{',
-                    "First non-space character of input string for an array must be {. Given string is: \n"<<valueString,
+                    "First non-space character of input string for an array must be '{'. Given string is: \n"<<valueString,
                     std::invalid_argument );
 
   size_t const numOpen = std::count( valueString.begin(), valueString.end(), '{' );
   size_t const numClose = std::count( valueString.begin(), valueString.end(), '}' );
 
   LVARRAY_THROW_IF( numOpen != numClose,
-                    "Number of opening { not equal to number of } in processing of string for filling"
+                    "Number of opening '{' not equal to number of '}' in processing of string for filling"
                     " an Array. Given string is: \n"<<valueString,
                     std::invalid_argument );
 

From b26fb83e0686f7b476f976a6f7973595e76de43f Mon Sep 17 00:00:00 2001
From: MelReyCG <melvin.rey@capgemini.com>
Date: Thu, 23 Mar 2023 16:10:12 +0100
Subject: [PATCH 3/4] Throwing exception when a token is missing before a '}'

---
 src/input.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/input.hpp b/src/input.hpp
index ad97edc8..12cc033a 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -242,6 +242,10 @@ static void stringToArray( Array< T, NDIM, PERMUTATION, INDEX_TYPE, BUFFER_TYPE
     }
     else if( c=='}' )
     {
+      LVARRAY_THROW_IF( lastChar==',',
+                        "character '}' follows '"<<lastChar<<"'. Closing brace must follow an array value.",
+                        std::invalid_argument );
+
       // } means that we are closing a dimension. That means we know the size of this dimLevel
       dimSet[dimLevel] = true;
       LVARRAY_THROW_IF( dims[dimLevel]!=currentDims[dimLevel],

From b0cbfe23acea45d277d6ea961cc951ad80aad1c6 Mon Sep 17 00:00:00 2001
From: MelReyCG <melvin.rey@capgemini.com>
Date: Mon, 27 Mar 2023 12:01:58 +0200
Subject: [PATCH 4/4] Changed testinput so it expects exceptions

---
 unitTests/testInput.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/unitTests/testInput.cpp b/unitTests/testInput.cpp
index a6b785c0..3cf89a82 100644
--- a/unitTests/testInput.cpp
+++ b/unitTests/testInput.cpp
@@ -38,62 +38,62 @@ TEST( input, stringToArrayErrors )
   {
     input = " { 10 1 } ";
     ArrayT< int, RAJA::PERM_I > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
 
   {
     input = " { { 1, 2 }{ 3, 4 } } ";
     ArrayT< int, RAJA::PERM_IJ > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
 
   // This should fail the num('{')==num('}') test
   {
     input = " { { {0,1,2},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14},{15,16,17} } , { {18,19,20},{21,22,23} } ";
     ArrayT< int, RAJA::PERM_IJK > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
   {
     input = " { { {0,1,2},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14},{15,16,17}  , { {18,19,20},{21,22,23} } }";
     ArrayT< int, RAJA::PERM_IKJ > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
   {
     input = " { { {0,1,2},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14,{15,16,17} } , { {18,19,20},{21,22,23} } }";
     ArrayT< int, RAJA::PERM_JIK > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
   {
     input = " { { {0,1,2},{3,4,5} }, { {6,7,8,{9,10,11} }, { {12,13,14},{15,16,17} } , { {18,19,20},{21,22,23} } }";
     ArrayT< int, RAJA::PERM_JKI > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
   {
     input = " { { 0,1,2},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14},{15,16,17} } , { {18,19,20},{21,22,23} } }";
     ArrayT< int, RAJA::PERM_KIJ > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
   {
     input = "  { {0,1,2},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14},{15,16,17} } , { {18,19,20},{21,22,23} } ";
     ArrayT< int, RAJA::PERM_KJI > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
 
   {
     input = " { { {,1,2},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14},{15,16,17} } , { {18,19,20},{21,22,23} } }";
     ArrayT< int, RAJA::PERM_IJK > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
 
   {
     input = " { { {},{3,4,5} }, { {6,7,8},{9,10,11} }, { {12,13,14},{15,16,17} } , { {18,19,20},{21,22,23} } }";
     ArrayT< int, RAJA::PERM_IJK > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }
   {
     input = " { { {0,1,2}}{ } }";
     ArrayT< int, RAJA::PERM_IJK > array;
-    EXPECT_DEATH_IF_SUPPORTED( input::stringToArray( array, input ), IGNORE_OUTPUT );
+    ASSERT_THROW( input::stringToArray( array, input ), std::invalid_argument );
   }