From fc16065d5ee5f77c9e91c05cf1d3f637c59d957f Mon Sep 17 00:00:00 2001 From: Reece Date: Sat, 9 Oct 2021 00:39:42 +0100 Subject: [PATCH] [*] boring clean up and refactor --- Include/Aurora/Hashing/CE/fnv1.hpp | 16 ++++++++-------- Include/Aurora/Locale/Encoding/Encoding.hpp | 8 ++++---- Source/Console/ConsoleStd/ConsoleStd.cpp | 2 +- Source/Parse/Parser.cpp | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Include/Aurora/Hashing/CE/fnv1.hpp b/Include/Aurora/Hashing/CE/fnv1.hpp index ecdaa49f..ff903710 100644 --- a/Include/Aurora/Hashing/CE/fnv1.hpp +++ b/Include/Aurora/Hashing/CE/fnv1.hpp @@ -11,12 +11,12 @@ namespace Aurora::Hashing { namespace CE { - constexpr uint64_t kFnv1MagicVal64 = 0xcbf29ce484222325; - constexpr uint64_t kFnv1MagicPrime64 = 0x100000001b3; + constexpr AuUInt64 kFnv1MagicVal64 = 0xcbf29ce484222325; + constexpr AuUInt64 kFnv1MagicPrime64 = 0x100000001b3; - inline constexpr uint64_t fnv1a(const char *const str, const uint64_t value = kFnv1MagicVal64) noexcept + inline constexpr AuUInt64 fnv1a(const char *const str, const AuUInt64 value = kFnv1MagicVal64) noexcept { - return (str[0] == '\0') ? value : fnv1a(&str[1], (value ^ uint64_t(str[0])) * kFnv1MagicPrime64); + return (str[0] == '\0') ? value : fnv1a(&str[1], (value ^ AuUInt64(str[0])) * kFnv1MagicPrime64); } inline constexpr uint32_t fnv1a_trunc(const char *const str) noexcept @@ -24,12 +24,12 @@ namespace Aurora::Hashing return static_cast(fnv1a(str)); } - constexpr uint64_t kFnv1MagicVal32 = 0x811c9dc5; - constexpr uint64_t kFnv1MagicPrime32 = 0x01000193; + constexpr AuUInt32 kFnv1MagicVal32 = 0x811c9dc5; + constexpr AuUInt32 kFnv1MagicPrime32 = 0x01000193; - inline constexpr uint32_t fnv1a_32(const char *const str, const uint32_t value = kFnv1MagicVal32) noexcept + inline constexpr uint32_t fnv1a_32(const char *const str, const AuUInt32 value = kFnv1MagicVal32) noexcept { - return (str[0] == '\0') ? value : fnv1a_32(&str[1], (value ^ uint32_t(str[0])) * kFnv1MagicPrime32); + return (str[0] == '\0') ? value : fnv1a_32(&str[1], (value ^ AuUInt32(str[0])) * kFnv1MagicPrime32); } } } \ No newline at end of file diff --git a/Include/Aurora/Locale/Encoding/Encoding.hpp b/Include/Aurora/Locale/Encoding/Encoding.hpp index 91b92c1e..1882326b 100644 --- a/Include/Aurora/Locale/Encoding/Encoding.hpp +++ b/Include/Aurora/Locale/Encoding/Encoding.hpp @@ -9,8 +9,8 @@ namespace Aurora::Locale::Encoding { - AUKN_SYM AuStreamReadWrittenPair_t EncodeUTF8(const Aurora::Memory::MemoryViewRead & utf8, const Aurora::Memory::MemoryViewWrite & binary, ECodePage page = ECodePage::eUnsupported); - static inline AuStreamReadWrittenPair_t EncodeUTF8(const AuString &utf8, const Aurora::Memory::MemoryViewWrite & binary, ECodePage page = ECodePage::eUnsupported) + AUKN_SYM AuStreamReadWrittenPair_t EncodeUTF8(const Aurora::Memory::MemoryViewRead &utf8, const Aurora::Memory::MemoryViewWrite &binary, ECodePage page = ECodePage::eUnsupported); + static inline AuStreamReadWrittenPair_t EncodeUTF8(const AuString &utf8, const Aurora::Memory::MemoryViewWrite &binary, ECodePage page = ECodePage::eUnsupported) { return EncodeUTF8(Aurora::Memory::MemoryViewRead(utf8), binary, page); } @@ -19,7 +19,7 @@ namespace Aurora::Locale::Encoding /// Translates a buffer, possibly a slice of a stream, to UTF-8 /// Returns a pair; bytes consumed, bytes written - AUKN_SYM AuStreamReadWrittenPair_t DecodeUTF8(const Aurora::Memory::MemoryViewRead & binary, const Aurora::Memory::MemoryViewWrite & utf8, ECodePage page = ECodePage::eUnsupported); + AUKN_SYM AuStreamReadWrittenPair_t DecodeUTF8(const Aurora::Memory::MemoryViewRead &binary, const Aurora::Memory::MemoryViewWrite &utf8, ECodePage page = ECodePage::eUnsupported); - AUKN_SYM AuStreamReadWrittenPair_t DecodeUTF8(const Aurora::Memory::MemoryViewRead & binary, AuString &out, ECodePage page = ECodePage::eUnsupported); + AUKN_SYM AuStreamReadWrittenPair_t DecodeUTF8(const Aurora::Memory::MemoryViewRead &binary, AuString &out, ECodePage page = ECodePage::eUnsupported); } \ No newline at end of file diff --git a/Source/Console/ConsoleStd/ConsoleStd.cpp b/Source/Console/ConsoleStd/ConsoleStd.cpp index 9c33636b..56ca57b4 100644 --- a/Source/Console/ConsoleStd/ConsoleStd.cpp +++ b/Source/Console/ConsoleStd/ConsoleStd.cpp @@ -353,7 +353,7 @@ namespace Aurora::Console::ConsoleStd if (line.size()) { - Console::Commands::DispatchCommand(line); + Console::Commands::DispatchRawLine(line); } } diff --git a/Source/Parse/Parser.cpp b/Source/Parse/Parser.cpp index 73e5f844..3d26f7c9 100644 --- a/Source/Parse/Parser.cpp +++ b/Source/Parse/Parser.cpp @@ -530,8 +530,8 @@ namespace Aurora::Parse } } - result.SyntaxError = "No-Debug"; - result.DebugTree = "No-Debug"; + result.syntaxError = "No-Debug"; + result.debugTree = "No-Debug"; return true; }