[tivars_lib_cpp] update from upstream

adriweb · adriweb · commit 76c6458b6d7b · 2019-04-29T00:15:40.000+08:00
diff --git a/gui/qt/tivarslib/BinaryFile.cpp b/gui/qt/tivarslib/BinaryFile.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/BinaryFile.h b/gui/qt/tivarslib/BinaryFile.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/CommonTypes.h b/gui/qt/tivarslib/CommonTypes.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIModel.cpp b/gui/qt/tivarslib/TIModel.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/TIs_lib
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIModel.h b/gui/qt/tivarslib/TIModel.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIModels.cpp b/gui/qt/tivarslib/TIModels.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIModels.h b/gui/qt/tivarslib/TIModels.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIVarFile.cpp b/gui/qt/tivarslib/TIVarFile.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIVarFile.h b/gui/qt/tivarslib/TIVarFile.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -28,13 +28,13 @@ namespace tivars
 
         struct var_entry_t
         {
-            uint16_t meta_length   = 0;   // byte count of the next 3 or 5 fields (== 11 or 13) depending on calcFlags, see below
+            uint16_t meta_length   = 0; // byte count of the next 3 or 5 fields (== 11 or 13) depending on calcFlags, see below
             uint16_t data_length   = 0;
             uchar    typeID        = 0;
             uchar    varname[8]    = {0};
             uchar    version       = 0;   // present only if calcFlags >= TIFeatureFlags::hasFlash
             uchar    archivedFlag  = 0;   // present only if calcFlags >= TIFeatureFlags::hasFlash
-            uint16_t data_length2  = 0;   // same as data_length
+            uint16_t data_length2  = 0; // same as data_length
             data_t   data;
         };
 
diff --git a/gui/qt/tivarslib/TIVarType.cpp b/gui/qt/tivarslib/TIVarType.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIVarType.h b/gui/qt/tivarslib/TIVarType.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIVarTypes.cpp b/gui/qt/tivarslib/TIVarTypes.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TIVarTypes.h b/gui/qt/tivarslib/TIVarTypes.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/DummyHandler.cpp b/gui/qt/tivarslib/TypeHandlers/DummyHandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/STH_DataAppVar.cpp b/gui/qt/tivarslib/TypeHandlers/STH_DataAppVar.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -40,6 +40,11 @@ namespace tivars
         (void)options;
 
         const size_t byteCount = data.size();
+        if (byteCount < 2)
+        {
+            throw std::invalid_argument("Invalid data array. Needs to contain at least 2 bytes");
+        }
+
         const size_t lengthExp = (size_t) ((data[0] & 0xFF) + ((data[1] & 0xFF) << 8));
         const size_t lengthDat = byteCount - 2;
 
