herb 0.9.2-arm-linux-gnu → 0.9.4-arm-linux-gnu

data/src/{ast_nodes.c → ast/ast_nodes.c}

@@ -1,20 +1,20 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/ast_nodes.c.erb
+// be modified manually. See /home/runner/work/herb/herb/templates/src/ast/ast_nodes.c.erb
 
 #include <stdio.h>
 #include <stdbool.h>
 
 #include <prism.h>
 
-#include "include/analyze/analyzed_ruby.h"
-#include "include/ast_node.h"
-#include "include/ast_nodes.h"
-#include "include/errors.h"
-#include "include/token.h"
-#include "include/util.h"
-#include "include/util/hb_allocator.h"
-#include "include/util/hb_array.h"
-#include "include/util/hb_string.h"
+#include "../include/analyze/analyzed_ruby.h"
+#include "../include/ast/ast_node.h"
+#include "../include/ast/ast_nodes.h"
+#include "../include/errors.h"
+#include "../include/lexer/token.h"
+#include "../include/util/util.h"
+#include "../include/lib/hb_allocator.h"
+#include "../include/lib/hb_array.h"
+#include "../include/lib/hb_string.h"
 
 
 AST_DOCUMENT_NODE_T* ast_document_node_init(hb_array_T* children, herb_prism_context_T* prism_context, herb_prism_node_T prism_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator) {
@@ -376,7 +376,7 @@ AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content,
   return erb_if_node;
 }
 
-AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, herb_prism_node_T prism_node, hb_array_T* body, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator) {
+AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, herb_prism_node_T prism_node, hb_array_T* body, struct AST_ERB_RESCUE_NODE_STRUCT* rescue_clause, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_ENSURE_NODE_STRUCT* ensure_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator) {
   AST_ERB_BLOCK_NODE_T* erb_block_node = hb_allocator_alloc(allocator, sizeof(AST_ERB_BLOCK_NODE_T));
 
   if (!erb_block_node) { return NULL; }
@@ -388,6 +388,9 @@ AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* con
   erb_block_node->tag_closing = token_copy(tag_closing, allocator);
   erb_block_node->prism_node = prism_node;
   erb_block_node->body = body;
+  erb_block_node->rescue_clause = rescue_clause;
+  erb_block_node->else_clause = else_clause;
+  erb_block_node->ensure_clause = ensure_clause;
   erb_block_node->end_node = end_node;
 
   return erb_block_node;
@@ -615,6 +618,38 @@ AST_ERB_RENDER_NODE_T* ast_erb_render_node_init(token_T* tag_opening, token_T* c
   return erb_render_node;
 }
 
+AST_RUBY_STRICT_LOCAL_NODE_T* ast_ruby_strict_local_node_init(token_T* name, struct AST_RUBY_LITERAL_NODE_STRUCT* default_value, bool required, bool double_splat, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator) {
+  AST_RUBY_STRICT_LOCAL_NODE_T* ruby_strict_local_node = hb_allocator_alloc(allocator, sizeof(AST_RUBY_STRICT_LOCAL_NODE_T));
+
+  if (!ruby_strict_local_node) { return NULL; }
+
+  ast_node_init(&ruby_strict_local_node->base, AST_RUBY_STRICT_LOCAL_NODE, start_position, end_position, errors, allocator);
+
+  ruby_strict_local_node->name = token_copy(name, allocator);
+  ruby_strict_local_node->default_value = default_value;
+  ruby_strict_local_node->required = required;
+  ruby_strict_local_node->double_splat = double_splat;
+
+  return ruby_strict_local_node;
+}
+
+AST_ERB_STRICT_LOCALS_NODE_T* ast_erb_strict_locals_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, herb_prism_node_T prism_node, hb_array_T* locals, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator) {
+  AST_ERB_STRICT_LOCALS_NODE_T* erb_strict_locals_node = hb_allocator_alloc(allocator, sizeof(AST_ERB_STRICT_LOCALS_NODE_T));
+
+  if (!erb_strict_locals_node) { return NULL; }
+
+  ast_node_init(&erb_strict_locals_node->base, AST_ERB_STRICT_LOCALS_NODE, start_position, end_position, errors, allocator);
+
+  erb_strict_locals_node->tag_opening = token_copy(tag_opening, allocator);
+  erb_strict_locals_node->content = token_copy(content, allocator);
+  erb_strict_locals_node->tag_closing = token_copy(tag_closing, allocator);
+  erb_strict_locals_node->analyzed_ruby = analyzed_ruby;
+  erb_strict_locals_node->prism_node = prism_node;
+  erb_strict_locals_node->locals = locals;
+
+  return erb_strict_locals_node;
+}
+
 AST_ERB_YIELD_NODE_T* ast_erb_yield_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator) {
   AST_ERB_YIELD_NODE_T* erb_yield_node = hb_allocator_alloc(allocator, sizeof(AST_ERB_YIELD_NODE_T));
 
@@ -685,6 +720,8 @@ hb_string_T ast_node_type_to_string(AST_NODE_T* node) {
     case AST_ERB_UNLESS_NODE: return hb_string("AST_ERB_UNLESS_NODE");
     case AST_RUBY_RENDER_LOCAL_NODE: return hb_string("AST_RUBY_RENDER_LOCAL_NODE");
     case AST_ERB_RENDER_NODE: return hb_string("AST_ERB_RENDER_NODE");
+    case AST_RUBY_STRICT_LOCAL_NODE: return hb_string("AST_RUBY_STRICT_LOCAL_NODE");
+    case AST_ERB_STRICT_LOCALS_NODE: return hb_string("AST_ERB_STRICT_LOCALS_NODE");
     case AST_ERB_YIELD_NODE: return hb_string("AST_ERB_YIELD_NODE");
     case AST_ERB_IN_NODE: return hb_string("AST_ERB_IN_NODE");
   }
@@ -732,6 +769,8 @@ hb_string_T ast_node_human_type(AST_NODE_T* node) {
     case AST_ERB_UNLESS_NODE: return hb_string("ERBUnlessNode");
     case AST_RUBY_RENDER_LOCAL_NODE: return hb_string("RubyRenderLocalNode");
     case AST_ERB_RENDER_NODE: return hb_string("ERBRenderNode");
+    case AST_RUBY_STRICT_LOCAL_NODE: return hb_string("RubyStrictLocalNode");
+    case AST_ERB_STRICT_LOCALS_NODE: return hb_string("ERBStrictLocalsNode");
     case AST_ERB_YIELD_NODE: return hb_string("ERBYieldNode");
     case AST_ERB_IN_NODE: return hb_string("ERBInNode");
   }
@@ -1069,6 +1108,9 @@ static void ast_free_erb_block_node(AST_ERB_BLOCK_NODE_T* erb_block_node, hb_all
 
     hb_array_free(&erb_block_node->body);
   }
+  ast_node_free((AST_NODE_T*) erb_block_node->rescue_clause, allocator);
+  ast_node_free((AST_NODE_T*) erb_block_node->else_clause, allocator);
+  ast_node_free((AST_NODE_T*) erb_block_node->ensure_clause, allocator);
   ast_node_free((AST_NODE_T*) erb_block_node->end_node, allocator);
 
   ast_free_base_node(&erb_block_node->base, allocator);
@@ -1317,6 +1359,33 @@ static void ast_free_erb_render_node(AST_ERB_RENDER_NODE_T* erb_render_node, hb_
   ast_free_base_node(&erb_render_node->base, allocator);
 }
 
+static void ast_free_ruby_strict_local_node(AST_RUBY_STRICT_LOCAL_NODE_T* ruby_strict_local_node, hb_allocator_T* allocator) {
+  if (ruby_strict_local_node->name != NULL) { token_free(ruby_strict_local_node->name, allocator); }
+  ast_node_free((AST_NODE_T*) ruby_strict_local_node->default_value, allocator);
+
+  ast_free_base_node(&ruby_strict_local_node->base, allocator);
+}
+
+static void ast_free_erb_strict_locals_node(AST_ERB_STRICT_LOCALS_NODE_T* erb_strict_locals_node, hb_allocator_T* allocator) {
+  if (erb_strict_locals_node->tag_opening != NULL) { token_free(erb_strict_locals_node->tag_opening, allocator); }
+  if (erb_strict_locals_node->content != NULL) { token_free(erb_strict_locals_node->content, allocator); }
+  if (erb_strict_locals_node->tag_closing != NULL) { token_free(erb_strict_locals_node->tag_closing, allocator); }
+  if (erb_strict_locals_node->analyzed_ruby != NULL) {
+    free_analyzed_ruby(erb_strict_locals_node->analyzed_ruby);
+  }
+  /* prism_node is a borrowed reference into the prism context, not freed here */
+  if (erb_strict_locals_node->locals != NULL) {
+    for (size_t i = 0; i < hb_array_size(erb_strict_locals_node->locals); i++) {
+      AST_NODE_T* child = hb_array_get(erb_strict_locals_node->locals, i);
+      if (child) { ast_node_free(child, allocator); }
+    }
+
+    hb_array_free(&erb_strict_locals_node->locals);
+  }
+
+  ast_free_base_node(&erb_strict_locals_node->base, allocator);
+}
+
 static void ast_free_erb_yield_node(AST_ERB_YIELD_NODE_T* erb_yield_node, hb_allocator_T* allocator) {
   if (erb_yield_node->tag_opening != NULL) { token_free(erb_yield_node->tag_opening, allocator); }
   if (erb_yield_node->content != NULL) { token_free(erb_yield_node->content, allocator); }
@@ -1384,6 +1453,8 @@ void ast_node_free(AST_NODE_T* node, hb_allocator_T* allocator) {
     case AST_ERB_UNLESS_NODE: ast_free_erb_unless_node((AST_ERB_UNLESS_NODE_T*) node, allocator); break;
     case AST_RUBY_RENDER_LOCAL_NODE: ast_free_ruby_render_local_node((AST_RUBY_RENDER_LOCAL_NODE_T*) node, allocator); break;
     case AST_ERB_RENDER_NODE: ast_free_erb_render_node((AST_ERB_RENDER_NODE_T*) node, allocator); break;
+    case AST_RUBY_STRICT_LOCAL_NODE: ast_free_ruby_strict_local_node((AST_RUBY_STRICT_LOCAL_NODE_T*) node, allocator); break;
+    case AST_ERB_STRICT_LOCALS_NODE: ast_free_erb_strict_locals_node((AST_ERB_STRICT_LOCALS_NODE_T*) node, allocator); break;
     case AST_ERB_YIELD_NODE: ast_free_erb_yield_node((AST_ERB_YIELD_NODE_T*) node, allocator); break;
     case AST_ERB_IN_NODE: ast_free_erb_in_node((AST_ERB_IN_NODE_T*) node, allocator); break;
   }

data/src/{ast_pretty_print.c → ast/ast_pretty_print.c}

@@ -1,18 +1,18 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/ast_pretty_print.c.erb
+// be modified manually. See /home/runner/work/herb/herb/templates/src/ast/ast_pretty_print.c.erb
 
 #ifdef HERB_EXCLUDE_PRETTYPRINT
   // Pretty print support excluded
 #else
 
-#include "include/analyze/helpers.h"
-#include "include/ast_node.h"
-#include "include/ast_nodes.h"
-#include "include/errors.h"
-#include "include/pretty_print.h"
-#include "include/token_struct.h"
-#include "include/util.h"
-#include "include/util/hb_buffer.h"
+#include "../include/analyze/helpers.h"
+#include "../include/ast/ast_node.h"
+#include "../include/ast/ast_nodes.h"
+#include "../include/errors.h"
+#include "../include/ast/pretty_print.h"
+#include "../include/lexer/token_struct.h"
+#include "../include/util/util.h"
+#include "../include/lib/hb_buffer.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -474,6 +474,51 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       }
       pretty_print_array(hb_string("body"), erb_block_node->body, indent, relative_indent, false, buffer);
 
+      pretty_print_label(hb_string("rescue_clause"), indent, relative_indent, false, buffer);
+
+      if (erb_block_node->rescue_clause) {
+        hb_buffer_append(buffer, "\n");
+        pretty_print_indent(buffer, indent);
+        pretty_print_indent(buffer, relative_indent + 1);
+
+        hb_buffer_append(buffer, "└── ");
+        ast_pretty_print_node((AST_NODE_T*) erb_block_node->rescue_clause, indent, relative_indent + 2, buffer);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+      hb_buffer_append(buffer, "\n");
+
+
+      pretty_print_label(hb_string("else_clause"), indent, relative_indent, false, buffer);
+
+      if (erb_block_node->else_clause) {
+        hb_buffer_append(buffer, "\n");
+        pretty_print_indent(buffer, indent);
+        pretty_print_indent(buffer, relative_indent + 1);
+
+        hb_buffer_append(buffer, "└── ");
+        ast_pretty_print_node((AST_NODE_T*) erb_block_node->else_clause, indent, relative_indent + 2, buffer);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+      hb_buffer_append(buffer, "\n");
+
+
+      pretty_print_label(hb_string("ensure_clause"), indent, relative_indent, false, buffer);
+
+      if (erb_block_node->ensure_clause) {
+        hb_buffer_append(buffer, "\n");
+        pretty_print_indent(buffer, indent);
+        pretty_print_indent(buffer, relative_indent + 1);
+
+        hb_buffer_append(buffer, "└── ");
+        ast_pretty_print_node((AST_NODE_T*) erb_block_node->ensure_clause, indent, relative_indent + 2, buffer);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+      hb_buffer_append(buffer, "\n");
+
+
       pretty_print_label(hb_string("end_node"), indent, relative_indent, true, buffer);
 
       if (erb_block_node->end_node) {
@@ -930,6 +975,65 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_array(hb_string("locals"), erb_render_node->locals, indent, relative_indent, true, buffer);
     } break;
 
+    case AST_RUBY_STRICT_LOCAL_NODE: {
+      const AST_RUBY_STRICT_LOCAL_NODE_T* ruby_strict_local_node = (AST_RUBY_STRICT_LOCAL_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(ruby_strict_local_node->name, hb_string("name"), indent, relative_indent, false, buffer);
+
+      pretty_print_label(hb_string("default_value"), indent, relative_indent, false, buffer);
+
+      if (ruby_strict_local_node->default_value) {
+        hb_buffer_append(buffer, "\n");
+        pretty_print_indent(buffer, indent);
+        pretty_print_indent(buffer, relative_indent + 1);
+
+        hb_buffer_append(buffer, "└── ");
+        ast_pretty_print_node((AST_NODE_T*) ruby_strict_local_node->default_value, indent, relative_indent + 2, buffer);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+      hb_buffer_append(buffer, "\n");
+
+      pretty_print_boolean_property(hb_string("required"), ruby_strict_local_node->required, indent, relative_indent, false, buffer);
+      pretty_print_boolean_property(hb_string("double_splat"), ruby_strict_local_node->double_splat, indent, relative_indent, true, buffer);
+    } break;
+
+    case AST_ERB_STRICT_LOCALS_NODE: {
+      const AST_ERB_STRICT_LOCALS_NODE_T* erb_strict_locals_node = (AST_ERB_STRICT_LOCALS_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_strict_locals_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_strict_locals_node->content, hb_string("content"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_strict_locals_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      if (erb_strict_locals_node->analyzed_ruby) {
+        pretty_print_boolean_property(hb_string("if_node"), has_if_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("elsif_node"), has_elsif_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("else_node"), has_else_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("end"), has_end(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("block_node"), has_block_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("block_closing"), has_block_closing(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("case_node"), has_case_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("when_node"), has_when_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("for_node"), has_for_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("while_node"), has_while_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("until_node"), has_until_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("begin_node"), has_begin_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("rescue_node"), has_rescue_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("ensure_node"), has_ensure_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+        pretty_print_boolean_property(hb_string("unless_node"), has_unless_node(erb_strict_locals_node->analyzed_ruby), indent, relative_indent, false, buffer);
+      } else {
+      pretty_print_label(hb_string("analyzed_ruby"), indent, relative_indent, false, buffer);
+        hb_buffer_append(buffer, " ∅\n");
+      }
+
+      if (erb_strict_locals_node->prism_node.node != NULL) {
+        pretty_print_label(hb_string("prism_node"), indent, relative_indent, false, buffer);
+        hb_buffer_append(buffer, " (pm_node_t*)\n");
+      }
+      pretty_print_array(hb_string("locals"), erb_strict_locals_node->locals, indent, relative_indent, true, buffer);
+    } break;
+
     case AST_ERB_YIELD_NODE: {
       const AST_ERB_YIELD_NODE_T* erb_yield_node = (AST_ERB_YIELD_NODE_T*) node;
 

data/src/{pretty_print.c → ast/pretty_print.c}

@@ -2,15 +2,15 @@
 // Pretty print support excluded
 #else
 
-#  include "include/pretty_print.h"
-#  include "include/ast_nodes.h"
-#  include "include/ast_pretty_print.h"
-#  include "include/errors.h"
-#  include "include/token_struct.h"
-#  include "include/util.h"
-#  include "include/util/hb_allocator.h"
-#  include "include/util/hb_buffer.h"
-#  include "include/util/hb_string.h"
+#  include "../include/ast/pretty_print.h"
+#  include "../include/ast/ast_nodes.h"
+#  include "../include/ast/ast_pretty_print.h"
+#  include "../include/errors.h"
+#  include "../include/lexer/token_struct.h"
+#  include "../include/lib/hb_allocator.h"
+#  include "../include/lib/hb_buffer.h"
+#  include "../include/lib/hb_string.h"
+#  include "../include/util/util.h"
 
 #  include <stdbool.h>
 #  include <stdio.h>