prism 0.15.0 → 0.16.0

data/src/util/pm_buffer.c

@@ -40,9 +40,13 @@ pm_buffer_append_length(pm_buffer_t *buffer, size_t length) {
     size_t next_length = buffer->length + length;
 
     if (next_length > buffer->capacity) {
-        do {
+        if (buffer->capacity == 0) {
+            buffer->capacity = 1;
+        }
+
+        while (next_length > buffer->capacity) {
             buffer->capacity *= 2;
-        } while (next_length > buffer->capacity);
+        }
 
         buffer->value = realloc(buffer->value, buffer->capacity);
     }
@@ -53,20 +57,43 @@ pm_buffer_append_length(pm_buffer_t *buffer, size_t length) {
 // Append a generic pointer to memory to the buffer.
 static inline void
 pm_buffer_append(pm_buffer_t *buffer, const void *source, size_t length) {
+    size_t cursor = buffer->length;
     pm_buffer_append_length(buffer, length);
-    memcpy(buffer->value + (buffer->length - length), source, length);
+    memcpy(buffer->value + cursor, source, length);
 }
 
 // Append the given amount of space as zeroes to the buffer.
 void
 pm_buffer_append_zeroes(pm_buffer_t *buffer, size_t length) {
+    size_t cursor = buffer->length;
     pm_buffer_append_length(buffer, length);
-    memset(buffer->value + (buffer->length - length), 0, length);
+    memset(buffer->value + cursor, 0, length);
+}
+
+// Append a formatted string to the buffer.
+void
+pm_buffer_append_format(pm_buffer_t *buffer, const char *format, ...) {
+    va_list arguments;
+    va_start(arguments, format);
+    int result = vsnprintf(NULL, 0, format, arguments);
+    va_end(arguments);
+
+    if (result < 0) return;
+    size_t length = (size_t) (result + 1);
+
+    size_t cursor = buffer->length;
+    pm_buffer_append_length(buffer, length);
+
+    va_start(arguments, format);
+    vsnprintf(buffer->value + cursor, length, format, arguments);
+    va_end(arguments);
+
+    buffer->length--;
 }
 
 // Append a string to the buffer.
 void
-pm_buffer_append_str(pm_buffer_t *buffer, const char *value, size_t length) {
+pm_buffer_append_string(pm_buffer_t *buffer, const char *value, size_t length) {
     pm_buffer_append(buffer, value, length);
 }
 
@@ -78,27 +105,35 @@ pm_buffer_append_bytes(pm_buffer_t *buffer, const uint8_t *value, size_t length)
 
 // Append a single byte to the buffer.
 void
-pm_buffer_append_u8(pm_buffer_t *buffer, uint8_t value) {
+pm_buffer_append_byte(pm_buffer_t *buffer, uint8_t value) {
     const void *source = &value;
     pm_buffer_append(buffer, source, sizeof(uint8_t));
 }
 
-// Append a 32-bit unsigned integer to the buffer.
+// Append a 32-bit unsigned integer to the buffer as a variable-length integer.
 void
-pm_buffer_append_u32(pm_buffer_t *buffer, uint32_t value) {
+pm_buffer_append_varint(pm_buffer_t *buffer, uint32_t value) {
     if (value < 128) {
-        pm_buffer_append_u8(buffer, (uint8_t) value);
+        pm_buffer_append_byte(buffer, (uint8_t) value);
     } else {
         uint32_t n = value;
         while (n >= 128) {
-            pm_buffer_append_u8(buffer, (uint8_t) (n | 128));
+            pm_buffer_append_byte(buffer, (uint8_t) (n | 128));
             n >>= 7;
         }
-        pm_buffer_append_u8(buffer, (uint8_t) n);
+        pm_buffer_append_byte(buffer, (uint8_t) n);
+    }
+}
+
+// Concatenate one buffer onto another.
+void
+pm_buffer_concat(pm_buffer_t *destination, const pm_buffer_t *source) {
+    if (source->length > 0) {
+        pm_buffer_append(destination, source->value, source->length);
     }
 }
 
-// Free the memory associated with the buffer.
+// Free the internal memory associated with the buffer.
 void
 pm_buffer_free(pm_buffer_t *buffer) {
     free(buffer->value);

data/src/util/pm_constant_pool.c

@@ -156,7 +156,7 @@ pm_constant_pool_init(pm_constant_pool_t *pool, uint32_t capacity) {
 
 // Return a pointer to the constant indicated by the given constant id.
 pm_constant_t *
-pm_constant_pool_id_to_constant(pm_constant_pool_t *pool, pm_constant_id_t constant_id) {
+pm_constant_pool_id_to_constant(const pm_constant_pool_t *pool, pm_constant_id_t constant_id) {
     assert(constant_id > 0 && constant_id <= pool->size);
     return &pool->constants[constant_id - 1];
 }
@@ -197,7 +197,7 @@ pm_constant_pool_insert(pm_constant_pool_t *pool, const uint8_t *start, size_t l
                 // constant and replace it with the shared constant.
                 free((void *) constant->start);
                 constant->start = start;
-                bucket->type = PM_CONSTANT_POOL_BUCKET_DEFAULT;
+                bucket->type = (unsigned int) (PM_CONSTANT_POOL_BUCKET_DEFAULT & 0x3);
             }
 
             return bucket->id;

data/src/util/pm_newline_list.c

@@ -53,10 +53,14 @@ pm_newline_list_check_append(pm_newline_list_t *list, const uint8_t *cursor) {
     return pm_newline_list_append(list, cursor);
 }
 
-// Returns the line and column of the given offset, assuming we don't have any
-// information about the previous index that we found.
-static pm_line_column_t
-pm_newline_list_line_column_search(pm_newline_list_t *list, size_t offset) {
+// Returns the line and column of the given offset. If the offset is not in the
+// list, the line and column of the closest offset less than the given offset
+// are returned.
+pm_line_column_t
+pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor) {
+    assert(cursor >= list->start);
+    size_t offset = (size_t) (cursor - list->start);
+
     size_t left = 0;
     size_t right = list->size - 1;
 
@@ -77,56 +81,6 @@ pm_newline_list_line_column_search(pm_newline_list_t *list, size_t offset) {
     return ((pm_line_column_t) { left - 1, offset - list->offsets[left - 1] });
 }
 
-// Returns the line and column of the given offset, assuming we know the last
-// index that we found.
-static pm_line_column_t
-pm_newline_list_line_column_scan(pm_newline_list_t *list, size_t offset) {
-    if (offset > list->last_offset) {
-        size_t index = list->last_index;
-        while (index < list->size && list->offsets[index] < offset) {
-            index++;
-        }
-
-        if (index == list->size) {
-            return ((pm_line_column_t) { index - 1, offset - list->offsets[index - 1] });
-        }
-
-        return ((pm_line_column_t) { index, 0 });
-    } else {
-        size_t index = list->last_index;
-        while (index > 0 && list->offsets[index] > offset) {
-            index--;
-        }
-
-        if (index == 0) {
-            return ((pm_line_column_t) { 0, offset });
-        }
-
-        return ((pm_line_column_t) { index, offset - list->offsets[index - 1] });
-    }
-}
-
-// Returns the line and column of the given offset. If the offset is not in the
-// list, the line and column of the closest offset less than the given offset
-// are returned.
-pm_line_column_t
-pm_newline_list_line_column(pm_newline_list_t *list, const uint8_t *cursor) {
-    assert(cursor >= list->start);
-    size_t offset = (size_t) (cursor - list->start);
-    pm_line_column_t result;
-
-    if (list->last_offset == 0) {
-        result = pm_newline_list_line_column_search(list, offset);
-    } else {
-        result = pm_newline_list_line_column_scan(list, offset);
-    }
-
-    list->last_index = result.line;
-    list->last_offset = offset;
-
-    return result;
-}
-
 // Free the internal memory allocated for the newline list.
 void
 pm_newline_list_free(pm_newline_list_t *list) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prism
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -32,8 +32,10 @@ files:
 - docs/encoding.md
 - docs/fuzzing.md
 - docs/heredocs.md
+- docs/javascript.md
 - docs/mapping.md
 - docs/prism.png
+- docs/releasing.md
 - docs/ripper.md
 - docs/ruby_api.md
 - docs/serialization.md
@@ -51,6 +53,7 @@ files:
 - include/prism/node.h
 - include/prism/pack.h
 - include/prism/parser.h
+- include/prism/prettyprint.h
 - include/prism/regexp.h
 - include/prism/util/pm_buffer.h
 - include/prism/util/pm_char.h
@@ -84,6 +87,10 @@ files:
 - lib/prism/serialize.rb
 - lib/prism/visitor.rb
 - prism.gemspec
+- rbi/prism.rbi
+- rbi/prism_static.rbi
+- sig/prism.rbs
+- sig/prism_static.rbs
 - src/diagnostic.c
 - src/enc/pm_big5.c
 - src/enc/pm_euc_jp.c