recurse scan continue

Author: takev

src/error/error_code.hpp

@@ -9,6 +9,7 @@
 #include <set>
 #include <cassert>
 #include <format>
+#include <print>
 
 namespace hk {
 
@@ -59,6 +60,37 @@ struct error_code {
     {
         return has_value();
     }
+
+    [[nodiscard]] friend std::string to_string(error_code rhs)
+    {
+        return std::format("{}{:04}", rhs.kind, rhs.code);
+    }
 };
 
+
+struct error_code_and_message_base {
+    error_code code = {};
+
+    error_code_and_message_base(error_code code) : code(code)
+    {
+        auto [it, inserted] = all_error_codes.insert(code);
+        if (not inserted) {
+            std::println(stderr, "Error: found collision in error-list: {}", to_string(code));
+            std::terminate();
+        }
+    }
+
+    inline static std::set<error_code> all_error_codes = {};
+};
+
+template<fixed_string Fmt>
+struct error_code_and_message : public error_code_and_message_base {
+    constexpr static decltype(Fmt) fmt = Fmt;
+
+    error_code_and_message() : error_code_and_message_base(error_code{fmt})
+    {
+    }
+};
+
+
 }

src/error/error_list.hpp

@@ -7,6 +7,7 @@
 #include "utility/fixed_string.hpp"
 #include <vector>
 #include <format>
+#include <concepts>
 
 namespace hk {
 
@@ -22,12 +23,12 @@ class error_list : public std::vector<error_item> {
      *  @param args The arguments to format the error message.
      *  @return A unexpected error containing the error code.
      */
-    template<typename ErrorType, typename... Args>
-    std::unexpected<error_code> add(file_location first, file_location last, Args&&... args)
+    template<std::derived_from<error_code_and_message_base> Message, typename... Args>
+    std::unexpected<error_code> add(file_location first, file_location last, Message msg, Args&&... args)
     {
-        auto e = error_item{first, last, ErrorType::code, ErrorType::fmt, std::forward<Args>(args)...};
+        auto e = error_item{first, last, msg.code, Message::fmt, std::forward<Args>(args)...};
         this->push_back(std::move(e));
-        return std::unexpected{ErrorType::code};
+        return std::unexpected{msg.code};
     }
 
     /** Add an error to the list. 
@@ -36,12 +37,12 @@ class error_list : public std::vector<error_item> {
      *  @param args The arguments to format the error message.
      *  @return A unexpected error containing the error code.
      */
-    template<typename ErrorType, typename... Args>
-    std::unexpected<error_code> add(Args&&... args)
+    template<std::derived_from<error_code_and_message_base> Message, typename... Args>
+    std::unexpected<error_code> add(Message msg, Args&&... args)
     {
-        auto e = error_item{ErrorType::code, ErrorType::fmt, std::forward<Args>(args)...};
+        auto e = error_item{msg.code, Message::fmt, std::forward<Args>(args)...};
         this->push_back(std::move(e));
-        return std::unexpected{ErrorType::code};
+        return std::unexpected{msg.code};
     }
 
 private:

src/error/error_location.hpp

@@ -35,14 +35,14 @@ class error_location {
      *  @param args The arguments to format the error message.
      *  @return A unexpected error containing the error code.
      */
-    template<typename ErrorType, typename... Args>
-    std::unexpected<error_code> add(Args&&... args)
+    template<std::derived_from<error_code_and_message_base> Message, typename... Args>
+    std::unexpected<error_code> add(Message msg, Args&&... args)
     {
         assert(_errors_ptr != nullptr);
 
-        auto e = error_item{_first, _last, ErrorType::code, ErrorType::fmt, std::forward<Args>(args)...};
+        auto e = error_item{_first, _last, msg.code, Message::fmt, std::forward<Args>(args)...};
         _errors_ptr->push_back(std::move(e));
-        return std::unexpected{ErrorType::code};
+        return std::unexpected{msg.code};
     }
 
 private:

src/error/errors.hpp

@@ -1,12 +1,11 @@
 
 #pragma once
 
-#include "make_error.hpp"
+#include "error_code.hpp"
 
-namespace hk::error {
-
-#define E(name, fmt) struct name : public make_error<fmt> {}
+#define E(name, fmt) inline error_code_and_message<fmt> name = {};
 
+namespace hk::error {
 E(missing_module_declaration_name, "E0001: Module declaration requires fqname.");
 E(missing_module_application_declaration_exe, "E0002: Module application declaration requires an executable name.");
 E(missing_module_library_declaration_bin, "E0003: Module library declaration requires a binary name.");
@@ -21,9 +20,10 @@ E(missing_import_mod_declaration_as_name, "E0011: Expected a name after 'as' key
 E(missing_import_mod_declaration_name, "E0012: Expected fully qualified name after 'import' keyword in a import-declaration.");
 E(missing_import_declaration_semicolon, "E0013: Expected ';' after a import-declaration.");
 E(missing_fqname_identifier_after_dot, "E0014: Expected identifier after '.' in fully qualified name.");
+E(could_not_clone_repository, "E0015: Could not clone repository '{}' rev '{}': {}.");
+}
 
-E(could_not_clone_repository, "W0001: Could not clone repository '{}' rev '{}': {}.");
+namespace hk::warning {
+}
 
 #undef E
-
-}

src/error/make_error.hpp

@@ -23,7 +23,7 @@ namespace hk {
 
         ++it;
         if (*it != token::identifier) {
-            return e.add<error::missing_fqname_identifier_after_dot>(first, it->last);
+            return e.add(first, it->last, error::missing_fqname_identifier_after_dot);
         }
 
         r += it->text;

src/parser/parse_fqname.cpp

@@ -23,15 +23,15 @@ namespace hk {
             url = it->text;
             ++it;
         } else {
-            return e.add<error::missing_import_git_declaration_url>(first, it->last);
+            return e.add(first, it->last, error::missing_import_git_declaration_url);
         }
 
         auto rev = std::string{};
         if (*it == token::string_literal) {
             rev = it->text;
             ++it;
         } else {
-            return e.add<error::missing_import_git_declaration_branch>(first, it->last);
+            return e.add(first, it->last, error::missing_import_git_declaration_branch);
         }
 
         auto repository = repository_url{repository_type::git, std::move(url), std::move(rev)};
@@ -45,7 +45,7 @@ namespace hk {
             url = it->text;
             ++it;
         } else {
-            return e.add<error::missing_import_zip_declaration_path>(first, it->last);
+            return e.add(first, it->last, error::missing_import_zip_declaration_path);
         }
 
         auto repository = repository_url{repository_type::zip, it->text};
@@ -59,7 +59,7 @@ namespace hk {
             path = it->text;
             ++it;
         } else {
-            return e.add<error::missing_import_lib_declaration_path>(first, it->last);
+            return e.add(first, it->last, error::missing_import_lib_declaration_path);
         }
 
         r = std::make_unique<ast::import_library_declaration_node>(first, it->last, path);
@@ -75,7 +75,7 @@ namespace hk {
                 as = std::move(as).value();
 
             } else {
-                return e.add<error::missing_import_mod_declaration_as_name>(first, it->last);
+                return e.add(first, it->last, error::missing_import_mod_declaration_as_name);
             }
         }
 
@@ -85,15 +85,15 @@ namespace hk {
         return std::unexpected{name.error()};
 
     } else {
-        return e.add<error::missing_import_mod_declaration_name>(first, it->last);
+        return e.add(first, it->last, error::missing_import_mod_declaration_name);
     }
 
     if (*it == ';') {
         ++it;
         return r;
     }
 
-    return e.add<error::missing_import_declaration_semicolon>(first, it->last);
+    return e.add(first, it->last, error::missing_import_declaration_semicolon);
 }
 
 } // namespace hk

src/parser/parse_import_declaration.cpp

@@ -21,7 +21,7 @@ namespace hk {
     } else if (node.error()) {
         return std::unexpected{node.error()};
     } else {
-        return e.add<error::missing_module_declaration_name>(first, it->last);
+        return e.add(first, it->last, error::missing_module_declaration_name);
     }
 
     // Optional module specialization.
@@ -32,7 +32,7 @@ namespace hk {
             r->output_filename = it->text;
             ++it;
         } else {
-            return e.add<error::missing_module_application_declaration_exe>(first, it->last);
+            return e.add(first, it->last, error::missing_module_application_declaration_exe);
         }
 
     } else if (*it == "library") {
@@ -42,7 +42,7 @@ namespace hk {
             r->output_filename = it->text;
             ++it;
         } else {
-            return e.add<error::missing_module_library_declaration_bin>(first, it->last);
+            return e.add(first, it->last, error::missing_module_library_declaration_bin);
         }
 
     } else if (*it == "package") {
@@ -52,7 +52,7 @@ namespace hk {
             r->version = it->version_value();
             ++it;
         } else {
-            return e.add<error::missing_module_package_declaration_version>(first, it->last);
+            return e.add(first, it->last, error::missing_module_package_declaration_version);
         }
 
     } else {
@@ -66,15 +66,15 @@ namespace hk {
 
     } else if (*it == "if") {
         ++it;
-        return e.add<error::unimplemented_module_declaration_if>(first, it->last);
+        return e.add(first, it->last, error::unimplemented_module_declaration_if);
     }
 
     if (*it == ';') {
         ++it;
         return r;
     }
 
-    return e.add<error::missing_module_declaration_semicolon>(first, it->last);
+    return e.add(first, it->last, error::missing_module_declaration_semicolon);
 }
 
 } // namespace hk

