TIVarFile: use valid default name ("A") for scalar vars.

Author: adriweb

scripts/cli_smoke_tests.sh

@@ -14,3 +14,4 @@ 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

src/TIVarFile.cpp

@@ -172,6 +172,11 @@ namespace tivars
         std::string default_var_name_for_type(const TIVarType& type)
         {
             const auto& typeName = type.getName();
+            const auto typeId = type.getId();
+            if (typeName == "Real" || typeName == "Complex" || (typeId >= 0x1B && typeId <= 0x21))
+            {
+                return "A";
+            }
             if (typeName == "RealList" || typeName == "ComplexList")
             {
                 return make_indexed_var_name(0x5D, 0x00);

tests.cpp

@@ -2008,6 +2008,16 @@ End)";
     }
 
     {
+        TIVarFile realDefaultVar = TIVarFile::createNew("Real");
+        const uint8_t expectedScalarDefault[8] = {'A'};
+        assert(std::equal(realDefaultVar.getVarEntries()[0].varname, realDefaultVar.getVarEntries()[0].varname + 8, expectedScalarDefault));
+
+        TIVarFile complexDefaultVar = TIVarFile::createNew("Complex");
+        assert(std::equal(complexDefaultVar.getVarEntries()[0].varname, complexDefaultVar.getVarEntries()[0].varname + 8, expectedScalarDefault));
+
+        TIVarFile exactDefaultVar = TIVarFile::createNew("ExactRealPi", "", "83PCE");
+        assert(std::equal(exactDefaultVar.getVarEntries()[0].varname, exactDefaultVar.getVarEntries()[0].varname + 8, expectedScalarDefault));
+
         TIVarFile listDefaultVar = TIVarFile::createNew("RealList");
         const auto& listDefault = listDefaultVar.getVarEntries()[0];
         const uint8_t expectedListDefault[8] = {0x5D, 0x00};