summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/fud_assert.hpp31
-rw-r--r--include/fud_c_file.hpp3
-rw-r--r--include/fud_status.hpp8
-rw-r--r--include/fud_string.hpp12
-rw-r--r--include/fud_utf8.hpp86
-rw-r--r--include/libfud.hpp20
6 files changed, 107 insertions, 53 deletions
diff --git a/include/fud_assert.hpp b/include/fud_assert.hpp
new file mode 100644
index 0000000..5b63703
--- /dev/null
+++ b/include/fud_assert.hpp
@@ -0,0 +1,31 @@
+/*
+ * libfud
+ * Copyright 2024 Dominick Allen
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FUD_ASSERT_HPP
+#define FUD_ASSERT_HPP
+
+namespace fud {
+
+void assertFail(const char* assertion, const char* file, unsigned int line, const char* function) noexcept(false)
+ __attribute__((__noreturn__));
+
+#define fudAssert(expr) \
+ (static_cast<bool>(expr) ? static_cast<void>(0) : assertFail(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__))
+
+} // namespace fud
+
+#endif
diff --git a/include/fud_c_file.hpp b/include/fud_c_file.hpp
index f89839d..281d216 100644
--- a/include/fud_c_file.hpp
+++ b/include/fud_c_file.hpp
@@ -86,10 +86,13 @@ class CBinaryFile {
public:
CBinaryFile(const String& filename, CFileMode mode);
CBinaryFile(const String& filename, CFileMode mode, const String& extraFlags);
+ CBinaryFile(const CBinaryFile& rhs) = delete;
~CBinaryFile();
+ CBinaryFile& operator=(const CBinaryFile& rhs) = delete;
FileResult open();
void close();
const FILE* file() const;
+ FILE* file();
private:
String m_filename;
diff --git a/include/fud_status.hpp b/include/fud_status.hpp
index 47b14a4..dd84429 100644
--- a/include/fud_status.hpp
+++ b/include/fud_status.hpp
@@ -83,7 +83,10 @@ static inline const char* FudStatusToString(FudStatus status)
}
}
-static inline bool anyAreNull() { return false; }
+static inline bool anyAreNull()
+{
+ return false;
+}
template <typename T>
bool anyAreNull(const T* pointer)
@@ -94,8 +97,7 @@ bool anyAreNull(const T* pointer)
template <typename T, typename... Ts>
bool anyAreNull(T pointer, Ts... pointers)
{
- if (pointer == nullptr)
- {
+ if (pointer == nullptr) {
return true;
}
return anyAreNull(pointers...);
diff --git a/include/fud_string.hpp b/include/fud_string.hpp
index 42009b4..5229f26 100644
--- a/include/fud_string.hpp
+++ b/include/fud_string.hpp
@@ -54,7 +54,7 @@ class String {
[[nodiscard]] constexpr size_t capacity() const
{
- return m_capacity;
+ return m_capacity - 1;
}
/** \brier The underlying data, guaranteed to have c string representation. */
@@ -87,7 +87,7 @@ class String {
[[nodiscard]] bool utf8Valid() const;
- [[nodiscard]] FudStatus nullTerminate() const;
+ [[nodiscard]] FudStatus nullTerminate();
[[nodiscard]] constexpr size_t remainingLength() const
{
@@ -117,11 +117,11 @@ class String {
utf8* m_data;
};
size_t m_length{0};
- size_t m_capacity{0};
+ size_t m_capacity{SSO_BUF_SIZE};
[[nodiscard]] constexpr bool isLarge() const
{
- return m_capacity > SSO_BUF_LENGTH;
+ return m_capacity > SSO_BUF_SIZE;
}
};
@@ -131,12 +131,12 @@ class StringView {
{
}
- constexpr StringView(size_t strLen, const utf8* strData) : m_length(0), m_data{strData}
+ constexpr StringView(size_t strLen, const utf8* strData) : m_length(strLen), m_data{strData}
{
}
StringView(size_t strLen, const char* strData) :
- m_length(0), // line break
+ m_length(strLen), // line break
m_data{reinterpret_cast<const utf8*>(strData)} // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
{
}
diff --git a/include/fud_utf8.hpp b/include/fud_utf8.hpp
index da1a5fe..99766d4 100644
--- a/include/fud_utf8.hpp
+++ b/include/fud_utf8.hpp
@@ -31,43 +31,44 @@ namespace fud {
using utf8 = unsigned char;
-struct StringView;
+class String;
+class StringView;
-constexpr uint8_t ASCII_MASK = 0x7F;
+constexpr utf8 ASCII_MASK = 0x7F;
-constexpr uint8_t UTF8_MB_PATTERN_MASK = 0xC0;
-constexpr uint8_t UTF8_MB_PATTERN = 0x80;
-constexpr uint8_t UTF8_MB_MASK = static_cast<uint8_t>(~UTF8_MB_PATTERN_MASK);
+constexpr utf8 UTF8_MB_PATTERN_MASK = 0xC0;
+constexpr utf8 UTF8_MB_PATTERN = 0x80;
+constexpr utf8 UTF8_MB_MASK = static_cast<utf8>(~UTF8_MB_PATTERN_MASK);
-constexpr uint8_t UTF8_2B_PATTERN_MASK = 0xE0;
-constexpr uint8_t UTF8_2B_PATTERN = 0xC0;
-constexpr uint8_t UTF8_2B_MASK = static_cast<uint8_t>(~UTF8_2B_PATTERN_MASK);
+constexpr utf8 UTF8_2B_PATTERN_MASK = 0xE0;
+constexpr utf8 UTF8_2B_PATTERN = 0xC0;
+constexpr utf8 UTF8_2B_MASK = static_cast<utf8>(~UTF8_2B_PATTERN_MASK);
-constexpr uint8_t UTF8_3B_PATTERN_MASK = 0xF0;
-constexpr uint8_t UTF8_3B_PATTERN = 0xE0;
-constexpr uint8_t UTF8_3B_MASK = static_cast<uint8_t>(~UTF8_3B_PATTERN_MASK);
+constexpr utf8 UTF8_3B_PATTERN_MASK = 0xF0;
+constexpr utf8 UTF8_3B_PATTERN = 0xE0;
+constexpr utf8 UTF8_3B_MASK = static_cast<utf8>(~UTF8_3B_PATTERN_MASK);
-constexpr uint8_t UTF8_4B_PATTERN_MASK = 0xF8;
-constexpr uint8_t UTF8_4B_PATTERN = 0xF0;
-constexpr uint8_t UTF8_4B_MASK = static_cast<uint8_t>(~UTF8_4B_PATTERN_MASK);
+constexpr utf8 UTF8_4B_PATTERN_MASK = 0xF8;
+constexpr utf8 UTF8_4B_PATTERN = 0xF0;
+constexpr utf8 UTF8_4B_MASK = static_cast<utf8>(~UTF8_4B_PATTERN_MASK);
namespace privateImpl {
-constexpr bool validUtf8MB(uint8_t code) noexcept
+constexpr bool validUtf8MB(utf8 code) noexcept
{
return (code & UTF8_MB_PATTERN_MASK) == UTF8_MB_PATTERN;
}
} // namespace privateImpl
struct Ascii {
- Array<uint8_t, 1> characters;
+ Array<utf8, 1> characters;
constexpr Ascii() noexcept = default;
- constexpr explicit Ascii(uint8_t chr) noexcept : characters{{chr}}
+ constexpr explicit Ascii(utf8 chr) noexcept : characters{{chr}}
{
}
- [[nodiscard]] constexpr uint8_t character() const noexcept
+ [[nodiscard]] constexpr utf8 character() const noexcept
{
return characters[0];
}
@@ -87,9 +88,9 @@ struct Ascii {
return valid(characters[0]);
}
- static constexpr bool valid(uint8_t character) noexcept
+ static constexpr bool valid(utf8 character) noexcept
{
- return static_cast<uint8_t>(character & ~ASCII_MASK) == 0;
+ return static_cast<utf8>(character & ~ASCII_MASK) == 0;
}
auto operator<=>(const Ascii& other) const noexcept = default;
@@ -107,10 +108,10 @@ static_assert(std::is_standard_layout_v<Ascii>);
*/
struct Utf82Byte {
- constexpr Utf82Byte(uint8_t first, uint8_t second) noexcept : characters{{first, second}}
+ constexpr Utf82Byte(utf8 first, utf8 second) noexcept : characters{{first, second}}
{
}
- Array<uint8_t, 2> characters;
+ Array<utf8, 2> characters;
static constexpr size_t size() noexcept
{
return 2;
@@ -121,18 +122,18 @@ struct Utf82Byte {
return valid(first(), second());
}
- static constexpr bool valid(uint8_t first, uint8_t second) noexcept
+ static constexpr bool valid(utf8 first, utf8 second) noexcept
{
using privateImpl::validUtf8MB;
return ((first & UTF8_2B_PATTERN_MASK) == UTF8_2B_PATTERN) && validUtf8MB(second);
}
- [[nodiscard]] constexpr uint8_t first() const noexcept
+ [[nodiscard]] constexpr utf8 first() const noexcept
{
return characters[0];
}
- [[nodiscard]] constexpr uint8_t second() const noexcept
+ [[nodiscard]] constexpr utf8 second() const noexcept
{
return characters[1];
}
@@ -141,11 +142,11 @@ struct Utf82Byte {
};
struct Utf83Byte {
- constexpr Utf83Byte(uint8_t first, uint8_t second, uint8_t third) noexcept : characters{{first, second, third}}
+ constexpr Utf83Byte(utf8 first, utf8 second, utf8 third) noexcept : characters{{first, second, third}}
{
}
- Array<uint8_t, 3> characters;
+ Array<utf8, 3> characters;
static constexpr size_t size() noexcept
{
@@ -157,23 +158,23 @@ struct Utf83Byte {
return valid(first(), second(), third());
}
- static constexpr bool valid(uint8_t first, uint8_t second, uint8_t third) noexcept
+ static constexpr bool valid(utf8 first, utf8 second, utf8 third) noexcept
{
using privateImpl::validUtf8MB;
return ((first & UTF8_3B_PATTERN_MASK) == UTF8_3B_PATTERN) && validUtf8MB(second) && validUtf8MB(third);
}
- [[nodiscard]] constexpr uint8_t first() const noexcept
+ [[nodiscard]] constexpr utf8 first() const noexcept
{
return characters[0];
}
- [[nodiscard]] constexpr uint8_t second() const noexcept
+ [[nodiscard]] constexpr utf8 second() const noexcept
{
return characters[1];
}
- [[nodiscard]] constexpr uint8_t third() const noexcept
+ [[nodiscard]] constexpr utf8 third() const noexcept
{
return characters[2];
}
@@ -182,12 +183,12 @@ struct Utf83Byte {
};
struct Utf84Byte {
- constexpr Utf84Byte(uint8_t first, uint8_t second, uint8_t third, uint8_t fourth) noexcept :
+ constexpr Utf84Byte(utf8 first, utf8 second, utf8 third, utf8 fourth) noexcept :
characters{{first, second, third, fourth}}
{
}
- Array<uint8_t, 4> characters;
+ Array<utf8, 4> characters;
static constexpr size_t size() noexcept
{
@@ -199,7 +200,7 @@ struct Utf84Byte {
return valid(first(), second(), third(), fourth());
}
- static constexpr bool valid(uint8_t first, uint8_t second, uint8_t third, uint8_t fourth) noexcept
+ static constexpr bool valid(utf8 first, utf8 second, utf8 third, utf8 fourth) noexcept
{
using privateImpl::validUtf8MB;
if ((first & UTF8_4B_PATTERN_MASK) != UTF8_4B_PATTERN) {
@@ -208,22 +209,22 @@ struct Utf84Byte {
return validUtf8MB(second) && validUtf8MB(third) && validUtf8MB(fourth);
}
- [[nodiscard]] constexpr uint8_t first() const noexcept
+ [[nodiscard]] constexpr utf8 first() const noexcept
{
return characters[0];
}
- [[nodiscard]] constexpr uint8_t second() const noexcept
+ [[nodiscard]] constexpr utf8 second() const noexcept
{
return characters[1];
}
- [[nodiscard]] constexpr uint8_t third() const noexcept
+ [[nodiscard]] constexpr utf8 third() const noexcept
{
return characters[2];
}
- [[nodiscard]] constexpr uint8_t fourth() const noexcept
+ [[nodiscard]] constexpr utf8 fourth() const noexcept
{
return characters[3];
}
@@ -246,9 +247,6 @@ static_assert(Utf8TypeSet.m_values[1] == static_cast<uint8_t>(Utf8Type::Utf82Byt
static_assert(Utf8TypeSet.m_values[2] == static_cast<uint8_t>(Utf8Type::Utf83Byte));
static_assert(Utf8TypeSet.m_values[3] == static_cast<uint8_t>(Utf8Type::Utf84Byte));
-class String;
-class StringView;
-
struct FudUtf8 {
Utf8Variant m_variant{Utf8Variant{Ascii{}}};
@@ -287,9 +285,9 @@ struct FudUtf8 {
static constexpr FudUtf8 invalidAscii()
{
- FudUtf8 utf8{};
- utf8.m_variant = Ascii{invalidAsciiCode};
- return utf8;
+ FudUtf8 character{};
+ character.m_variant = Ascii{invalidAsciiCode};
+ return character;
}
[[nodiscard]] constexpr Utf8Type getType() const
diff --git a/include/libfud.hpp b/include/libfud.hpp
index be840a4..ceb1b20 100644
--- a/include/libfud.hpp
+++ b/include/libfud.hpp
@@ -18,8 +18,28 @@
#ifndef LIBFUD_HPP
#define LIBFUD_HPP
+#include "fud_status.hpp" // IWYU pragma: export
+
#include "fud_result.hpp" // IWYU pragma: export
+#include "fud_memory.hpp" // IWYU pragma: export
+
+#include "fud_assert.hpp" // IWYU pragma: export
+
+#include "fud_array.hpp" // IWYU pragma: export
+
+#include "fud_c_file.hpp" // IWYU pragma: export
+
+#include "fud_fud_type_traits.hpp" // IWYU pragma: export
+
+#include "fud_string.hpp" // IWYU pragma: export
+
+#include "fud_unique_array.hpp" // IWYU pragma: export
+
+#include "fud_utf8.hpp" // IWYU pragma: export
+
+#include "fud_utf8_iterator.hpp" // IWYU pragma: export
+
namespace fud {
void fud();
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 14:45:39 +0000