rbs 4.0.0.dev.5 → 4.0.1.dev.1

data/src/lexstate.c

@@ -118,7 +118,7 @@ unsigned int rbs_peek(rbs_lexer_t *lexer) {
 }
 
 bool rbs_next_char(rbs_lexer_t *lexer, unsigned int *codepoint, size_t *byte_len) {
-    if (RBS_UNLIKELY(lexer->current.char_pos == lexer->end_pos)) {
+    if (RBS_UNLIKELY(lexer->current.byte_pos == lexer->end_pos)) {
         return false;
     }
 

data/src/location.c

@@ -1,48 +1,8 @@
 #include "rbs/location.h"
-#include "rbs/util/rbs_assert.h"
 
-#include <stdio.h>
-
-#define RBS_LOC_CHILDREN_SIZE(cap) (sizeof(rbs_loc_children) + sizeof(rbs_loc_entry) * ((cap) - 1))
-
-void rbs_loc_alloc_children(rbs_allocator_t *allocator, rbs_location_t *loc, size_t capacity) {
-    RBS_ASSERT(capacity <= sizeof(rbs_loc_entry_bitmap) * 8, "Capacity %zu is too large. Max is %zu", capacity, sizeof(rbs_loc_entry_bitmap) * 8);
-
-    loc->children = (rbs_loc_children *) rbs_allocator_malloc_impl(allocator, RBS_LOC_CHILDREN_SIZE(capacity), rbs_alignof(rbs_loc_children));
-
-    loc->children->len = 0;
-    loc->children->required_p = 0;
-    loc->children->cap = capacity;
-}
-
-void rbs_loc_add_optional_child(rbs_location_t *loc, rbs_constant_id_t name, rbs_range_t r) {
-    RBS_ASSERT(loc->children != NULL, "All children should have been pre-allocated with rbs_loc_alloc_children()");
-    RBS_ASSERT((loc->children->len + 1 <= loc->children->cap), "Not enough space was pre-allocated for the children. Children: %hu, Capacity: %hu", loc->children->len, loc->children->cap);
-
-    unsigned short i = loc->children->len++;
-    loc->children->entries[i].name = name;
-    loc->children->entries[i].rg = (rbs_loc_range) { r.start.char_pos, r.end.char_pos };
-}
-
-void rbs_loc_add_required_child(rbs_location_t *loc, rbs_constant_id_t name, rbs_range_t r) {
-    rbs_loc_add_optional_child(loc, name, r);
-    unsigned short last_index = loc->children->len - 1;
-    loc->children->required_p |= 1 << last_index;
-}
-
-rbs_location_t *rbs_location_new(rbs_allocator_t *allocator, rbs_range_t rg) {
-    rbs_location_t *location = rbs_allocator_alloc(allocator, rbs_location_t);
-    *location = (rbs_location_t) {
-        .rg = rg,
-        .children = NULL,
-    };
-
-    return location;
-}
-
-rbs_location_list_t *rbs_location_list_new(rbs_allocator_t *allocator) {
-    rbs_location_list_t *list = rbs_allocator_alloc(allocator, rbs_location_list_t);
-    *list = (rbs_location_list_t) {
+rbs_location_range_list_t *rbs_location_range_list_new(rbs_allocator_t *allocator) {
+    rbs_location_range_list_t *list = rbs_allocator_alloc(allocator, rbs_location_range_list_t);
+    *list = (rbs_location_range_list_t) {
         .allocator = allocator,
         .head = NULL,
         .tail = NULL,
@@ -52,10 +12,10 @@ rbs_location_list_t *rbs_location_list_new(rbs_allocator_t *allocator) {
     return list;
 }
 
-void rbs_location_list_append(rbs_location_list_t *list, rbs_location_t *loc) {
-    rbs_location_list_node_t *node = rbs_allocator_alloc(list->allocator, rbs_location_list_node_t);
-    *node = (rbs_location_list_node_t) {
-        .loc = loc,
+void rbs_location_range_list_append(rbs_location_range_list_t *list, rbs_location_range range) {
+    rbs_location_range_list_node_t *node = rbs_allocator_alloc(list->allocator, rbs_location_range_list_node_t);
+    *node = (rbs_location_range_list_node_t) {
+        .range = range,
         .next = NULL,
     };