herb 0.8.5 → 0.8.6

data/vendor/prism/src/serialize.c

@@ -395,6 +395,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
                 pm_buffer_append_byte(buffer, 1);
                 pm_serialize_location(parser, &((pm_call_node_t *)node)->closing_loc, buffer);
             }
+            if (((pm_call_node_t *)node)->equal_loc.start == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_buffer_append_byte(buffer, 1);
+                pm_serialize_location(parser, &((pm_call_node_t *)node)->equal_loc, buffer);
+            }
             if (((pm_call_node_t *)node)->block == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -2177,7 +2183,7 @@ pm_serialize_content(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer)
                 // buffer offset. We will add a leading 1 to indicate that this
                 // is a buffer offset.
                 uint32_t content_offset = pm_sizet_to_u32(buffer->length);
-                uint32_t owned_mask = (uint32_t) (1 << 31);
+                uint32_t owned_mask = 1U << 31;
 
                 assert(content_offset < owned_mask);
                 content_offset |= owned_mask;

data/vendor/prism/src/token_type.c

@@ -48,6 +48,8 @@ pm_token_type_name(pm_token_type_t token_type) {
             return "NEWLINE";
         case PM_TOKEN_PARENTHESIS_RIGHT:
             return "PARENTHESIS_RIGHT";
+        case PM_TOKEN_PIPE:
+            return "PIPE";
         case PM_TOKEN_SEMICOLON:
             return "SEMICOLON";
         case PM_TOKEN_AMPERSAND:
@@ -280,8 +282,6 @@ pm_token_type_name(pm_token_type_t token_type) {
             return "PERCENT_UPPER_I";
         case PM_TOKEN_PERCENT_UPPER_W:
             return "PERCENT_UPPER_W";
-        case PM_TOKEN_PIPE:
-            return "PIPE";
         case PM_TOKEN_PIPE_EQUAL:
             return "PIPE_EQUAL";
         case PM_TOKEN_PIPE_PIPE:

data/vendor/prism/src/util/pm_constant_pool.c

@@ -264,7 +264,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.
                 xfree((void *) constant->start);
                 constant->start = start;
-                bucket->type = (unsigned int) (PM_CONSTANT_POOL_BUCKET_DEFAULT & 0x3);
+                bucket->type = (unsigned int) (type & 0x3);
             }
 
             return bucket->id;

data/vendor/prism/templates/include/prism/ast.h.erb

@@ -105,22 +105,6 @@ typedef uint16_t pm_node_flags_t;
 static const pm_node_flags_t PM_NODE_FLAG_NEWLINE = 0x1;
 static const pm_node_flags_t PM_NODE_FLAG_STATIC_LITERAL = 0x2;
 
-/**
- * Cast the type to an enum to allow the compiler to provide exhaustiveness
- * checking.
- */
-#define PM_NODE_TYPE(node) ((enum pm_node_type) (node)->type)
-
-/**
- * Return true if the type of the given node matches the given type.
- */
-#define PM_NODE_TYPE_P(node, type) (PM_NODE_TYPE(node) == (type))
-
-/**
- * Return true if the given flag is set on the given node.
- */
-#define PM_NODE_FLAG_P(node, flag) ((((pm_node_t *)(node))->flags & (flag)) != 0)
-
 /**
  * This is the base structure that represents a node in the syntax tree. It is
  * embedded into every node type.
@@ -150,6 +134,32 @@ typedef struct pm_node {
      */
     pm_location_t location;
 } pm_node_t;
+
+/**
+ * Cast the given node to the base pm_node_t type.
+ */
+#define PM_NODE_UPCAST(node_) ((pm_node_t *) (node_))
+
+/**
+ * Cast the type to an enum to allow the compiler to provide exhaustiveness
+ * checking.
+ */
+#define PM_NODE_TYPE(node_) ((enum pm_node_type) (node_)->type)
+
+/**
+ * Return true if the type of the given node matches the given type.
+ */
+#define PM_NODE_TYPE_P(node_, type_) (PM_NODE_TYPE(node_) == (type_))
+
+/**
+ * Return the flags associated with the given node.
+ */
+#define PM_NODE_FLAGS(node_) (PM_NODE_UPCAST(node_)->flags)
+
+/**
+ * Return true if the given flag is set on the given node.
+ */
+#define PM_NODE_FLAG_P(node_, flag_) ((PM_NODE_FLAGS(node_) & (flag_)) != 0)
 <%- nodes.each do |node| -%>
 
 /**

data/vendor/prism/templates/java/org/prism/Loader.java.erb

@@ -101,7 +101,7 @@ public class Loader {
         expect((byte) 'M', "incorrect prism header");
 
         expect((byte) 1, "prism major version does not match");
-        expect((byte) 6, "prism minor version does not match");
+        expect((byte) 7, "prism minor version does not match");
         expect((byte) 0, "prism patch version does not match");
 
         expect((byte) 1, "Loader.java requires no location fields in the serialized output");

data/vendor/prism/templates/javascript/src/deserialize.js.erb

@@ -1,7 +1,7 @@
 import * as nodes from "./nodes.js";
 
 const MAJOR_VERSION = 1;
-const MINOR_VERSION = 6;
+const MINOR_VERSION = 7;
 const PATCH_VERSION = 0;
 
 // The DataView getFloat64 function takes an optional second argument that

data/vendor/prism/templates/lib/prism/serialize.rb.erb

@@ -10,7 +10,7 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 6
+    MINOR_VERSION = 7
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.

data/vendor/prism/templates/src/diagnostic.c.erb

@@ -301,6 +301,7 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_MAX] = {
     [PM_ERR_PARAMETER_UNEXPECTED_NO_KW]         = { "unexpected **nil; no keywords marker disallowed after keywords", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_ARRAY_MULTIPLE_RESTS]       = { "unexpected multiple '*' rest patterns in an array pattern", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_CAPTURE_DUPLICATE]          = { "duplicated variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_CAPTURE_IN_ALTERNATIVE]     = { "variable capture in alternative pattern", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET]   = { "expected a pattern expression after the `[` operator", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA]     = { "expected a pattern expression after `,`", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET]   = { "expected a pattern expression after `=>`", PM_ERROR_LEVEL_SYNTAX },
@@ -361,6 +362,7 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_MAX] = {
     [PM_ERR_UNEXPECTED_INDEX_KEYWORDS]          = { "unexpected keyword arg given in index assignment; keywords are not allowed in index assignment expressions", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_UNEXPECTED_LABEL]                   = { "unexpected label", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_UNEXPECTED_MULTI_WRITE]             = { "unexpected multiple assignment; multiple assignment is not allowed in this context", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_PARAMETER_DEFAULT_VALUE] = { "unexpected %s; expected a default value for a parameter", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_UNEXPECTED_RANGE_OPERATOR]          = { "unexpected range operator; .. and ... are non-associative and cannot be chained", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_UNEXPECTED_SAFE_NAVIGATION]         = { "&. inside multiple assignment destination", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT]     = { "unexpected %s, assuming it is closing the parent %s", PM_ERROR_LEVEL_SYNTAX },

data/vendor/prism/templates/src/serialize.c.erb

@@ -315,7 +315,7 @@ pm_serialize_content(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer)
                 // buffer offset. We will add a leading 1 to indicate that this
                 // is a buffer offset.
                 uint32_t content_offset = pm_sizet_to_u32(buffer->length);
-                uint32_t owned_mask = (uint32_t) (1 << 31);
+                uint32_t owned_mask = 1U << 31;
 
                 assert(content_offset < owned_mask);
                 content_offset |= owned_mask;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herb
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Marco Roth
@@ -145,6 +145,7 @@ files:
 - src/include/util/hb_arena_debug.h
 - src/include/util/hb_array.h
 - src/include/util/hb_buffer.h
+- src/include/util/hb_narray.h
 - src/include/util/hb_string.h
 - src/include/util/hb_system.h
 - src/include/version.h
@@ -170,6 +171,7 @@ files:
 - src/util/hb_arena_debug.c
 - src/util/hb_array.c
 - src/util/hb_buffer.c
+- src/util/hb_narray.c
 - src/util/hb_string.c
 - src/util/hb_system.c
 - src/visitor.c