Skip to content

Commit

Permalink
apply resharper suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonathanmcdermid
jonathanmcdermid committed Apr 30, 2024
1 parent 3f80df3 commit 748a662
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/decoders/common/api/circular_buffer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,6 @@ inline unsigned char* CircularBuffer::GetBuffer() const { return pucMyBuffer; }
//
//! \return unsigned character
//----------------------------------------------------------------------------
inline unsigned char CircularBuffer::operator[](int32_t iIndex_) const { return GetByte(iIndex_); }
inline unsigned char CircularBuffer::operator[](const int32_t iIndex_) const { return GetByte(iIndex_); }

#endif // CIRCULAR_BUFFER_HPP
28 changes: 14 additions & 14 deletions src/decoders/common/api/json_reader.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ class JsonReaderFailure : public std::exception
char acWhatString[256];

public:
JsonReaderFailure(const char* func_, const char* file_, int32_t line_, std::filesystem::path json_file_, const char* failure_)
: func(func_), file(file_), line(line_), clFilePath(std::move(json_file_)), failure(failure_), acWhatString{}
JsonReaderFailure(const char* func_, const char* file_, int32_t line_, std::filesystem::path jsonFile_, const char* failure_)
: func(func_), file(file_), line(line_), clFilePath(std::move(jsonFile_)), failure(failure_), acWhatString{}
{
}

const char* what() const throw() override
[[nodiscard]] const char* what() const throw() override
{
sprintf(const_cast<char*>(acWhatString), "In file \"%s\" : %s() (Line %d)\n\t\"%s: %s.\"", file, func, line,
clFilePath.generic_string().c_str(), failure);
Expand Down Expand Up @@ -137,7 +137,7 @@ inline std::string DataTypeConversion(const DATA_TYPE eType_)
}

