Fix some __VA_ARGS__ macro issues (ugh)

2 files changed, 29 insertions, 28 deletions

diff --git a/src/badlib.h b/src/badlib.h
index 837d377..496f106 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -16,22 +16,16 @@
 //   thing or at least a small range).
 //
 
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
-#define printstr(s) \
-    if (s) printf("%.*s", (int)(s)->size, (s)->mem);
-#define printstrln(s) \
-    if (s) printf("%.*s\n", (int)(s)->size, (s)->mem);
 
 //
-// This simple header just typedefs the basic C define types to a shorter name,
-// loads the quality of life bool macro for _Bool and defines shorthand macros
-// for byte sizes.  We need that the targeted architecture uses the floating
-// point representation as described on the IEEE-754 standard.
+// Basic types.
 //
 
 _Static_assert(sizeof(double) == 8, "no support for IEEE-754");
@@ -1119,8 +1113,6 @@ log_float(Logger *l, f64 num, sz precision) {
     log_int(l, fractional);
 }
 
-#include <stdarg.h>
-
 void
 log_print(Logger *l, Str format, ...) {
     assert(l);
@@ -1287,12 +1279,18 @@ log_init(sz memsize, FILE *dest, Arena arena) {
 
 // Default loggers and convenience macros for printing.
 Logger logger_inf, logger_err;
-#define print(format, ...) \
+
+#define _print(format, ...) \
     log_print(&logger_inf, (Str){(u8 *)(format), LEN(format) - 1}, __VA_ARGS__)
-#define println(format, ...) print(format "\n", __VA_ARGS__)
-#define printerr(format, ...) \
+#define _println(format, ...) print(format "\n", __VA_ARGS__)
+#define print(...) _print(__VA_ARGS__, "")
+#define println(...) _println(__VA_ARGS__, "")
+
+#define _printerr(format, ...) \
     log_print(&logger_err, (Str){(u8 *)(format), LEN(format) - 1}, __VA_ARGS__)
-#define printerrln(format, ...) printerr(format "\n", __VA_ARGS__)
+#define _printerrln(format, ...) printerr(format "\n", __VA_ARGS__)
+#define printerr(...) _printerr(__VA_ARGS__, "")
+#define printerrln(...) _printerrln(__VA_ARGS__, "")
 
 void
 log_func_register(Logger *l, LogFuncMap map) {
diff --git a/src/main.c b/src/main.c
index 82d7e8b..0567116 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,29 +17,30 @@ static ExecMode mode = RUN_NORMAL;
 #define LEXER_MEM GB(2)
 
 void
+init(void) {
+    log_init_default();
+}
+
+void
 process_file(Str path) {
-    printf("processing: ");
-    printstrln(&path);
-    printf("initialing memory...\n");
+    println("processing: ");
+    println("%s", path);
+    println("initialing memory...");
     Arena lexer_arena = arena_create(LEXER_MEM, os_allocator);
-    printf("reading file...\n");
+    println("reading file...");
     FileContents file = platform_read_file(path, &lexer_arena);
 
     Str scanner = file.data;
-    Str line = str_split(&scanner, cstr("\n"));
-    printf("%04d  ", 1);
-    printstrln(&line);
     // NOTE: Testing file read line by line.
-    // for (sz i = 0; scanner.size != 0; i++) {
-    //     Str line = str_split(&scanner, cstr("\n"));
-    //     printf("%04ld  ", i + 1);
-    //     printstrln(&line);
-    // }
+    for (sz i = 0; scanner.size != 0; i++) {
+        Str line = str_split(&scanner, cstr("\n"));
+        println("%x{4}  %s", i + 1, line);
+    }
 
-    log_init_default();
     println("<<< %x{4} %b{4} %f{2} %s %{Arena} >>>", 123, 3, 1.345,
             cstr("BOOM!"), &logger_inf.storage);
-    printerrln("%s:%d:%d: %s", path, 1, 1, cstr("error: testing string logger"));
+    printerrln("%s:%d:%d: %s", path, 1, 1,
+               cstr("error: testing string logger"));
 
     // TODO: run lexer.
 }
@@ -89,6 +90,8 @@ main(int argc, char *argv[]) {
         }
     }
 
+    init();
+
     // Run from stdin.
     if (optind == argc) {
         // TODO: REPL