herb 0.8.10-arm-linux-gnu → 0.9.1-arm-linux-gnu

data/src/{analyze_transform.c → analyze/transform.c}

@@ -1,8 +1,8 @@
 // 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/analyze_transform.c.erb
+// be modified manually. See /home/runner/work/herb/herb/templates/src/analyze/transform.c.erb
 
-#include "include/analyze.h"
-#include "include/visitor.h"
+#include "../include/analyze/analyze.h"
+#include "../include/visitor.h"
 
 bool transform_erb_nodes(const AST_NODE_T* node, void* data) {
   analyze_ruby_context_T* context = (analyze_ruby_context_T*) data;
@@ -36,6 +36,13 @@ bool transform_erb_nodes(const AST_NODE_T* node, void* data) {
     hb_array_free(&old_array);
   }
 
+  if (node->type == AST_HTML_CONDITIONAL_ELEMENT_NODE) {
+    AST_HTML_CONDITIONAL_ELEMENT_NODE_T* html_conditional_element_node = (AST_HTML_CONDITIONAL_ELEMENT_NODE_T*) node;
+    hb_array_T* old_array = html_conditional_element_node->body;
+    html_conditional_element_node->body = rewrite_node_array((AST_NODE_T*) node, html_conditional_element_node->body, context);
+    hb_array_free(&old_array);
+  }
+
   if (node->type == AST_HTML_ATTRIBUTE_VALUE_NODE) {
     AST_HTML_ATTRIBUTE_VALUE_NODE_T* html_attribute_value_node = (AST_HTML_ATTRIBUTE_VALUE_NODE_T*) node;
     hb_array_T* old_array = html_attribute_value_node->children;
@@ -50,6 +57,13 @@ bool transform_erb_nodes(const AST_NODE_T* node, void* data) {
     hb_array_free(&old_array);
   }
 
+  if (node->type == AST_ERB_OPEN_TAG_NODE) {
+    AST_ERB_OPEN_TAG_NODE_T* erb_open_tag_node = (AST_ERB_OPEN_TAG_NODE_T*) node;
+    hb_array_T* old_array = erb_open_tag_node->children;
+    erb_open_tag_node->children = rewrite_node_array((AST_NODE_T*) node, erb_open_tag_node->children, context);
+    hb_array_free(&old_array);
+  }
+
   if (node->type == AST_HTML_COMMENT_NODE) {
     AST_HTML_COMMENT_NODE_T* html_comment_node = (AST_HTML_COMMENT_NODE_T*) node;
     hb_array_T* old_array = html_comment_node->children;
@@ -183,6 +197,13 @@ bool transform_erb_nodes(const AST_NODE_T* node, void* data) {
     hb_array_free(&old_array);
   }
 
+  if (node->type == AST_ERB_RENDER_NODE) {
+    AST_ERB_RENDER_NODE_T* erb_render_node = (AST_ERB_RENDER_NODE_T*) node;
+    hb_array_T* old_array = erb_render_node->locals;
+    erb_render_node->locals = rewrite_node_array((AST_NODE_T*) node, erb_render_node->locals, context);
+    hb_array_free(&old_array);
+  }
+
   if (node->type == AST_ERB_IN_NODE) {
     AST_ERB_IN_NODE_T* erb_in_node = (AST_ERB_IN_NODE_T*) node;
     hb_array_T* old_array = erb_in_node->statements;

data/src/ast_node.c

@@ -2,8 +2,9 @@
 #include "include/ast_nodes.h"
 #include "include/errors.h"
 #include "include/position.h"
-#include "include/token.h"
 #include "include/util.h"
+#include "include/util/hb_allocator.h"
+#include "include/util/hb_string.h"
 #include "include/visitor.h"
 
 #include <prism.h>
@@ -14,7 +15,14 @@ size_t ast_node_sizeof(void) {
   return sizeof(struct AST_NODE_STRUCT);
 }
 
-void ast_node_init(AST_NODE_T* node, const ast_node_type_T type, position_T start, position_T end, hb_array_T* errors) {
+void ast_node_init(
+  AST_NODE_T* node,
+  const ast_node_type_T type,
+  position_T start,
+  position_T end,
+  hb_array_T* errors,
+  hb_allocator_T* allocator
+) {
   if (!node) { return; }
 
   node->type = type;
@@ -22,18 +30,20 @@ void ast_node_init(AST_NODE_T* node, const ast_node_type_T type, position_T star
   node->location.end = end;
 
   if (errors == NULL) {
-    node->errors = hb_array_init(8);
+    node->errors = hb_array_init(0, allocator);
   } else {
     node->errors = errors;
   }
 }
 
-AST_LITERAL_NODE_T* ast_literal_node_init_from_token(const token_T* token) {
-  AST_LITERAL_NODE_T* literal = malloc(sizeof(AST_LITERAL_NODE_T));
+AST_LITERAL_NODE_T* ast_literal_node_init_from_token(const token_T* token, hb_allocator_T* allocator) {
+  AST_LITERAL_NODE_T* literal = hb_allocator_alloc(allocator, sizeof(AST_LITERAL_NODE_T));
 
-  ast_node_init(&literal->base, AST_LITERAL_NODE, token->location.start, token->location.end, NULL);
+  if (!literal) { return NULL; }
 
-  literal->content = herb_strdup(token->value);
+  ast_node_init(&literal->base, AST_LITERAL_NODE, token->location.start, token->location.end, NULL, allocator);
+
+  literal->content = hb_string_copy(token->value, allocator);
 
   return literal;
 }