//!< Mapping from String to data type enums.
static const std::unordered_map<std::string, DATA_TYPE> DataTypeEnumLookup = {
static const std::unordered_map<std::string, DATA_TYPE> DATA_TYPE_ENUM_LOOKUP = {
{"BOOL", DATA_TYPE::BOOL}, {"HEXBYTE", DATA_TYPE::HEXBYTE}, {"CHAR", DATA_TYPE::CHAR},
{"UCHAR", DATA_TYPE::UCHAR}, {"SHORT", DATA_TYPE::SHORT}, {"USHORT", DATA_TYPE::USHORT},
{"INT", DATA_TYPE::INT}, {"UINT", DATA_TYPE::UINT}, {"LONG", DATA_TYPE::LONG},
Expand Down Expand Up @@ -166,14 +166,14 @@ enum class FIELD_TYPE
};

//!< Mapping from String to field type enums.
static const std::unordered_map<std::string, FIELD_TYPE> FieldTypeEnumLookup = {{"SIMPLE", FIELD_TYPE::SIMPLE},
{"ENUM", FIELD_TYPE::ENUM},
{"BITFIELD", FIELD_TYPE::BITFIELD},
{"FIXED_LENGTH_ARRAY", FIELD_TYPE::FIXED_LENGTH_ARRAY},
{"VARIABLE_LENGTH_ARRAY", FIELD_TYPE::VARIABLE_LENGTH_ARRAY},
{"STRING", FIELD_TYPE::STRING},
{"FIELD_ARRAY", FIELD_TYPE::FIELD_ARRAY},
{"UNKNOWN", FIELD_TYPE::UNKNOWN}};
static const std::unordered_map<std::string, FIELD_TYPE> FIELD_TYPE_ENUM_LOOKUP = {{"SIMPLE", FIELD_TYPE::SIMPLE},
{"ENUM", FIELD_TYPE::ENUM},
{"BITFIELD", FIELD_TYPE::BITFIELD},
{"FIXED_LENGTH_ARRAY", FIELD_TYPE::FIXED_LENGTH_ARRAY},
{"VARIABLE_LENGTH_ARRAY", FIELD_TYPE::VARIABLE_LENGTH_ARRAY},
{"STRING", FIELD_TYPE::STRING},
{"FIELD_ARRAY", FIELD_TYPE::FIELD_ARRAY},
{"UNKNOWN", FIELD_TYPE::UNKNOWN}};

//-----------------------------------------------------------------------
//! \struct EnumDataType
Expand Down Expand Up @@ -418,7 +418,7 @@ struct MessageDefinition
{
for (auto& value : fields | std::views::values)
{
for (auto f : value) { delete f; }
for (const auto f : value) { delete f; }
}
}

Expand Down Expand Up @@ -610,7 +610,7 @@ class JsonReader
//----------------------------------------------------------------------------
[[nodiscard]] novatel::edie::EnumDefinition* GetEnumDefName(const std::string& sEnumName_) const
{
auto it = mEnumName.find(sEnumName_);
const auto it = mEnumName.find(sEnumName_);
return it != mEnumName.end() ? it->second : nullptr;
}

Expand Down
66 changes: 66 additions & 0 deletions src/decoders/common/src/json_reader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,43 @@
namespace novatel::edie {

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, EnumDataType& f_)
=======
void FromJson(const json& j_, EnumDataType& f_)
>>>>>>> 4777501 (apply resharper suggestions)
{
f_.value = j_.at("value");
f_.name = j_.at("name");
f_.description = j_.at("description").is_null() ? "" : j_.at("description");
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, BaseDataType& f_)
{
auto itrDataTypeMapping = DataTypeEnumLookup.find(j_.at("name"));
f_.name = itrDataTypeMapping != DataTypeEnumLookup.end() ? itrDataTypeMapping->second : DATA_TYPE::UNKNOWN;
=======
void FromJson(const json& j_, BaseDataType& f_)
{
auto itrDataTypeMapping = DATA_TYPE_ENUM_LOOKUP.find(j_.at("name"));
f_.name = itrDataTypeMapping != DATA_TYPE_ENUM_LOOKUP.end() ? itrDataTypeMapping->second : DATA_TYPE::UNKNOWN;
>>>>>>> 4777501 (apply resharper suggestions)
f_.length = j_.at("length");
f_.description = j_.at("description").is_null() ? "" : j_.at("description");
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, SimpleDataType& f_)
{
from_json(j_, static_cast<BaseDataType&>(f_));
=======
void FromJson(const json& j_, SimpleDataType& f_)
{
FromJson(j_, static_cast<BaseDataType&>(f_));
>>>>>>> 4777501 (apply resharper suggestions)

if (j_.find("enum") != j_.end())
{
Expand All @@ -58,13 +75,22 @@ void from_json(const json& j_, SimpleDataType& f_)
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, BaseField& f_)
=======
void FromJson(const json& j_, BaseField& f_)
>>>>>>> 4777501 (apply resharper suggestions)
{
f_.name = j_.at("name");
f_.description = j_.at("description").is_null() ? "" : j_.at("description");

<<<<<<< HEAD
const auto itrFieldTypeMapping = FieldTypeEnumLookup.find(j_.at("type"));
f_.type = itrFieldTypeMapping != FieldTypeEnumLookup.end() ? itrFieldTypeMapping->second : FIELD_TYPE::UNKNOWN;
=======
auto itrFieldTypeMapping = FIELD_TYPE_ENUM_LOOKUP.find(j_.at("type"));
f_.type = itrFieldTypeMapping != FIELD_TYPE_ENUM_LOOKUP.end() ? itrFieldTypeMapping->second : FIELD_TYPE::UNKNOWN;
>>>>>>> 4777501 (apply resharper suggestions)

if (j_.find("conversionString") != j_.end())
{
Expand All @@ -76,6 +102,7 @@ void from_json(const json& j_, BaseField& f_)
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, EnumField& f_)
{
from_json(j_, static_cast<BaseField&>(f_));
Expand All @@ -89,22 +116,47 @@ void from_json(const json& j_, EnumField& f_)
void from_json(const json& j_, ArrayField& fd_)
{
from_json(j_, static_cast<BaseField&>(fd_));
=======
void FromJson(const json& j_, EnumField& f_)
{
FromJson(j_, static_cast<BaseField&>(f_));

if (j_.at("enumID").is_null()) { throw std::runtime_error("Invalid enum ID - cannot be NULL. JsonDB file is likely corrupted."); }

f_.enumID = j_.at("enumID");
}

//-----------------------------------------------------------------------
void FromJson(const json& j_, ArrayField& fd_)
{
FromJson(j_, static_cast<BaseField&>(fd_));
>>>>>>> 4777501 (apply resharper suggestions)

fd_.arrayLength = j_.at("arrayLength");
fd_.dataType = j_.at("dataType");
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, FieldArrayField& fd_)
{
from_json(j_, static_cast<BaseField&>(fd_));
=======
void FromJson(const json& j_, FieldArrayField& fd_)
{
FromJson(j_, static_cast<BaseField&>(fd_));
>>>>>>> 4777501 (apply resharper suggestions)

fd_.arrayLength = j_.at("arrayLength").is_null() ? 0 : static_cast<uint32_t>(j_.at("arrayLength"));
fd_.fieldSize = fd_.arrayLength * ParseFields(j_.at("fields"), fd_.fields);
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, MessageDefinition& md_)
=======
void FromJson(const json& j_, MessageDefinition& md_)
>>>>>>> 4777501 (apply resharper suggestions)
{
md_._id = j_.at("_id");
md_.logID = j_.at("messageID"); // this was "logID"
Expand All @@ -114,14 +166,24 @@ void from_json(const json& j_, MessageDefinition& md_)

for (const auto& fields : j_.at("fields").items())
{
<<<<<<< HEAD
uint32_t defCrc = std::stoul(fields.key());
md_.fields[defCrc];
ParseFields(fields.value(), md_.fields[defCrc]);
=======
uint32_t defCRC = std::stoul(fields.key());
md_.fields[defCRC];
ParseFields(fields.value(), md_.fields[defCRC]);
>>>>>>> 4777501 (apply resharper suggestions)
}
}

//-----------------------------------------------------------------------
<<<<<<< HEAD
void from_json(const json& j_, EnumDefinition& ed_)
=======
void FromJson(const json& j_, EnumDefinition& ed_)
>>>>>>> 4777501 (apply resharper suggestions)
{
ed_._id = j_.at("_id");
ed_.name = j_.at("name");
Expand Down Expand Up @@ -414,7 +476,11 @@ std::string JsonReader::MsgIdToMsgName(const uint32_t uiMessageId_) const
uint32_t uiMessageFormat = 0;
uint32_t uiResponse = 0;

<<<<<<< HEAD
UnpackMsgId(uiMessageId_, usLogId, uiSiblingId, uiMessageFormat, uiResponse);
=======
UnpackMsgId(uiMessageId_, usLogID, uiSiblingID, uiMessageFormat, uiResponse);
>>>>>>> 4777501 (apply resharper suggestions)

const novatel::edie::MessageDefinition* pstMessageDefinition = GetMsgDef(usLogId);
std::string strMessageName = pstMessageDefinition ? pstMessageDefinition->name : GetEnumString(vEnumDefinitions.data(), usLogId);
Expand Down

0 comments on commit 748a662

Please sign in to comment.