More const stuff.

Author: Joshua Whitley

examples/parse_types.cpp

@@ -61,7 +61,7 @@ int main(int argc, char ** argv)
   std::cout << "Signal receiving bus nodes: ";
 
   for (auto & node : sig.getReceivingNodes()) {
-    std::cout << node.getName() << " ";
+    std::cout << node->getName() << " ";
   }
 
   std::cout << std::endl;

examples/read_dbc.cpp

@@ -51,22 +51,22 @@ int main(int argc, char ** argv)
   auto attr_defs = dbc.getAttributeDefinitions();
 
   for (auto & bus_node : bus_nodes) {
-    if (bus_node.getComment() != nullptr) {
+    if (bus_node->getComment() != nullptr) {
       bus_node_comment_counter++;
     }
   }
 
   for (auto & msg : messages) {
-    auto signals = msg.second.getSignals();
+    auto signals = msg.second->getSignals();
 
-    if (msg.second.getComment() != nullptr) {
+    if (msg.second->getComment() != nullptr) {
       message_comment_counter++;
     }
 
     signal_counter += signals.size();
 
     for (auto & sig : signals) {
-      if (sig.second.getComment() != nullptr) {
+      if (sig.second->getComment() != nullptr) {
         signal_comment_counter++;
       }
     }

include/bus_node.hpp

@@ -35,7 +35,7 @@ namespace DbcLoader
 {
 
 class BusNode
-  : public AttributeObject
+  : public AttrObj
 {
 public:
   BusNode(std::string && node_name);

include/common_defs.hpp

@@ -152,7 +152,7 @@ class DbcObj
   virtual void parse() = 0;
 };
 
-class AttributeObject
+class AttrObj
 {
 public:
   const std::unordered_map<std::string, std::string> getAttributeValues()

include/database.hpp

@@ -56,8 +56,8 @@ class Database
 
   std::string getVersion() const;
   std::string getBusConfig() const;
-  std::vector<BusNode> getBusNodes() const;
-  std::unordered_map<unsigned int, Message> getMessages() const;
+  std::vector<const BusNode *> getBusNodes() const;
+  std::unordered_map<unsigned int, const Message *> getMessages() const;
   std::vector<const Attribute *> getAttributeDefinitions() const;
   void writeDbcToFile(const std::string & dbc_path) const;
   void writeDbcToStream(std::ostream & mem_stream) const;

include/message.hpp

@@ -39,7 +39,7 @@ namespace DbcLoader
 {
 
 class Message
-  : public DbcObj, public AttributeObject
+  : public DbcObj, public AttrObj
 {
 public:
   Message(std::string && dbc_text);
@@ -60,7 +60,7 @@ class Message
   unsigned char getDlc() const;
   unsigned char getLength() const;
   BusNode getTransmittingNode() const;
-  std::unordered_map<std::string, Signal> getSignals() const;
+  std::unordered_map<std::string, const Signal *> getSignals() const;
   const std::string * getComment() const;
 
   unsigned char dlcToLength(const unsigned char & dlc) const;

include/signal.hpp

@@ -38,7 +38,7 @@ namespace DbcLoader
 {
 
 class Signal
-  : public DbcObj, public AttributeObject
+  : public DbcObj, public AttrObj
 {
 public:
   Signal(std::string && dbc_text);
@@ -76,8 +76,8 @@ class Signal
   float getMinVal() const;
   float getMaxVal() const;
   std::string getUnit() const;
-  std::vector<BusNode> getReceivingNodes() const;
-  std::map<unsigned int, std::string> getValueDescriptions() const;
+  std::vector<const BusNode *> getReceivingNodes() const;
+  std::map<unsigned int, const std::string *> getValueDescriptions() const;
   const std::string * getComment() const;
 
   friend class Message;

src/database.cpp

@@ -94,14 +94,26 @@ std::string Database::getBusConfig() const
   return bus_config_;
 }
 
-std::vector<BusNode> Database::getBusNodes() const
+std::vector<const BusNode *> Database::getBusNodes() const
 {
-  return std::vector<BusNode>(bus_nodes_);
+  std::vector<const BusNode *> nodes;
+
+  for (auto & node : bus_nodes_) {
+    nodes.emplace_back(&node);
+  }
+
+  return nodes;
 }
 
-std::unordered_map<unsigned int, Message> Database::getMessages() const
+std::unordered_map<unsigned int, const Message *> Database::getMessages() const
 {
-  return std::unordered_map<unsigned int, Message>(messages_);
+  std::unordered_map<unsigned int, const Message *> msgs;
+
+  for (auto & msg : messages_) {
+    msgs[msg.first] = &(msg.second);
+  }
+
+  return msgs;
 }
 
 std::vector<const Attribute *> Database::getAttributeDefinitions() const

src/message.cpp

@@ -103,9 +103,15 @@ BusNode Message::getTransmittingNode() const
   return BusNode(transmitting_node_);
 }
 
-std::unordered_map<std::string, Signal> Message::getSignals() const
+std::unordered_map<std::string, const Signal *> Message::getSignals() const
 {
-  return signals_;
+  std::unordered_map<std::string, const Signal *> sigs;
+
+  for (auto & sig : signals_) {
+    sigs[sig.first] = &(sig.second);
+  }
+
+  return sigs;
 }
 
 const std::string * Message::getComment() const

src/signal.cpp

@@ -166,14 +166,26 @@ std::string Signal::getUnit() const
   return unit_;
 }
 
-std::vector<BusNode> Signal::getReceivingNodes() const
+std::vector<const BusNode *> Signal::getReceivingNodes() const
 {
-  return receiving_nodes_;
+  std::vector<const BusNode *> nodes;
+
+  for (auto & node : receiving_nodes_) {
+    nodes.push_back(&node);
+  }
+
+  return nodes;
 }
 
-std::map<unsigned int, std::string> Signal::getValueDescriptions() const
+std::map<unsigned int, const std::string *> Signal::getValueDescriptions() const
 {
-  return value_descs_;
+  std::map<unsigned int, const std::string *> descs;
+
+  for (auto & desc : value_descs_) {
+    descs[desc.first] = &(desc.second);
+  }
+
+  return descs;
 }
 
 const std::string * Signal::getComment() const