src/parser/parse_module_declaration.cpp

@@ -71,7 +71,7 @@ void repository::scan_prologues(repository_flags flags)
     untouch(true);
 }
 
-void repository::recursive_scan_prologues(repository_flags flags)
+error_code repository::recursive_scan_prologues(repository_flags flags)
 {
     auto todo = std::map<repository_url, error_location>{};
     auto done = std::map<repository_url, error_location>{};
@@ -94,14 +94,20 @@ void repository::recursive_scan_prologues(repository_flags flags)
         auto &child_repo = get_child_repository(it->first);
         if (not child_repo.repository) {
             if (auto r = git_checkout_or_clone(it->first, child_repo_path, flags); r != git_error::ok) {
-                it->second.add<error::could_not_clone_repository>(it->first.url(), it->first.rev(), r);
+                return xxxxxxxxxxxxxxx needs destination directory in message it->second.add(error::could_not_clone_repository, it->first.url(), it->first.rev(), r).error();
             }
 
             child_repo.repository = std::make_unique<repository>(child_repo_path);
+            child_repo.repository->scan_prologues(flags);
+            for (auto item : child_repo.repository->remote_repositories()) {
+                todo.insert(std::move(item));
+            }
         }
     }
 
     // Remove internal repositories not in done.
+
+    return error_code{};
 }
 
 void repository::untouch(bool remove)

src/repository/repository.cpp

@@ -27,7 +27,7 @@ class repository {
      * 
      * @param force Force scanning even on files that were already parsed.
      */
-    void recursive_scan_prologues(repository_flags flags);
+    error_code recursive_scan_prologues(repository_flags flags);
 
     [[nodiscard]] generator<std::pair<repository_url, error_location>> remote_repositories() const;