Add initial scanner functions

1 files changed, 6 insertions, 14 deletions

diff --git a/src/badlib.h b/src/badlib.h
index 9bab563..a91fcf8 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -571,6 +571,9 @@ str_next(Str *s) {
 char
 str_peek(Str s) {
     assert(s.mem);
+    if (s.size == 0) {
+        return EOF;
+    }
     return *s.mem;
 }
 
@@ -936,7 +939,6 @@ typedef enum {
     FILE_ERR_OK = 0,
     FILE_ERR_CANT_OPEN,
     FILE_ERR_READ_ERR,
-    FILE_ERR_PATH_TOO_BIG,
     FILE_ERR_EMPTY,
     FILE_ERR_NUM,
 } FileErr;
@@ -945,8 +947,7 @@ Str file_err_str[FILE_ERR_NUM] = {
     cstr(""),
     cstr("couldn't open file"),
     cstr("couldn't read file"),
-    cstr("file path too big"),
-    cstr("file is empty"),
+    cstr("empty file"),
 };
 
 typedef struct FileContents {
@@ -958,19 +959,11 @@ typedef struct FileContents {
 FileContents
 platform_read_file(Str path, Arena *a) {
     // Transform Str to cstr.
-    char path_str[KB(1)];
-    if (path.size >= KB(1) - 1) {
-        return (FileContents){
-            .path = path,
-            .err = FILE_ERR_PATH_TOO_BIG,
-        };
-    }
-    memcpy(path_str, path.mem, path.size);
-    path_str[path.size] = 0;
+    Str path_str = str_concat(path, cstr("\0"), a);
 
     // Read the entire file into memory.
     sz file_size = 0;
-    FILE *fp = fopen(path_str, "rb+");
+    FILE *fp = fopen((char*)path_str.mem, "rb+");
     if (!fp) {
         return (FileContents){
             .path = path,
@@ -989,7 +982,6 @@ platform_read_file(Str path, Arena *a) {
             .err = FILE_ERR_EMPTY,
         };
     }
-
     return (FileContents){
         .path = path,
         .data = (Array){.mem = memory, .size = file_size},