herb 0.10.4-x86_64-linux-gnu → 0.11.0-x86_64-linux-gnu

data/src/ast/ast_pretty_print.c

@@ -1,5 +1,5 @@
 // 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/ast_pretty_print.c.erb
+// be modified manually. See templates/src/ast/ast_pretty_print.c.erb
 
 #ifdef HERB_EXCLUDE_PRETTYPRINT
   // Pretty print support excluded
@@ -333,6 +333,16 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(xml_declaration_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, true, buffer);
     } break;
 
+    case AST_XML_PROCESSING_INSTRUCTION_NODE: {
+      const AST_XML_PROCESSING_INSTRUCTION_NODE_T* xml_processing_instruction_node = (AST_XML_PROCESSING_INSTRUCTION_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(xml_processing_instruction_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(xml_processing_instruction_node->target, hb_string("target"), indent, relative_indent, false, buffer);
+      pretty_print_array(hb_string("children"), xml_processing_instruction_node->children, indent, relative_indent, false, buffer);
+      pretty_print_token_property(xml_processing_instruction_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, true, buffer);
+    } break;
+
     case AST_CDATA_NODE: {
       const AST_CDATA_NODE_T* cdata_node = (AST_CDATA_NODE_T*) node;
 
@@ -536,6 +546,86 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
 
     } break;
 
+    case AST_ERB_ITERATION_BLOCK_NODE: {
+      const AST_ERB_ITERATION_BLOCK_NODE_T* erb_iteration_block_node = (AST_ERB_ITERATION_BLOCK_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_iteration_block_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_iteration_block_node->content, hb_string("content"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_iteration_block_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      if (erb_iteration_block_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_token_property(erb_iteration_block_node->receiver, hb_string("receiver"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_iteration_block_node->call_operator, hb_string("call_operator"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_iteration_block_node->message, hb_string("message"), indent, relative_indent, false, buffer);
+      pretty_print_array(hb_string("arguments"), erb_iteration_block_node->arguments, indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_iteration_block_node->block_opening, hb_string("block_opening"), indent, relative_indent, false, buffer);
+      pretty_print_array(hb_string("body"), erb_iteration_block_node->body, indent, relative_indent, false, buffer);
+      pretty_print_array(hb_string("block_arguments"), erb_iteration_block_node->block_arguments, indent, relative_indent, false, buffer);
+
+      pretty_print_label(hb_string("rescue_clause"), indent, relative_indent, false, buffer);
+
+      if (erb_iteration_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_iteration_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_iteration_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_iteration_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_iteration_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_iteration_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_iteration_block_node->end_node) {
+        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_iteration_block_node->end_node, indent, relative_indent + 2, buffer);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+      hb_buffer_append(buffer, "\n");
+
+    } break;
+
     case AST_ERB_WHEN_NODE: {
       const AST_ERB_WHEN_NODE_T* erb_when_node = (AST_ERB_WHEN_NODE_T*) node;
 
@@ -945,7 +1035,21 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(ruby_render_keywords_node->variants, hb_string("variants"), indent, relative_indent, false, buffer);
       pretty_print_token_property(ruby_render_keywords_node->handlers, hb_string("handlers"), indent, relative_indent, false, buffer);
       pretty_print_token_property(ruby_render_keywords_node->content_type, hb_string("content_type"), indent, relative_indent, false, buffer);
-      pretty_print_array(hb_string("locals"), ruby_render_keywords_node->locals, indent, relative_indent, true, buffer);
+      pretty_print_array(hb_string("locals"), ruby_render_keywords_node->locals, indent, relative_indent, false, buffer);
+      pretty_print_array(hb_string("state"), ruby_render_keywords_node->state, indent, relative_indent, false, buffer);
+      pretty_print_label(hb_string("state_location"), indent, relative_indent, true, buffer);
+      if (ruby_render_keywords_node->state_location) {
+        char state_location_location_string[128];
+        sprintf(state_location_location_string, " (location: (%u:%u)-(%u:%u))\n",
+          ruby_render_keywords_node->state_location->start.line,
+          ruby_render_keywords_node->state_location->start.column,
+          ruby_render_keywords_node->state_location->end.line,
+          ruby_render_keywords_node->state_location->end.column);
+        hb_buffer_append(buffer, state_location_location_string);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+
     } break;
 
     case AST_ERB_RENDER_NODE: {
@@ -1150,6 +1254,61 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_array(hb_string("statements"), erb_in_node->statements, indent, relative_indent, true, buffer);
     } break;
 
+    case AST_HERB_DIRECTIVE_NODE: {
+      const AST_HERB_DIRECTIVE_NODE_T* herb_directive_node = (AST_HERB_DIRECTIVE_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_directive_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_directive_node->content, hb_string("content"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_directive_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_directive_node->key, hb_string("key"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_directive_node->arguments, hb_string("arguments"), indent, relative_indent, true, buffer);
+    } break;
+
+    case AST_HERB_STATE_DECLARATION_NODE: {
+      const AST_HERB_STATE_DECLARATION_NODE_T* herb_state_declaration_node = (AST_HERB_STATE_DECLARATION_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_state_declaration_node->name, hb_string("name"), indent, relative_indent, false, buffer);
+
+      pretty_print_label(hb_string("default_value"), indent, relative_indent, false, buffer);
+
+      if (herb_state_declaration_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*) herb_state_declaration_node->default_value, indent, relative_indent + 2, buffer);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+      hb_buffer_append(buffer, "\n");
+
+      pretty_print_string_property(herb_state_declaration_node->kind, hb_string("kind"), indent, relative_indent, true, buffer);
+    } break;
+
+    case AST_HERB_STATE_DIRECTIVE_NODE: {
+      const AST_HERB_STATE_DIRECTIVE_NODE_T* herb_state_directive_node = (AST_HERB_STATE_DIRECTIVE_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_state_directive_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_state_directive_node->content, hb_string("content"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_state_directive_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_state_directive_node->key, hb_string("key"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(herb_state_directive_node->signature, hb_string("signature"), indent, relative_indent, false, buffer);
+      pretty_print_array(hb_string("states"), herb_state_directive_node->states, indent, relative_indent, true, buffer);
+    } break;
+
+    case AST_ERB_COMMENT_NODE: {
+      const AST_ERB_COMMENT_NODE_T* erb_comment_node = (AST_ERB_COMMENT_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_comment_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_comment_node->content, hb_string("content"), indent, relative_indent, false, buffer);
+      pretty_print_token_property(erb_comment_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, true, buffer);
+    } break;
+
   }
 }
 

data/src/diff/herb_diff.c

@@ -6,6 +6,8 @@
 
 #include <stdio.h>
 
+const herb_diff_options_T HERB_DEFAULT_DIFF_OPTIONS = { .track_whitespace_changes = false };
+
 herb_diff_path_T herb_diff_path_empty(void) {
   herb_diff_path_T path;
 
@@ -52,12 +54,14 @@ static void emit_operation(
 herb_diff_result_T* herb_diff(
   const AST_DOCUMENT_NODE_T* old_document,
   const AST_DOCUMENT_NODE_T* new_document,
+  const herb_diff_options_T* options,
   hb_allocator_T* allocator
 ) {
   herb_diff_result_T* result = (herb_diff_result_T*) hb_allocator_alloc(allocator, sizeof(herb_diff_result_T));
   result->operations = hb_array_init(16, allocator);
   result->allocator = allocator;
   result->trees_identical = false;
+  result->options = (options != NULL) ? *options : HERB_DEFAULT_DIFF_OPTIONS;
 
   herb_hash_map_T old_hashes;
   herb_hash_map_T new_hashes;
@@ -81,9 +85,12 @@ herb_diff_result_T* herb_diff(
     root_path,
     &old_hashes,
     &new_hashes,
+    false,
     result
   );
 
+  result->trees_identical = hb_array_size(result->operations) == 0;
+
   return result;
 }
 
@@ -119,6 +126,7 @@ const char* herb_diff_operation_type_to_string(const herb_diff_operation_type_T
     case HERB_DIFF_NODE_WRAPPED: return "node_wrapped";
     case HERB_DIFF_TAG_NAME_CHANGED: return "tag_name_changed";
     case HERB_DIFF_TEXT_CHANGED: return "text_changed";
+    case HERB_DIFF_WHITESPACE_CHANGED: return "whitespace_changed";
   }
 
   return "unknown";

data/src/diff/herb_diff_attributes.c

@@ -116,6 +116,7 @@ void herb_diff_attributes(
               herb_diff_path_append(parent_path, (uint32_t) new_index),
               old_hashes,
               new_hashes,
+              false,
               result
             );
           }

data/src/diff/herb_diff_children.c

@@ -159,6 +159,7 @@ void herb_diff_children(
   const herb_diff_path_T parent_path,
   const herb_hash_map_T* old_hashes,
   const herb_hash_map_T* new_hashes,
+  const bool preserve_whitespace,
   herb_diff_result_T* result
 ) {
   if (old_children == NULL && new_children == NULL) { return; }
@@ -428,7 +429,7 @@ void herb_diff_children(
       const AST_NODE_T* new_child = (const AST_NODE_T*) hb_array_get(new_children, entry->new_index);
 
       herb_diff_path_T child_path = herb_diff_path_append(parent_path, (uint32_t) entry->new_index);
-      herb_diff_node(old_child, new_child, child_path, old_hashes, new_hashes, result);
+      herb_diff_node(old_child, new_child, child_path, old_hashes, new_hashes, preserve_whitespace, result);
     } else if (entry->type == EDIT_INSERT) {
       const AST_NODE_T* new_child = (const AST_NODE_T*) hb_array_get(new_children, entry->new_index);
 
@@ -468,7 +469,7 @@ void herb_diff_children(
       );
 
       herb_diff_path_T child_path = herb_diff_path_append(parent_path, (uint32_t) entry->new_index);
-      herb_diff_node(old_child, new_child, child_path, old_hashes, new_hashes, result);
+      herb_diff_node(old_child, new_child, child_path, old_hashes, new_hashes, preserve_whitespace, result);
     } else if (entry->type == EDIT_COALESCED_KEEP) {
       const AST_NODE_T* old_child = (const AST_NODE_T*) hb_array_get(old_children, entry->old_index);
       const AST_NODE_T* new_child = (const AST_NODE_T*) hb_array_get(new_children, entry->new_index);
@@ -486,7 +487,7 @@ void herb_diff_children(
         );
       }
 
-      herb_diff_node(old_child, new_child, child_path, old_hashes, new_hashes, result);
+      herb_diff_node(old_child, new_child, child_path, old_hashes, new_hashes, preserve_whitespace, result);
     } else if (entry->type == EDIT_WRAP) {
       const AST_NODE_T* old_child = (const AST_NODE_T*) hb_array_get(old_children, entry->old_index);
       const AST_NODE_T* new_child = (const AST_NODE_T*) hb_array_get(new_children, entry->new_index);

data/src/diff/herb_diff_helpers.c

@@ -1,5 +1,5 @@
 // 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/diff/herb_diff_helpers.c.erb
+// be modified manually. See templates/src/diff/herb_diff_helpers.c.erb
 
 #include "../include/diff/herb_diff.h"
 
@@ -40,6 +40,9 @@ const hb_array_T* herb_diff_get_node_children(const AST_NODE_T* node) {
     case AST_XML_DECLARATION_NODE:
       return ((const AST_XML_DECLARATION_NODE_T*) node)->children;
 
+    case AST_XML_PROCESSING_INSTRUCTION_NODE:
+      return ((const AST_XML_PROCESSING_INSTRUCTION_NODE_T*) node)->children;
+
     case AST_CDATA_NODE:
       return ((const AST_CDATA_NODE_T*) node)->children;
 
@@ -52,6 +55,9 @@ const hb_array_T* herb_diff_get_node_children(const AST_NODE_T* node) {
     case AST_ERB_BLOCK_NODE:
       return ((const AST_ERB_BLOCK_NODE_T*) node)->body;
 
+    case AST_ERB_ITERATION_BLOCK_NODE:
+      return ((const AST_ERB_ITERATION_BLOCK_NODE_T*) node)->body;
+
     case AST_ERB_WHEN_NODE:
       return ((const AST_ERB_WHEN_NODE_T*) node)->statements;