From d0a08e9883907847342505c8c5cf459fb84b4aa5 Mon Sep 17 00:00:00 2001
From: Steven Le Rouzic <steven.lerouzic@gmail.com>
Date: Mon, 4 Nov 2024 22:34:24 +0100
Subject: Use span in format

---
 asl/format.cpp | 17 ++++++++---------
 asl/format.hpp |  7 ++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'asl')

diff --git a/asl/format.cpp b/asl/format.cpp
index 99ad9da..b410d39 100644
--- a/asl/format.cpp
+++ b/asl/format.cpp
@@ -5,14 +5,13 @@
 void asl::format_internals::format(
     writer* writer,
     const char* fmt,
-    const type_erased_arg* args,
-    int64_t arg_count)
+    span<const type_erased_arg> args)
 {
     formatter f(writer);
 
-
-    int64_t arg = 0;
-
+    const auto* arg_it = args.begin();
+    const auto* arg_end = args.end();
+    
     const char* begin = fmt;
     while (*fmt != '\0')
     {
@@ -20,14 +19,14 @@ void asl::format_internals::format(
         {
             if (fmt[1] == '}')
             {
-                if (arg < arg_count)
+                if (arg_it < arg_end)
                 {
                     f.write(begin, fmt - begin);
                     fmt += 2;
                     begin = fmt;
 
-                    args[arg].fn(f, args[arg].data);
-                    arg += 1;
+                    arg_it->fn(f, arg_it->data);
+                    arg_it++; // NOLINT(*-pointer-arithmetic)
                 }
                 else
                 {
@@ -168,7 +167,7 @@ void asl::AslFormat(formatter& f, uint64_t v)
     else if (v > 0 || cursor == kMaxDigits)
     {
         ASL_ASSERT(v < 10);
-        write_one('0' + (char)v);
+        write_one('0' + static_cast<char>(v));
     }
 
     f.write(buffer + cursor, kMaxDigits - cursor);
diff --git a/asl/format.hpp b/asl/format.hpp
index 386a39c..aad9d65 100644
--- a/asl/format.hpp
+++ b/asl/format.hpp
@@ -3,6 +3,7 @@
 #include "asl/integers.hpp"
 #include "asl/meta.hpp"
 #include "asl/io.hpp"
+#include "asl/span.hpp"
 
 namespace asl
 {
@@ -37,7 +38,7 @@ struct type_erased_arg
 };
 
 // @Todo Use span
-void format(writer*, const char* fmt, const type_erased_arg* args, int64_t arg_count);
+void format(writer*, const char* fmt, span<const type_erased_arg> args);
 
 } // namespace internals
 
@@ -67,11 +68,11 @@ void format(writer* w, const char* fmt, const Args&... args)
             format_internals::type_erased_arg(args)...
         };
 
-        format_internals::format(w, fmt, type_erased_args, types_count<Args...>);
+        format_internals::format(w, fmt, type_erased_args);
     }
     else
     {
-        format_internals::format(w, fmt, nullptr, 0);
+        format_internals::format(w, fmt, {});
     }
 }
 
-- 
cgit