prism 0.26.0 → 0.27.0

data/sig/prism.rbs

@@ -17,7 +17,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[ProgramNode]
+  ) -> ParseResult
 
   def self.lex: (
     String source,
@@ -28,7 +28,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[Array[[Token, Integer]]]
+  ) -> LexResult
 
   def self.lex_compat: (
     String source,
@@ -39,7 +39,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[Array[[[Integer, Integer], Symbol, String, untyped]]]
+  ) -> LexCompat::Result
 
   def self.parse_lex: (
     String source,
@@ -50,7 +50,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[[ProgramNode, Array[[Token, Integer]]]]
+  ) -> ParseLexResult
 
   def self.dump: (
     String source,
@@ -99,7 +99,7 @@ module Prism
   def self.load: (
     String source,
     String serialized
-  ) -> ParseResult[ProgramNode]
+  ) -> ParseResult
 
   def self.lex_ripper: (
     String source
@@ -115,7 +115,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[ProgramNode]
+  ) -> ParseResult
 
   def self.lex_file: (
     String filepath,
@@ -125,7 +125,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[Array[[Token, Integer]]]
+  ) -> LexResult
 
   def self.parse_lex_file: (
     String filepath,
@@ -135,7 +135,7 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[[ProgramNode, Array[[Token, Integer]]]]
+  ) -> ParseLexResult
 
   def self.dump_file: (
     String filepath,
@@ -190,5 +190,5 @@ module Prism
     ?frozen_string_literal: bool,
     ?verbose: bool,
     ?scopes: Array[Array[Symbol]]
-  ) -> ParseResult[ProgramNode]
+  ) -> ParseResult
 end

data/src/diagnostic.c

@@ -8,7 +8,7 @@
 
 #include "prism/diagnostic.h"
 
