prism 0.17.1 → 0.19.0

data/src/node.c

@@ -237,6 +237,12 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
+#line 58 "node.c.erb"
+        case PM_CALL_TARGET_NODE: {
+            pm_call_target_node_t *cast = (pm_call_target_node_t *) node;
+            pm_node_destroy(parser, (pm_node_t *)cast->receiver);
+            break;
+        }
 #line 58 "node.c.erb"
         case PM_CAPTURE_PATTERN_NODE: {
             pm_capture_pattern_node_t *cast = (pm_capture_pattern_node_t *) node;
@@ -244,6 +250,18 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->target);
             break;
         }
+#line 58 "node.c.erb"
+        case PM_CASE_MATCH_NODE: {
+            pm_case_match_node_t *cast = (pm_case_match_node_t *) node;
+            if (cast->predicate != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->predicate);
+            }
+            pm_node_list_free(parser, &cast->conditions);
+            if (cast->consequent != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->consequent);
+            }
+            break;
+        }
 #line 58 "node.c.erb"
         case PM_CASE_NODE: {
             pm_case_node_t *cast = (pm_case_node_t *) node;
@@ -560,6 +578,10 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
+#line 58 "node.c.erb"
+        case PM_IMPLICIT_REST_NODE: {
+            break;
+        }
 #line 58 "node.c.erb"
         case PM_IN_NODE: {
             pm_in_node_t *cast = (pm_in_node_t *) node;
@@ -614,6 +636,18 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
+#line 58 "node.c.erb"
+        case PM_INDEX_TARGET_NODE: {
+            pm_index_target_node_t *cast = (pm_index_target_node_t *) node;
+            pm_node_destroy(parser, (pm_node_t *)cast->receiver);
+            if (cast->arguments != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->arguments);
+            }
+            if (cast->block != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->block);
+            }
+            break;
+        }
 #line 58 "node.c.erb"
         case PM_INSTANCE_VARIABLE_AND_WRITE_NODE: {
             pm_instance_variable_and_write_node_t *cast = (pm_instance_variable_and_write_node_t *) node;
@@ -758,7 +792,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
         case PM_MATCH_WRITE_NODE: {
             pm_match_write_node_t *cast = (pm_match_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->call);
-            pm_constant_id_list_free(&cast->locals);
+            pm_node_list_free(parser, &cast->targets);
             break;
         }
 #line 58 "node.c.erb"
@@ -812,6 +846,10 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
         case PM_NO_KEYWORDS_PARAMETER_NODE: {
             break;
         }
+#line 58 "node.c.erb"
+        case PM_NUMBERED_PARAMETERS_NODE: {
+            break;
+        }
 #line 58 "node.c.erb"
         case PM_NUMBERED_REFERENCE_READ_NODE: {
             break;
@@ -1011,13 +1049,6 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_list_free(parser, &cast->body);
             break;
         }
-#line 58 "node.c.erb"
-        case PM_STRING_CONCAT_NODE: {
-            pm_string_concat_node_t *cast = (pm_string_concat_node_t *) node;
-            pm_node_destroy(parser, (pm_node_t *)cast->left);
-            pm_node_destroy(parser, (pm_node_t *)cast->right);
-            break;
-        }
 #line 58 "node.c.erb"
         case PM_STRING_NODE: {
             pm_string_node_t *cast = (pm_string_node_t *) node;
@@ -1332,6 +1363,13 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             pm_node_memsize_node((pm_node_t *)cast->value, memsize);
             break;
         }
+#line 103 "node.c.erb"
+        case PM_CALL_TARGET_NODE: {
+            pm_call_target_node_t *cast = (pm_call_target_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            pm_node_memsize_node((pm_node_t *)cast->receiver, memsize);
+            break;
+        }
 #line 103 "node.c.erb"
         case PM_CAPTURE_PATTERN_NODE: {
             pm_capture_pattern_node_t *cast = (pm_capture_pattern_node_t *) node;
@@ -1340,6 +1378,21 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             pm_node_memsize_node((pm_node_t *)cast->target, memsize);
             break;
         }
+#line 103 "node.c.erb"
+        case PM_CASE_MATCH_NODE: {
+            pm_case_match_node_t *cast = (pm_case_match_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            // Node lists will add in their own sizes below.
+            memsize->memsize -= sizeof(pm_node_list_t) * 1;
+            if (cast->predicate != NULL) {
+                pm_node_memsize_node((pm_node_t *)cast->predicate, memsize);
+            }
+            memsize->memsize += pm_node_list_memsize(&cast->conditions, memsize);
+            if (cast->consequent != NULL) {
+                pm_node_memsize_node((pm_node_t *)cast->consequent, memsize);
+            }
+            break;
+        }
 #line 103 "node.c.erb"
         case PM_CASE_NODE: {
             pm_case_node_t *cast = (pm_case_node_t *) node;
@@ -1723,6 +1776,12 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             pm_node_memsize_node((pm_node_t *)cast->value, memsize);
             break;
         }
+#line 103 "node.c.erb"
+        case PM_IMPLICIT_REST_NODE: {
+            pm_implicit_rest_node_t *cast = (pm_implicit_rest_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            break;
+        }
 #line 103 "node.c.erb"
         case PM_IN_NODE: {
             pm_in_node_t *cast = (pm_in_node_t *) node;
@@ -1781,6 +1840,19 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             pm_node_memsize_node((pm_node_t *)cast->value, memsize);
             break;
         }
+#line 103 "node.c.erb"
+        case PM_INDEX_TARGET_NODE: {
+            pm_index_target_node_t *cast = (pm_index_target_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            pm_node_memsize_node((pm_node_t *)cast->receiver, memsize);
+            if (cast->arguments != NULL) {
+                pm_node_memsize_node((pm_node_t *)cast->arguments, memsize);
+            }
+            if (cast->block != NULL) {
+                pm_node_memsize_node((pm_node_t *)cast->block, memsize);
+            }
+            break;
+        }
 #line 103 "node.c.erb"
         case PM_INSTANCE_VARIABLE_AND_WRITE_NODE: {
             pm_instance_variable_and_write_node_t *cast = (pm_instance_variable_and_write_node_t *) node;
@@ -1969,10 +2041,10 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
         case PM_MATCH_WRITE_NODE: {
             pm_match_write_node_t *cast = (pm_match_write_node_t *) node;
             memsize->memsize += sizeof(*cast);
-            // Constant id lists will add in their own sizes below.
-            memsize->memsize -= sizeof(pm_constant_id_list_t) * 1;
+            // Node lists will add in their own sizes below.
+            memsize->memsize -= sizeof(pm_node_list_t) * 1;
             pm_node_memsize_node((pm_node_t *)cast->call, memsize);
-            memsize->memsize += pm_constant_id_list_memsize(&cast->locals);
+            memsize->memsize += pm_node_list_memsize(&cast->targets, memsize);
             break;
         }
 #line 103 "node.c.erb"
@@ -2042,6 +2114,12 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             memsize->memsize += sizeof(*cast);
             break;
         }
+#line 103 "node.c.erb"
+        case PM_NUMBERED_PARAMETERS_NODE: {
+            pm_numbered_parameters_node_t *cast = (pm_numbered_parameters_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            break;
+        }
 #line 103 "node.c.erb"
         case PM_NUMBERED_REFERENCE_READ_NODE: {
             pm_numbered_reference_read_node_t *cast = (pm_numbered_reference_read_node_t *) node;
@@ -2289,14 +2367,6 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             memsize->memsize += pm_node_list_memsize(&cast->body, memsize);
             break;
         }
-#line 103 "node.c.erb"
-        case PM_STRING_CONCAT_NODE: {
-            pm_string_concat_node_t *cast = (pm_string_concat_node_t *) node;
-            memsize->memsize += sizeof(*cast);
-            pm_node_memsize_node((pm_node_t *)cast->left, memsize);
-            pm_node_memsize_node((pm_node_t *)cast->right, memsize);
-            break;
-        }
 #line 103 "node.c.erb"
         case PM_STRING_NODE: {
             pm_string_node_t *cast = (pm_string_node_t *) node;
@@ -2461,8 +2531,12 @@ pm_node_type_to_str(pm_node_type_t node_type)
             return "PM_CALL_OPERATOR_WRITE_NODE";
         case PM_CALL_OR_WRITE_NODE:
             return "PM_CALL_OR_WRITE_NODE";
+        case PM_CALL_TARGET_NODE:
+            return "PM_CALL_TARGET_NODE";
         case PM_CAPTURE_PATTERN_NODE:
             return "PM_CAPTURE_PATTERN_NODE";
+        case PM_CASE_MATCH_NODE:
+            return "PM_CASE_MATCH_NODE";
         case PM_CASE_NODE:
             return "PM_CASE_NODE";
         case PM_CLASS_NODE:
@@ -2553,6 +2627,8 @@ pm_node_type_to_str(pm_node_type_t node_type)
             return "PM_IMAGINARY_NODE";
         case PM_IMPLICIT_NODE:
             return "PM_IMPLICIT_NODE";
+        case PM_IMPLICIT_REST_NODE:
+            return "PM_IMPLICIT_REST_NODE";
         case PM_IN_NODE:
             return "PM_IN_NODE";
         case PM_INDEX_AND_WRITE_NODE:
@@ -2561,6 +2637,8 @@ pm_node_type_to_str(pm_node_type_t node_type)
             return "PM_INDEX_OPERATOR_WRITE_NODE";
         case PM_INDEX_OR_WRITE_NODE:
             return "PM_INDEX_OR_WRITE_NODE";
+        case PM_INDEX_TARGET_NODE:
+            return "PM_INDEX_TARGET_NODE";
         case PM_INSTANCE_VARIABLE_AND_WRITE_NODE:
             return "PM_INSTANCE_VARIABLE_AND_WRITE_NODE";
         case PM_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE:
@@ -2625,6 +2703,8 @@ pm_node_type_to_str(pm_node_type_t node_type)
             return "PM_NIL_NODE";
         case PM_NO_KEYWORDS_PARAMETER_NODE:
             return "PM_NO_KEYWORDS_PARAMETER_NODE";
+        case PM_NUMBERED_PARAMETERS_NODE:
+            return "PM_NUMBERED_PARAMETERS_NODE";
         case PM_NUMBERED_REFERENCE_READ_NODE:
             return "PM_NUMBERED_REFERENCE_READ_NODE";
         case PM_OPTIONAL_KEYWORD_PARAMETER_NODE:
@@ -2683,8 +2763,6 @@ pm_node_type_to_str(pm_node_type_t node_type)
             return "PM_SPLAT_NODE";
         case PM_STATEMENTS_NODE:
             return "PM_STATEMENTS_NODE";
-        case PM_STRING_CONCAT_NODE:
-            return "PM_STRING_CONCAT_NODE";
         case PM_STRING_NODE:
             return "PM_STRING_NODE";
         case PM_SUPER_NODE:

data/src/options.c

@@ -20,7 +20,7 @@ pm_options_encoding_set(pm_options_t *options, const char *encoding) {
  * Set the line option on the given options struct.
  */
 PRISM_EXPORTED_FUNCTION void
-pm_options_line_set(pm_options_t *options, uint32_t line) {
+pm_options_line_set(pm_options_t *options, int32_t line) {
     options->line = line;
 }
 
@@ -114,6 +114,22 @@ pm_options_read_u32(const char *data) {
     }
 }
 
+/**
+ * Read a 32-bit signed integer from a pointer. This function is used to read
+ * the options that are passed into the parser from the Ruby implementation. It
+ * handles aligned and unaligned reads.
+ */
+static int32_t
+pm_options_read_s32(const char *data) {
+    if (((uintptr_t) data) % sizeof(int32_t) == 0) {
+        return *((int32_t *) data);
+    } else {
+        int32_t value;
+        memcpy(&value, data, sizeof(int32_t));
+        return value;
+    }
+}
+
 /**
  * Deserialize an options struct from the given binary string. This is used to
  * pass options to the parser from an FFI call so that consumers of the library
@@ -123,6 +139,9 @@ pm_options_read_u32(const char *data) {
  */
 void
 pm_options_read(pm_options_t *options, const char *data) {
+    options->line = 1; // default
+    if (data == NULL) return;
+
     uint32_t filepath_length = pm_options_read_u32(data);
     data += 4;
 
@@ -131,7 +150,7 @@ pm_options_read(pm_options_t *options, const char *data) {
         data += filepath_length;
     }
 
-    options->line = pm_options_read_u32(data);
+    options->line = pm_options_read_s32(data);
     data += 4;
 
     uint32_t encoding_length = pm_options_read_u32(data);