From 2a990d69669c2a2cd16134e8ebbd2750060f8071 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 27 May 2021 16:32:35 -0700
Subject: stage1: rework tokenizer to match stage2

 * Extracts AstGen logic from ir.cpp into astgen.cpp. Reduces the
   largest file of stage1 from 33,551 lines to 25,510.
 * tokenizer: rework it completely to match the stage2 tokenizer logic.
   They can now be maintained together; when one is changed, the other
   can be changed in the same way.
   - Each token now takes up 13 bytes instead of 64 bytes. The tokenizer
     does not parse char literals, string literals, integer literals,
     etc into meaningful data. Instead, that happens during parsing or
     astgen.
   - no longer store line offsets. Error messages scan source
     files to find the line/column as needed (same as stage2).
   - main loop: instead of checking the loop, handle a null byte
     explicitly in the switch statements. This is a nice improvement
     that we may want to backport to stage2.
   - delete some dead tokens, artifacts of past syntax that no longer
     exists.
 * Parser: fix a TODO by parsing builtin functions as tokens rather than
   `@` as a separate token. This is how stage2 does it.
 * Remove some debugging infrastructure. These will need to be redone,
   if at all, as the code migrates to match stage2.
   - remove the ast_render code.
   - remove the IR debugging stuff
   - remove teh token printing code
---
 src/stage1/errmsg.cpp | 59 +++++++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 40 deletions(-)

(limited to 'src/stage1/errmsg.cpp')

diff --git a/src/stage1/errmsg.cpp b/src/stage1/errmsg.cpp
index 7bf096547f..e04d39fe88 100644
--- a/src/stage1/errmsg.cpp
+++ b/src/stage1/errmsg.cpp
@@ -96,14 +96,14 @@ void err_msg_add_note(ErrorMsg *parent, ErrorMsg *note) {
     parent->notes.append(note);
 }
 
-ErrorMsg *err_msg_create_with_offset(Buf *path, size_t line, size_t column, size_t offset,
-        const char *source, Buf *msg)
+ErrorMsg *err_msg_create_with_offset(Buf *path, uint32_t byte_offset, const char *source,
+    Buf *msg)
 {
     ErrorMsg *err_msg = heap::c_allocator.create<ErrorMsg>();
     err_msg->path = path;
-    err_msg->line_start = line;
-    err_msg->column_start = column;
     err_msg->msg = msg;
+    err_msg->line_start = 0;
+    err_msg->column_start = 0;
 
     if (source == nullptr) {
         // Must initialize the buffer anyway
@@ -111,46 +111,25 @@ ErrorMsg *err_msg_create_with_offset(Buf *path, size_t line, size_t column, size
         return err_msg;
     }
 
-    size_t line_start_offset = offset;
-    for (;;) {
-        if (line_start_offset == 0) {
-            break;
-        }
-
-        line_start_offset -= 1;
-
-        if (source[line_start_offset] == '\n') {
-            line_start_offset += 1;
-            break;
+    size_t line_start = 0;
+    size_t i = 0;
+    for (;i < byte_offset; i += 1) {
+        switch (source[i]) {
+            case '\n':
+                err_msg->line_start += 1;
+                err_msg->column_start = 0;
+                line_start = i + 1;
+                continue;
+            default:
+                err_msg->column_start += 1;
+                continue;
         }
     }
-
-    size_t line_end_offset = offset;
-    while (source[line_end_offset] && source[line_end_offset] != '\n') {
-        line_end_offset += 1;
+    while (source[i] != '\n' && source[i] != 0) {
+        i += 1;
     }
 
-    buf_init_from_mem(&err_msg->line_buf, source + line_start_offset, line_end_offset - line_start_offset);
-
-    return err_msg;
-}
-
-ErrorMsg *err_msg_create_with_line(Buf *path, size_t line, size_t column,
-        Buf *source, ZigList<size_t> *line_offsets, Buf *msg)
-{
-    ErrorMsg *err_msg = heap::c_allocator.create<ErrorMsg>();
-    err_msg->path = path;
-    err_msg->line_start = line;
-    err_msg->column_start = column;
-    err_msg->msg = msg;
-
-    size_t line_start_offset = line_offsets->at(line);
-    size_t end_line = line + 1;
-    size_t line_end_offset = (end_line >= line_offsets->length) ? buf_len(source) : line_offsets->at(line + 1);
-    size_t len = (line_end_offset + 1 > line_start_offset) ? (line_end_offset - line_start_offset - 1) : 0;
-    if (len == SIZE_MAX) len = 0;
-
-    buf_init_from_mem(&err_msg->line_buf, buf_ptr(source) + line_start_offset, len);
+    buf_init_from_mem(&err_msg->line_buf, source + line_start, i - line_start);
 
     return err_msg;
 }
-- 
cgit v1.2.3