again

Author: takev

src/prologue/prologue_scan.cpp

@@ -5,7 +5,7 @@
 namespace hk {
 
 
-std::vector<std::unique_ptr<ast::module_node>> prologue_scan_repository(std::filesystem::path const& path)
+[[nodiscard]] std::vector<std::unique_ptr<ast::module_node>> prologue_scan_repository(std::filesystem::path const& path)
 {
     auto r = std::vector<std::unique_ptr<ast::module_node>>{};
 
@@ -39,7 +39,16 @@ std::vector<std::unique_ptr<ast::module_node>> prologue_scan_repository(std::fil
             continue;
         }
 
-        r.push_back(parse_module(entry.path(), ast::module_node::state_type::prologue));
+        auto cursor = file_cursor(entry.path());
+        if (auto node = parse_module(cursor, errors, true)) {
+
+            r.push_back(std::move(node()).value());
+        } else if (node.is_error()) {
+
+
+        } else {
+
+        }
     }
 
     return r;

src/prologue/prologue_scan.hpp

@@ -79,7 +79,7 @@ struct repository {
  * 
  * @param path The path to the repository to scan.
  */
-std::vector<std::unique_ptr<ast::module_node>> prologue_scan_repository(std::filesystem::path const& path);
+[[nodiscard]] std::vector<std::unique_ptr<ast::module_node>> prologue_scan_repository(std::filesystem::path const& path);
 
 
 }

src/tokenizer/tokenizer.cpp

@@ -25,7 +25,7 @@ send_error(hk::file_cursor& c, tokenize_delegate& delegate, unsigned int advance
     delegate.on_token(std::move(r));
 }
 
-static void simple_tokenize(hk::file_cursor& c, tokenize_delegate& delegate, tokenizer_context& context)
+static void simple_tokenize(hk::file_cursor& c, tokenize_delegate& delegate)
 {
     enum class state_type {
         normal,
@@ -273,10 +273,10 @@ struct tokenize_delegate_helper : tokenize_delegate {
     }
 };
 
-void tokenize(hk::file_cursor& c, tokenize_delegate& delegate, tokenizer_context &context)
+void tokenize(hk::file_cursor& c, tokenize_delegate& delegate)
 {
     auto simple_delegate = tokenize_delegate_helper{delegate};
-    return simple_tokenize(c, simple_delegate, context);
+    return simple_tokenize(c, simple_delegate);
 }
 
 } // namespace hk

src/tokenizer/tokenizer.hpp

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "token.hpp"
-#include "tokenizer_context.hpp"
 #include "utility/file_cursor.hpp"
 #include "utility/char_category.hpp"
 #include "utility/module.hpp"
@@ -42,7 +41,7 @@ struct tokenize_delegate {
  * @param file_cursor The file cursor pointing to the text to tokenize.
  * @param delegate The delegate to call for each token produced.
  */
-void tokenize(hk::file_cursor &file_cursor, tokenize_delegate &delegate, tokenizer_context &context);
+void tokenize(hk::file_cursor &file_cursor, tokenize_delegate &delegate);
 
 
 } // namespace hk

src/tokenizer/tokenizer_context.hpp

@@ -28,11 +28,5 @@ namespace hk {
 [[nodiscard]] std::expected<std::filesystem::path, std::error_code> absolute_to(
     std::filesystem::path const& path, std::filesystem::path const& base);
 
-/** A unique identifier for a filesystem path.
- * 
- * This class is used to intern filesystem paths, allowing for efficient
- * comparison and storage of paths in a way that avoids duplication.
- */
-using path_id = interned<std::filesystem::path>;
 
 }