From e8aa42db982c272d9c2d8f466ce532fd8a8dad92 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 1 Sep 2021 19:00:05 -0400
Subject: [PATCH] Move CHECK_VALUE and UNEXPECTED_VALUE macros into
 ImportContext header.

Any loader that uses ImportContext will be able to use them.
---
 oscar/SleepLib/importcontext.h              | 12 ++++++++++++
 oscar/SleepLib/loader_plugins/prs1_parser.h | 18 +++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/oscar/SleepLib/importcontext.h b/oscar/SleepLib/importcontext.h
index 43e3ba96..8a1164a3 100644
--- a/oscar/SleepLib/importcontext.h
+++ b/oscar/SleepLib/importcontext.h
@@ -43,6 +43,18 @@ protected:
 };
 
 
+// Loaders and parsers #define IMPORT_CTX and SESSIONID based on their internal data structures.
+#define UNEXPECTED_VALUE(SRC, VALS) { \
+    QString message = QString("%1:%2: %3 = %4 != %5").arg(__func__).arg(__LINE__).arg(#SRC).arg(SRC).arg(VALS); \
+    qWarning() << SESSIONID << message; \
+    IMPORT_CTX->LogUnexpectedMessage(message); \
+    }
+#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) UNEXPECTED_VALUE(SRC, VAL)
+#define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2)
+// For more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails.
+#define HEX(SRC) { qWarning() << SESSIONID << QString("%1:%2: %3 = %4").arg(__func__).arg(__LINE__).arg(#SRC).arg((SRC & 0xFF), 2, 16, QChar('0')); }
+
+
 // ProfileImportContext isolates the loader from Profile and its storage.
 class Profile;
 class ProfileImportContext : public ImportContext
diff --git a/oscar/SleepLib/loader_plugins/prs1_parser.h b/oscar/SleepLib/loader_plugins/prs1_parser.h
index bf7c0527..b58b98c6 100644
--- a/oscar/SleepLib/loader_plugins/prs1_parser.h
+++ b/oscar/SleepLib/loader_plugins/prs1_parser.h
@@ -14,6 +14,11 @@
 #include <QString>
 #include "SleepLib/session.h"
 
+// Include and configure the CHECK_VALUE and UNEXPECTED_VALUE macros.
+#include "SleepLib/importcontext.h"
+#define IMPORT_CTX loader->context()
+#define SESSIONID this->sessionid
+
 //********************************************************************************************
 // MARK: -
 // MARK: Internal PRS1 parsed data types
@@ -634,19 +639,6 @@ protected:
 
 #define DUMP_EVENT() qWarning() << this->sessionid << DumpEvent(t, code, data + pos, size - (pos - startpos)) + "  @ " + QString("0x") + QString::number(startpos-1, 16).toUpper()
 
-// TODO: See the LogUnexpectedMessage TODO about generalizing this for other loaders.
-// Right now this macro assumes that it's called within a method that has a "loader" member
-// that points to the PRS1Loader* instance that's calling it.
-#define UNEXPECTED_VALUE(SRC, VALS) { \
-    QString message = QString("%1:%2: %3 = %4 != %5").arg(__func__).arg(__LINE__).arg(#SRC).arg(SRC).arg(VALS); \
-    qWarning() << this->sessionid << message; \
-    loader->LogUnexpectedMessage(message); \
-    }
-#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) UNEXPECTED_VALUE(SRC, VAL)
-#define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2)
-// for more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails
-#define HEX(SRC) { qWarning() << this->sessionid << QString("%1:%2: %3 = %4").arg(__func__).arg(__LINE__).arg(#SRC).arg((SRC & 0xFF), 2, 16, QChar('0')); }
-
 enum FlexMode { FLEX_None, FLEX_CFlex, FLEX_CFlexPlus, FLEX_AFlex, FLEX_RiseTime, FLEX_BiFlex, FLEX_PFlex, FLEX_Flex, FLEX_Unknown = -1  };
 
 enum BackupBreathMode { PRS1Backup_Off, PRS1Backup_Auto, PRS1Backup_Fixed };