prism 0.23.0 → 0.25.0

data/src/options.c

@@ -29,7 +29,15 @@ pm_options_line_set(pm_options_t *options, int32_t line) {
  */
 PRISM_EXPORTED_FUNCTION void
 pm_options_frozen_string_literal_set(pm_options_t *options, bool frozen_string_literal) {
-    options->frozen_string_literal = frozen_string_literal;
+    options->frozen_string_literal = frozen_string_literal ? PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED : PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED;
+}
+
+/**
+ * Sets the command line option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_command_line_set(pm_options_t *options, uint8_t command_line) {
+    options->command_line = command_line;
 }
 
 /**
@@ -64,14 +72,22 @@ pm_options_version_set(pm_options_t *options, const char *version, size_t length
     return false;
 }
 
+// For some reason, GCC analyzer thinks we're leaking allocated scopes and
+// locals here, even though we definitely aren't. This is a false positive.
+// Ideally we wouldn't need to suppress this.
+#if defined(__GNUC__) && (__GNUC__ >= 10)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
+#endif
+
 /**
  * Allocate and zero out the scopes array on the given options struct.
  */
-PRISM_EXPORTED_FUNCTION void
+PRISM_EXPORTED_FUNCTION bool
 pm_options_scopes_init(pm_options_t *options, size_t scopes_count) {
     options->scopes_count = scopes_count;
-    options->scopes = calloc(scopes_count, sizeof(pm_options_scope_t));
-    if (options->scopes == NULL) abort();
+    options->scopes = xcalloc(scopes_count, sizeof(pm_options_scope_t));
+    return options->scopes != NULL;
 }
 
 /**
@@ -86,11 +102,11 @@ pm_options_scope_get(const pm_options_t *options, size_t index) {
  * Create a new options scope struct. This will hold a set of locals that are in
  * scope surrounding the code that is being parsed.
  */
-PRISM_EXPORTED_FUNCTION void
+PRISM_EXPORTED_FUNCTION bool
 pm_options_scope_init(pm_options_scope_t *scope, size_t locals_count) {
     scope->locals_count = locals_count;
-    scope->locals = calloc(locals_count, sizeof(pm_string_t));
-    if (scope->locals == NULL) abort();
+    scope->locals = xcalloc(locals_count, sizeof(pm_string_t));
+    return scope->locals != NULL;
 }
 
 /**
@@ -116,10 +132,10 @@ pm_options_free(pm_options_t *options) {
             pm_string_free(&scope->locals[local_index]);
         }
 
-        free(scope->locals);
+        xfree(scope->locals);
     }
 
-    free(options->scopes);
+    xfree(options->scopes);
 }
 
 /**
@@ -185,21 +201,25 @@ pm_options_read(pm_options_t *options, const char *data) {
         data += encoding_length;
     }
 
-    options->frozen_string_literal = *data++;
+    options->frozen_string_literal = (int8_t) *data++;
+    options->command_line = (uint8_t) *data++;
     options->version = (pm_options_version_t) *data++;
 
     uint32_t scopes_count = pm_options_read_u32(data);
     data += 4;
 
     if (scopes_count > 0) {
-        pm_options_scopes_init(options, scopes_count);
+        if (!pm_options_scopes_init(options, scopes_count)) return;
 
         for (size_t scope_index = 0; scope_index < scopes_count; scope_index++) {
             uint32_t locals_count = pm_options_read_u32(data);
             data += 4;
 
             pm_options_scope_t *scope = &options->scopes[scope_index];
-            pm_options_scope_init(scope, locals_count);
+            if (!pm_options_scope_init(scope, locals_count)) {
+                pm_options_free(options);
+                return;
+            }
 
             for (size_t local_index = 0; local_index < locals_count; local_index++) {
                 uint32_t local_length = pm_options_read_u32(data);
@@ -211,3 +231,7 @@ pm_options_read(pm_options_t *options, const char *data) {
         }
     }
 }
+
+#if defined(__GNUC__) && (__GNUC__ >= 10)
+#pragma GCC diagnostic pop
+#endif

data/src/pack.c

@@ -1,16 +1,43 @@
 #include "prism/pack.h"
 
+// We optionally support parsing String#pack templates. For systems that don't
+// want or need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_PACK define.
+#ifdef PRISM_EXCLUDE_PACK
+
+void pm_pack_parse(void) {}
+
+#else
+
 #include <stdbool.h>
 #include <errno.h>
 
 static uintmax_t
-strtoumaxc(const char **format);
+strtoumaxc(const char **format) {
+    uintmax_t value = 0;
+    while (**format >= '0' && **format <= '9') {
+        if (value > UINTMAX_MAX / 10) {
+            errno = ERANGE;
+        }
+        value = value * 10 + ((uintmax_t) (**format - '0'));
+        (*format)++;
+    }
+    return value;
+}
 
 PRISM_EXPORTED_FUNCTION pm_pack_result
-pm_pack_parse(pm_pack_variant variant, const char **format, const char *format_end,
-                            pm_pack_type *type, pm_pack_signed *signed_type, pm_pack_endian *endian, pm_pack_size *size,
-                            pm_pack_length_type *length_type, uint64_t *length, pm_pack_encoding *encoding) {
-
+pm_pack_parse(
+    pm_pack_variant variant,
+    const char **format,
+    const char *format_end,
+    pm_pack_type *type,
+    pm_pack_signed *signed_type,
+    pm_pack_endian *endian,
+    pm_pack_size *size,
+    pm_pack_length_type *length_type,
+    uint64_t *length,
+    pm_pack_encoding *encoding
+) {
     if (*encoding == PM_PACK_ENCODING_START) {
         *encoding = PM_PACK_ENCODING_US_ASCII;
     }
@@ -479,15 +506,4 @@ pm_size_to_native(pm_pack_size size) {
     }
 }
 
-static uintmax_t
-strtoumaxc(const char **format) {
-    uintmax_t value = 0;
-    while (**format >= '0' && **format <= '9') {
-        if (value > UINTMAX_MAX / 10) {
-            errno = ERANGE;
-        }
-        value = value * 10 + ((uintmax_t) (**format - '0'));
-        (*format)++;
-    }
-    return value;
-}
+#endif