diff options
Diffstat (limited to 'src')
42 files changed, 87 insertions, 91 deletions
diff --git a/src/CompilerKit/AE.h b/src/CompilerKit/AE.h index 438bb36..a1f56e6 100644 --- a/src/CompilerKit/AE.h +++ b/src/CompilerKit/AE.h @@ -10,7 +10,7 @@ #ifndef _NECTI_AE_H_ #define _NECTI_AE_H_ -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #define kAEIdentVersion (0x0122) diff --git a/src/CompilerKit/AST.h b/src/CompilerKit/AST.h index 74db957..3cb5a08 100644 --- a/src/CompilerKit/AST.h +++ b/src/CompilerKit/AST.h @@ -22,7 +22,7 @@ struct CompilerKeyword; /// =========================================================== /// enum KeywordKind { - kKeywordKindReserved = 0, + kKeywordKindReserved = 0, kKeywordKindNamespace = 100, kKeywordKindFunctionStart, kKeywordKindFunctionEnd, diff --git a/src/CompilerKit/Compiler.h b/src/CompilerKit/Compiler.h index 1f24370..b02f1ef 100644 --- a/src/CompilerKit/Compiler.h +++ b/src/CompilerKit/Compiler.h @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/Macros.h> #include <CompilerKit/StringKit.h> diff --git a/src/CompilerKit/Defines.h b/src/CompilerKit/Config.h index d036767..59efcf0 100644 --- a/src/CompilerKit/Defines.h +++ b/src/CompilerKit/Config.h @@ -8,7 +8,7 @@ #define __NECTI_DEFINES_H__ /// =========================================================== /// -/// @file Defines.h +/// @file Config.h /// @author Amlal El Mahrouss /// @brief Basic defines and types for CompilerKit. /// =========================================================== /// @@ -91,8 +91,7 @@ #define kObjectFileExt ".obj" #define kBinaryFileExt ".bin" -#define kAsmFileExts \ - { ".64x", ".32x", ".masm", ".s", ".S", ".asm", ".x64" } +#define kAsmFileExts {".64x", ".32x", ".masm", ".s", ".S", ".asm", ".x64"} #define kAsmFileExtsMax (7U) diff --git a/src/CompilerKit/ErrorID.h b/src/CompilerKit/ErrorID.h index 35039ab..1b1e8e8 100644 --- a/src/CompilerKit/ErrorID.h +++ b/src/CompilerKit/ErrorID.h @@ -9,7 +9,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> /// =========================================================== /// /// @file ErrorID.h diff --git a/src/CompilerKit/ErrorOr.h b/src/CompilerKit/ErrorOr.h index ac42c19..54c1c45 100644 --- a/src/CompilerKit/ErrorOr.h +++ b/src/CompilerKit/ErrorOr.h @@ -15,7 +15,7 @@ /// @brief ErrorOr for CompilerKit. /// =========================================================== /// -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/Ref.h> #include <CompilerKit/StringKit.h> diff --git a/src/CompilerKit/PEF.h b/src/CompilerKit/PEF.h index edf8f5d..f69102a 100644 --- a/src/CompilerKit/PEF.h +++ b/src/CompilerKit/PEF.h @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> // @file PEF.h // @brief Preferred Executable Format diff --git a/src/CompilerKit/Ref.h b/src/CompilerKit/Ref.h index 66ed60f..703fde8 100644 --- a/src/CompilerKit/Ref.h +++ b/src/CompilerKit/Ref.h @@ -10,7 +10,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> namespace CompilerKit { /// @author Amlal El Mahrouss diff --git a/src/CompilerKit/StringKit.h b/src/CompilerKit/StringKit.h index f93b135..e4bc1c1 100644 --- a/src/CompilerKit/StringKit.h +++ b/src/CompilerKit/StringKit.h @@ -10,7 +10,7 @@ #ifndef __NECTI_STRINGKIT__ #define __NECTI_STRINGKIT__ -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/ErrorOr.h> /// =========================================================== /// diff --git a/src/CompilerKit/UUID.h b/src/CompilerKit/UUID.h index 98733fd..2993b8b 100644 --- a/src/CompilerKit/UUID.h +++ b/src/CompilerKit/UUID.h @@ -165,7 +165,7 @@ namespace Detail { process_byte(static_cast<unsigned char>((bitCount >> 24) & 0xFF)); process_byte(static_cast<unsigned char>((bitCount >> 16) & 0xFF)); process_byte(static_cast<unsigned char>((bitCount >> 8) & 0xFF)); - process_byte(static_cast<unsigned char>((bitCount) &0xFF)); + process_byte(static_cast<unsigned char>((bitCount) & 0xFF)); memcpy(digest, m_digest, 5 * sizeof(uint32_t)); return digest; diff --git a/src/CompilerKit/XCOFF.h b/src/CompilerKit/XCOFF.h index a61949a..e9c1f2e 100644 --- a/src/CompilerKit/XCOFF.h +++ b/src/CompilerKit/XCOFF.h @@ -14,7 +14,7 @@ #ifndef _NECTI_XCOFF_H_ #define _NECTI_XCOFF_H_ -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #define kXCOFF64Magic 0x01F7 diff --git a/src/CompilerKit/impl/32x0.h b/src/CompilerKit/impl/32x0.h index 1ad13ee..5996708 100644 --- a/src/CompilerKit/impl/32x0.h +++ b/src/CompilerKit/impl/32x0.h @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> // @brief Open32x0 support. // @file impl/32x0.h diff --git a/src/CompilerKit/impl/64x0.h b/src/CompilerKit/impl/64x0.h index ce2ae89..cc521f1 100644 --- a/src/CompilerKit/impl/64x0.h +++ b/src/CompilerKit/impl/64x0.h @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <vector> // @brief Open64x0 support. diff --git a/src/CompilerKit/impl/Aarch64.h b/src/CompilerKit/impl/Aarch64.h index c1e9c77..be052c0 100644 --- a/src/CompilerKit/impl/Aarch64.h +++ b/src/CompilerKit/impl/Aarch64.h @@ -6,7 +6,7 @@ Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <stdint.h> /// @brief ARM64 encoding support. diff --git a/src/CompilerKit/impl/X64.h b/src/CompilerKit/impl/X64.h index ccbcf13..e69d509 100644 --- a/src/CompilerKit/impl/X64.h +++ b/src/CompilerKit/impl/X64.h @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> // @brief AMD64 support. // @file impl/X64.h diff --git a/src/CompilerKit/src/Backend/AssemblerARM64.cc b/src/CompilerKit/src/Backend/AssemblerARM64.cc index e50b8ec..6aa8dea 100644 --- a/src/CompilerKit/src/Backend/AssemblerARM64.cc +++ b/src/CompilerKit/src/Backend/AssemblerARM64.cc @@ -20,8 +20,8 @@ #endif #include <CompilerKit/AE.h> -#include <CompilerKit/ErrorID.h> #include <CompilerKit/AST.h> +#include <CompilerKit/ErrorID.h> #include <CompilerKit/PEF.h> #include <CompilerKit/Version.h> #include <CompilerKit/impl/Aarch64.h> diff --git a/src/CompilerKit/src/Backend/AssemblerPowerPC.cc b/src/CompilerKit/src/Backend/AssemblerPowerPC.cc index 7074123..a845f8b 100644 --- a/src/CompilerKit/src/Backend/AssemblerPowerPC.cc +++ b/src/CompilerKit/src/Backend/AssemblerPowerPC.cc @@ -20,8 +20,8 @@ #endif #include <CompilerKit/AE.h> -#include <CompilerKit/ErrorID.h> #include <CompilerKit/AST.h> +#include <CompilerKit/ErrorID.h> #include <CompilerKit/PEF.h> #include <CompilerKit/Version.h> #include <CompilerKit/impl/PowerPC.h> diff --git a/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc b/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc index c0f366d..c0addff 100644 --- a/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc +++ b/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc @@ -762,8 +762,7 @@ class AssemblyCPlusPlusInterfaceAMD64 final CK_ASSEMBLY_INTERFACE { ///////////////////////////////////////////////////////////////////////////////////////// -#define kExtListCxx \ - { ".cpp", ".cxx", ".cc", ".c++", ".cp" } +#define kExtListCxx {".cpp", ".cxx", ".cc", ".c++", ".cp"} NECTI_MODULE(CompilerCPlusPlusAMD64) { Boolean skip = false; diff --git a/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc b/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc index 4236ceb..7c56624 100644 --- a/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc +++ b/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc @@ -15,7 +15,7 @@ #include <CompilerKit/AE.h> #include <CompilerKit/Compiler.h> -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/PEF.h> #include <CompilerKit/UUID.h> diff --git a/src/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc b/src/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc index 980f0e0..4cf42dc 100644 --- a/src/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc +++ b/src/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc @@ -9,8 +9,8 @@ /// BUGS: 0 -#include <CompilerKit/ErrorID.h> #include <CompilerKit/AST.h> +#include <CompilerKit/ErrorID.h> #include <algorithm> #include <filesystem> #include <fstream> diff --git a/src/CompilerKit/src/StringKit.cc b/src/CompilerKit/src/StringKit.cc index 45e50a9..95326bc 100644 --- a/src/CompilerKit/src/StringKit.cc +++ b/src/CompilerKit/src/StringKit.cc @@ -74,7 +74,7 @@ NEString NEStringBuilder::FromInt(const char* fmt, int i) { const SizeType res_len = string_length(result); NEString output(fmt_len + res_len); - bool inserted = false; + bool inserted = false; for (SizeType idx = 0; idx < fmt_len; ++idx) { if (!inserted && fmt[idx] == '%') { @@ -96,7 +96,7 @@ NEString NEStringBuilder::FromBool(const char* fmt, bool val) { const SizeType res_len = string_length(boolean_expr); NEString output(fmt_len + res_len); - bool inserted = false; + bool inserted = false; for (SizeType idx = 0; idx < fmt_len; ++idx) { if (!inserted && fmt[idx] == '%') { @@ -125,7 +125,7 @@ NEString NEStringBuilder::Format(const char* fmt, const char* fmtRight) { const SizeType rhs_len = string_length(fmtRight); NEString output(fmt_len + rhs_len); - bool inserted = false; + bool inserted = false; for (SizeType idx = 0; idx < fmt_len; ++idx) { if (!inserted && fmt[idx] == '%') { diff --git a/src/CompilerKit/utils/AsmUtils.h b/src/CompilerKit/utils/AsmUtils.h index 83086e3..40fa133 100644 --- a/src/CompilerKit/utils/AsmUtils.h +++ b/src/CompilerKit/utils/AsmUtils.h @@ -6,8 +6,8 @@ #pragma once -#include <CompilerKit/Compiler.h> #include <CompilerKit/AST.h> +#include <CompilerKit/Compiler.h> #include <CompilerKit/utils/CompilerUtils.h> using namespace CompilerKit; diff --git a/src/CompilerKit/utils/CompilerUtils.h b/src/CompilerKit/utils/CompilerUtils.h index 607418d..8ae6291 100644 --- a/src/CompilerKit/utils/CompilerUtils.h +++ b/src/CompilerKit/utils/CompilerUtils.h @@ -6,9 +6,9 @@ #pragma once +#include <CompilerKit/AST.h> #include <CompilerKit/Compiler.h> #include <CompilerKit/ErrorID.h> -#include <CompilerKit/AST.h> #include <CompilerKit/Version.h> #include <ThirdParty/Dialogs.h> #include <iostream> diff --git a/src/CompilerKit/utils/DylibHelpers.h b/src/CompilerKit/utils/DylibHelpers.h index ab58fc7..ca7af38 100644 --- a/src/CompilerKit/utils/DylibHelpers.h +++ b/src/CompilerKit/utils/DylibHelpers.h @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <dlfcn.h> #include <mutex> diff --git a/src/DebuggerKit/Platform.h b/src/DebuggerKit/Config.h index f878845..2697832 100644 --- a/src/DebuggerKit/Platform.h +++ b/src/DebuggerKit/Config.h @@ -10,7 +10,7 @@ /// @author Amlal El Mahrouss /// =========================================================== /// -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <arpa/inet.h> #include <sys/socket.h> diff --git a/src/DebuggerKit/DebuggerContract.h b/src/DebuggerKit/DebuggerContract.h index 2114041..2db0526 100644 --- a/src/DebuggerKit/DebuggerContract.h +++ b/src/DebuggerKit/DebuggerContract.h @@ -6,7 +6,7 @@ #pragma once -#include <DebuggerKit/Platform.h> +#include <DebuggerKit/Config.h> #define DK_DEBUGGER_CONTRACT : public ::DebuggerKit::DebuggerContract @@ -46,7 +46,7 @@ class DebuggerContract { virtual std::unordered_map<uintptr_t, uintptr_t>& Get() { return m_breakpoints; } protected: - ProcessID m_pid{(ProcessID)~0}; + ProcessID m_pid{(ProcessID) ~0}; std::unordered_map<uintptr_t, uintptr_t> m_breakpoints; }; } // namespace DebuggerKit diff --git a/src/DebuggerKit/NeKernelContract.h b/src/DebuggerKit/NeKernelContract.h index d048303..f1e294d 100644 --- a/src/DebuggerKit/NeKernelContract.h +++ b/src/DebuggerKit/NeKernelContract.h @@ -12,7 +12,7 @@ #ifdef DK_NEKERNEL_DEBUGGER -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <DebuggerKit/DebuggerContract.h> namespace DebuggerKit::NeKernel { diff --git a/src/DebuggerKit/src/NeKernelContract.cc b/src/DebuggerKit/src/NeKernelContract.cc index 38f327d..84a25eb 100644 --- a/src/DebuggerKit/src/NeKernelContract.cc +++ b/src/DebuggerKit/src/NeKernelContract.cc @@ -9,9 +9,9 @@ /// @author Amlal El Mahrouss /// @brief Kernel Debugger Protocol -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> +#include <DebuggerKit/Config.h> #include <DebuggerKit/NeKernelContract.h> -#include <DebuggerKit/Platform.h> #include <ThirdParty/Dialogs.h> using namespace DebuggerKit::NeKernel; diff --git a/src/DebuggerKit/src/NeKernelContractCLI.cc b/src/DebuggerKit/src/NeKernelContractCLI.cc index fc13a53..6c55c44 100644 --- a/src/DebuggerKit/src/NeKernelContractCLI.cc +++ b/src/DebuggerKit/src/NeKernelContractCLI.cc @@ -6,7 +6,7 @@ #ifdef DK_NEKERNEL_DEBUGGER -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <DebuggerKit/NeKernelContract.h> #include <ThirdParty/Dialogs.h> #include <string> diff --git a/src/DebuggerKit/src/POSIXMachContractCLI.cc b/src/DebuggerKit/src/POSIXMachContractCLI.cc index 77fe844..9e77a1b 100644 --- a/src/DebuggerKit/src/POSIXMachContractCLI.cc +++ b/src/DebuggerKit/src/POSIXMachContractCLI.cc @@ -6,7 +6,7 @@ #ifdef DK_MACH_DEBUGGER -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <DebuggerKit/POSIXMachContract.h> #include <ThirdParty/Dialogs.h> #include <DebuggerKit/CommonCLI.inl> diff --git a/src/LibC++/__abi+unreachable.cc b/src/LibC++/__abi+unreachable.cc index 1fc9830..5628e7d 100644 --- a/src/LibC++/__abi+unreachable.cc +++ b/src/LibC++/__abi+unreachable.cc @@ -12,6 +12,5 @@ static const int32_t __unreachable_code = 34; extern "C" void __compilerkit_unreachable(void) { std::base_process::signal(__unreachable_code); - while (1) - ; + while (1); }
\ No newline at end of file diff --git a/src/LibC++/__abi.h b/src/LibC++/__abi.h index 70afae5..206b5ef 100644 --- a/src/LibC++/__abi.h +++ b/src/LibC++/__abi.h @@ -10,6 +10,6 @@ __init_decl() -extern void __compilerkit_unreachable(void); + extern void __compilerkit_unreachable(void); __fini_decl()
\ No newline at end of file diff --git a/src/LibC++/base_process.h b/src/LibC++/base_process.h index f9b0596..cb25aa1 100644 --- a/src/LibC++/base_process.h +++ b/src/LibC++/base_process.h @@ -10,10 +10,10 @@ __init_decl() -/// @brief CRT exit, with exit code (!!! exits all threads. !!!) -/// @param code the exit code. -/// @return the return > 0 for non successful. -extern int exit_(int code); + /// @brief CRT exit, with exit code (!!! exits all threads. !!!) + /// @param code the exit code. + /// @return the return > 0 for non successful. + extern int exit_(int code); /// @brief CRT signal handler. /// @param code the signal code. @@ -25,21 +25,21 @@ extern size_t __atexit_lst_cnt; __fini_decl() -/// @brief Standard C++ namespace -namespace std::base_process { -inline int signal(int code) { - signal_(code); - return -1; -} - -inline int32_t exit(const int32_t& code) { - for (auto idx = 0UL; idx < __atexit_lst_cnt; ++idx) { - __atexit_lst_ptr[idx](); + /// @brief Standard C++ namespace + namespace std::base_process { + inline int signal(int code) { + signal_(code); + return -1; } - if (__atexit_cdecl_ptr) __atexit_cdecl_ptr(); + inline int32_t exit(const int32_t& code) { + for (auto idx = 0UL; idx < __atexit_lst_cnt; ++idx) { + __atexit_lst_ptr[idx](); + } + + if (__atexit_cdecl_ptr) __atexit_cdecl_ptr(); - exit_(code); - return -1; -} + exit_(code); + return -1; + } } // namespace std::base_process diff --git a/src/LibC++/defines.h b/src/LibC++/defines.h index b8ef10c..9293bc2 100644 --- a/src/LibC++/defines.h +++ b/src/LibC++/defines.h @@ -17,10 +17,10 @@ typedef void* ptr_type; typedef __SIZE_TYPE__ size_type; typedef __INT64_TYPE__ ptrdiff_t; -typedef size_t uintptr_t; -typedef void* voidptr_t; -typedef void* any_t; -typedef char* caddr_t; +typedef size_t uintptr_t; +typedef void* voidptr_t; +typedef void* any_t; +typedef char* caddr_t; #ifndef NULL #define NULL ((voidptr_t) 0) diff --git a/src/ThirdParty/Dialogs.h b/src/ThirdParty/Dialogs.h index 7264e20..f632026 100644 --- a/src/ThirdParty/Dialogs.h +++ b/src/ThirdParty/Dialogs.h @@ -175,7 +175,7 @@ namespace internal { #elif __EMSCRIPTEN__ void start(int exit_code); #else - void start_process(std::vector<std::string> const& command); + void start_process(std::vector<std::string> const& command); #endif ~executor(); @@ -218,7 +218,7 @@ namespace internal { : m_proc(reinterpret_cast<T*>((void*) ::GetProcAddress(lib.handle, sym.c_str()))) {} explicit operator bool() const { return m_proc != nullptr; } - operator T*() const { return m_proc; } + operator T*() const { return m_proc; } private: T* m_proc; @@ -490,10 +490,10 @@ inline settings::settings(bool resync) { #if _WIN32 flags(flag::is_vista) = internal::is_vista(); #elif !__APPLE__ - flags(flag::has_zenity) = check_program("zenity"); + flags(flag::has_zenity) = check_program("zenity"); flags(flag::has_matedialog) = check_program("matedialog"); - flags(flag::has_qarma) = check_program("qarma"); - flags(flag::has_kdialog) = check_program("kdialog"); + flags(flag::has_qarma) = check_program("qarma"); + flags(flag::has_kdialog) = check_program("kdialog"); // If multiple helpers are available, try to default to the best one if (flags(flag::has_zenity) && flags(flag::has_kdialog)) { @@ -540,7 +540,7 @@ inline bool settings::check_program(std::string const& program) { (void) program; return false; #else - int exit_code = -1; + int exit_code = -1; internal::executor async; async.start_process({"/bin/sh", "-c", "which " + program}); async.result(&exit_code); @@ -604,7 +604,7 @@ inline std::string path::home() { if (size_max != -1) len = size_t(size_max); #endif std::vector<char> buf(len); - struct passwd pwd, *result; + struct passwd pwd, *result; if (getpwuid_r(getuid(), &pwd, buf.data(), buf.size(), &result) == 0) return result->pw_dir; #endif return "/"; @@ -717,7 +717,7 @@ inline void internal::executor::start_process(std::vector<std::string> const& co } close(in[1]); - m_fd = out[0]; + m_fd = out[0]; auto flags = fcntl(m_fd, F_GETFL); fcntl(m_fd, F_SETFL, flags | O_NONBLOCK); @@ -753,7 +753,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */) // FIXME: do something (void) timeout; #else - char buf[BUFSIZ]; + char buf[BUFSIZ]; ssize_t received = read(m_fd, buf, BUFSIZ); // Flawfinder: ignore if (received > 0) { m_stdout += std::string(buf, received); @@ -764,7 +764,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */) // (this happens when the calling application handles or ignores SIG_CHLD) and results in // waitpid() failing with ECHILD. Otherwise we assume the child is running and we sleep for // a little while. - int status; + int status; pid_t child = waitpid(m_pid, &status, WNOHANG); if (child != m_pid && (child >= 0 || errno != ECHILD)) { // FIXME: this happens almost always at first iteration @@ -782,8 +782,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */) inline void internal::executor::stop() { // Loop until the user closes the dialog - while (!ready()) - ; + while (!ready()); } // dll implementation @@ -879,11 +878,11 @@ inline std::vector<std::string> internal::dialog::desktop_helper() const { #if __APPLE__ return {"osascript"}; #else - return {flags(flag::has_zenity) ? "zenity" + return {flags(flag::has_zenity) ? "zenity" : flags(flag::has_matedialog) ? "matedialog" - : flags(flag::has_qarma) ? "qarma" - : flags(flag::has_kdialog) ? "kdialog" - : "echo"}; + : flags(flag::has_qarma) ? "qarma" + : flags(flag::has_kdialog) ? "kdialog" + : "echo"}; #endif } @@ -1125,9 +1124,9 @@ inline internal::file_dialog::file_dialog(type in_type, std::string const& title // Split the pattern list to check whether "*" is in there; if it // is, we have to disable filters because there is no mechanism in // OS X for the user to override the filter. - std::regex sep("\\s+"); - std::string filter_list; - bool has_filter = true; + std::regex sep("\\s+"); + std::string filter_list; + bool has_filter = true; std::sregex_token_iterator iter(patterns.begin(), patterns.end(), sep, -1); std::sregex_token_iterator end; for (; iter != end; ++iter) { @@ -1236,7 +1235,7 @@ inline std::vector<std::string> internal::file_dialog::vector_result() { return m_vector_result; #else std::vector<std::string> ret; - auto result = m_async->result(); + auto result = m_async->result(); for (;;) { // Split result along newline characters auto i = result.find('\n'); @@ -1569,7 +1568,7 @@ inline message::message(std::string const& title, std::string const& text, if_cancel = button::ok; break; } - m_mappings[1] = if_cancel; + m_mappings[1] = if_cancel; m_mappings[256] = if_cancel; // XXX: I think this was never correct script += " with icon "; switch (_icon) { @@ -1656,7 +1655,7 @@ inline message::message(std::string const& title, std::string const& text, if (_choice == choice::yes_no_cancel) flag += "cancel"; command.push_back(flag); if (_choice == choice::yes_no || _choice == choice::yes_no_cancel) { - m_mappings[0] = button::yes; + m_mappings[0] = button::yes; m_mappings[256] = button::no; } } diff --git a/src/Tools/asm.cc b/src/Tools/asm.cc index 025b158..37c7d01 100644 --- a/src/Tools/asm.cc +++ b/src/Tools/asm.cc @@ -7,7 +7,7 @@ /// @file asm.cc /// @brief Assembler frontend. -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/Version.h> #include <cstring> #include <vector> diff --git a/src/Tools/cppdrv.cc b/src/Tools/cppdrv.cc index 2cccf2b..9d42b15 100644 --- a/src/Tools/cppdrv.cc +++ b/src/Tools/cppdrv.cc @@ -7,7 +7,7 @@ /// @file cxxdrv.cc /// @brief NeCTI frontend preprocessor. -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/Version.h> #include <cstring> diff --git a/src/Tools/dbg.cc b/src/Tools/dbg.cc index a54c59e..b100c76 100644 --- a/src/Tools/dbg.cc +++ b/src/Tools/dbg.cc @@ -4,7 +4,7 @@ ======================================== */ -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> /// @file dbg.cc /// @brief NeCTI debugger. diff --git a/src/Tools/kdbg.cc b/src/Tools/kdbg.cc index 4ee508d..1409e98 100644 --- a/src/Tools/kdbg.cc +++ b/src/Tools/kdbg.cc @@ -4,7 +4,7 @@ ======================================== */ -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> /// @file kdbg.cc /// @brief NeKernel debugger. diff --git a/src/Tools/ld64.cc b/src/Tools/ld64.cc index 1f0392d..6d47028 100644 --- a/src/Tools/ld64.cc +++ b/src/Tools/ld64.cc @@ -4,7 +4,7 @@ ======================================== */ -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> /// @file ld64.cc /// @brief NeCTI linker for AE objects. diff --git a/src/Tools/pef-amd64-cxxdrv.cc b/src/Tools/pef-amd64-cxxdrv.cc index 3fc41fe..8aedba5 100644 --- a/src/Tools/pef-amd64-cxxdrv.cc +++ b/src/Tools/pef-amd64-cxxdrv.cc @@ -7,7 +7,7 @@ /// @file cxxdrv.cc /// @brief NeCTI C++ frontend compiler. -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/Version.h> #include <CompilerKit/utils/CompilerUtils.h> diff --git a/src/Tools/pef-arm64-cdrv.cc b/src/Tools/pef-arm64-cdrv.cc index 0a4a9af..d07d9bd 100644 --- a/src/Tools/pef-arm64-cdrv.cc +++ b/src/Tools/pef-arm64-cdrv.cc @@ -7,7 +7,7 @@ /// @file cxxdrv.cc /// @brief NeCTI C++ frontend compiler. -#include <CompilerKit/Defines.h> +#include <CompilerKit/Config.h> #include <CompilerKit/ErrorID.h> #include <CompilerKit/Version.h> #include <CompilerKit/utils/CompilerUtils.h> |