Reuse rbs_buffer for comment tokens

Author: amomchilov

include/rbs/parser.h

@@ -4,6 +4,7 @@
 #include "rbs/defines.h"
 #include "rbs/util/rbs_allocator.h"
 #include "rbs/util/rbs_constant_pool.h"
+#include "rbs/util/rbs_buffer.h"
 #include "rbs/lexer.h"
 #include "rbs/ast.h"
 
@@ -27,9 +28,8 @@ typedef struct rbs_comment_t {
     rbs_position_t start;
     rbs_position_t end;
 
-    size_t line_tokens_capacity;
     size_t line_tokens_count;
-    rbs_token_t *line_tokens;
+    rbs_buffer_t /* of rbs_token_t */ line_tokens;
 
     struct rbs_comment_t *next_comment;
 } rbs_comment_t;

include/rbs/util/rbs_buffer.h

@@ -76,4 +76,29 @@ void rbs_buffer_append_string(rbs_allocator_t *, rbs_buffer_t *buffer, const cha
  */
 rbs_string_t rbs_buffer_to_string(rbs_buffer_t *buffer);
 
+/**
+ * Append a value to the buffer.
+ *
+ * @param allocator The allocator to use.
+ * @param buffer The buffer to append to.
+ * @param value The value to append.
+ * @param type The type of the value to append, which determines how many bytes to append.
+ */
+#define rbs_buffer_append_value(allocator, buffer, value, type) \
+    rbs_buffer_append_string((allocator), (buffer), (char *) (value), sizeof(type))
+
+/**
+ * Returns a copy of a `type` from the `buffer` at the given `index`.
+ *
+ * This cast is unchecked, so it's up to caller to ensure the type is correct.
+ *
+ * @param buffer The buffer to get the value from.
+ * @param index The index of the element to retrieve.
+ * @param type The element type that the data will be cast to.
+ * @returns The value at the specified index, cast to the specified type.
+ */
+#define rbs_buffer_get(buffer, index, type) ( \
+    ((type *) (buffer).value)[index]          \
+)
+
 #endif

src/parser.c

@@ -3116,7 +3116,7 @@ static rbs_ast_comment_t *parse_comment_lines(rbs_parser_t *parser, rbs_comment_
     rbs_buffer_init(ALLOCATOR(), &rbs_buffer);
 
     for (size_t i = 0; i < com->line_tokens_count; i++) {
-        rbs_token_t tok = com->line_tokens[i];
+        rbs_token_t tok = rbs_buffer_get(com->line_tokens, i, rbs_token_t);
 
         const char *comment_start = parser->rbs_lexer_t->string.start + tok.range.start.byte_pos + hash_bytes;
         size_t comment_bytes = RBS_RANGE_BYTES(tok.range) - hash_bytes;
@@ -3160,43 +3160,29 @@ static rbs_comment_t *comment_get_comment(rbs_comment_t *com, int line) {
 }
 
 static void comment_insert_new_line(rbs_allocator_t *allocator, rbs_comment_t *com, rbs_token_t comment_token) {
-    if (com->line_tokens_count == com->line_tokens_capacity) {
-        size_t old_size = com->line_tokens_capacity;
-        size_t new_size = old_size * 2;
-        com->line_tokens_capacity = new_size;
-
-        com->line_tokens = rbs_allocator_realloc(
-            allocator,
-            com->line_tokens,
-            sizeof(rbs_token_t) * old_size,
-            sizeof(rbs_token_t) * new_size,
-            rbs_token_t
-        );
-    }
+    rbs_buffer_append_value(allocator, &com->line_tokens, &comment_token, rbs_token_t);
 
-    com->line_tokens[com->line_tokens_count++] = comment_token;
+    com->line_tokens_count++;
     com->end = comment_token.range.end;
 }
 
 static rbs_comment_t *alloc_comment(rbs_allocator_t *allocator, rbs_token_t comment_token, rbs_comment_t *last_comment) {
     rbs_comment_t *new_comment = rbs_allocator_alloc(allocator, rbs_comment_t);
 
-    size_t initial_line_capacity = 10;
-
-    rbs_token_t *tokens = rbs_allocator_calloc(allocator, initial_line_capacity, rbs_token_t);
-    tokens[0] = comment_token;
-
     *new_comment = (rbs_comment_t) {
         .start = comment_token.range.start,
         .end = comment_token.range.end,
 
-        .line_tokens_capacity = initial_line_capacity,
-        .line_tokens_count = 1,
-        .line_tokens = tokens,
+        .line_tokens_count = 0,
+        .line_tokens = { 0 },
 
         .next_comment = last_comment,
     };
 
+    size_t initial_line_size = 10;
+    rbs_buffer_init_with_capacity(allocator, &new_comment->line_tokens, initial_line_size * sizeof(rbs_token_t));
+    comment_insert_new_line(allocator, new_comment, comment_token);
+
     return new_comment;
 }