herb 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad9b36758689e8b12d360b0ab22322e820762b4b065556d90a5d1d2cdd319b0
-  data.tar.gz: d298f4e91debfefac4725f7647f671d4eeb571a0d6e52d19b2452eeaf5c4b497
+  metadata.gz: 66ed20e875ccdc0463b1725a0f31c677bc937a1b0bd6a4fc84818d2a931084e4
+  data.tar.gz: 760085da8a546311e48998363501a705df7cd90cf28b16ca7624b0725bfc28b7
 SHA512:
-  metadata.gz: a935b405301ba5ffc3531ae41157321278d4f6f56a56a15d7e287605493eaf2d4fe9a4a43e753001ea094d462d7972c50691c569ea01c7e2470e8f41cc8d4623
-  data.tar.gz: 1157b317060949235da509fb8f7b33f424ade19a1288b3319140c233e6df53afc560042ca4713ee71abfdb00975b673844d0bd16d01259ea2b0fbe91cce43ae8
+  metadata.gz: 88cee87519fef1a297eb582fc87150de05d50a2b83cca919b077de5bf8ce45eff36ed3dc28e3fcd7faa745b2e13ad490a43d4a84a032de5d33135c7503731b30
+  data.tar.gz: b66b20f7fa764e3798073f6e5516ed6f8cfecfdbec80e3a9bdc9a9c0f7927945e3b91790ada745ab7276a1f19a7673f30a7b14c960f97587138784791f78a44c

data/config.yml

@@ -886,6 +886,11 @@ nodes:
           type: array
           kind: Node
 
+        - name: block_arguments
+          type: array
+          kind:
+            - RubyParameterNode
+
         - name: rescue_clause
           type: node
           kind: ERBRescueNode
@@ -1184,23 +1189,8 @@ nodes:
           type: node
           kind: RubyLiteralNode
 
-    - name: ERBRenderNode
+    - name: RubyRenderKeywordsNode
       fields:
-        - name: tag_opening
-          type: token
-
-        - name: content
-          type: token
-
-        - name: tag_closing
-          type: token
-
-        - name: analyzed_ruby
-          type: analyzed_ruby
-
-        - name: prism_node
-          type: prism_node
-
         - name: partial
           type: token
 
@@ -1257,7 +1247,53 @@ nodes:
           kind:
             - RubyRenderLocalNode
 
-    - name: RubyStrictLocalNode
+    - name: ERBRenderNode
+      fields:
+        - name: tag_opening
+          type: token
+
+        - name: content
+          type: token
+
+        - name: tag_closing
+          type: token
+
+        - name: analyzed_ruby
+          type: analyzed_ruby
+
+        - name: prism_node
+          type: prism_node
+
+        - name: keywords
+          type: node
+          kind: RubyRenderKeywordsNode
+
+        - name: body
+          type: array
+          kind: Node
+
+        - name: block_arguments
+          type: array
+          kind:
+            - RubyParameterNode
+
+        - name: rescue_clause
+          type: node
+          kind: ERBRescueNode
+
+        - name: else_clause
+          type: node
+          kind: ERBElseNode
+
+        - name: ensure_clause
+          type: node
+          kind: ERBEnsureNode
+
+        - name: end_node
+          type: node
+          kind: ERBEndNode
+
+    - name: RubyParameterNode
       fields:
         - name: name
           type: token
@@ -1266,10 +1302,10 @@ nodes:
           type: node
           kind: RubyLiteralNode
 
-        - name: required
-          type: boolean
+        - name: kind
+          type: string
 
-        - name: double_splat
+        - name: required
           type: boolean
 
     - name: ERBStrictLocalsNode
@@ -1292,7 +1328,7 @@ nodes:
         - name: locals
           type: array
           kind:
-            - RubyStrictLocalNode
+            - RubyParameterNode
 
     - name: ERBYieldNode
       fields:

data/ext/herb/nodes.c

@@ -54,8 +54,9 @@ static VALUE cERBEnsureNode;
 static VALUE cERBBeginNode;
 static VALUE cERBUnlessNode;
 static VALUE cRubyRenderLocalNode;
+static VALUE cRubyRenderKeywordsNode;
 static VALUE cERBRenderNode;
-static VALUE cRubyStrictLocalNode;
+static VALUE cRubyParameterNode;
 static VALUE cERBStrictLocalsNode;
 static VALUE cERBYieldNode;
 static VALUE cERBInNode;
@@ -100,8 +101,9 @@ void rb_init_node_classes(void) {
   cERBBeginNode = rb_define_class_under(mAST, "ERBBeginNode", cNode);
   cERBUnlessNode = rb_define_class_under(mAST, "ERBUnlessNode", cNode);
   cRubyRenderLocalNode = rb_define_class_under(mAST, "RubyRenderLocalNode", cNode);
+  cRubyRenderKeywordsNode = rb_define_class_under(mAST, "RubyRenderKeywordsNode", cNode);
   cERBRenderNode = rb_define_class_under(mAST, "ERBRenderNode", cNode);
-  cRubyStrictLocalNode = rb_define_class_under(mAST, "RubyStrictLocalNode", cNode);
+  cRubyParameterNode = rb_define_class_under(mAST, "RubyParameterNode", cNode);
   cERBStrictLocalsNode = rb_define_class_under(mAST, "ERBStrictLocalsNode", cNode);
   cERBYieldNode = rb_define_class_under(mAST, "ERBYieldNode", cNode);
   cERBInNode = rb_define_class_under(mAST, "ERBInNode", cNode);
@@ -826,12 +828,13 @@ static VALUE rb_erb_block_node_from_c_struct(AST_ERB_BLOCK_NODE_T* erb_block_nod
     erb_block_node_prism_node = Qnil;
   }
   VALUE erb_block_node_body = rb_nodes_array_from_c_array(erb_block_node->body);
+  VALUE erb_block_node_block_arguments = rb_nodes_array_from_c_array(erb_block_node->block_arguments);
   VALUE erb_block_node_rescue_clause = rb_node_from_c_struct((AST_NODE_T*) erb_block_node->rescue_clause);
   VALUE erb_block_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_block_node->else_clause);
   VALUE erb_block_node_ensure_clause = rb_node_from_c_struct((AST_NODE_T*) erb_block_node->ensure_clause);
   VALUE erb_block_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_block_node->end_node);
 
-  VALUE args[12] = {
+  VALUE args[13] = {
     type,
     location,
     errors,
@@ -840,13 +843,14 @@ static VALUE rb_erb_block_node_from_c_struct(AST_ERB_BLOCK_NODE_T* erb_block_nod
     erb_block_node_tag_closing,
     erb_block_node_prism_node,
     erb_block_node_body,
+    erb_block_node_block_arguments,
     erb_block_node_rescue_clause,
     erb_block_node_else_clause,
     erb_block_node_ensure_clause,
     erb_block_node_end_node
   };
 
-  return rb_class_new_instance(12, args, cERBBlockNode);
+  return rb_class_new_instance(13, args, cERBBlockNode);
 };
 
 static VALUE rb_erb_when_node_from_c_struct(AST_ERB_WHEN_NODE_T* erb_when_node) {
@@ -1297,6 +1301,61 @@ static VALUE rb_ruby_render_local_node_from_c_struct(AST_RUBY_RENDER_LOCAL_NODE_
   return rb_class_new_instance(5, args, cRubyRenderLocalNode);
 };
 
+static VALUE rb_ruby_render_keywords_node_from_c_struct(AST_RUBY_RENDER_KEYWORDS_NODE_T* ruby_render_keywords_node) {
+  if (ruby_render_keywords_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &ruby_render_keywords_node->base;
+
+  VALUE type = rb_string_from_hb_string(ast_node_type_to_string(node));
+  VALUE location = rb_location_from_c_struct(node->location);
+  VALUE errors = rb_errors_array_from_c_array(node->errors);
+
+  VALUE ruby_render_keywords_node_partial = rb_token_from_c_struct(ruby_render_keywords_node->partial);
+  VALUE ruby_render_keywords_node_template_path = rb_token_from_c_struct(ruby_render_keywords_node->template_path);
+  VALUE ruby_render_keywords_node_layout = rb_token_from_c_struct(ruby_render_keywords_node->layout);
+  VALUE ruby_render_keywords_node_file = rb_token_from_c_struct(ruby_render_keywords_node->file);
+  VALUE ruby_render_keywords_node_inline_template = rb_token_from_c_struct(ruby_render_keywords_node->inline_template);
+  VALUE ruby_render_keywords_node_body = rb_token_from_c_struct(ruby_render_keywords_node->body);
+  VALUE ruby_render_keywords_node_plain = rb_token_from_c_struct(ruby_render_keywords_node->plain);
+  VALUE ruby_render_keywords_node_html = rb_token_from_c_struct(ruby_render_keywords_node->html);
+  VALUE ruby_render_keywords_node_renderable = rb_token_from_c_struct(ruby_render_keywords_node->renderable);
+  VALUE ruby_render_keywords_node_collection = rb_token_from_c_struct(ruby_render_keywords_node->collection);
+  VALUE ruby_render_keywords_node_object = rb_token_from_c_struct(ruby_render_keywords_node->object);
+  VALUE ruby_render_keywords_node_as_name = rb_token_from_c_struct(ruby_render_keywords_node->as_name);
+  VALUE ruby_render_keywords_node_spacer_template = rb_token_from_c_struct(ruby_render_keywords_node->spacer_template);
+  VALUE ruby_render_keywords_node_formats = rb_token_from_c_struct(ruby_render_keywords_node->formats);
+  VALUE ruby_render_keywords_node_variants = rb_token_from_c_struct(ruby_render_keywords_node->variants);
+  VALUE ruby_render_keywords_node_handlers = rb_token_from_c_struct(ruby_render_keywords_node->handlers);
+  VALUE ruby_render_keywords_node_content_type = rb_token_from_c_struct(ruby_render_keywords_node->content_type);
+  VALUE ruby_render_keywords_node_locals = rb_nodes_array_from_c_array(ruby_render_keywords_node->locals);
+
+  VALUE args[21] = {
+    type,
+    location,
+    errors,
+    ruby_render_keywords_node_partial,
+    ruby_render_keywords_node_template_path,
+    ruby_render_keywords_node_layout,
+    ruby_render_keywords_node_file,
+    ruby_render_keywords_node_inline_template,
+    ruby_render_keywords_node_body,
+    ruby_render_keywords_node_plain,
+    ruby_render_keywords_node_html,
+    ruby_render_keywords_node_renderable,
+    ruby_render_keywords_node_collection,
+    ruby_render_keywords_node_object,
+    ruby_render_keywords_node_as_name,
+    ruby_render_keywords_node_spacer_template,
+    ruby_render_keywords_node_formats,
+    ruby_render_keywords_node_variants,
+    ruby_render_keywords_node_handlers,
+    ruby_render_keywords_node_content_type,
+    ruby_render_keywords_node_locals
+  };
+
+  return rb_class_new_instance(21, args, cRubyRenderKeywordsNode);
+};
+
 static VALUE rb_erb_render_node_from_c_struct(AST_ERB_RENDER_NODE_T* erb_render_node) {
   if (erb_render_node == NULL) { return Qnil; }
 
@@ -1327,26 +1386,15 @@ static VALUE rb_erb_render_node_from_c_struct(AST_ERB_RENDER_NODE_T* erb_render_
   } else {
     erb_render_node_prism_node = Qnil;
   }
-  VALUE erb_render_node_partial = rb_token_from_c_struct(erb_render_node->partial);
-  VALUE erb_render_node_template_path = rb_token_from_c_struct(erb_render_node->template_path);
-  VALUE erb_render_node_layout = rb_token_from_c_struct(erb_render_node->layout);
-  VALUE erb_render_node_file = rb_token_from_c_struct(erb_render_node->file);
-  VALUE erb_render_node_inline_template = rb_token_from_c_struct(erb_render_node->inline_template);
-  VALUE erb_render_node_body = rb_token_from_c_struct(erb_render_node->body);
-  VALUE erb_render_node_plain = rb_token_from_c_struct(erb_render_node->plain);
-  VALUE erb_render_node_html = rb_token_from_c_struct(erb_render_node->html);
-  VALUE erb_render_node_renderable = rb_token_from_c_struct(erb_render_node->renderable);
-  VALUE erb_render_node_collection = rb_token_from_c_struct(erb_render_node->collection);
-  VALUE erb_render_node_object = rb_token_from_c_struct(erb_render_node->object);
-  VALUE erb_render_node_as_name = rb_token_from_c_struct(erb_render_node->as_name);
-  VALUE erb_render_node_spacer_template = rb_token_from_c_struct(erb_render_node->spacer_template);
-  VALUE erb_render_node_formats = rb_token_from_c_struct(erb_render_node->formats);
-  VALUE erb_render_node_variants = rb_token_from_c_struct(erb_render_node->variants);
-  VALUE erb_render_node_handlers = rb_token_from_c_struct(erb_render_node->handlers);
-  VALUE erb_render_node_content_type = rb_token_from_c_struct(erb_render_node->content_type);
-  VALUE erb_render_node_locals = rb_nodes_array_from_c_array(erb_render_node->locals);
-
-  VALUE args[26] = {
+  VALUE erb_render_node_keywords = rb_node_from_c_struct((AST_NODE_T*) erb_render_node->keywords);
+  VALUE erb_render_node_body = rb_nodes_array_from_c_array(erb_render_node->body);
+  VALUE erb_render_node_block_arguments = rb_nodes_array_from_c_array(erb_render_node->block_arguments);
+  VALUE erb_render_node_rescue_clause = rb_node_from_c_struct((AST_NODE_T*) erb_render_node->rescue_clause);
+  VALUE erb_render_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_render_node->else_clause);
+  VALUE erb_render_node_ensure_clause = rb_node_from_c_struct((AST_NODE_T*) erb_render_node->ensure_clause);
+  VALUE erb_render_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_render_node->end_node);
+
+  VALUE args[15] = {
     type,
     location,
     errors,
@@ -1355,54 +1403,43 @@ static VALUE rb_erb_render_node_from_c_struct(AST_ERB_RENDER_NODE_T* erb_render_
     erb_render_node_tag_closing,
     erb_render_node_analyzed_ruby,
     erb_render_node_prism_node,
-    erb_render_node_partial,
-    erb_render_node_template_path,
-    erb_render_node_layout,
-    erb_render_node_file,
-    erb_render_node_inline_template,
+    erb_render_node_keywords,
     erb_render_node_body,
-    erb_render_node_plain,
-    erb_render_node_html,
-    erb_render_node_renderable,
-    erb_render_node_collection,
-    erb_render_node_object,
-    erb_render_node_as_name,
-    erb_render_node_spacer_template,
-    erb_render_node_formats,
-    erb_render_node_variants,
-    erb_render_node_handlers,
-    erb_render_node_content_type,
-    erb_render_node_locals
+    erb_render_node_block_arguments,
+    erb_render_node_rescue_clause,
+    erb_render_node_else_clause,
+    erb_render_node_ensure_clause,
+    erb_render_node_end_node
   };
 
-  return rb_class_new_instance(26, args, cERBRenderNode);
+  return rb_class_new_instance(15, args, cERBRenderNode);
 };
 
-static VALUE rb_ruby_strict_local_node_from_c_struct(AST_RUBY_STRICT_LOCAL_NODE_T* ruby_strict_local_node) {
-  if (ruby_strict_local_node == NULL) { return Qnil; }
+static VALUE rb_ruby_parameter_node_from_c_struct(AST_RUBY_PARAMETER_NODE_T* ruby_parameter_node) {
+  if (ruby_parameter_node == NULL) { return Qnil; }
 
-  AST_NODE_T* node = &ruby_strict_local_node->base;
+  AST_NODE_T* node = &ruby_parameter_node->base;
 
   VALUE type = rb_string_from_hb_string(ast_node_type_to_string(node));
   VALUE location = rb_location_from_c_struct(node->location);
   VALUE errors = rb_errors_array_from_c_array(node->errors);
 
-  VALUE ruby_strict_local_node_name = rb_token_from_c_struct(ruby_strict_local_node->name);
-  VALUE ruby_strict_local_node_default_value = rb_node_from_c_struct((AST_NODE_T*) ruby_strict_local_node->default_value);
-  VALUE ruby_strict_local_node_required = (ruby_strict_local_node->required) ? Qtrue : Qfalse;
-  VALUE ruby_strict_local_node_double_splat = (ruby_strict_local_node->double_splat) ? Qtrue : Qfalse;
+  VALUE ruby_parameter_node_name = rb_token_from_c_struct(ruby_parameter_node->name);
+  VALUE ruby_parameter_node_default_value = rb_node_from_c_struct((AST_NODE_T*) ruby_parameter_node->default_value);
+  VALUE ruby_parameter_node_kind = rb_string_from_hb_string(ruby_parameter_node->kind);
+  VALUE ruby_parameter_node_required = (ruby_parameter_node->required) ? Qtrue : Qfalse;
 
   VALUE args[7] = {
     type,
     location,
     errors,
-    ruby_strict_local_node_name,
-    ruby_strict_local_node_default_value,
-    ruby_strict_local_node_required,
-    ruby_strict_local_node_double_splat
+    ruby_parameter_node_name,
+    ruby_parameter_node_default_value,
+    ruby_parameter_node_kind,
+    ruby_parameter_node_required
   };
 
-  return rb_class_new_instance(7, args, cRubyStrictLocalNode);
+  return rb_class_new_instance(7, args, cRubyParameterNode);
 };
 
 static VALUE rb_erb_strict_locals_node_from_c_struct(AST_ERB_STRICT_LOCALS_NODE_T* erb_strict_locals_node) {
@@ -1548,8 +1585,9 @@ VALUE rb_node_from_c_struct(AST_NODE_T* node) {
     case AST_ERB_BEGIN_NODE: return rb_erb_begin_node_from_c_struct((AST_ERB_BEGIN_NODE_T*) node); break;
     case AST_ERB_UNLESS_NODE: return rb_erb_unless_node_from_c_struct((AST_ERB_UNLESS_NODE_T*) node); break;
     case AST_RUBY_RENDER_LOCAL_NODE: return rb_ruby_render_local_node_from_c_struct((AST_RUBY_RENDER_LOCAL_NODE_T*) node); break;
+    case AST_RUBY_RENDER_KEYWORDS_NODE: return rb_ruby_render_keywords_node_from_c_struct((AST_RUBY_RENDER_KEYWORDS_NODE_T*) node); break;
     case AST_ERB_RENDER_NODE: return rb_erb_render_node_from_c_struct((AST_ERB_RENDER_NODE_T*) node); break;
-    case AST_RUBY_STRICT_LOCAL_NODE: return rb_ruby_strict_local_node_from_c_struct((AST_RUBY_STRICT_LOCAL_NODE_T*) node); break;
+    case AST_RUBY_PARAMETER_NODE: return rb_ruby_parameter_node_from_c_struct((AST_RUBY_PARAMETER_NODE_T*) node); break;
     case AST_ERB_STRICT_LOCALS_NODE: return rb_erb_strict_locals_node_from_c_struct((AST_ERB_STRICT_LOCALS_NODE_T*) node); break;
     case AST_ERB_YIELD_NODE: return rb_erb_yield_node_from_c_struct((AST_ERB_YIELD_NODE_T*) node); break;
     case AST_ERB_IN_NODE: return rb_erb_in_node_from_c_struct((AST_ERB_IN_NODE_T*) node); break;