herb 0.7.4-aarch64-linux-gnu → 0.8.0-aarch64-linux-gnu

data/src/include/ast_nodes.h

@@ -7,13 +7,14 @@
 #include <stdbool.h>
 #include <prism.h>
 
-#include "array.h"
-#include "buffer.h"
-#include "position.h"
-#include "location.h"
-#include "token_struct.h"
 #include "analyzed_ruby.h"
 #include "element_source.h"
+#include "location.h"
+#include "position.h"
+#include "token_struct.h"
+#include "util/hb_array.h"
+#include "util/hb_buffer.h"
+#include "util/hb_string.h"
 
 typedef enum {
   AST_DOCUMENT_NODE,
@@ -51,15 +52,15 @@ typedef enum {
 
 typedef struct AST_NODE_STRUCT {
   ast_node_type_T type;
-  location_T* location;
+  location_T location;
   // maybe a range too?
-  array_T* errors;
+  hb_array_T* errors;
 } AST_NODE_T;
 
 
 typedef struct AST_DOCUMENT_NODE_STRUCT {
   AST_NODE_T base;
-  array_T* children;
+  hb_array_T* children;
 } AST_DOCUMENT_NODE_T;
 
 typedef struct AST_LITERAL_NODE_STRUCT {
@@ -72,7 +73,7 @@ typedef struct AST_HTML_OPEN_TAG_NODE_STRUCT {
   token_T* tag_opening;
   token_T* tag_name;
   token_T* tag_closing;
-  array_T* children;
+  hb_array_T* children;
   bool is_void;
 } AST_HTML_OPEN_TAG_NODE_T;
 
@@ -80,7 +81,7 @@ typedef struct AST_HTML_CLOSE_TAG_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
   token_T* tag_name;
-  array_T* children;
+  hb_array_T* children;
   token_T* tag_closing;
 } AST_HTML_CLOSE_TAG_NODE_T;
 
@@ -88,7 +89,7 @@ typedef struct AST_HTML_ELEMENT_NODE_STRUCT {
   AST_NODE_T base;
   struct AST_HTML_OPEN_TAG_NODE_STRUCT* open_tag;
   token_T* tag_name;
-  array_T* body;
+  hb_array_T* body;
   struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag;
   bool is_void;
   element_source_t source;
@@ -97,14 +98,14 @@ typedef struct AST_HTML_ELEMENT_NODE_STRUCT {
 typedef struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT {
   AST_NODE_T base;
   token_T* open_quote;
-  array_T* children;
+  hb_array_T* children;
   token_T* close_quote;
   bool quoted;
 } AST_HTML_ATTRIBUTE_VALUE_NODE_T;
 
 typedef struct AST_HTML_ATTRIBUTE_NAME_NODE_STRUCT {
   AST_NODE_T base;
-  array_T* children;
+  hb_array_T* children;
 } AST_HTML_ATTRIBUTE_NAME_NODE_T;
 
 typedef struct AST_HTML_ATTRIBUTE_NODE_STRUCT {
@@ -122,28 +123,28 @@ typedef struct AST_HTML_TEXT_NODE_STRUCT {
 typedef struct AST_HTML_COMMENT_NODE_STRUCT {
   AST_NODE_T base;
   token_T* comment_start;
-  array_T* children;
+  hb_array_T* children;
   token_T* comment_end;
 } AST_HTML_COMMENT_NODE_T;
 
 typedef struct AST_HTML_DOCTYPE_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
-  array_T* children;
+  hb_array_T* children;
   token_T* tag_closing;
 } AST_HTML_DOCTYPE_NODE_T;
 
 typedef struct AST_XML_DECLARATION_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
-  array_T* children;
+  hb_array_T* children;
   token_T* tag_closing;
 } AST_XML_DECLARATION_NODE_T;
 
 typedef struct AST_CDATA_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
-  array_T* children;
+  hb_array_T* children;
   token_T* tag_closing;
 } AST_CDATA_NODE_T;
 
@@ -174,7 +175,7 @@ typedef struct AST_ERB_ELSE_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
 } AST_ERB_ELSE_NODE_T;
 
 typedef struct AST_ERB_IF_NODE_STRUCT {
@@ -182,7 +183,7 @@ typedef struct AST_ERB_IF_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_NODE_STRUCT* subsequent;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_IF_NODE_T;
@@ -192,7 +193,7 @@ typedef struct AST_ERB_BLOCK_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* body;
+  hb_array_T* body;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_BLOCK_NODE_T;
 
@@ -201,7 +202,7 @@ typedef struct AST_ERB_WHEN_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
 } AST_ERB_WHEN_NODE_T;
 
 typedef struct AST_ERB_CASE_NODE_STRUCT {
@@ -209,8 +210,8 @@ typedef struct AST_ERB_CASE_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* children;
-  array_T* conditions;
+  hb_array_T* children;
+  hb_array_T* conditions;
   struct AST_ERB_ELSE_NODE_STRUCT* else_clause;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_CASE_NODE_T;
@@ -220,8 +221,8 @@ typedef struct AST_ERB_CASE_MATCH_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* children;
-  array_T* conditions;
+  hb_array_T* children;
+  hb_array_T* conditions;
   struct AST_ERB_ELSE_NODE_STRUCT* else_clause;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_CASE_MATCH_NODE_T;
@@ -231,7 +232,7 @@ typedef struct AST_ERB_WHILE_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_WHILE_NODE_T;
 
@@ -240,7 +241,7 @@ typedef struct AST_ERB_UNTIL_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_UNTIL_NODE_T;
 
@@ -249,7 +250,7 @@ typedef struct AST_ERB_FOR_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_FOR_NODE_T;
 
@@ -258,7 +259,7 @@ typedef struct AST_ERB_RESCUE_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_ERB_RESCUE_NODE_STRUCT* subsequent;
 } AST_ERB_RESCUE_NODE_T;
 
@@ -267,7 +268,7 @@ typedef struct AST_ERB_ENSURE_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
 } AST_ERB_ENSURE_NODE_T;
 
 typedef struct AST_ERB_BEGIN_NODE_STRUCT {
@@ -275,7 +276,7 @@ typedef struct AST_ERB_BEGIN_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_ERB_RESCUE_NODE_STRUCT* rescue_clause;
   struct AST_ERB_ELSE_NODE_STRUCT* else_clause;
   struct AST_ERB_ENSURE_NODE_STRUCT* ensure_clause;
@@ -287,7 +288,7 @@ typedef struct AST_ERB_UNLESS_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
   struct AST_ERB_ELSE_NODE_STRUCT* else_clause;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_UNLESS_NODE_T;
@@ -304,42 +305,42 @@ typedef struct AST_ERB_IN_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
-  array_T* statements;
+  hb_array_T* statements;
 } AST_ERB_IN_NODE_T;
 
-AST_DOCUMENT_NODE_T* ast_document_node_init(array_T* children, position_T* start_position, position_T* end_position, array_T* errors);
-AST_LITERAL_NODE_T* ast_literal_node_init(const char* content, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_OPEN_TAG_NODE_T* ast_html_open_tag_node_init(token_T* tag_opening, token_T* tag_name, token_T* tag_closing, array_T* children, bool is_void, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, token_T* tag_name, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_ELEMENT_NODE_T* ast_html_element_node_init(struct AST_HTML_OPEN_TAG_NODE_STRUCT* open_tag, token_T* tag_name, array_T* body, struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag, bool is_void, element_source_t source, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_ATTRIBUTE_VALUE_NODE_T* ast_html_attribute_value_node_init(token_T* open_quote, array_T* children, token_T* close_quote, bool quoted, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_ATTRIBUTE_NAME_NODE_T* ast_html_attribute_name_node_init(array_T* children, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_ATTRIBUTE_NODE_T* ast_html_attribute_node_init(struct AST_HTML_ATTRIBUTE_NAME_NODE_STRUCT* name, token_T* equals, struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT* value, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_TEXT_NODE_T* ast_html_text_node_init(const char* content, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_COMMENT_NODE_T* ast_html_comment_node_init(token_T* comment_start, array_T* children, token_T* comment_end, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_DOCTYPE_NODE_T* ast_html_doctype_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
-AST_XML_DECLARATION_NODE_T* ast_xml_declaration_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
-AST_CDATA_NODE_T* ast_cdata_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
-AST_WHITESPACE_NODE_T* ast_whitespace_node_init(token_T* value, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_CONTENT_NODE_T* ast_erb_content_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, bool parsed, bool valid, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_END_NODE_T* ast_erb_end_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_ELSE_NODE_T* ast_erb_else_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_NODE_STRUCT* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* body, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_WHEN_NODE_T* ast_erb_when_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_CASE_NODE_T* ast_erb_case_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* children, array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_CASE_MATCH_NODE_T* ast_erb_case_match_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* children, array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_WHILE_NODE_T* ast_erb_while_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_UNTIL_NODE_T* ast_erb_until_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_FOR_NODE_T* ast_erb_for_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_RESCUE_NODE_T* ast_erb_rescue_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_ERB_RESCUE_NODE_STRUCT* subsequent, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_ENSURE_NODE_T* ast_erb_ensure_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_BEGIN_NODE_T* ast_erb_begin_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, 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, array_T* errors);
-AST_ERB_UNLESS_NODE_T* ast_erb_unless_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
-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, array_T* errors);
-AST_ERB_IN_NODE_T* ast_erb_in_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, position_T* start_position, position_T* end_position, array_T* errors);
-
-const char* ast_node_type_to_string(AST_NODE_T* node);
-const char* ast_node_human_type(AST_NODE_T* node);
+AST_DOCUMENT_NODE_T* ast_document_node_init(hb_array_T* children, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_LITERAL_NODE_T* ast_literal_node_init(const char* content, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_OPEN_TAG_NODE_T* ast_html_open_tag_node_init(token_T* tag_opening, token_T* tag_name, token_T* tag_closing, hb_array_T* children, bool is_void, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, token_T* tag_name, hb_array_T* children, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_ELEMENT_NODE_T* ast_html_element_node_init(struct AST_HTML_OPEN_TAG_NODE_STRUCT* open_tag, token_T* tag_name, hb_array_T* body, struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag, bool is_void, element_source_t source, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_ATTRIBUTE_VALUE_NODE_T* ast_html_attribute_value_node_init(token_T* open_quote, hb_array_T* children, token_T* close_quote, bool quoted, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_ATTRIBUTE_NAME_NODE_T* ast_html_attribute_name_node_init(hb_array_T* children, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_ATTRIBUTE_NODE_T* ast_html_attribute_node_init(struct AST_HTML_ATTRIBUTE_NAME_NODE_STRUCT* name, token_T* equals, struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT* value, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_TEXT_NODE_T* ast_html_text_node_init(const char* content, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_COMMENT_NODE_T* ast_html_comment_node_init(token_T* comment_start, hb_array_T* children, token_T* comment_end, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_HTML_DOCTYPE_NODE_T* ast_html_doctype_node_init(token_T* tag_opening, hb_array_T* children, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_XML_DECLARATION_NODE_T* ast_xml_declaration_node_init(token_T* tag_opening, hb_array_T* children, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_CDATA_NODE_T* ast_cdata_node_init(token_T* tag_opening, hb_array_T* children, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_WHITESPACE_NODE_T* ast_whitespace_node_init(token_T* value, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_CONTENT_NODE_T* ast_erb_content_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, bool parsed, bool valid, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_END_NODE_T* ast_erb_end_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);
+AST_ERB_ELSE_NODE_T* ast_erb_else_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_NODE_STRUCT* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* body, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_WHEN_NODE_T* ast_erb_when_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_CASE_NODE_T* ast_erb_case_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* children, hb_array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_CASE_MATCH_NODE_T* ast_erb_case_match_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* children, hb_array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_WHILE_NODE_T* ast_erb_while_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_UNTIL_NODE_T* ast_erb_until_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_FOR_NODE_T* ast_erb_for_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_RESCUE_NODE_T* ast_erb_rescue_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_RESCUE_NODE_STRUCT* subsequent, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_ENSURE_NODE_T* ast_erb_ensure_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_BEGIN_NODE_T* ast_erb_begin_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, 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);
+AST_ERB_UNLESS_NODE_T* ast_erb_unless_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+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);
+AST_ERB_IN_NODE_T* ast_erb_in_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
+
+hb_string_T ast_node_type_to_string(AST_NODE_T* node);
+hb_string_T ast_node_human_type(AST_NODE_T* node);
 
 #endif

data/src/include/ast_pretty_print.h

@@ -5,13 +5,13 @@
 #define HERB_AST_PRETTY_PRINT_H
 
 #include "ast_nodes.h"
-#include "buffer.h"
+#include "util/hb_buffer.h"
 
 void ast_pretty_print_node(
   AST_NODE_T* node,
   size_t indent,
   size_t relative_indent,
-  buffer_T* buffer
+  hb_buffer_T* buffer
 );
 
 #endif

data/src/include/element_source.h

@@ -1,6 +1,8 @@
 #ifndef HERB_ELEMENT_SOURCE_H
 #define HERB_ELEMENT_SOURCE_H
 
+#include "util/hb_string.h"
+
 typedef enum {
   ELEMENT_SOURCE_HTML,
   ELEMENT_SOURCE_ACTIONVIEW,
@@ -8,6 +10,6 @@ typedef enum {
   ELEMENT_SOURCE_SLIM
 } element_source_t;
 
-const char* element_source_to_string(element_source_t source);
+hb_string_T element_source_to_string(element_source_t source);
 
 #endif

data/src/include/errors.h

@@ -4,12 +4,12 @@
 #ifndef HERB_ERRORS_H
 #define HERB_ERRORS_H
 
-#include "array.h"
-#include "buffer.h"
 #include "errors.h"
 #include "location.h"
 #include "position.h"
 #include "token.h"
+#include "util/hb_array.h"
+#include "util/hb_buffer.h"
 
 typedef enum {
   UNEXPECTED_ERROR,
@@ -21,11 +21,13 @@ typedef enum {
   VOID_ELEMENT_CLOSING_TAG_ERROR,
   UNCLOSED_ELEMENT_ERROR,
   RUBY_PARSE_ERROR,
+  ERB_CONTROL_FLOW_SCOPE_ERROR,
+  MISSINGERB_END_TAG_ERROR,
 } error_type_T;
 
 typedef struct ERROR_STRUCT {
   error_type_T type;
-  location_T* location;
+  location_T location;
   char* message;
 } ERROR_T;
 
@@ -84,26 +86,40 @@ typedef struct {
   const char* level;
 } RUBY_PARSE_ERROR_T;
 
-UNEXPECTED_ERROR_T* unexpected_error_init(const char* description, const char* expected, const char* found, position_T* start, position_T* end);
-void append_unexpected_error(const char* description, const char* expected, const char* found, position_T* start, position_T* end, array_T* errors);
-UNEXPECTED_TOKEN_ERROR_T* unexpected_token_error_init(token_type_T expected_type, token_T* found, position_T* start, position_T* end);
-void append_unexpected_token_error(token_type_T expected_type, token_T* found, position_T* start, position_T* end, array_T* errors);
-MISSING_OPENING_TAG_ERROR_T* missing_opening_tag_error_init(token_T* closing_tag, position_T* start, position_T* end);
-void append_missing_opening_tag_error(token_T* closing_tag, position_T* start, position_T* end, array_T* errors);
-MISSING_CLOSING_TAG_ERROR_T* missing_closing_tag_error_init(token_T* opening_tag, position_T* start, position_T* end);
-void append_missing_closing_tag_error(token_T* opening_tag, position_T* start, position_T* end, array_T* errors);
-TAG_NAMES_MISMATCH_ERROR_T* tag_names_mismatch_error_init(token_T* opening_tag, token_T* closing_tag, position_T* start, position_T* end);
-void append_tag_names_mismatch_error(token_T* opening_tag, token_T* closing_tag, position_T* start, position_T* end, array_T* errors);
-QUOTES_MISMATCH_ERROR_T* quotes_mismatch_error_init(token_T* opening_quote, token_T* closing_quote, position_T* start, position_T* end);
-void append_quotes_mismatch_error(token_T* opening_quote, token_T* closing_quote, position_T* start, position_T* end, array_T* errors);
-VOID_ELEMENT_CLOSING_TAG_ERROR_T* void_element_closing_tag_error_init(token_T* tag_name, const char* expected, const char* found, position_T* start, position_T* end);
-void append_void_element_closing_tag_error(token_T* tag_name, const char* expected, const char* found, position_T* start, position_T* end, array_T* errors);
-UNCLOSED_ELEMENT_ERROR_T* unclosed_element_error_init(token_T* opening_tag, position_T* start, position_T* end);
-void append_unclosed_element_error(token_T* opening_tag, position_T* start, position_T* end, array_T* errors);
-RUBY_PARSE_ERROR_T* ruby_parse_error_init(const char* error_message, const char* diagnostic_id, const char* level, position_T* start, position_T* end);
-void append_ruby_parse_error(const char* error_message, const char* diagnostic_id, const char* level, position_T* start, position_T* end, array_T* errors);
-
-void error_init(ERROR_T* error, error_type_T type, position_T* start, position_T* end);
+typedef struct {
+  ERROR_T base;
+  const char* keyword;
+} ERB_CONTROL_FLOW_SCOPE_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  const char* keyword;
+} MISSINGERB_END_TAG_ERROR_T;
+
+UNEXPECTED_ERROR_T* unexpected_error_init(const char* description, const char* expected, const char* found, position_T start, position_T end);
+void append_unexpected_error(const char* description, const char* expected, const char* found, position_T start, position_T end, hb_array_T* errors);
+UNEXPECTED_TOKEN_ERROR_T* unexpected_token_error_init(token_type_T expected_type, token_T* found, position_T start, position_T end);
+void append_unexpected_token_error(token_type_T expected_type, token_T* found, position_T start, position_T end, hb_array_T* errors);
+MISSING_OPENING_TAG_ERROR_T* missing_opening_tag_error_init(token_T* closing_tag, position_T start, position_T end);
+void append_missing_opening_tag_error(token_T* closing_tag, position_T start, position_T end, hb_array_T* errors);
+MISSING_CLOSING_TAG_ERROR_T* missing_closing_tag_error_init(token_T* opening_tag, position_T start, position_T end);
+void append_missing_closing_tag_error(token_T* opening_tag, position_T start, position_T end, hb_array_T* errors);
+TAG_NAMES_MISMATCH_ERROR_T* tag_names_mismatch_error_init(token_T* opening_tag, token_T* closing_tag, position_T start, position_T end);
+void append_tag_names_mismatch_error(token_T* opening_tag, token_T* closing_tag, position_T start, position_T end, hb_array_T* errors);
+QUOTES_MISMATCH_ERROR_T* quotes_mismatch_error_init(token_T* opening_quote, token_T* closing_quote, position_T start, position_T end);
+void append_quotes_mismatch_error(token_T* opening_quote, token_T* closing_quote, position_T start, position_T end, hb_array_T* errors);
+VOID_ELEMENT_CLOSING_TAG_ERROR_T* void_element_closing_tag_error_init(token_T* tag_name, const char* expected, const char* found, position_T start, position_T end);
+void append_void_element_closing_tag_error(token_T* tag_name, const char* expected, const char* found, position_T start, position_T end, hb_array_T* errors);
+UNCLOSED_ELEMENT_ERROR_T* unclosed_element_error_init(token_T* opening_tag, position_T start, position_T end);
+void append_unclosed_element_error(token_T* opening_tag, position_T start, position_T end, hb_array_T* errors);
+RUBY_PARSE_ERROR_T* ruby_parse_error_init(const char* error_message, const char* diagnostic_id, const char* level, position_T start, position_T end);
+void append_ruby_parse_error(const char* error_message, const char* diagnostic_id, const char* level, position_T start, position_T end, hb_array_T* errors);
+ERB_CONTROL_FLOW_SCOPE_ERROR_T* erb_control_flow_scope_error_init(const char* keyword, position_T start, position_T end);
+void append_erb_control_flow_scope_error(const char* keyword, position_T start, position_T end, hb_array_T* errors);
+MISSINGERB_END_TAG_ERROR_T* missingerb_end_tag_error_init(const char* keyword, position_T start, position_T end);
+void append_missingerb_end_tag_error(const char* keyword, position_T start, position_T end, hb_array_T* errors);
+
+void error_init(ERROR_T* error, error_type_T type, position_T start, position_T end);
 
 size_t error_sizeof(void);
 error_type_T error_type(ERROR_T* error);
@@ -115,11 +131,11 @@ const char* error_human_type(ERROR_T* error);
 
 void error_free(ERROR_T* error);
 
-void error_pretty_print(ERROR_T* error, size_t indent, size_t relative_indent, buffer_T* buffer);
+void error_pretty_print(ERROR_T* error, size_t indent, size_t relative_indent, hb_buffer_T* buffer);
 
 void error_pretty_print_array(
-  const char* name, array_T* array, size_t indent, size_t relative_indent, bool last_property,
-  buffer_T* buffer
+  const char* name, hb_array_T* array, size_t indent, size_t relative_indent, bool last_property,
+  hb_buffer_T* buffer
 );
 
 #endif

data/src/include/extract.h

@@ -1,18 +1,18 @@
 #ifndef HERB_EXTRACT_H
 #define HERB_EXTRACT_H
 
-#include "buffer.h"
+#include "util/hb_buffer.h"
 
 typedef enum {
   HERB_EXTRACT_LANGUAGE_RUBY,
   HERB_EXTRACT_LANGUAGE_HTML,
 } herb_extract_language_T;
 
-void herb_extract_ruby_to_buffer(const char* source, buffer_T* output);
-void herb_extract_html_to_buffer(const char* source, buffer_T* output);
+void herb_extract_ruby_to_buffer(const char* source, hb_buffer_T* output);
+void herb_extract_html_to_buffer(const char* source, hb_buffer_T* output);
 
 char* herb_extract_ruby_with_semicolons(const char* source);
-void herb_extract_ruby_to_buffer_with_semicolons(const char* source, buffer_T* output);
+void herb_extract_ruby_to_buffer_with_semicolons(const char* source, hb_buffer_T* output);
 
 char* herb_extract(const char* source, herb_extract_language_T language);
 char* herb_extract_from_file(const char* path, herb_extract_language_T language);

data/src/include/herb.h

@@ -1,11 +1,11 @@
 #ifndef HERB_H
 #define HERB_H
 
-#include "array.h"
 #include "ast_node.h"
-#include "buffer.h"
 #include "extract.h"
 #include "parser.h"
+#include "util/hb_array.h"
+#include "util/hb_buffer.h"
 
 #include <stdint.h>
 
@@ -13,18 +13,17 @@
 extern "C" {
 #endif
 
-void herb_lex_to_buffer(const char* source, buffer_T* output);
-void herb_lex_json_to_buffer(const char* source, buffer_T* output);
+void herb_lex_to_buffer(const char* source, hb_buffer_T* output);
 
-array_T* herb_lex(const char* source);
-array_T* herb_lex_file(const char* path);
+hb_array_T* herb_lex(const char* source);
+hb_array_T* herb_lex_file(const char* path);
 
 AST_DOCUMENT_NODE_T* herb_parse(const char* source, parser_options_T* options);
 
 const char* herb_version(void);
 const char* herb_prism_version(void);
 
-void herb_free_tokens(array_T** tokens);
+void herb_free_tokens(hb_array_T** tokens);
 
 #ifdef __cplusplus
 }

data/src/include/html_util.h

@@ -1,13 +1,12 @@
 #ifndef HERB_HTML_UTIL_H
 #define HERB_HTML_UTIL_H
 
+#include "util/hb_string.h"
 #include <stdbool.h>
 
-bool is_void_element(const char* tag_name);
-bool is_html4_void_element(const char* tag_name);
+bool is_void_element(hb_string_T tag_name);
 
-char* html_opening_tag_string(const char* tag_name);
-char* html_closing_tag_string(const char* tag_name);
-char* html_self_closing_tag_string(const char* tag_name);
+hb_string_T html_closing_tag_string(hb_string_T tag_name);
+hb_string_T html_self_closing_tag_string(hb_string_T tag_name);
 
 #endif

data/src/include/lexer.h

@@ -4,10 +4,8 @@
 #include "lexer_struct.h"
 #include "token_struct.h"
 
-lexer_T* lexer_init(const char* source);
+void lexer_init(lexer_T* lexer, const char* source);
 token_T* lexer_next_token(lexer_T* lexer);
 token_T* lexer_error(lexer_T* lexer, const char* message);
 
-void lexer_free(lexer_T* lexer);
-
 #endif

data/src/include/lexer_peek_helpers.h

@@ -5,38 +5,40 @@
 #include "token_struct.h"
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 typedef struct {
-  size_t position;
-  size_t line;
-  size_t column;
-  size_t previous_position;
-  size_t previous_line;
-  size_t previous_column;
+  uint32_t position;
+  uint32_t line;
+  uint32_t column;
+  uint32_t previous_position;
+  uint32_t previous_line;
+  uint32_t previous_column;
   char current_character;
   lexer_state_T state;
 } lexer_state_snapshot_T;
 
-char lexer_peek(const lexer_T* lexer, int offset);
-bool lexer_peek_for_doctype(const lexer_T* lexer, int offset);
-bool lexer_peek_for_xml_declaration(const lexer_T* lexer, int offset);
-bool lexer_peek_for_cdata_start(const lexer_T* lexer, int offset);
-bool lexer_peek_for_cdata_end(const lexer_T* lexer, int offset);
+char lexer_peek(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_for_doctype(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_for_xml_declaration(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_for_cdata_start(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_for_cdata_end(const lexer_T* lexer, uint32_t offset);
 
-bool lexer_peek_for_html_comment_start(const lexer_T* lexer, int offset);
-bool lexer_peek_for_html_comment_end(const lexer_T* lexer, int offset);
+bool lexer_peek_for_html_comment_start(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_for_html_comment_end(const lexer_T* lexer, uint32_t offset);
 
-bool lexer_peek_erb_close_tag(const lexer_T* lexer, int offset);
-bool lexer_peek_erb_dash_close_tag(const lexer_T* lexer, int offset);
-bool lexer_peek_erb_percent_close_tag(const lexer_T* lexer, int offset);
-bool lexer_peek_erb_end(const lexer_T* lexer, int offset);
+bool lexer_peek_erb_close_tag(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_erb_dash_close_tag(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_erb_percent_close_tag(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_erb_equals_close_tag(const lexer_T* lexer, uint32_t offset);
+bool lexer_peek_erb_end(const lexer_T* lexer, uint32_t offset);
 
-char lexer_backtrack(const lexer_T* lexer, int offset);
+char lexer_backtrack(const lexer_T* lexer, uint32_t offset);
 
 bool lexer_peek_for_token_type_after_whitespace(lexer_T* lexer, token_type_T token_type);
-bool lexer_peek_for_close_tag_start(const lexer_T* lexer, int offset);
+bool lexer_peek_for_close_tag_start(const lexer_T* lexer, uint32_t offset);
 
 lexer_state_snapshot_T lexer_save_state(lexer_T* lexer);
 void lexer_restore_state(lexer_T* lexer, lexer_state_snapshot_T snapshot);