prism 0.17.0 → 0.18.0

data/src/regexp.c

@@ -116,18 +116,18 @@ pm_regexp_char_find(pm_regexp_parser_t *parser, uint8_t value) {
  * The properly track everything, we're going to build a little state machine.
  * It looks something like the following:
  *
- *                  ┌───────┐                 ┌─────────┐ ────────────┐
- * ──── lbrace ───> │ start │ ──── digit ───> │ minimum │             │
- *                  └───────┘                 └─────────┘ <─── digit ─┘
- *                      │                       │    │
- *   ┌───────┐          │                       │  rbrace
- *   │ comma │ <───── comma  ┌──── comma ───────┘    │
- *   └───────┘               V                       V
- *      │             ┌─────────┐               ┌─────────┐
- *      └── digit ──> │ maximum │ ── rbrace ──> │| final |│
- *                    └─────────┘               └─────────┘
- *                    │         ^
- *                    └─ digit ─┘
+ *                  +-------+                 +---------+ ------------+
+ * ---- lbrace ---> | start | ---- digit ---> | minimum |             |
+ *                  +-------+                 +---------+ <--- digit -+
+ *                      |                       |    |
+ *   +-------+          |                       |  rbrace
+ *   | comma | <----- comma  +---- comma -------+    |
+ *   +-------+               V                       V
+ *      |             +---------+               +---------+
+ *      +-- digit --> | maximum | -- rbrace --> || final ||
+ *                    +---------+               +---------+
+ *                    |         ^
+ *                    +- digit -+
  *
  * Note that by the time we've hit this function, the lbrace has already been
  * consumed so we're in the start state.

data/src/serialize.c

@@ -422,6 +422,26 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             pm_serialize_location(parser, &((pm_capture_pattern_node_t *)node)->operator_loc, buffer);
             break;
         }
+        case PM_CASE_MATCH_NODE: {
+            if (((pm_case_match_node_t *)node)->predicate == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_serialize_node(parser, (pm_node_t *)((pm_case_match_node_t *)node)->predicate, buffer);
+            }
+            uint32_t conditions_size = pm_sizet_to_u32(((pm_case_match_node_t *)node)->conditions.size);
+            pm_buffer_append_varint(buffer, conditions_size);
+            for (uint32_t index = 0; index < conditions_size; index++) {
+                pm_serialize_node(parser, (pm_node_t *) ((pm_case_match_node_t *)node)->conditions.nodes[index], buffer);
+            }
+            if (((pm_case_match_node_t *)node)->consequent == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_serialize_node(parser, (pm_node_t *)((pm_case_match_node_t *)node)->consequent, buffer);
+            }
+            pm_serialize_location(parser, &((pm_case_match_node_t *)node)->case_keyword_loc, buffer);
+            pm_serialize_location(parser, &((pm_case_match_node_t *)node)->end_keyword_loc, buffer);
+            break;
+        }
         case PM_CASE_NODE: {
             if (((pm_case_node_t *)node)->predicate == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -880,6 +900,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
                 pm_serialize_location(parser, &((pm_if_node_t *)node)->if_keyword_loc, buffer);
             }
             pm_serialize_node(parser, (pm_node_t *)((pm_if_node_t *)node)->predicate, buffer);
+            if (((pm_if_node_t *)node)->then_keyword_loc.start == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_buffer_append_byte(buffer, 1);
+                pm_serialize_location(parser, &((pm_if_node_t *)node)->then_keyword_loc, buffer);
+            }
             if (((pm_if_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1228,10 +1254,10 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
         }
         case PM_MATCH_WRITE_NODE: {
             pm_serialize_node(parser, (pm_node_t *)((pm_match_write_node_t *)node)->call, buffer);
-            uint32_t locals_size = pm_sizet_to_u32(((pm_match_write_node_t *)node)->locals.size);
-            pm_buffer_append_varint(buffer, locals_size);
-            for (uint32_t index = 0; index < locals_size; index++) {
-                pm_buffer_append_varint(buffer, pm_sizet_to_u32(((pm_match_write_node_t *)node)->locals.ids[index]));
+            uint32_t targets_size = pm_sizet_to_u32(((pm_match_write_node_t *)node)->targets.size);
+            pm_buffer_append_varint(buffer, targets_size);
+            for (uint32_t index = 0; index < targets_size; index++) {
+                pm_serialize_node(parser, (pm_node_t *) ((pm_match_write_node_t *)node)->targets.nodes[index], buffer);
             }
             break;
         }
@@ -1593,11 +1619,6 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             }
             break;
         }
-        case PM_STRING_CONCAT_NODE: {
-            pm_serialize_node(parser, (pm_node_t *)((pm_string_concat_node_t *)node)->left, buffer);
-            pm_serialize_node(parser, (pm_node_t *)((pm_string_concat_node_t *)node)->right, buffer);
-            break;
-        }
         case PM_STRING_NODE: {
             pm_buffer_append_varint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
             if (((pm_string_node_t *)node)->opening_loc.start == NULL) {
@@ -1679,6 +1700,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
         case PM_UNLESS_NODE: {
             pm_serialize_location(parser, &((pm_unless_node_t *)node)->keyword_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_unless_node_t *)node)->predicate, buffer);
+            if (((pm_unless_node_t *)node)->then_keyword_loc.start == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_buffer_append_byte(buffer, 1);
+                pm_serialize_location(parser, &((pm_unless_node_t *)node)->then_keyword_loc, buffer);
+            }
             if (((pm_unless_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prism
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -72,6 +72,7 @@ files:
 - lib/prism/debug.rb
 - lib/prism/desugar_compiler.rb
 - lib/prism/dispatcher.rb
+- lib/prism/dot_visitor.rb
 - lib/prism/dsl.rb
 - lib/prism/ffi.rb
 - lib/prism/lex_compat.rb
@@ -94,6 +95,7 @@ files:
 - sig/prism_static.rbs
 - src/diagnostic.c
 - src/enc/pm_big5.c
+- src/enc/pm_cp51932.c
 - src/enc/pm_euc_jp.c
 - src/enc/pm_gbk.c
 - src/enc/pm_shift_jis.c
@@ -124,6 +126,8 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  source_code_uri: https://github.com/ruby/prism
+  changelog_uri: https://github.com/ruby/prism/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: