List/Matrix: Trim readable list and matrix input.

Author: adriweb

scripts/cli_smoke_tests.sh

@@ -15,3 +15,9 @@ cmp -s "$TMP_DIR/one_real_raw.bin" "$TMP_DIR/one_real_roundtrip.bin"
 printf '1' > "$TMP_DIR/one_real.txt"
 "$CLI" -i "$TMP_DIR/one_real.txt" -j readable -o "$TMP_DIR/one_real_83.83n" -k varfile -t Real -m 83 -n A
 "$CLI" -i "$TMP_DIR/one_real.txt" -j readable -o "$TMP_DIR/one_real_default.8xn" -k varfile -t Real
+
+printf '{1,2}\n' > "$TMP_DIR/list_with_newline.txt"
+"$CLI" -i "$TMP_DIR/list_with_newline.txt" -j readable -o "$TMP_DIR/list_with_newline.8xl" -k varfile -t RealList -n L1
+
+printf '[[1,2][3,4]]\n' > "$TMP_DIR/matrix_with_newline.txt"
+"$CLI" -i "$TMP_DIR/matrix_with_newline.txt" -j readable -o "$TMP_DIR/matrix_with_newline.8xm" -k varfile -t Matrix -n A

src/TypeHandlers/TH_GenericList.cpp

@@ -28,7 +28,7 @@ namespace tivars::TypeHandlers
             throw std::invalid_argument("Invalid type for given string");
         }
 
-        const std::string inner = trim(str, "{}");
+        const std::string inner = trim(trim(str), "{}");
         if (inner.empty())
         {
             return {0, 0};

src/TypeHandlers/TH_Matrix.cpp

@@ -21,14 +21,15 @@ namespace tivars::TypeHandlers
 
         data_t data(2); // reserve 2 bytes for size fields
 
-        if (str.length() < 5 || str.substr(0, 2) != "[[" || str.substr(str.length()-2, 2) != "]]")
+        const std::string trimmed = trim(str);
+        if (trimmed.length() < 5 || trimmed.substr(0, 2) != "[[" || trimmed.substr(trimmed.length()-2, 2) != "]]")
         {
             throw std::invalid_argument("Invalid input string. Needs to be a valid matrix");
         }
 
         std::vector<std::vector<std::string>> matrix;
 
-        std::vector<std::string> rows = explode(str.substr(2, str.length() - 4), "][");
+        std::vector<std::string> rows = explode(trimmed.substr(2, trimmed.length() - 4), "][");
         const size_t rowCount = rows.size();
         matrix.resize(rowCount);
 

tests.cpp

@@ -1452,6 +1452,8 @@ End)";
         const std::string content = "{9,0,0.5,-6e-8}";
         testRealList.setContentFromString(content);
         assert(testRealList.getReadableContent() == content);
+        testRealList.setContentFromString("{1,2}\n");
+        assert(testRealList.getReadableContent() == "{1,2}");
     }
 
     {
@@ -1462,6 +1464,10 @@ End)";
         testStandardMatrix.setContentFromString("[[1,2,3][4,5,6][-7.5,-8,-9][1,2,3][4,5,6][-0.002,-8,-9]]");
         cout << testStandardMatrix.getReadableContent() << "\n";
         testStandardMatrix.saveVarToFile("testData", "Matrix_new");
+
+        TIVarFile matrixWithNewline = TIVarFile::createNew("Matrix", "A");
+        matrixWithNewline.setContentFromString("[[1,2][3,4]]\n");
+        assert(matrixWithNewline.getReadableContent() == "[[1,2][3,4]]");
     }
 
 #ifndef __EMSCRIPTEN__