-#define PM_DIAGNOSTIC_ID_MAX 281
+#define PM_DIAGNOSTIC_ID_MAX 284
 
 /** This struct holds the data for each diagnostic. */
 typedef struct {
@@ -224,6 +224,8 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_MAX] = {
     [PM_ERR_INSTANCE_VARIABLE_BARE]             = { "'@' without identifiers is not allowed as an instance variable name", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_BLOCK_EXIT]                 = { "Invalid %s", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_FLOAT_EXPONENT]             = { "invalid exponent", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_LOCAL_VARIABLE_READ]        = { "identifier %.*s is not valid to get", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_LOCAL_VARIABLE_WRITE]       = { "identifier %.*s is not valid to set", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_NUMBER_BINARY]              = { "invalid binary number", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_NUMBER_DECIMAL]             = { "invalid decimal number", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_NUMBER_HEXADECIMAL]         = { "invalid hexadecimal number", PM_ERROR_LEVEL_SYNTAX },
@@ -297,6 +299,7 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_MAX] = {
     [PM_ERR_PATTERN_HASH_KEY]                   = { "expected a key in the hash pattern", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_HASH_KEY_DUPLICATE]         = { "duplicated key name", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_HASH_KEY_LABEL]             = { "expected a label as the key in the hash pattern", PM_ERROR_LEVEL_SYNTAX }, // TODO // THIS // AND // ABOVE // IS WEIRD
+    [PM_ERR_PATTERN_HASH_KEY_LOCALS]            = { "key must be valid as local variables", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_IDENT_AFTER_HROCKET]        = { "expected an identifier after the `=>` operator", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_LABEL_AFTER_COMMA]          = { "expected a label after the `,` in the hash pattern", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_REST]                       = { "unexpected rest pattern", PM_ERROR_LEVEL_SYNTAX },
@@ -515,6 +518,8 @@ pm_diagnostic_id_human(pm_diagnostic_id_t diag_id) {
         case PM_ERR_INVALID_CHARACTER: return "invalid_character";
         case PM_ERR_INVALID_ENCODING_MAGIC_COMMENT: return "invalid_encoding_magic_comment";
         case PM_ERR_INVALID_FLOAT_EXPONENT: return "invalid_float_exponent";
+        case PM_ERR_INVALID_LOCAL_VARIABLE_READ: return "invalid_local_variable_read";
+        case PM_ERR_INVALID_LOCAL_VARIABLE_WRITE: return "invalid_local_variable_write";
         case PM_ERR_INVALID_MULTIBYTE_CHAR: return "invalid_multibyte_char";
         case PM_ERR_INVALID_MULTIBYTE_CHARACTER: return "invalid_multibyte_character";
         case PM_ERR_INVALID_MULTIBYTE_ESCAPE: return "invalid_multibyte_escape";
@@ -587,6 +592,7 @@ pm_diagnostic_id_human(pm_diagnostic_id_t diag_id) {
         case PM_ERR_PATTERN_HASH_KEY: return "pattern_hash_key";
         case PM_ERR_PATTERN_HASH_KEY_DUPLICATE: return "pattern_hash_key_duplicate";
         case PM_ERR_PATTERN_HASH_KEY_LABEL: return "pattern_hash_key_label";
+        case PM_ERR_PATTERN_HASH_KEY_LOCALS: return "pattern_hash_key_locals";
         case PM_ERR_PATTERN_IDENT_AFTER_HROCKET: return "pattern_ident_after_hrocket";
         case PM_ERR_PATTERN_LABEL_AFTER_COMMA: return "pattern_label_after_comma";
         case PM_ERR_PATTERN_REST: return "pattern_rest";

data/src/prism.c

@@ -13234,9 +13234,15 @@ parse_assocs(pm_parser_t *parser, pm_static_literals_t *literals, pm_node_t *nod
                         pm_token_t constant = { .type = PM_TOKEN_CONSTANT, .start = label.start, .end = label.end - 1 };
                         value = (pm_node_t *) pm_constant_read_node_create(parser, &constant);
                     } else {
-                        int depth = pm_parser_local_depth(parser, &((pm_token_t) { .type = PM_TOKEN_IDENTIFIER, .start = label.start, .end = label.end - 1 }));
+                        int depth = -1;
                         pm_token_t identifier = { .type = PM_TOKEN_IDENTIFIER, .start = label.start, .end = label.end - 1 };
 
+                        if (identifier.end[-1] == '!' || identifier.end[-1] == '?') {
+                            PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, identifier, PM_ERR_INVALID_LOCAL_VARIABLE_READ);
+                        } else {
+                            depth = pm_parser_local_depth(parser, &identifier);
+                        }
+
                         if (depth == -1) {
                             value = (pm_node_t *) pm_call_node_variable_call_create(parser, &identifier);
                         } else {
@@ -15643,8 +15649,15 @@ parse_pattern_hash_implicit_value(pm_parser_t *parser, pm_constant_id_list_t *ca
     const pm_location_t *value_loc = &((pm_symbol_node_t *) key)->value_loc;
     pm_constant_id_t constant_id = pm_parser_constant_id_location(parser, value_loc->start, value_loc->end);
 
-    int depth;
-    if ((depth = pm_parser_local_depth_constant_id(parser, constant_id)) == -1) {
+    int depth = -1;
+    if (value_loc->end[-1] == '!' || value_loc->end[-1] == '?') {
+        pm_parser_err(parser, key->base.location.start, key->base.location.end, PM_ERR_PATTERN_HASH_KEY_LOCALS);
+        PM_PARSER_ERR_LOCATION_FORMAT(parser, value_loc, PM_ERR_INVALID_LOCAL_VARIABLE_WRITE, (int) (value_loc->end - value_loc->start), (const char *) value_loc->start);
+    } else {
+        depth = pm_parser_local_depth_constant_id(parser, constant_id);
+    }
+
+    if (depth == -1) {
         pm_parser_local_add(parser, constant_id, value_loc->start, value_loc->end, 0);
     }
 

data/src/util/pm_integer.c

@@ -135,12 +135,19 @@ karatsuba_multiply(pm_integer_t *destination, pm_integer_t *left, pm_integer_t *
     }
 
     if (left_length * 2 <= right_length) {
-        uint32_t *values = (uint32_t*) xcalloc(left_length + right_length, sizeof(uint32_t));
+        uint32_t *values = (uint32_t *) xcalloc(left_length + right_length, sizeof(uint32_t));
 
         for (size_t start_offset = 0; start_offset < right_length; start_offset += left_length) {
             size_t end_offset = start_offset + left_length;
             if (end_offset > right_length) end_offset = right_length;
 
+            pm_integer_t sliced_left = {
+                .value = 0,
+                .length = left_length,
+                .values = left_values,
+                .negative = false
+            };
+
             pm_integer_t sliced_right = {
                 .value = 0,
                 .length = end_offset - start_offset,
@@ -149,7 +156,7 @@ karatsuba_multiply(pm_integer_t *destination, pm_integer_t *left, pm_integer_t *
             };
 
             pm_integer_t product;
-            karatsuba_multiply(&product, left, &sliced_right, base);
+            karatsuba_multiply(&product, &sliced_left, &sliced_right, base);
 
             uint32_t carry = 0;
             for (size_t index = 0; index < product.length; index++) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prism
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email: