fixup! implementing decoder interface

Author: andreagilardoni

src/cbor/CborDecoder.cpp

@@ -31,7 +31,13 @@ Decoder::Status CBORMessageDecoderSingleton::decode(Message* msg, const uint8_t*
     return Decoder::Status::Error;
   }
 
-  auto decoder_it = decoders.find(tag);
+  auto decoder_it = decoders.begin();
+
+  for(; decoder_it != decoders.end(); decoder_it++) {
+    if(decoder_it->first == msg->id) {
+      break;
+    }
+  }
 
   // check if message.id exists on the decoders list or return error
   if(decoder_it == decoders.end()) {
@@ -52,6 +58,20 @@ CBORMessageDecoderSingleton& CBORMessageDecoderSingleton::getInstance() {
   return singleton;
 }
 
+void CBORMessageDecoderSingleton::append(CBORTag tag, CBORMessageDecoderInterface* decoder) {
+    auto decoder_it = decoders.begin();
+
+  for(; decoder_it != decoders.end(); decoder_it++) {
+    if(decoder_it->first == tag) {
+      return;
+    }
+  }
+
+  decoders.push_back(
+    std::make_pair(tag, decoder)
+  );
+}
+
 CBORMessageDecoderInterface::CBORMessageDecoderInterface(const CBORTag tag, const MessageId id)
 : tag(tag), id(id) {
   // call singleton/global variable and insert this encoder

src/cbor/CborDecoder.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include <unordered_map>
+#include <vector>
 #include "../interfaces/Decoder.h"
 #include "CBOR.h"
 #include "../interfaces/message.h"
@@ -43,15 +43,13 @@ class CBORMessageDecoderSingleton: public Decoder {
 public:
   static CBORMessageDecoderSingleton& getInstance();
 
-  void append(CBORTag id, CBORMessageDecoderInterface* encoder) {
-    decoders[id] = encoder;
-  }
+  void append(CBORTag id, CBORMessageDecoderInterface* encoder);
 
   Decoder::Status decode(Message* msg, const uint8_t* const buf, size_t &len);
 private:
   CBORMessageDecoderSingleton() {}
 
-  std::unordered_map<CBORTag, CBORMessageDecoderInterface*> decoders;
+  std::vector<std::pair<CBORTag, CBORMessageDecoderInterface*>> decoders;
 };
 
 class CBORMessageDecoder: public Decoder {