diff options
Diffstat (limited to 'ZAPD/Declaration.cpp')
| -rw-r--r-- | ZAPD/Declaration.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/ZAPD/Declaration.cpp b/ZAPD/Declaration.cpp index eafe948..d2a86ff 100644 --- a/ZAPD/Declaration.cpp +++ b/ZAPD/Declaration.cpp @@ -3,26 +3,29 @@ #include "Globals.h" #include "Utils/StringHelper.h" -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const std::string& nText) +Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, + const std::string& nText) { + address = nAddress; alignment = nAlignment; size = nSize; text = nText; } -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const std::string& nVarType, - const std::string& nVarName, bool nIsArray, const std::string& nText) - : Declaration(nAlignment, nSize, nText) +Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, + const std::string& nVarType, const std::string& nVarName, bool nIsArray, + const std::string& nText) + : Declaration(nAddress, nAlignment, nSize, nText) { varType = nVarType; varName = nVarName; isArray = nIsArray; } -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const std::string& nVarType, - const std::string& nVarName, bool nIsArray, size_t nArrayItemCnt, - const std::string& nText) - : Declaration(nAlignment, nSize, nText) +Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, + const std::string& nVarType, const std::string& nVarName, bool nIsArray, + size_t nArrayItemCnt, const std::string& nText) + : Declaration(nAddress, nAlignment, nSize, nText) { varType = nVarType; varName = nVarName; @@ -30,10 +33,10 @@ Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const st arrayItemCnt = nArrayItemCnt; } -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const std::string& nVarType, - const std::string& nVarName, bool nIsArray, +Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, + const std::string& nVarType, const std::string& nVarName, bool nIsArray, const std::string& nArrayItemCntStr, const std::string& nText) - : Declaration(nAlignment, nSize, nText) + : Declaration(nAddress, nAlignment, nSize, nText) { varType = nVarType; varName = nVarName; @@ -41,17 +44,17 @@ Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const st arrayItemCntStr = nArrayItemCntStr; } -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, const std::string& nVarType, - const std::string& nVarName, bool nIsArray, size_t nArrayItemCnt, - const std::string& nText, bool nIsExternal) - : Declaration(nAlignment, nSize, nVarType, nVarName, nIsArray, nArrayItemCnt, nText) +Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, + const std::string& nVarType, const std::string& nVarName, bool nIsArray, + size_t nArrayItemCnt, const std::string& nText, bool nIsExternal) + : Declaration(nAddress, nAlignment, nSize, nVarType, nVarName, nIsArray, nArrayItemCnt, nText) { isExternal = nIsExternal; } -Declaration::Declaration(const std::string& nIncludePath, size_t nSize, const std::string& nVarType, - const std::string& nVarName) - : Declaration(DeclarationAlignment::Align4, nSize, "") +Declaration::Declaration(offset_t nAddress, const std::string& nIncludePath, size_t nSize, + const std::string& nVarType, const std::string& nVarName) + : Declaration(nAddress, DeclarationAlignment::Align4, nSize, "") { includePath = nIncludePath; varType = nVarType; |