diff --git a/gui/qt/tivarslib/TypeHandlers/STH_ExactFraction.cpp b/gui/qt/tivarslib/TypeHandlers/STH_ExactFraction.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/STH_ExactFractionPi.cpp b/gui/qt/tivarslib/TypeHandlers/STH_ExactFractionPi.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/STH_ExactPi.cpp b/gui/qt/tivarslib/TypeHandlers/STH_ExactPi.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/STH_ExactRadical.cpp b/gui/qt/tivarslib/TypeHandlers/STH_ExactRadical.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/STH_FP.cpp b/gui/qt/tivarslib/TypeHandlers/STH_FP.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/TH_GenericComplex.cpp b/gui/qt/tivarslib/TypeHandlers/TH_GenericComplex.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/TH_GenericList.cpp b/gui/qt/tivarslib/TypeHandlers/TH_GenericList.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -55,6 +55,11 @@ namespace tivars
     std::string TH_GenericList::makeStringFromData(const data_t& data, const options_t& options)
     {
         const size_t byteCount = data.size();
+        if (byteCount < 2)
+        {
+            throw std::invalid_argument("Invalid data array. Needs to contain at least 2 bytes");
+        }
+
         const size_t numCount = (size_t) ((data[0] & 0xFF) + ((data[1] & 0xFF) << 8));
 
         const bool isRealList    = (numCount == (size_t)((byteCount - 2) / TH_GenericReal::dataByteCount));
diff --git a/gui/qt/tivarslib/TypeHandlers/TH_GenericReal.cpp b/gui/qt/tivarslib/TypeHandlers/TH_GenericReal.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
diff --git a/gui/qt/tivarslib/TypeHandlers/TH_Matrix.cpp b/gui/qt/tivarslib/TypeHandlers/TH_Matrix.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -75,9 +75,14 @@ namespace tivars
     {
         (void)options; // TODO: prettified option
 
-        size_t byteCount = data.size();
-        size_t colCount = data[0];
-        size_t rowCount = data[1];
+        const size_t byteCount = data.size();
+        if (byteCount < 2)
+        {
+            throw std::invalid_argument("Invalid data array. Needs to contain at least 2 bytes");
+        }
+
+        const size_t colCount = data[0];
+        const size_t rowCount = data[1];
 
         if (data.size() < 2+TH_GenericReal::dataByteCount || colCount < 1 || rowCount < 1 || colCount > 255 || rowCount > 255
             || ((byteCount - 2) % TH_GenericReal::dataByteCount != 0) || (colCount*rowCount != (byteCount - 2) / TH_GenericReal::dataByteCount))
diff --git a/gui/qt/tivarslib/TypeHandlers/TH_TempEqu.cpp b/gui/qt/tivarslib/TypeHandlers/TH_TempEqu.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -21,7 +21,7 @@ namespace tivars
     std::string TH_TempEqu::makeStringFromData(const data_t& data, const options_t& options)
     {
         (void)options;
-        
+
         if (data.size() < 2)
         {
             throw std::invalid_argument("Invalid data array. Missing the 2 initial bytes.");
diff --git a/gui/qt/tivarslib/TypeHandlers/TH_Tokenized.cpp b/gui/qt/tivarslib/TypeHandlers/TH_Tokenized.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -77,20 +77,26 @@ namespace tivars
 
     std::string TH_Tokenized::makeStringFromData(const data_t& data, const options_t& options)
     {
-        if (data.size() < 2)
+        const size_t dataSize = data.size();
+
+        const bool fromRawBytes = has_option(options, "fromRawBytes") && options.at("fromRawBytes") == 1;
+        if (!fromRawBytes && dataSize < 2)
         {
             throw std::invalid_argument("Invalid data array. Needs to contain at least 2 bytes (size fields)");
         }
 
         uint langIdx = (uint)((has_option(options, "lang") && options.at("lang") == LANG_FR) ? LANG_FR : LANG_EN);
 
-        const int howManyBytes = (data[0] & 0xFF) + ((data[1] & 0xFF) << 8);
-        if (howManyBytes != (int)data.size() - 2)
+        const int howManyBytes = fromRawBytes ? (int)data.size() : ((data[0] & 0xFF) + ((data[1] & 0xFF) << 8));
+        if (!fromRawBytes)
         {
-            std::cerr << "[Warning] Byte count (" << (data.size() - 2) << ") and size field (" << howManyBytes  << ") mismatch!";
+            if (howManyBytes != (int)dataSize - 2)
+            {
+                std::cerr << "[Warning] Byte count (" << (dataSize - 2) << ") and size field (" << howManyBytes  << ") mismatch!";
+            }
         }
 
-        if (howManyBytes >= 2)
+        if (!fromRawBytes && howManyBytes >= 2 && dataSize >= 4)
         {
             const uint16_t twoFirstBytes = (uint16_t) ((data[3] & 0xFF) + ((data[2] & 0xFF) << 8));
             if (std::find(std::begin(squishedASMTokens), std::end(squishedASMTokens), twoFirstBytes) != std::end(squishedASMTokens))
@@ -101,8 +107,7 @@ namespace tivars
 
         uint errCount = 0;
         std::string str;
-        const size_t dataSize = data.size();
-        for (uint i = 2; i < (uint)dataSize; i++)
+        for (uint i = fromRawBytes ? 0 : 2; i < (uint)dataSize; i++)
         {
             uint currentToken = data[i];
             uint nextToken = (i < dataSize-1) ? data[i+1] : (uint)-1;
diff --git a/gui/qt/tivarslib/TypeHandlers/TypeHandlers.h b/gui/qt/tivarslib/TypeHandlers/TypeHandlers.h
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
@@ -39,12 +39,6 @@ namespace tivars
         th();
         static const constexpr char* validPattern = "===UNIMPLEMENTED==="; // TODO
     }
-    namespace STH_ExactFractionPi
-    {
-        th();
-        static const constexpr char* validPattern = "===UNIMPLEMENTED==="; // TODO
-    }
-
     namespace STH_DataAppVar
     {
         th();
@@ -55,6 +49,11 @@ namespace tivars
         static const constexpr char ID_SCRIPT[] = "PYSC";
         static const constexpr char ID_CODE[] = "PYCD";
     }
+    namespace STH_ExactFractionPi
+    {
+        th();
+        static const constexpr char* validPattern = "===UNIMPLEMENTED==="; // TODO
+    }
 
     namespace TH_GenericReal
     {
diff --git a/gui/qt/tivarslib/tivarslib_utils.cpp b/gui/qt/tivarslib/tivarslib_utils.cpp
@@ -1,6 +1,6 @@
 /*
  * Part of tivars_lib_cpp
- * (C) 2015-2018 Adrien "Adriweb" Bertrand
+ * (C) 2015-2019 Adrien "Adriweb" Bertrand
  * https://github.com/adriweb/tivars_lib_cpp
  * License: MIT
  */
