Canonicalize the error printer.

tswhison · May 16, 2024 · 96354a7 · 96354a7
1 parent 9b73aab
commit 96354a7
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/include/c_lexer/Lexer.h b/include/c_lexer/Lexer.h
@@ -78,18 +78,21 @@ class Lexer {
   Lexeme eat();
   void preload(std::size_t);
 
-  template <typename... Args>
-  std::ostream &print_error(std::ostream &os, Args... args) {
+  template <typename S, typename... Args>
+  S &print_error(S &os, Args &&...args) {
     return printer(os, "c_lexer[", row_, ',', col_, "]: ", args...);
   }
 
 protected:
   Lexeme scan_token();
 
-  template <typename... Args>
-  std::ostream &printer(std::ostream &os, Args... args) {
-    auto tmp = {(os << args, 0)...};
-    (void)tmp;
+  template <typename S, typename T0, typename... Ts>
+  S &printer(S &os, T0 &&t0, Ts &&...ts) {
+    os << std::forward<T0>(t0);
+
+    if constexpr (sizeof...(ts))
+      printer(os, std::forward<Ts>(ts)...);
+
     return os;
   }