Namespaces

src/ElfFile.cpp

@@ -70,24 +70,37 @@ std::string ElfFile::getMD5() const { return md5; }
  *nonetheless. Will re-evaluate. Visit https://en.cppreference.com/w/cpp/utility/optional
  *and https://en.cppreference.com/w/cpp/utility/tuple for details.
  */
-Symbol*     ElfFile::getSymbol(std::string& name)
+Symbol*     ElfFile::getSymbol(std::string& name, Namespace* ns)
 {
     Symbol* returnSymbol = nullptr;
 
     for (auto&& symbol : symbols)
     {
-        if (symbol->getName() == name)
+        if (ns != nullptr && symbol->getNamespace() != nullptr)
         {
-            returnSymbol = symbol.get();
+            if (symbol->getName() == name && symbol->getNamespace()->getFullyQualifiedName() == ns->getFullyQualifiedName())
+            {
+                returnSymbol = symbol.get();
+            }
+        }
+
+        else if (ns == nullptr && symbol->getNamespace() == nullptr)
+        {
+            {
+                if (symbol->getName() == name)
+                {
+                    returnSymbol = symbol.get();
+                }
+            }
         }
     }
 
     return returnSymbol;
 }
 
-Symbol* ElfFile::addSymbol(std::string& inName, uint32_t inByteSize, Artifact newArtifact, Symbol* targetSymbol)
+Symbol* ElfFile::addSymbol(std::string& inName, uint32_t inByteSize, Artifact newArtifact, Symbol* targetSymbol, Namespace* symbolNamepace)
 {
-    Symbol* symbol = getSymbol(inName);
+    Symbol* symbol = getSymbol(inName, symbolNamepace);
 
     if (symbol == nullptr)
     {
@@ -102,13 +115,14 @@ Symbol* ElfFile::addSymbol(std::string& inName, uint32_t inByteSize, Artifact ne
     return symbol;
 }
 
-Symbol* ElfFile::addSymbol(std::string& inName, uint32_t inByteSize, Artifact newArtifact)
+Symbol* ElfFile::addSymbol(std::string& inName, uint32_t inByteSize, Artifact newArtifact, Namespace* symbolNamepace)
 {
-    Symbol* symbol = getSymbol(inName);
+    Symbol* symbol = getSymbol(inName, symbolNamepace);
 
     if (symbol == nullptr)
     {
         std::unique_ptr<Symbol> newSymbol = std::make_unique<Symbol>(*this, inName, inByteSize, newArtifact);
+        newSymbol->setNamespace(symbolNamepace);
 
         symbols.push_back(std::move(newSymbol));
 
@@ -238,4 +252,47 @@ void      ElfFile::setElfClass(int newelfClass)
     }
 }
 
-int ElfFile::getElfClass() { return elfClass; }
+int  ElfFile::getElfClass() { return elfClass; }
+
+void ElfFile::addNamespace(Namespace newNamespace)
+{
+    // Check if the namespace already exists
+    // for (auto&& namespace_ : namespaces)
+    // {
+    //     if (namespace_->getName() == newNamespace.getName())
+    //     {
+    //         // Logger::getInstance().logError("Namespace already exists in the list");
+    //         return;
+    //     }
+    // }
+    namespaces.push_back(std::make_unique<Namespace>(newNamespace));
+}
+
+void ElfFile::addNamespace(std::unique_ptr<Namespace> newNamespace)
+{
+    // Check if the namespace already exists
+    for (auto&& namespace_ : namespaces)
+    {
+        if (namespace_->getFullyQualifiedName() == newNamespace->getFullyQualifiedName())
+        {
+            // Logger::getInstance().logError("Namespace already exists in the list");
+            return;
+        }
+    }
+    namespaces.push_back(std::move(newNamespace));
+}
+
+Namespace* ElfFile::getNamespace(std::string name)
+{
+    for (auto&& namespace_ : namespaces)
+    {
+        if (namespace_->getFullyQualifiedName() == name)
+        {
+            return namespace_.get();
+        }
+    }
+
+    return nullptr;
+}
+
+std::vector<std::unique_ptr<Namespace>>& ElfFile::getNamespaces() { return namespaces; }

src/ElfFile.h

@@ -21,13 +21,15 @@
 #include "Field.h"
 #include "Juicer.h"
 #include "Logger.h"
+#include "Namespace.hpp"
 #include "Variable.h"
 #include "dwarf.h"
 
 class Symbol;
 class Field;
 class Enumeration;
 class Variable;
+class Namespace;
 
 /**
  * The elf class contains an "module" with a user-defined name.
@@ -46,25 +48,25 @@ class ElfFile
    public:
     ElfFile(std::string &name);
     virtual ~ElfFile();
-    std::vector<std::unique_ptr<Symbol>>              &getSymbols();
-
-    std::string                                        getName() const;
-    uint32_t                                           getId(void) const;
-    void                                               setId(uint32_t newId);
-    Symbol                                            *addSymbol(std::string &name, uint32_t byte_size, Artifact newArtifact);
-    Symbol                                            *addSymbol(std::string &inName, uint32_t inByteSize, Artifact newArtifact, Symbol *targetSymbol);
-    std::vector<Field *>                               getFields();
-    std::vector<Enumeration *>                         getEnumerations();
-    Symbol                                            *getSymbol(std::string &name);
-    const std::string                                 &getDate() const;
-    void                                               setDate(const std::string &date);
-    bool                                               isLittleEndian() const;
-    void                                               isLittleEndian(bool littleEndian);
-    void                                               setMD5(std::string newID);
-    std::string                                        getMD5() const;
-    void                                               addDefineMacro(DefineMacro newMacro);
-
-    const std::vector<DefineMacro>                    &getDefineMacros() const;
+    std::vector<std::unique_ptr<Symbol>> &getSymbols();
+
+    std::string                           getName() const;
+    uint32_t                              getId(void) const;
+    void                                  setId(uint32_t newId);
+    Symbol                               *addSymbol(std::string &name, uint32_t byte_size, Artifact newArtifact, Namespace *symbolNamepace);
+    Symbol                         *addSymbol(std::string &inName, uint32_t inByteSize, Artifact newArtifact, Symbol *targetSymbol, Namespace *symbolNamepace);
+    std::vector<Field *>            getFields();
+    std::vector<Enumeration *>      getEnumerations();
+    Symbol                         *getSymbol(std::string &name, Namespace *ns);
+    const std::string              &getDate() const;
+    void                            setDate(const std::string &date);
+    bool                            isLittleEndian() const;
+    void                            isLittleEndian(bool littleEndian);
+    void                            setMD5(std::string newID);
+    std::string                     getMD5() const;
+    void                            addDefineMacro(DefineMacro newMacro);
+
+    const std::vector<DefineMacro> &getDefineMacros() const;
 
     const std::map<std::string, std::vector<uint8_t>> &getInitializedSymbolData() const;
 
@@ -91,6 +93,11 @@ class ElfFile
 
     void                                               setElfClass(int newelfClass);
 
+    void                                               addNamespace(Namespace newNamespace);
+    void                                               addNamespace(std::unique_ptr<Namespace> newNamespace);
+    std::vector<std::unique_ptr<Namespace>>           &getNamespaces();
+    Namespace                                         *getNamespace(std::string name);
+
    private:
     std::string                                 md5;
     /**
@@ -155,7 +162,7 @@ class ElfFile
 
     };
 
-    Encoding &getDWARFEncoding();
+    Encoding                               &getDWARFEncoding();
 
     /**
      * @brief elfClass
@@ -164,7 +171,9 @@ class ElfFile
      * #define ELFCLASS32	1		 32-bit objects
      * #define ELFCLASS64	2		 64-bit objects
      */
-    int       elfClass{ELFCLASSNONE};
+    int                                     elfClass{ELFCLASSNONE};
+
+    std::vector<std::unique_ptr<Namespace>> namespaces{};
 };
 
 #endif /* ElfFile_H_ */