fixup! implementing decoder interface

Author: andreagilardoni

src/cbor/CborDecoder.cpp

@@ -31,21 +31,24 @@ Decoder::Status CBORMessageDecoderSingleton::decode(Message* msg, const uint8_t*
     return Decoder::Status::Error;
   }
 
-  auto decoder_it = decoders.begin();
+  // FIXME try with std::find
+  auto decoder_it = decoders_tags.begin();
 
-  for(; decoder_it != decoders.end(); decoder_it++) {
-    if(decoder_it->first == msg->id) {
+  for(; decoder_it != decoders_tags.end(); decoder_it++) {
+    if(*decoder_it == tag) {
       break;
     }
   }
 
   // check if message.id exists on the decoders list or return error
-  if(decoder_it == decoders.end()) {
+  if(decoder_it == decoders_tags.end()) {
     return Decoder::Status::Error;
   }
 
+  auto decoder = decoders[decoder_it - decoders_tags.begin()];
+
   // encode the message
-  if(decoder_it->second->_decode(&iter, msg) == Decoder::Status::Error) {
+  if(decoder->_decode(&iter, msg) == Decoder::Status::Error) {
     return Decoder::Status::Error;
   }
 
@@ -59,17 +62,16 @@ CBORMessageDecoderSingleton& CBORMessageDecoderSingleton::getInstance() {
 }
 
 void CBORMessageDecoderSingleton::append(CBORTag tag, CBORMessageDecoderInterface* decoder) {
-    auto decoder_it = decoders.begin();
+    auto decoder_it = decoders_tags.begin();
 
-  for(; decoder_it != decoders.end(); decoder_it++) {
-    if(decoder_it->first == tag) {
+  for(; decoder_it != decoders_tags.end(); decoder_it++) {
+    if(*  decoder_it == tag) {
       return;
     }
   }
 
-  decoders.push_back(
-    std::make_pair(tag, decoder)
-  );
+  decoders_tags.push_back(tag);
+  decoders.push_back(decoder);
 }
 
 CBORMessageDecoderInterface::CBORMessageDecoderInterface(const CBORTag tag, const MessageId id)

src/cbor/CborDecoder.h

@@ -49,7 +49,8 @@ class CBORMessageDecoderSingleton: public Decoder {
 private:
   CBORMessageDecoderSingleton() {}
 
-  std::vector<std::pair<CBORTag, CBORMessageDecoderInterface*>> decoders;
+  std::vector<CBORTag> decoders_tags;
+  std::vector<CBORMessageDecoderInterface*> decoders;
 };
 
 class CBORMessageDecoder: public Decoder {