Remove `DeclarationPadding` and `DeclarationAlignment::None` (#186)

* Nuke DeclarationPadding

* Remove DeclarationAlignment::None

* Fix AddDeclaration memory leaks

* Run formatter

* Remove extra AddDeclarationPlaceholder

* Revert "Remove extra AddDeclarationPlaceholder"

This reverts commit 7a5d6a19d80bb246e0a6c8fde009b2a00a84ef96.

1 files changed, 5 insertions, 28 deletions

diff --git a/ZAPD/Declaration.cpp b/ZAPD/Declaration.cpp
index 63a3918..dc4954e 100644
--- a/ZAPD/Declaration.cpp
+++ b/ZAPD/Declaration.cpp
@@ -1,27 +1,15 @@
 #include "Declaration.h"
 
-Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize,
-                         std::string nText)
+Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nText)
 {
 	alignment = nAlignment;
-	padding = nPadding;
 	size = nSize;
 	text = nText;
 }
 
 Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType,
                          std::string nVarName, bool nIsArray, std::string nText)
-	: Declaration(nAlignment, DeclarationPadding::None, nSize, nText)
-{
-	varType = nVarType;
-	varName = nVarName;
-	isArray = nIsArray;
-}
-
-Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize,
-                         std::string nVarType, std::string nVarName, bool nIsArray,
-                         std::string nText)
-	: Declaration(nAlignment, nPadding, nSize, nText)
+	: Declaration(nAlignment, nSize, nText)
 {
 	varType = nVarType;
 	varName = nVarName;
@@ -31,7 +19,7 @@ Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPa
 Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType,
                          std::string nVarName, bool nIsArray, size_t nArrayItemCnt,
                          std::string nText)
-	: Declaration(nAlignment, DeclarationPadding::None, nSize, nText)
+	: Declaration(nAlignment, nSize, nText)
 {
 	varType = nVarType;
 	varName = nVarName;
@@ -42,7 +30,7 @@ Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::str
 Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType,
                          std::string nVarName, bool nIsArray, std::string nArrayItemCntStr,
                          std::string nText)
-	: Declaration(nAlignment, DeclarationPadding::None, nSize, nText)
+	: Declaration(nAlignment, nSize, nText)
 {
 	varType = nVarType;
 	varName = nVarName;
@@ -58,20 +46,9 @@ Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::str
 	isExternal = nIsExternal;
 }
 
-Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize,
-                         std::string nVarType, std::string nVarName, bool nIsArray,
-                         size_t nArrayItemCnt, std::string nText)
-	: Declaration(nAlignment, nPadding, nSize, nText)
-{
-	varType = nVarType;
-	varName = nVarName;
-	isArray = nIsArray;
-	arrayItemCnt = nArrayItemCnt;
-}
-
 Declaration::Declaration(std::string nIncludePath, size_t nSize, std::string nVarType,
                          std::string nVarName)
-	: Declaration(DeclarationAlignment::None, DeclarationPadding::None, nSize, "")
+	: Declaration(DeclarationAlignment::Align4, nSize, "")
 {
 	includePath = nIncludePath;
 	varType = nVarType;