add varname checks by types in TIVarFile::var_entry_t::setVarName

Author: adriweb

src/TIVarFile.cpp

@@ -255,21 +255,32 @@ namespace tivars
         // Here we handle various theta chars. Note thata in TI-ASCII, theta is at 0x5B which is "[" in ASCII.
         newName = std::regex_replace(newName, std::regex("(\u03b8|\u0398|\u03F4|\u1DBF)"), "[");
 
-        // TODO: handle names according to _type
-        newName = std::regex_replace(newName, std::regex("[^[a-zA-Z0-9]"), "");
-        if (newName.length() > sizeof(varname) || newName.empty() || is_numeric(newName.substr(0, 1)))
-        {
-            throw std::invalid_argument("Invalid name given. 8 chars (A-Z, 0-9, θ) max, starting by a letter or θ.");
-        }
-
-        // TODO: again, properly handle names according to _type... (needs to be implemented by each type)
-        // Quick hack for now...
         const auto& typeName = _type.getName();
+        const auto& typeId = _type.getId();
+
         if (typeName == "Real" || typeName == "Complex" || typeName == "Program" || typeName == "ProtectedProgram")
         {
             for (auto & c: newName) c = (char) toupper(c);
         }
 
+        if (((typeName == "Real" || typeName == "Complex" || (typeId >= 0x1B && typeId <= 0x21)) && !regex_match(newName, std::regex(R"(^[[A-Z]$)"))) // exact types
+          || ((typeName == "RealList" || typeName == "ComplexList") && !regex_match(newName, std::regex(R"(^\x5D([\x00-\x05])?|([[0-9A-F]{0,5})$)")))
+          || ((typeName == "Program" || typeName == "ProtectedProgram") && !regex_match(newName, std::regex(R"(^[[A-Z][[A-Z0-9]{0,7}$)")))
+          || (typeName == "Equation" && !regex_match(newName, std::regex(R"(^\x5E[\x00-\xFF]?$)")))
+          || (typeName == "Matrix" && !regex_match(newName, std::regex(R"(^\x5C[\x00-\x09]?$)")))
+          || (typeName == "String" && !regex_match(newName, std::regex(R"(^\xAA[\x00-\x09]?$)")))
+          || (typeName == "Pic" && !regex_match(newName, std::regex(R"(^\x60[\x00-\x09]?$)")))
+          || (typeName == "Image" && !regex_match(newName, std::regex(R"(^\x3C[\x00-\x09]?$)")))
+          || (typeName == "GraphDataBase" && !regex_match(newName, std::regex(R"(^\x61[\x00-\x09]?$)"))))
+        {
+            newName = "";
+        }
+
+        if (newName.length() > sizeof(varname) || newName.empty())
+        {
+            throw std::invalid_argument("Invalid name given. 8 chars (A-Z, 0-9, θ) max, starting by a letter or θ.");
+        }
+
         newName = str_pad(newName, sizeof(varname), "\0");
         std::copy(newName.begin(), newName.end(), varname);
     }

tests.cpp

@@ -47,7 +47,7 @@ int main(int argc, char** argv)
     assert(TIVarType{"ExactRealPi"}.getId() == 32);
 
     {
-        TIVarFile testReal = TIVarFile::createNew("Real");
+        TIVarFile testReal = TIVarFile::createNew("Real", "A");
         for (const auto& str : { "0.0", "0", "+0.0", "+0" })
         {
             testReal.setContentFromString(str);
@@ -483,6 +483,14 @@ End)";
         testRealList.saveVarToFile("testData", "RealList_new");
     }
 
+    {
+        TIVarFile testRealList = TIVarFile::createNew("RealList", "\x5D\x00"); // L₁
+        assert(testRealList.getRawContent().empty());
+        const std::string content = "{9,0,0.5,-6e-8}";
+        testRealList.setContentFromString(content);
+        assert(testRealList.getReadableContent() == content);
+    }
+
     {
         TIVarFile testStandardMatrix = TIVarFile::loadFromFile("testData/Matrix_3x3_standard.8xm");
         cout << "Before: " << testStandardMatrix.getReadableContent() << "\n   Now: ";
@@ -640,7 +648,7 @@ End)";
         std::stringstream gdbJSON;
         gdbJSON << jsonFile.rdbuf();
 
-        TIVarFile paramGDB = TIVarFile::createNew("GraphDataBase", "a");
+        TIVarFile paramGDB = TIVarFile::createNew("GraphDataBase", "\x61\x00"); // GDB0
         paramGDB.setContentFromString(gdbJSON.str());
         cout << "paramGDB.getReadableContent() : " << paramGDB.getReadableContent() << endl;
         paramGDB.saveVarToFile("testData", "GraphDataBase_Param_new");