Pass the TIVarFile instance as a context param of conversion functions.

adriweb · May 25, 2024 · f04cdbd · f04cdbd
1 parent e8d2167
commit f04cdbd
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 46 deletions.
diff --git a/TIVarsLib.wasm b/TIVarsLib.wasm
diff --git a/src/TIVarFile.cpp b/src/TIVarFile.cpp
@@ -279,7 +279,7 @@ namespace tivars
     void TIVarFile::setContentFromString(const std::string& str, const options_t& options, uint16_t entryIdx)
     {
         auto& entry = this->entries[entryIdx];
-        entry.data = (entry._type.getHandlers().first)(str, options);
+        entry.data = (entry._type.getHandlers().first)(str, options, this);
         this->refreshMetadataFields();
     }
     void TIVarFile::setContentFromString(const std::string& str, const options_t& options)
@@ -341,7 +341,7 @@ namespace tivars
     std::string TIVarFile::getReadableContent(const options_t& options, uint16_t entryIdx)
     {
         const auto& entry = this->entries[entryIdx];
-        return (entry._type.getHandlers().second)(entry.data, options);
+        return (entry._type.getHandlers().second)(entry.data, options, this);
     }
     std::string TIVarFile::getReadableContent(const options_t& options)
     {

diff --git a/src/TIVarTypes.cpp b/src/TIVarTypes.cpp
@@ -13,10 +13,10 @@ namespace tivars
 
 // Wrap the makeDataFromStr function by one that adds the type/subtype in the options
 // Ideally, the handlers would parse the string and select the correct handler to dispatch...
-#define GenericHandlerPair(which, type) make_pair([](const std::string& str, const options_t& options) -> data_t { \
+#define GenericHandlerPair(which, type) make_pair([](const std::string& str, const options_t& options, const TIVarFile* _ctx) -> data_t { \
     options_t options_withType = options;                                                                          \
     options_withType["_type"] = type;                                                                              \
-    return (TH_Generic##which::makeDataFromString)(str, options_withType);                                         \
+    return (TH_Generic##which::makeDataFromString)(str, options_withType, _ctx);                                   \
 }, &TH_Generic##which::makeStringFromData)
 
     /**

diff --git a/src/TypeHandlers/DummyHandler.cpp b/src/TypeHandlers/DummyHandler.cpp
@@ -12,18 +12,19 @@
 
 namespace tivars
 {
-
-    data_t DummyHandler::makeDataFromString(const std::string& str, const options_t& options)
+    data_t DummyHandler::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)str;
         (void)options;
+        (void)_ctx;
         throw std::runtime_error("This type is not supported / implemented (yet?)");
     }
 
-    std::string DummyHandler::makeStringFromData(const data_t& data, const options_t& options)
+    std::string DummyHandler::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         (void)data;
         (void)options;
+        (void)_ctx;
         throw std::runtime_error("This type is not supported / implemented (yet?)");
     }
 

diff --git a/src/TypeHandlers/STH_DataAppVar.cpp b/src/TypeHandlers/STH_DataAppVar.cpp
@@ -13,7 +13,7 @@
 
 namespace tivars
 {
-    data_t STH_DataAppVar::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_DataAppVar::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -37,7 +37,7 @@ namespace tivars
         return data;
     }
 
-    std::string STH_DataAppVar::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_DataAppVar::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 

diff --git a/src/TypeHandlers/STH_ExactFraction.cpp b/src/TypeHandlers/STH_ExactFraction.cpp
@@ -13,7 +13,7 @@
 namespace tivars
 {
 
-    data_t STH_ExactFraction::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_ExactFraction::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -25,7 +25,7 @@ namespace tivars
         }
     }
 
-    std::string STH_ExactFraction::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_ExactFraction::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         if (data.size() != dataByteCount)
         {

diff --git a/src/TypeHandlers/STH_ExactFractionPi.cpp b/src/TypeHandlers/STH_ExactFractionPi.cpp
@@ -13,7 +13,7 @@
 namespace tivars
 {
 
-    data_t STH_ExactFractionPi::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_ExactFractionPi::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -25,7 +25,7 @@ namespace tivars
         }
     }
 
-    std::string STH_ExactFractionPi::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_ExactFractionPi::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         if (data.size() != dataByteCount)
         {

diff --git a/src/TypeHandlers/STH_ExactPi.cpp b/src/TypeHandlers/STH_ExactPi.cpp
@@ -13,7 +13,7 @@
 namespace tivars
 {
 
-    data_t STH_ExactPi::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_ExactPi::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -25,7 +25,7 @@ namespace tivars
         }
     }
 
-    std::string STH_ExactPi::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_ExactPi::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         if (data.size() != dataByteCount)
         {

diff --git a/src/TypeHandlers/STH_ExactRadical.cpp b/src/TypeHandlers/STH_ExactRadical.cpp
@@ -15,7 +15,7 @@
 namespace tivars
 {
 
-    data_t STH_ExactRadical::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_ExactRadical::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -28,7 +28,7 @@ namespace tivars
     }
 
     // TODO: handle sign bit?
-    std::string STH_ExactRadical::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_ExactRadical::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 

diff --git a/src/TypeHandlers/STH_FP.cpp b/src/TypeHandlers/STH_FP.cpp
@@ -24,7 +24,7 @@ static bool parseSign(std::string::const_iterator &i, const std::string::const_i
 
 namespace tivars
 {
-    data_t STH_FP::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_FP::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -102,7 +102,7 @@ namespace tivars
         return data;
     }
 
-    std::string STH_FP::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_FP::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         bool scientific = false;
         (void)options;

diff --git a/src/TypeHandlers/STH_PythonAppVar.cpp b/src/TypeHandlers/STH_PythonAppVar.cpp
@@ -17,7 +17,7 @@
 
 namespace tivars
 {
-    data_t STH_PythonAppVar::makeDataFromString(const std::string& str, const options_t& options)
+    data_t STH_PythonAppVar::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -37,7 +37,7 @@ namespace tivars
         return data;
     }
 
-    std::string STH_PythonAppVar::makeStringFromData(const data_t& data, const options_t& options)
+    std::string STH_PythonAppVar::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 

diff --git a/src/TypeHandlers/TH_GDB.cpp b/src/TypeHandlers/TH_GDB.cpp
@@ -397,7 +397,7 @@ namespace
 
 namespace tivars
 {
-    data_t TH_GDB::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_GDB::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -463,7 +463,7 @@ namespace tivars
         return data;
     }
 
-    std::string TH_GDB::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_GDB::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         const size_t dataSizeActual = data.size();
         if (dataSizeActual < dataByteCountMinimum)

diff --git a/src/TypeHandlers/TH_GenericAppVar.cpp b/src/TypeHandlers/TH_GenericAppVar.cpp
@@ -12,12 +12,12 @@
 
 namespace tivars
 {
-    data_t TH_GenericAppVar::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_GenericAppVar::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         return STH_DataAppVar::makeDataFromString(str, options);
     }
 
-    std::string TH_GenericAppVar::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_GenericAppVar::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         if (data.size() < 2)
         {

diff --git a/src/TypeHandlers/TH_GenericComplex.cpp b/src/TypeHandlers/TH_GenericComplex.cpp
@@ -44,7 +44,7 @@ namespace tivars
 
     // For this, we're going to assume that both members are of the same type...
     // TODO: guess, by parsing, the type instead of reading it from the options
-    data_t TH_GenericComplex::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_GenericComplex::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         constexpr size_t bytesPerMember = 9;
         const auto& typeIter = options.find("_type");
@@ -81,7 +81,7 @@ namespace tivars
                 coeff = "0";
             }
 
-            const data_t& member_data = handler(coeff, options);
+            const data_t& member_data = handler(coeff, options, _ctx);
             data.insert(data.end(), member_data.begin(), member_data.end());
 
             uint8_t flags = 0;
@@ -95,7 +95,7 @@ namespace tivars
         return data;
     }
 
-    std::string TH_GenericComplex::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_GenericComplex::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         constexpr size_t bytesPerMember = 9;
 
@@ -123,8 +123,8 @@ namespace tivars
         const auto& handlerI = handlerIIter->second.second;
 
         const data_t::const_iterator mid = data.cbegin() + bytesPerMember;
-        const std::string coeffR = handlerR(data_t(data.cbegin(), mid), options);
-        const std::string coeffI = handlerI(data_t(mid, data.cend()), options);
+        const std::string coeffR = handlerR(data_t(data.cbegin(), mid), options, _ctx);
+        const std::string coeffI = handlerI(data_t(mid, data.cend()), options, _ctx);
 
         const bool coeffRZero = coeffR == "0";
         const bool coeffIZero = coeffI == "0";

diff --git a/src/TypeHandlers/TH_GenericList.cpp b/src/TypeHandlers/TH_GenericList.cpp
@@ -14,7 +14,7 @@
 namespace tivars
 {
     // TODO: also make it detect the type correctly...
-    data_t TH_GenericList::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_GenericList::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         const auto& typeIter = options.find("_type");
         if (typeIter == options.end())
@@ -49,14 +49,14 @@ namespace tivars
 
         for (const auto& numStr : arr)
         {
-            const auto& tmp = handler(numStr, options);
+            const auto& tmp = handler(numStr, options, _ctx);
             data.insert(data.end(), tmp.begin(), tmp.end());
         }
 
         return data;
     }
 
-    std::string TH_GenericList::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_GenericList::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         const size_t byteCount = data.size();
         if (byteCount < 2)
@@ -86,7 +86,7 @@ namespace tivars
         std::string str = "{";
         for (size_t i = 2, num = 0; i < byteCount; i += typeByteCount, num++)
         {
-            str += handler(data_t(data.begin()+i, data.begin()+i+typeByteCount), options);
+            str += handler(data_t(data.begin()+i, data.begin()+i+typeByteCount), options, _ctx);
             if (num < numCount - 1) // not last num
             {
                 str += ',';

diff --git a/src/TypeHandlers/TH_GenericReal.cpp b/src/TypeHandlers/TH_GenericReal.cpp
@@ -21,7 +21,7 @@ namespace tivars
     };
 
     // TODO: guess, by parsing, the type instead of reading it from the options
-    data_t TH_GenericReal::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_GenericReal::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         const auto& typeIter = options.find("_type");
         if (typeIter == options.end())
@@ -34,10 +34,10 @@ namespace tivars
         {
             throw std::runtime_error("Unknown/Invalid type for this TH_GenericReal: " + std::to_string(type));
         }
-        return (handlerIter->second.first)(str, options);
+        return (handlerIter->second.first)(str, options, _ctx);
     }
 
-    std::string TH_GenericReal::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_GenericReal::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         if (data.size() != dataByteCount)
         {
@@ -49,6 +49,6 @@ namespace tivars
         {
             throw std::runtime_error("Unknown/Invalid type in this TH_GenericReal data: " + std::to_string(type));
         }
-        return (handlerIter->second.second)(data, options);
+        return (handlerIter->second.second)(data, options, _ctx);
     }
 }
diff --git a/src/TypeHandlers/TH_Matrix.cpp b/src/TypeHandlers/TH_Matrix.cpp
@@ -13,7 +13,7 @@
 namespace tivars
 {
 
-    data_t TH_Matrix::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_Matrix::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 
@@ -73,7 +73,7 @@ namespace tivars
         return data;
     }
 
-    std::string TH_Matrix::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_Matrix::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options; // TODO: prettified option
 

diff --git a/src/TypeHandlers/TH_TempEqu.cpp b/src/TypeHandlers/TH_TempEqu.cpp
@@ -12,15 +12,15 @@
 
 namespace tivars
 {
-    data_t TH_TempEqu::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_TempEqu::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         (void)str;
         (void)options;
 
         throw std::runtime_error("Unimplemented");
     }
 
-    std::string TH_TempEqu::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_TempEqu::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         (void)options;
 

diff --git a/src/TypeHandlers/TH_Tokenized.cpp b/src/TypeHandlers/TH_Tokenized.cpp
@@ -32,7 +32,7 @@ namespace tivars
         const std::regex toPrettifyRX(R"(\[?\|([a-zA-Z]+)\]?)");
     }
 
-    data_t TH_Tokenized::makeDataFromString(const std::string& str, const options_t& options)
+    data_t TH_Tokenized::makeDataFromString(const std::string& str, const options_t& options, const TIVarFile* _ctx)
     {
         data_t data;
 
@@ -109,7 +109,7 @@ namespace tivars
         return data;
     }
 
-    std::string TH_Tokenized::makeStringFromData(const data_t& data, const options_t& options)
+    std::string TH_Tokenized::makeStringFromData(const data_t& data, const options_t& options, const TIVarFile* _ctx)
     {
         const size_t dataSize = data.size();
 

diff --git a/src/TypeHandlers/TypeHandlers.h b/src/TypeHandlers/TypeHandlers.h
@@ -12,9 +12,10 @@
 
 namespace tivars
 {
+    class TIVarFile;
 
-#define th()    data_t      makeDataFromString(const std::string& str,  const options_t& options = options_t()); \
-                std::string makeStringFromData(const data_t& data,      const options_t& options = options_t())
+#define th()    data_t      makeDataFromString(const std::string& str, const options_t& options = options_t(), const TIVarFile* _ctx = nullptr); \
+                std::string makeStringFromData(const data_t& data,     const options_t& options = options_t(), const TIVarFile* _ctx = nullptr);
 
     namespace DummyHandler { th(); }