[C++] Add referencedName and packageName to the Token definition.

Author: vyazelenko

sbe-tool/src/main/cpp/otf/IrDecoder.h

@@ -289,6 +289,9 @@ class IrDecoder
         tmpLen = tokenCodec.getReferencedName(tmpBuffer, sizeof(tmpBuffer));
         std::string referencedName(tmpBuffer, tmpLen);
 
+        tmpLen = tokenCodec.getPackageName(tmpBuffer, sizeof(tmpBuffer));
+        std::string packageName(tmpBuffer, tmpLen);
+
         Encoding encoding(
             type,
             presence,
@@ -302,7 +305,7 @@ class IrDecoder
             timeUnit,
             semanticType);
 
-        Token token(tokenOffset, id, version, tokenSize, componentTokenCount, signal, name, description, encoding);
+        Token token(tokenOffset, id, version, tokenSize, componentTokenCount, signal, name, description, encoding, referencedName, packageName);
 
         tokens->push_back(token);
 

sbe-tool/src/main/cpp/otf/Token.h

@@ -77,7 +77,10 @@ class Token
         Signal signal,
         std::string name,
         std::string description,
-        Encoding encoding) :
+        Encoding encoding,
+        std::string referencedName = "",
+        std::string packageName = ""
+        ) :
         m_offset(offset),
         m_fieldId(fieldId),
         m_version(version),
@@ -86,7 +89,9 @@ class Token
         m_signal(signal),
         m_name(std::move(name)),
         m_description(std::move(description)),
-        m_encoding(std::move(encoding))
+        m_encoding(std::move(encoding)),
+        m_referencedName(std::move(referencedName)),
+        m_packageName(std::move(packageName))
     {
     }
 
@@ -105,6 +110,16 @@ class Token
         return m_description;
     }
 
+    inline const std::string &referencedName() const
+    {
+        return m_referencedName;
+    }
+
+    inline const std::string &packageName() const
+    {
+        return m_packageName;
+    }
+
     inline std::int32_t fieldId() const
     {
         return m_fieldId;
@@ -150,6 +165,8 @@ class Token
     const std::string m_name;
     const std::string m_description;
     const Encoding m_encoding;
+    const std::string m_referencedName;
+    const std::string m_packageName;
 };
 
 }}