pre merge

Author: takev

src/ast/node.cpp

@@ -7,7 +7,8 @@ namespace hk::ast {
 
 std::unexpected<hkc_error> node::_add(hkc_error error, std::string message)
 {
-    return std::unexpected{source().errors().add(source().lines(), first, last, error, std::move(message))};
+    auto const [it, _] = source().errors().add(source().lines(), first, last, error, std::move(message));
+    return std::unexpected{it->code()};
 }
 
 }

src/error/error_item.hpp

@@ -8,6 +8,7 @@
 #include <cassert>
 #include <filesystem>
 #include <expected>
+#include <compare>
 
 namespace hk {
 
@@ -24,9 +25,20 @@ class error_item {
     {
     }
 
-    operator std::unexpected<hkc_error>() const
+    [[nodiscard]] constexpr friend bool operator==(error_item const& lhs, error_item const& rhs) noexcept
     {
-        return std::unexpected{_code};
+        return lhs._first == rhs._first and lhs._last == rhs._last and lhs._code == rhs._code;
+    }
+    
+    [[nodiscard]] constexpr friend auto operator<=>(error_item const& lhs, error_item const& rhs) noexcept
+    {
+        if (auto r = lhs._first <=> rhs._first; r != std::strong_ordering::equal) {
+            return r;
+        } else if (auto r = lhs._last <=> rhs._last; r != std::strong_ordering::equal) {
+            return r;
+        } else {
+            return lhs._code <=> rhs._code;
+        }
     }
 
     [[nodiscard]] constexpr char const* first() const noexcept

src/error/error_list.hpp

@@ -8,34 +8,96 @@
 #include <format>
 #include <concepts>
 #include <expected>
+#include <algorithm>
 
 namespace hk {
 
 class error_list : public std::vector<error_item> {
 public:
     using element_type = error_item;
 
-    hkc_error add(line_table const& lines, char const* first, char const* last, hkc_error code, std::string message = std::string{})
+    /** Add an error.
+     *
+     * This add will make sure the error_list is sorted by file order.
+     * Parsing the file multiple times will not introduce duplicate errors.
+     * 
+     * @param lines The line table for this file. Used for print the error
+     *              message to stderr.
+     * @param first Pointer to the first character causing the error.
+     * @param last Pointer to beyond the last character causing the error.
+     * @param error The error code.
+     * @param message An extra message to print.
+     * @return The iterator to the error, true if a new error was inserted.
+     */
+    std::pair<iterator, bool> add(line_table const& lines, char const* first, char const* last, hkc_error error, std::string message = std::string{})
     {
-        auto const& e = this->emplace_back(code, first, last, std::move(message));
-        e.print(lines);
-        return code;
+        auto e = error_item{error, first, last, std::move(message)};
+
+        auto it = std::lower_bound(begin(), end(), e, [](auto const& item, auto const& x) {
+            return item < x;
+        });
+        if (it != end() and *it == e) {
+            return {it, false};
+        }
+
+        it = insert(it, std::move(e));
+        it->print(lines);
+        return {it, true};
     }
 
+    /** Add an error.
+     *
+     * This add will make sure the error_list is sorted by file order.
+     * Parsing the file multiple times will not introduce duplicate errors.
+     * 
+     * @param lines The line table for this file. Used for print the error
+     *              message to stderr.
+     * @param first Pointer to the first character causing the error.
+     * @param last Pointer to beyond the last character causing the error.
+     * @param error The error code.
+     * @param fmt Formatting string for an extra error message (optional)
+     * @param args... Arguments for formatting.
+     * @return The iterator to the error, true if a new error was inserted.
+     */
     template<typename... Args>
-    hkc_error add(line_table const& lines, char const* first, char const* last, hkc_error code, std::format_string<Args...> fmt = {}, Args&&... args)
+    std::pair<iterator, bool> add(line_table const& lines, char const* first, char const* last, hkc_error code, std::format_string<Args...> fmt = {}, Args&&... args)
     {
         return add(lines, first, last, code, std::format(std::move(fmt), std::forward<Args>(args)...));
     }
 
+    /** Add an error.
+     *
+     * This add will make sure the error_list is sorted by file order.
+     * Parsing the file multiple times will not introduce duplicate errors.
+     * 
+     * @param lines The line table for this file. Used for print the error
+     *              message to stderr.
+     * @param first Pointer to the first character causing the error.
+     * @param error The error code.
+     * @param fmt Formatting string for an extra error message (optional)
+     * @param args... Arguments for formatting.
+     * @return The iterator to the error, true if a new error was inserted.
+     */
     template<typename... Args>
-    hkc_error add(line_table const& lines, char const* first, hkc_error code, std::format_string<Args...> fmt = {}, Args&&... args)
+    std::pair<iterator, bool> add(line_table const& lines, char const* first, hkc_error code, std::format_string<Args...> fmt = {}, Args&&... args)
     {
         return add(lines, first, nullptr, code, std::format(std::move(fmt), std::forward<Args>(args)...));
     }
 
+    /** Add an error.
+     *
+     * This add will make sure the error_list is sorted by file order.
+     * Parsing the file multiple times will not introduce duplicate errors.
+     * 
+     * @param lines The line table for this file. Used for print the error
+     *              message to stderr.
+     * @param error The error code.
+     * @param fmt Formatting string for an extra error message (optional)
+     * @param args... Arguments for formatting.
+     * @return The iterator to the error, true if a new error was inserted.
+     */
     template<typename... Args>
-    hkc_error add(line_table const& lines, hkc_error code, std::format_string<Args...> fmt = {}, Args&&... args)
+    std::pair<iterator, bool> add(line_table const& lines, hkc_error code, std::format_string<Args...> fmt = {}, Args&&... args)
     {
         return add(lines, nullptr, nullptr, code, std::format(std::move(fmt), std::forward<Args>(args)...));
     }

src/parser/parse_context.hpp

@@ -26,7 +26,8 @@ class parse_context {
 
     std::unexpected<hkc_error> add(char const* first, char const* last, hkc_error error, std::string message = std::string{})
     {
-        return std::unexpected{errors().add(lines(), first, last, error, std::move(message))};
+        auto const [it, _] = errors().add(lines(), first, last, error, std::move(message));
+        return std::unexpected{it->code()};
     }
 
     /** Add an error to the list.

src/repository/repository_tests.cpp

@@ -34,6 +34,8 @@ TEST_CASE(recursive_repository_scan)
     REQUIRE(repository.child_repositories().size() == 2);
     REQUIRE(repository.child_repositories()[0]->remote.url() == "https://github.com/hikoworks/hikolang-test-a.git");
     REQUIRE(repository.child_repositories()[1]->remote.url() == "https://github.com/hikoworks/hikolang-test-b.git");
+
+    REQUIRE(repository.anchors().size() == 2);
 }
 
 //TEST_CASE(parse_repository)

src/utility/fqname.hpp

@@ -10,6 +10,28 @@
 
 namespace hk {
 
+class fqname_long {
+public:
+private:
+    uint8_t _capacity;
+    uint8_t _component_positions[16];
+    uint8_t _text[];
+};
+
+class fqname {
+public:
+
+private:
+    union {
+        fqname_long *_ptr;
+        uint8_t _text[sizeof(fqname_long *)];
+    };
+    uint8_t _component_positions[7];
+    uint8_t _prefix_dots : 4 = 0;
+    uint8_t _is_long : 1 = 0;
+};
+
+
 class fqname {
 public:
     class const_iterator {
@@ -457,7 +479,16 @@ class fqname {
 private:
     uint8_t _num_prefix_dots = 0;
     uint8_t _num_components = 0;
+    uint8_t _component_positions[6];
     std::string _name = {};
+
+    union {
+        char const *_ptr;
+        uint8_t _buffer[sizeof(char const *)];
+    };
+    uint8_t _component_positions[15];
+    uint8_t _num_prefix_dots : 3 = 0;
+    uint8_t _capacity : 5 = 0;
 };
 
 }

t.py

@@ -0,0 +1,8 @@
+
+
+for i in range(4):
+    n = i
+    i = i >> 1
+    n = n & i
+    n = n + i
+    print(n)

test_data/return42/main.hkm

@@ -1,9 +1,7 @@
 
 program "return42"
 
-
-fn main() -> __builtin_i32
-    ccc
+fn main()
 {
     return 42
 }

test_data/simple.hkm

@@ -2,3 +2,4 @@
 module com.example.foo application "bar"
 
 import git "https://github.com/example/baz" "main"
+