From 028bd1d4b8b57f2b878a519f7d9a5f67c13b8136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 27 Dec 2023 23:18:24 +0200
Subject: [PATCH] Move Label to base folder

---
 CMakeLists.txt                           | 2 +-
 include/zasm/{program => base}/label.hpp | 0
 include/zasm/program/embeddedlabel.hpp   | 3 +--
 include/zasm/program/labeldata.hpp       | 2 +-
 include/zasm/program/memory.hpp          | 3 +--
 include/zasm/program/node.hpp            | 2 +-
 include/zasm/program/operand.hpp         | 2 +-
 include/zasm/program/program.hpp         | 2 +-
 src/zasm/src/encoder/encoder.context.hpp | 2 +-
 src/zasm/src/program/program.state.hpp   | 4 ++--
 10 files changed, 10 insertions(+), 12 deletions(-)
 rename include/zasm/{program => base}/label.hpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 366960b..58f739d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ set(zasm_SOURCES
 	"src/zasm/src/program/saverestoretypes.hpp"
 	"include/zasm/base/immediate.hpp"
 	"include/zasm/base/instruction.hpp"
+	"include/zasm/base/label.hpp"
 	"include/zasm/base/meta.hpp"
 	"include/zasm/base/mode.hpp"
 	"include/zasm/base/register.hpp"
@@ -112,7 +113,6 @@ set(zasm_SOURCES
 	"include/zasm/program/data.hpp"
 	"include/zasm/program/embeddedlabel.hpp"
 	"include/zasm/program/instruction.hpp"
-	"include/zasm/program/label.hpp"
 	"include/zasm/program/labeldata.hpp"
 	"include/zasm/program/memory.hpp"
 	"include/zasm/program/node.hpp"
diff --git a/include/zasm/program/label.hpp b/include/zasm/base/label.hpp
similarity index 100%
rename from include/zasm/program/label.hpp
rename to include/zasm/base/label.hpp
diff --git a/include/zasm/program/embeddedlabel.hpp b/include/zasm/program/embeddedlabel.hpp
index 7d314a5..d7791b1 100644
--- a/include/zasm/program/embeddedlabel.hpp
+++ b/include/zasm/program/embeddedlabel.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "label.hpp"
-
 #include <cstddef>
 #include <cstdint>
+#include <zasm/base/label.hpp>
 #include <zasm/core/bitsize.hpp>
 
 namespace zasm
diff --git a/include/zasm/program/labeldata.hpp b/include/zasm/program/labeldata.hpp
index f9b0575..4371fe2 100644
--- a/include/zasm/program/labeldata.hpp
+++ b/include/zasm/program/labeldata.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <cstdint>
+#include <zasm/base/label.hpp>
 #include <zasm/core/enumflags.hpp>
-#include <zasm/program/label.hpp>
 
 namespace zasm
 {
diff --git a/include/zasm/program/memory.hpp b/include/zasm/program/memory.hpp
index fdd915b..0cfb2eb 100644
--- a/include/zasm/program/memory.hpp
+++ b/include/zasm/program/memory.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "label.hpp"
-
 #include <cstdint>
 #include <limits>
+#include <zasm/base/label.hpp>
 #include <zasm/base/mode.hpp>
 #include <zasm/base/register.hpp>
 #include <zasm/core/bitsize.hpp>
diff --git a/include/zasm/program/node.hpp b/include/zasm/program/node.hpp
index 0f39acb..3f16c77 100644
--- a/include/zasm/program/node.hpp
+++ b/include/zasm/program/node.hpp
@@ -4,13 +4,13 @@
 #include "data.hpp"
 #include "embeddedlabel.hpp"
 #include "instruction.hpp"
-#include "label.hpp"
 #include "section.hpp"
 #include "sentinel.hpp"
 
 #include <climits>
 #include <cstddef>
 #include <variant>
+#include <zasm/base/label.hpp>
 #include <zasm/core/enumflags.hpp>
 
 namespace zasm
diff --git a/include/zasm/program/operand.hpp b/include/zasm/program/operand.hpp
index d4db535..362af4b 100644
--- a/include/zasm/program/operand.hpp
+++ b/include/zasm/program/operand.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "label.hpp"
 #include "memory.hpp"
 
 #include <cstdint>
 #include <variant>
 #include <zasm/base/immediate.hpp>
+#include <zasm/base/label.hpp>
 #include <zasm/base/register.hpp>
 #include <zasm/core/enumflags.hpp>
 
diff --git a/include/zasm/program/program.hpp b/include/zasm/program/program.hpp
index 8f9a816..4ec3acc 100644
--- a/include/zasm/program/program.hpp
+++ b/include/zasm/program/program.hpp
@@ -2,13 +2,13 @@
 
 #include "data.hpp"
 #include "embeddedlabel.hpp"
-#include "label.hpp"
 #include "node.hpp"
 #include "section.hpp"
 
 #include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <zasm/base/label.hpp>
 #include <zasm/base/mode.hpp>
 #include <zasm/core/errors.hpp>
 #include <zasm/core/expected.hpp>
diff --git a/src/zasm/src/encoder/encoder.context.hpp b/src/zasm/src/encoder/encoder.context.hpp
index 008dd1e..7370030 100644
--- a/src/zasm/src/encoder/encoder.context.hpp
+++ b/src/zasm/src/encoder/encoder.context.hpp
@@ -5,8 +5,8 @@
 #include <cstdint>
 #include <optional>
 #include <vector>
+#include <zasm/base/label.hpp>
 #include <zasm/core/stringpool.hpp>
-#include <zasm/program/label.hpp>
 #include <zasm/program/section.hpp>
 
 namespace zasm
diff --git a/src/zasm/src/program/program.state.hpp b/src/zasm/src/program/program.state.hpp
index 73ce688..3740289 100644
--- a/src/zasm/src/program/program.state.hpp
+++ b/src/zasm/src/program/program.state.hpp
@@ -1,12 +1,10 @@
 #pragma once
 
-#include "zasm/base/mode.hpp"
 #include "zasm/core/enumflags.hpp"
 #include "zasm/core/objectpool.hpp"
 #include "zasm/core/stringpool.hpp"
 #include "zasm/encoder/encoder.hpp"
 #include "zasm/program/data.hpp"
-#include "zasm/program/label.hpp"
 #include "zasm/program/labeldata.hpp"
 #include "zasm/program/node.hpp"
 #include "zasm/program/section.hpp"
@@ -14,6 +12,8 @@
 #include <Zydis/Zydis.h>
 #include <cstddef>
 #include <vector>
+#include <zasm/base/label.hpp>
+#include <zasm/base/mode.hpp>
 
 namespace zasm
 {