diff options
Diffstat (limited to 'src/CompilerKit')
13 files changed, 18 insertions, 17 deletions
diff --git a/src/CompilerKit/src/Backends/Assembler+32x0.cpp b/src/CompilerKit/src/Backends/Assembler+32x0.cpp index a2eb191..c8e18bd 100644 --- a/src/CompilerKit/src/Backends/Assembler+32x0.cpp +++ b/src/CompilerKit/src/Backends/Assembler+32x0.cpp @@ -24,7 +24,7 @@ #include <CompilerKit/AST.h> #include <CompilerKit/Detail/32x0.h> #include <CompilerKit/PEF.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/CompilerKit/src/Backends/Assembler+64x0.cpp b/src/CompilerKit/src/Backends/Assembler+64x0.cpp index 4f33246..f6e77c1 100644 --- a/src/CompilerKit/src/Backends/Assembler+64x0.cpp +++ b/src/CompilerKit/src/Backends/Assembler+64x0.cpp @@ -24,7 +24,7 @@ #include <CompilerKit/AST.h> #include <CompilerKit/Detail/64x0.h> #include <CompilerKit/PEF.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> static char kOutputArch = CompilerKit::kPefArch64000; diff --git a/src/CompilerKit/src/Backends/Assembler+AMD64.cpp b/src/CompilerKit/src/Backends/Assembler+AMD64.cpp index e0f7eef..46c3529 100644 --- a/src/CompilerKit/src/Backends/Assembler+AMD64.cpp +++ b/src/CompilerKit/src/Backends/Assembler+AMD64.cpp @@ -32,7 +32,7 @@ #include <CompilerKit/AST.h> #include <CompilerKit/Detail/AMD64.h> #include <CompilerKit/PEF.h> -#include <CompilerKit/Utilities/Assembler.h> +#include <CompilerKit/Utils/Assembler.h> static char kOutputArch = CompilerKit::kPefArchAMD64; diff --git a/src/CompilerKit/src/Backends/Assembler+ARM64.cpp b/src/CompilerKit/src/Backends/Assembler+ARM64.cpp index 1c25338..ca16060 100644 --- a/src/CompilerKit/src/Backends/Assembler+ARM64.cpp +++ b/src/CompilerKit/src/Backends/Assembler+ARM64.cpp @@ -24,7 +24,7 @@ #include <CompilerKit/Detail/Config.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/PEF.h> -#include <CompilerKit/Utilities/Assembler.h> +#include <CompilerKit/Utils/Assembler.h> constexpr auto kArm64Alignment = 0x1U; diff --git a/src/CompilerKit/src/Backends/Assembler+PowerPC.cpp b/src/CompilerKit/src/Backends/Assembler+PowerPC.cpp index 1c05a1c..fc49ba2 100644 --- a/src/CompilerKit/src/Backends/Assembler+PowerPC.cpp +++ b/src/CompilerKit/src/Backends/Assembler+PowerPC.cpp @@ -24,7 +24,7 @@ #include <CompilerKit/Detail/Power64.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/PEF.h> -#include <CompilerKit/Utilities/Assembler.h> +#include <CompilerKit/Utils/Assembler.h> constexpr auto kPowerIPAlignment = 0x1U; diff --git a/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp b/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp index 85e12ea..36606a4 100644 --- a/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp +++ b/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp @@ -10,7 +10,7 @@ #include <CompilerKit/Detail/AMD64.h> #include <CompilerKit/PEF.h> #include <CompilerKit/UUID.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> /* Nectar Compiler Driver. */ /* This is part of the CompilerKit. */ diff --git a/src/CompilerKit/src/Frontends/NectarCompiler+Chk.cpp b/src/CompilerKit/src/Frontends/NectarCompiler+Chk.cpp index da7af9a..82685ea 100644 --- a/src/CompilerKit/src/Frontends/NectarCompiler+Chk.cpp +++ b/src/CompilerKit/src/Frontends/NectarCompiler+Chk.cpp @@ -10,7 +10,7 @@ #include <CompilerKit/Detail/AMD64.h> #include <CompilerKit/PEF.h> #include <CompilerKit/UUID.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> /* Nectar Compiler Check Driver. */ /* This is part of the CompilerKit. */ @@ -19,7 +19,8 @@ using namespace CompilerKit; static bool kInIfBody = false; -static bool kInCtxBody = false; +static bool kInElseBody = false; +static bool kInTraitBody = false; CK_IMPORT_C bool NectarCheckFrontend(CompilerKit::STLString& input) { if (input.empty()) return false; @@ -81,7 +82,7 @@ CK_IMPORT_C bool NectarCheckFrontend(CompilerKit::STLString& input) { } if (input == "}" || input == "}\n" || input == "}\r\n") { - if (kInCtxBody) kInCtxBody = false; + if (kInTraitBody) kInTraitBody = false; } return true; diff --git a/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp b/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp index 5d15a77..3fb8503 100644 --- a/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp +++ b/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp @@ -10,7 +10,7 @@ #include <CompilerKit/AST.h> #include <CompilerKit/UUID.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> /* Nectar Compiler Driver. */ /* This is part of the CompilerKit. */ diff --git a/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp b/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp index 823fbd4..1a97660 100644 --- a/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp +++ b/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp @@ -18,7 +18,7 @@ #include <CompilerKit/MachO.h> #include <CompilerKit/PEF.h> #include <CompilerKit/UUID.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> #define kLatestOSX (15) diff --git a/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp b/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp index 34333a3..250ec75 100644 --- a/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp +++ b/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp @@ -16,7 +16,7 @@ #include <CompilerKit/ErrorID.h> #include <CompilerKit/PEF.h> #include <CompilerKit/UUID.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> #define kLinkerPefNoCpu (0U) #define kLinkerPefNoSubCpu (0U) diff --git a/src/CompilerKit/src/Optimizers/NectarOptimize+AMD64.cpp b/src/CompilerKit/src/Optimizers/NectarOptimize+AMD64.cpp index e350076..f754fbb 100644 --- a/src/CompilerKit/src/Optimizers/NectarOptimize+AMD64.cpp +++ b/src/CompilerKit/src/Optimizers/NectarOptimize+AMD64.cpp @@ -10,7 +10,7 @@ #include <CompilerKit/Detail/AMD64.h> #include <CompilerKit/PEF.h> #include <CompilerKit/UUID.h> -#include <CompilerKit/Utilities/Compiler.h> +#include <CompilerKit/Utils/Compiler.h> /* Nectar Compiler Optimizing Driver. */ /* This is part of the CompilerKit. */ diff --git a/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cpp b/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cpp index 6cd2167..50a6c21 100644 --- a/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cpp +++ b/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cpp @@ -8,8 +8,8 @@ #include <CompilerKit/Detail/Config.h> #include <CompilerKit/ErrorID.h> -#include <CompilerKit/Utilities/Compiler.h> -#include <CompilerKit/Utilities/DLL.h> +#include <CompilerKit/Utils/Compiler.h> +#include <CompilerKit/Utils/DLL.h> #include <gtest/gtest.h> diff --git a/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cpp b/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cpp index e67916a..1af43d9 100644 --- a/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cpp +++ b/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cpp @@ -8,8 +8,8 @@ #include <CompilerKit/Detail/Config.h> #include <CompilerKit/ErrorID.h> -#include <CompilerKit/Utilities/Compiler.h> -#include <CompilerKit/Utilities/DLL.h> +#include <CompilerKit/Utils/Compiler.h> +#include <CompilerKit/Utils/DLL.h> #include <gtest/gtest.h> |