herb 0.8.10-arm-linux-gnu → 0.9.0-arm-linux-gnu

data/ext/herb/nodes.c

@@ -2,6 +2,7 @@
 // be modified manually. See /home/runner/work/herb/herb/templates/ext/herb/nodes.c.erb
 
 #include <ruby.h>
+#include <ruby/encoding.h>
 
 #include "error_helpers.h"
 #include "extension_helpers.h"
@@ -14,31 +15,129 @@
 VALUE rb_node_from_c_struct(AST_NODE_T* node);
 static VALUE rb_nodes_array_from_c_array(hb_array_T* array);
 
+static VALUE mAST;
+static VALUE cNode;
+static VALUE cDocumentNode;
+static VALUE cLiteralNode;
+static VALUE cHTMLOpenTagNode;
+static VALUE cHTMLConditionalOpenTagNode;
+static VALUE cHTMLCloseTagNode;
+static VALUE cHTMLOmittedCloseTagNode;
+static VALUE cHTMLVirtualCloseTagNode;
+static VALUE cHTMLElementNode;
+static VALUE cHTMLConditionalElementNode;
+static VALUE cHTMLAttributeValueNode;
+static VALUE cHTMLAttributeNameNode;
+static VALUE cHTMLAttributeNode;
+static VALUE cRubyLiteralNode;
+static VALUE cRubyHTMLAttributesSplatNode;
+static VALUE cERBOpenTagNode;
+static VALUE cHTMLTextNode;
+static VALUE cHTMLCommentNode;
+static VALUE cHTMLDoctypeNode;
+static VALUE cXMLDeclarationNode;
+static VALUE cCDATANode;
+static VALUE cWhitespaceNode;
+static VALUE cERBContentNode;
+static VALUE cERBEndNode;
+static VALUE cERBElseNode;
+static VALUE cERBIfNode;
+static VALUE cERBBlockNode;
+static VALUE cERBWhenNode;
+static VALUE cERBCaseNode;
+static VALUE cERBCaseMatchNode;
+static VALUE cERBWhileNode;
+static VALUE cERBUntilNode;
+static VALUE cERBForNode;
+static VALUE cERBRescueNode;
+static VALUE cERBEnsureNode;
+static VALUE cERBBeginNode;
+static VALUE cERBUnlessNode;
+static VALUE cERBYieldNode;
+static VALUE cERBInNode;
+
+void rb_init_node_classes(void) {
+  mAST = rb_define_module_under(mHerb, "AST");
+  cNode = rb_define_class_under(mAST, "Node", rb_cObject);
+  cDocumentNode = rb_define_class_under(mAST, "DocumentNode", cNode);
+  cLiteralNode = rb_define_class_under(mAST, "LiteralNode", cNode);
+  cHTMLOpenTagNode = rb_define_class_under(mAST, "HTMLOpenTagNode", cNode);
+  cHTMLConditionalOpenTagNode = rb_define_class_under(mAST, "HTMLConditionalOpenTagNode", cNode);
+  cHTMLCloseTagNode = rb_define_class_under(mAST, "HTMLCloseTagNode", cNode);
+  cHTMLOmittedCloseTagNode = rb_define_class_under(mAST, "HTMLOmittedCloseTagNode", cNode);
+  cHTMLVirtualCloseTagNode = rb_define_class_under(mAST, "HTMLVirtualCloseTagNode", cNode);
+  cHTMLElementNode = rb_define_class_under(mAST, "HTMLElementNode", cNode);
+  cHTMLConditionalElementNode = rb_define_class_under(mAST, "HTMLConditionalElementNode", cNode);
+  cHTMLAttributeValueNode = rb_define_class_under(mAST, "HTMLAttributeValueNode", cNode);
+  cHTMLAttributeNameNode = rb_define_class_under(mAST, "HTMLAttributeNameNode", cNode);
+  cHTMLAttributeNode = rb_define_class_under(mAST, "HTMLAttributeNode", cNode);
+  cRubyLiteralNode = rb_define_class_under(mAST, "RubyLiteralNode", cNode);
+  cRubyHTMLAttributesSplatNode = rb_define_class_under(mAST, "RubyHTMLAttributesSplatNode", cNode);
+  cERBOpenTagNode = rb_define_class_under(mAST, "ERBOpenTagNode", cNode);
+  cHTMLTextNode = rb_define_class_under(mAST, "HTMLTextNode", cNode);
+  cHTMLCommentNode = rb_define_class_under(mAST, "HTMLCommentNode", cNode);
+  cHTMLDoctypeNode = rb_define_class_under(mAST, "HTMLDoctypeNode", cNode);
+  cXMLDeclarationNode = rb_define_class_under(mAST, "XMLDeclarationNode", cNode);
+  cCDATANode = rb_define_class_under(mAST, "CDATANode", cNode);
+  cWhitespaceNode = rb_define_class_under(mAST, "WhitespaceNode", cNode);
+  cERBContentNode = rb_define_class_under(mAST, "ERBContentNode", cNode);
+  cERBEndNode = rb_define_class_under(mAST, "ERBEndNode", cNode);
+  cERBElseNode = rb_define_class_under(mAST, "ERBElseNode", cNode);
+  cERBIfNode = rb_define_class_under(mAST, "ERBIfNode", cNode);
+  cERBBlockNode = rb_define_class_under(mAST, "ERBBlockNode", cNode);
+  cERBWhenNode = rb_define_class_under(mAST, "ERBWhenNode", cNode);
+  cERBCaseNode = rb_define_class_under(mAST, "ERBCaseNode", cNode);
+  cERBCaseMatchNode = rb_define_class_under(mAST, "ERBCaseMatchNode", cNode);
+  cERBWhileNode = rb_define_class_under(mAST, "ERBWhileNode", cNode);
+  cERBUntilNode = rb_define_class_under(mAST, "ERBUntilNode", cNode);
+  cERBForNode = rb_define_class_under(mAST, "ERBForNode", cNode);
+  cERBRescueNode = rb_define_class_under(mAST, "ERBRescueNode", cNode);
+  cERBEnsureNode = rb_define_class_under(mAST, "ERBEnsureNode", cNode);
+  cERBBeginNode = rb_define_class_under(mAST, "ERBBeginNode", cNode);
+  cERBUnlessNode = rb_define_class_under(mAST, "ERBUnlessNode", cNode);
+  cERBYieldNode = rb_define_class_under(mAST, "ERBYieldNode", cNode);
+  cERBInNode = rb_define_class_under(mAST, "ERBInNode", cNode);
+}
+
 static VALUE rb_document_node_from_c_struct(AST_DOCUMENT_NODE_T* document_node) {
   if (document_node == NULL) { return Qnil; }
 
   AST_NODE_T* node = &document_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE DocumentNode = rb_define_class_under(AST, "DocumentNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 document_node_children = rb_nodes_array_from_c_array(document_node->children);
+  /* prism_context is internal parser state, not exposed to Ruby */
+  VALUE document_node_prism_context = Qnil;
+  VALUE document_node_prism_node;
+  if (document_node->prism_node.node != NULL && document_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(document_node->prism_node.parser, document_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      document_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(document_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(document_node_prism_node);
+    } else {
+      document_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    document_node_prism_node = Qnil;
+  }
 
-  VALUE args[4] = {
+  VALUE args[6] = {
     type,
     location,
     errors,
-    document_node_children
+    document_node_children,
+    document_node_prism_context,
+    document_node_prism_node
   };
 
-  return rb_class_new_instance(4, args, DocumentNode);
+  return rb_class_new_instance(6, args, cDocumentNode);
 };
 
 static VALUE rb_literal_node_from_c_struct(AST_LITERAL_NODE_T* literal_node) {
@@ -46,17 +145,11 @@ static VALUE rb_literal_node_from_c_struct(AST_LITERAL_NODE_T* literal_node) {
 
   AST_NODE_T* node = &literal_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE LiteralNode = rb_define_class_under(AST, "LiteralNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 literal_node_content = rb_utf8_str_new_cstr(literal_node->content);
+  VALUE literal_node_content = rb_string_from_hb_string(literal_node->content);
 
   VALUE args[4] = {
     type,
@@ -65,7 +158,7 @@ static VALUE rb_literal_node_from_c_struct(AST_LITERAL_NODE_T* literal_node) {
     literal_node_content
   };
 
-  return rb_class_new_instance(4, args, LiteralNode);
+  return rb_class_new_instance(4, args, cLiteralNode);
 };
 
 static VALUE rb_html_open_tag_node_from_c_struct(AST_HTML_OPEN_TAG_NODE_T* html_open_tag_node) {
@@ -73,13 +166,7 @@ static VALUE rb_html_open_tag_node_from_c_struct(AST_HTML_OPEN_TAG_NODE_T* html_
 
   AST_NODE_T* node = &html_open_tag_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLOpenTagNode = rb_define_class_under(AST, "HTMLOpenTagNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -100,7 +187,32 @@ static VALUE rb_html_open_tag_node_from_c_struct(AST_HTML_OPEN_TAG_NODE_T* html_
     html_open_tag_node_is_void
   };
 
-  return rb_class_new_instance(8, args, HTMLOpenTagNode);
+  return rb_class_new_instance(8, args, cHTMLOpenTagNode);
+};
+
+static VALUE rb_html_conditional_open_tag_node_from_c_struct(AST_HTML_CONDITIONAL_OPEN_TAG_NODE_T* html_conditional_open_tag_node) {
+  if (html_conditional_open_tag_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &html_conditional_open_tag_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 html_conditional_open_tag_node_conditional = rb_node_from_c_struct((AST_NODE_T*) html_conditional_open_tag_node->conditional);
+  VALUE html_conditional_open_tag_node_tag_name = rb_token_from_c_struct(html_conditional_open_tag_node->tag_name);
+  VALUE html_conditional_open_tag_node_is_void = (html_conditional_open_tag_node->is_void) ? Qtrue : Qfalse;
+
+  VALUE args[6] = {
+    type,
+    location,
+    errors,
+    html_conditional_open_tag_node_conditional,
+    html_conditional_open_tag_node_tag_name,
+    html_conditional_open_tag_node_is_void
+  };
+
+  return rb_class_new_instance(6, args, cHTMLConditionalOpenTagNode);
 };
 
 static VALUE rb_html_close_tag_node_from_c_struct(AST_HTML_CLOSE_TAG_NODE_T* html_close_tag_node) {
@@ -108,13 +220,7 @@ static VALUE rb_html_close_tag_node_from_c_struct(AST_HTML_CLOSE_TAG_NODE_T* htm
 
   AST_NODE_T* node = &html_close_tag_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLCloseTagNode = rb_define_class_under(AST, "HTMLCloseTagNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -133,7 +239,49 @@ static VALUE rb_html_close_tag_node_from_c_struct(AST_HTML_CLOSE_TAG_NODE_T* htm
     html_close_tag_node_tag_closing
   };
 
-  return rb_class_new_instance(7, args, HTMLCloseTagNode);
+  return rb_class_new_instance(7, args, cHTMLCloseTagNode);
+};
+
+static VALUE rb_html_omitted_close_tag_node_from_c_struct(AST_HTML_OMITTED_CLOSE_TAG_NODE_T* html_omitted_close_tag_node) {
+  if (html_omitted_close_tag_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &html_omitted_close_tag_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 html_omitted_close_tag_node_tag_name = rb_token_from_c_struct(html_omitted_close_tag_node->tag_name);
+
+  VALUE args[4] = {
+    type,
+    location,
+    errors,
+    html_omitted_close_tag_node_tag_name
+  };
+
+  return rb_class_new_instance(4, args, cHTMLOmittedCloseTagNode);
+};
+
+static VALUE rb_html_virtual_close_tag_node_from_c_struct(AST_HTML_VIRTUAL_CLOSE_TAG_NODE_T* html_virtual_close_tag_node) {
+  if (html_virtual_close_tag_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &html_virtual_close_tag_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 html_virtual_close_tag_node_tag_name = rb_token_from_c_struct(html_virtual_close_tag_node->tag_name);
+
+  VALUE args[4] = {
+    type,
+    location,
+    errors,
+    html_virtual_close_tag_node_tag_name
+  };
+
+  return rb_class_new_instance(4, args, cHTMLVirtualCloseTagNode);
 };
 
 static VALUE rb_html_element_node_from_c_struct(AST_HTML_ELEMENT_NODE_T* html_element_node) {
@@ -141,13 +289,7 @@ static VALUE rb_html_element_node_from_c_struct(AST_HTML_ELEMENT_NODE_T* html_el
 
   AST_NODE_T* node = &html_element_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLElementNode = rb_define_class_under(AST, "HTMLElementNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -156,11 +298,7 @@ static VALUE rb_html_element_node_from_c_struct(AST_HTML_ELEMENT_NODE_T* html_el
   VALUE html_element_node_body = rb_nodes_array_from_c_array(html_element_node->body);
   VALUE html_element_node_close_tag = rb_node_from_c_struct((AST_NODE_T*) html_element_node->close_tag);
   VALUE html_element_node_is_void = (html_element_node->is_void) ? Qtrue : Qfalse;
-  VALUE html_element_node_source;
-  {
-    hb_string_T element_source_string = element_source_to_string(html_element_node->source);
-    html_element_node_source = rb_utf8_str_new(element_source_string.data, element_source_string.length);
-  }
+  VALUE html_element_node_element_source = rb_string_from_hb_string(html_element_node->element_source);
 
   VALUE args[9] = {
     type,
@@ -171,10 +309,45 @@ static VALUE rb_html_element_node_from_c_struct(AST_HTML_ELEMENT_NODE_T* html_el
     html_element_node_body,
     html_element_node_close_tag,
     html_element_node_is_void,
-    html_element_node_source
+    html_element_node_element_source
   };
 
-  return rb_class_new_instance(9, args, HTMLElementNode);
+  return rb_class_new_instance(9, args, cHTMLElementNode);
+};
+
+static VALUE rb_html_conditional_element_node_from_c_struct(AST_HTML_CONDITIONAL_ELEMENT_NODE_T* html_conditional_element_node) {
+  if (html_conditional_element_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &html_conditional_element_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 html_conditional_element_node_condition = rb_string_from_hb_string(html_conditional_element_node->condition);
+  VALUE html_conditional_element_node_open_conditional = rb_node_from_c_struct((AST_NODE_T*) html_conditional_element_node->open_conditional);
+  VALUE html_conditional_element_node_open_tag = rb_node_from_c_struct((AST_NODE_T*) html_conditional_element_node->open_tag);
+  VALUE html_conditional_element_node_body = rb_nodes_array_from_c_array(html_conditional_element_node->body);
+  VALUE html_conditional_element_node_close_tag = rb_node_from_c_struct((AST_NODE_T*) html_conditional_element_node->close_tag);
+  VALUE html_conditional_element_node_close_conditional = rb_node_from_c_struct((AST_NODE_T*) html_conditional_element_node->close_conditional);
+  VALUE html_conditional_element_node_tag_name = rb_token_from_c_struct(html_conditional_element_node->tag_name);
+  VALUE html_conditional_element_node_element_source = rb_string_from_hb_string(html_conditional_element_node->element_source);
+
+  VALUE args[11] = {
+    type,
+    location,
+    errors,
+    html_conditional_element_node_condition,
+    html_conditional_element_node_open_conditional,
+    html_conditional_element_node_open_tag,
+    html_conditional_element_node_body,
+    html_conditional_element_node_close_tag,
+    html_conditional_element_node_close_conditional,
+    html_conditional_element_node_tag_name,
+    html_conditional_element_node_element_source
+  };
+
+  return rb_class_new_instance(11, args, cHTMLConditionalElementNode);
 };
 
 static VALUE rb_html_attribute_value_node_from_c_struct(AST_HTML_ATTRIBUTE_VALUE_NODE_T* html_attribute_value_node) {
@@ -182,13 +355,7 @@ static VALUE rb_html_attribute_value_node_from_c_struct(AST_HTML_ATTRIBUTE_VALUE
 
   AST_NODE_T* node = &html_attribute_value_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLAttributeValueNode = rb_define_class_under(AST, "HTMLAttributeValueNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -207,7 +374,7 @@ static VALUE rb_html_attribute_value_node_from_c_struct(AST_HTML_ATTRIBUTE_VALUE
     html_attribute_value_node_quoted
   };
 
-  return rb_class_new_instance(7, args, HTMLAttributeValueNode);
+  return rb_class_new_instance(7, args, cHTMLAttributeValueNode);
 };
 
 static VALUE rb_html_attribute_name_node_from_c_struct(AST_HTML_ATTRIBUTE_NAME_NODE_T* html_attribute_name_node) {
@@ -215,13 +382,7 @@ static VALUE rb_html_attribute_name_node_from_c_struct(AST_HTML_ATTRIBUTE_NAME_N
 
   AST_NODE_T* node = &html_attribute_name_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLAttributeNameNode = rb_define_class_under(AST, "HTMLAttributeNameNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -234,7 +395,7 @@ static VALUE rb_html_attribute_name_node_from_c_struct(AST_HTML_ATTRIBUTE_NAME_N
     html_attribute_name_node_children
   };
 
-  return rb_class_new_instance(4, args, HTMLAttributeNameNode);
+  return rb_class_new_instance(4, args, cHTMLAttributeNameNode);
 };
 
 static VALUE rb_html_attribute_node_from_c_struct(AST_HTML_ATTRIBUTE_NODE_T* html_attribute_node) {
@@ -242,13 +403,7 @@ static VALUE rb_html_attribute_node_from_c_struct(AST_HTML_ATTRIBUTE_NODE_T* htm
 
   AST_NODE_T* node = &html_attribute_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLAttributeNode = rb_define_class_under(AST, "HTMLAttributeNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -265,7 +420,80 @@ static VALUE rb_html_attribute_node_from_c_struct(AST_HTML_ATTRIBUTE_NODE_T* htm
     html_attribute_node_value
   };
 
-  return rb_class_new_instance(6, args, HTMLAttributeNode);
+  return rb_class_new_instance(6, args, cHTMLAttributeNode);
+};
+
+static VALUE rb_ruby_literal_node_from_c_struct(AST_RUBY_LITERAL_NODE_T* ruby_literal_node) {
+  if (ruby_literal_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &ruby_literal_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_literal_node_content = rb_string_from_hb_string(ruby_literal_node->content);
+
+  VALUE args[4] = {
+    type,
+    location,
+    errors,
+    ruby_literal_node_content
+  };
+
+  return rb_class_new_instance(4, args, cRubyLiteralNode);
+};
+
+static VALUE rb_ruby_html_attributes_splat_node_from_c_struct(AST_RUBY_HTML_ATTRIBUTES_SPLAT_NODE_T* ruby_html_attributes_splat_node) {
+  if (ruby_html_attributes_splat_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &ruby_html_attributes_splat_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_html_attributes_splat_node_content = rb_string_from_hb_string(ruby_html_attributes_splat_node->content);
+  VALUE ruby_html_attributes_splat_node_prefix = rb_string_from_hb_string(ruby_html_attributes_splat_node->prefix);
+
+  VALUE args[5] = {
+    type,
+    location,
+    errors,
+    ruby_html_attributes_splat_node_content,
+    ruby_html_attributes_splat_node_prefix
+  };
+
+  return rb_class_new_instance(5, args, cRubyHTMLAttributesSplatNode);
+};
+
+static VALUE rb_erb_open_tag_node_from_c_struct(AST_ERB_OPEN_TAG_NODE_T* erb_open_tag_node) {
+  if (erb_open_tag_node == NULL) { return Qnil; }
+
+  AST_NODE_T* node = &erb_open_tag_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 erb_open_tag_node_tag_opening = rb_token_from_c_struct(erb_open_tag_node->tag_opening);
+  VALUE erb_open_tag_node_content = rb_token_from_c_struct(erb_open_tag_node->content);
+  VALUE erb_open_tag_node_tag_closing = rb_token_from_c_struct(erb_open_tag_node->tag_closing);
+  VALUE erb_open_tag_node_tag_name = rb_token_from_c_struct(erb_open_tag_node->tag_name);
+  VALUE erb_open_tag_node_children = rb_nodes_array_from_c_array(erb_open_tag_node->children);
+
+  VALUE args[8] = {
+    type,
+    location,
+    errors,
+    erb_open_tag_node_tag_opening,
+    erb_open_tag_node_content,
+    erb_open_tag_node_tag_closing,
+    erb_open_tag_node_tag_name,
+    erb_open_tag_node_children
+  };
+
+  return rb_class_new_instance(8, args, cERBOpenTagNode);
 };
 
 static VALUE rb_html_text_node_from_c_struct(AST_HTML_TEXT_NODE_T* html_text_node) {
@@ -273,17 +501,11 @@ static VALUE rb_html_text_node_from_c_struct(AST_HTML_TEXT_NODE_T* html_text_nod
 
   AST_NODE_T* node = &html_text_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLTextNode = rb_define_class_under(AST, "HTMLTextNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 html_text_node_content = rb_utf8_str_new_cstr(html_text_node->content);
+  VALUE html_text_node_content = rb_string_from_hb_string(html_text_node->content);
 
   VALUE args[4] = {
     type,
@@ -292,7 +514,7 @@ static VALUE rb_html_text_node_from_c_struct(AST_HTML_TEXT_NODE_T* html_text_nod
     html_text_node_content
   };
 
-  return rb_class_new_instance(4, args, HTMLTextNode);
+  return rb_class_new_instance(4, args, cHTMLTextNode);
 };
 
 static VALUE rb_html_comment_node_from_c_struct(AST_HTML_COMMENT_NODE_T* html_comment_node) {
@@ -300,13 +522,7 @@ static VALUE rb_html_comment_node_from_c_struct(AST_HTML_COMMENT_NODE_T* html_co
 
   AST_NODE_T* node = &html_comment_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLCommentNode = rb_define_class_under(AST, "HTMLCommentNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -323,7 +539,7 @@ static VALUE rb_html_comment_node_from_c_struct(AST_HTML_COMMENT_NODE_T* html_co
     html_comment_node_comment_end
   };
 
-  return rb_class_new_instance(6, args, HTMLCommentNode);
+  return rb_class_new_instance(6, args, cHTMLCommentNode);
 };
 
 static VALUE rb_html_doctype_node_from_c_struct(AST_HTML_DOCTYPE_NODE_T* html_doctype_node) {
@@ -331,13 +547,7 @@ static VALUE rb_html_doctype_node_from_c_struct(AST_HTML_DOCTYPE_NODE_T* html_do
 
   AST_NODE_T* node = &html_doctype_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE HTMLDoctypeNode = rb_define_class_under(AST, "HTMLDoctypeNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -354,7 +564,7 @@ static VALUE rb_html_doctype_node_from_c_struct(AST_HTML_DOCTYPE_NODE_T* html_do
     html_doctype_node_tag_closing
   };
 
-  return rb_class_new_instance(6, args, HTMLDoctypeNode);
+  return rb_class_new_instance(6, args, cHTMLDoctypeNode);
 };
 
 static VALUE rb_xml_declaration_node_from_c_struct(AST_XML_DECLARATION_NODE_T* xml_declaration_node) {
@@ -362,13 +572,7 @@ static VALUE rb_xml_declaration_node_from_c_struct(AST_XML_DECLARATION_NODE_T* x
 
   AST_NODE_T* node = &xml_declaration_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE XMLDeclarationNode = rb_define_class_under(AST, "XMLDeclarationNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -385,7 +589,7 @@ static VALUE rb_xml_declaration_node_from_c_struct(AST_XML_DECLARATION_NODE_T* x
     xml_declaration_node_tag_closing
   };
 
-  return rb_class_new_instance(6, args, XMLDeclarationNode);
+  return rb_class_new_instance(6, args, cXMLDeclarationNode);
 };
 
 static VALUE rb_cdata_node_from_c_struct(AST_CDATA_NODE_T* cdata_node) {
@@ -393,13 +597,7 @@ static VALUE rb_cdata_node_from_c_struct(AST_CDATA_NODE_T* cdata_node) {
 
   AST_NODE_T* node = &cdata_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE CDATANode = rb_define_class_under(AST, "CDATANode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -416,7 +614,7 @@ static VALUE rb_cdata_node_from_c_struct(AST_CDATA_NODE_T* cdata_node) {
     cdata_node_tag_closing
   };
 
-  return rb_class_new_instance(6, args, CDATANode);
+  return rb_class_new_instance(6, args, cCDATANode);
 };
 
 static VALUE rb_whitespace_node_from_c_struct(AST_WHITESPACE_NODE_T* whitespace_node) {
@@ -424,13 +622,7 @@ static VALUE rb_whitespace_node_from_c_struct(AST_WHITESPACE_NODE_T* whitespace_
 
   AST_NODE_T* node = &whitespace_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE WhitespaceNode = rb_define_class_under(AST, "WhitespaceNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -443,7 +635,7 @@ static VALUE rb_whitespace_node_from_c_struct(AST_WHITESPACE_NODE_T* whitespace_
     whitespace_node_value
   };
 
-  return rb_class_new_instance(4, args, WhitespaceNode);
+  return rb_class_new_instance(4, args, cWhitespaceNode);
 };
 
 static VALUE rb_erb_content_node_from_c_struct(AST_ERB_CONTENT_NODE_T* erb_content_node) {
@@ -451,25 +643,35 @@ static VALUE rb_erb_content_node_from_c_struct(AST_ERB_CONTENT_NODE_T* erb_conte
 
   AST_NODE_T* node = &erb_content_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBContentNode = rb_define_class_under(AST, "ERBContentNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 erb_content_node_tag_opening = rb_token_from_c_struct(erb_content_node->tag_opening);
   VALUE erb_content_node_content = rb_token_from_c_struct(erb_content_node->content);
   VALUE erb_content_node_tag_closing = rb_token_from_c_struct(erb_content_node->tag_closing);
-  /* #<Herb::Template::AnalyzedRubyField:0x00007fb54f94c300 @name="analyzed_ruby", @options={kind: nil}> */
+  /* analyzed_ruby is internal parser state, not exposed to Ruby */
   VALUE erb_content_node_analyzed_ruby = Qnil;
   VALUE erb_content_node_parsed = (erb_content_node->parsed) ? Qtrue : Qfalse;
   VALUE erb_content_node_valid = (erb_content_node->valid) ? Qtrue : Qfalse;
+  VALUE erb_content_node_prism_node;
+  if (erb_content_node->prism_node.node != NULL && erb_content_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_content_node->prism_node.parser, erb_content_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_content_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_content_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_content_node_prism_node);
+    } else {
+      erb_content_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_content_node_prism_node = Qnil;
+  }
 
-  VALUE args[9] = {
+  VALUE args[10] = {
     type,
     location,
     errors,
@@ -478,10 +680,11 @@ static VALUE rb_erb_content_node_from_c_struct(AST_ERB_CONTENT_NODE_T* erb_conte
     erb_content_node_tag_closing,
     erb_content_node_analyzed_ruby,
     erb_content_node_parsed,
-    erb_content_node_valid
+    erb_content_node_valid,
+    erb_content_node_prism_node
   };
 
-  return rb_class_new_instance(9, args, ERBContentNode);
+  return rb_class_new_instance(10, args, cERBContentNode);
 };
 
 static VALUE rb_erb_end_node_from_c_struct(AST_ERB_END_NODE_T* erb_end_node) {
@@ -489,13 +692,7 @@ static VALUE rb_erb_end_node_from_c_struct(AST_ERB_END_NODE_T* erb_end_node) {
 
   AST_NODE_T* node = &erb_end_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBEndNode = rb_define_class_under(AST, "ERBEndNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -512,7 +709,7 @@ static VALUE rb_erb_end_node_from_c_struct(AST_ERB_END_NODE_T* erb_end_node) {
     erb_end_node_tag_closing
   };
 
-  return rb_class_new_instance(6, args, ERBEndNode);
+  return rb_class_new_instance(6, args, cERBEndNode);
 };
 
 static VALUE rb_erb_else_node_from_c_struct(AST_ERB_ELSE_NODE_T* erb_else_node) {
@@ -520,13 +717,7 @@ static VALUE rb_erb_else_node_from_c_struct(AST_ERB_ELSE_NODE_T* erb_else_node)
 
   AST_NODE_T* node = &erb_else_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBElseNode = rb_define_class_under(AST, "ERBElseNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -545,7 +736,7 @@ static VALUE rb_erb_else_node_from_c_struct(AST_ERB_ELSE_NODE_T* erb_else_node)
     erb_else_node_statements
   };
 
-  return rb_class_new_instance(7, args, ERBElseNode);
+  return rb_class_new_instance(7, args, cERBElseNode);
 };
 
 static VALUE rb_erb_if_node_from_c_struct(AST_ERB_IF_NODE_T* erb_if_node) {
@@ -553,13 +744,7 @@ static VALUE rb_erb_if_node_from_c_struct(AST_ERB_IF_NODE_T* erb_if_node) {
 
   AST_NODE_T* node = &erb_if_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBIfNode = rb_define_class_under(AST, "ERBIfNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -567,11 +752,27 @@ static VALUE rb_erb_if_node_from_c_struct(AST_ERB_IF_NODE_T* erb_if_node) {
   VALUE erb_if_node_content = rb_token_from_c_struct(erb_if_node->content);
   VALUE erb_if_node_tag_closing = rb_token_from_c_struct(erb_if_node->tag_closing);
   VALUE erb_if_node_then_keyword = (erb_if_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_if_node->then_keyword) : Qnil;
+  VALUE erb_if_node_prism_node;
+  if (erb_if_node->prism_node.node != NULL && erb_if_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_if_node->prism_node.parser, erb_if_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_if_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_if_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_if_node_prism_node);
+    } else {
+      erb_if_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_if_node_prism_node = Qnil;
+  }
   VALUE erb_if_node_statements = rb_nodes_array_from_c_array(erb_if_node->statements);
   VALUE erb_if_node_subsequent = rb_node_from_c_struct((AST_NODE_T*) erb_if_node->subsequent);
   VALUE erb_if_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_if_node->end_node);
 
-  VALUE args[10] = {
+  VALUE args[11] = {
     type,
     location,
     errors,
@@ -579,12 +780,13 @@ static VALUE rb_erb_if_node_from_c_struct(AST_ERB_IF_NODE_T* erb_if_node) {
     erb_if_node_content,
     erb_if_node_tag_closing,
     erb_if_node_then_keyword,
+    erb_if_node_prism_node,
     erb_if_node_statements,
     erb_if_node_subsequent,
     erb_if_node_end_node
   };
 
-  return rb_class_new_instance(10, args, ERBIfNode);
+  return rb_class_new_instance(11, args, cERBIfNode);
 };
 
 static VALUE rb_erb_block_node_from_c_struct(AST_ERB_BLOCK_NODE_T* erb_block_node) {
@@ -592,34 +794,45 @@ static VALUE rb_erb_block_node_from_c_struct(AST_ERB_BLOCK_NODE_T* erb_block_nod
 
   AST_NODE_T* node = &erb_block_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBBlockNode = rb_define_class_under(AST, "ERBBlockNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 erb_block_node_tag_opening = rb_token_from_c_struct(erb_block_node->tag_opening);
   VALUE erb_block_node_content = rb_token_from_c_struct(erb_block_node->content);
   VALUE erb_block_node_tag_closing = rb_token_from_c_struct(erb_block_node->tag_closing);
+  VALUE erb_block_node_prism_node;
+  if (erb_block_node->prism_node.node != NULL && erb_block_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_block_node->prism_node.parser, erb_block_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_block_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_block_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_block_node_prism_node);
+    } else {
+      erb_block_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    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_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_block_node->end_node);
 
-  VALUE args[8] = {
+  VALUE args[9] = {
     type,
     location,
     errors,
     erb_block_node_tag_opening,
     erb_block_node_content,
     erb_block_node_tag_closing,
+    erb_block_node_prism_node,
     erb_block_node_body,
     erb_block_node_end_node
   };
 
-  return rb_class_new_instance(8, args, ERBBlockNode);
+  return rb_class_new_instance(9, args, cERBBlockNode);
 };
 
 static VALUE rb_erb_when_node_from_c_struct(AST_ERB_WHEN_NODE_T* erb_when_node) {
@@ -627,13 +840,7 @@ static VALUE rb_erb_when_node_from_c_struct(AST_ERB_WHEN_NODE_T* erb_when_node)
 
   AST_NODE_T* node = &erb_when_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBWhenNode = rb_define_class_under(AST, "ERBWhenNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -654,7 +861,7 @@ static VALUE rb_erb_when_node_from_c_struct(AST_ERB_WHEN_NODE_T* erb_when_node)
     erb_when_node_statements
   };
 
-  return rb_class_new_instance(8, args, ERBWhenNode);
+  return rb_class_new_instance(8, args, cERBWhenNode);
 };
 
 static VALUE rb_erb_case_node_from_c_struct(AST_ERB_CASE_NODE_T* erb_case_node) {
@@ -662,13 +869,7 @@ static VALUE rb_erb_case_node_from_c_struct(AST_ERB_CASE_NODE_T* erb_case_node)
 
   AST_NODE_T* node = &erb_case_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBCaseNode = rb_define_class_under(AST, "ERBCaseNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -676,11 +877,27 @@ static VALUE rb_erb_case_node_from_c_struct(AST_ERB_CASE_NODE_T* erb_case_node)
   VALUE erb_case_node_content = rb_token_from_c_struct(erb_case_node->content);
   VALUE erb_case_node_tag_closing = rb_token_from_c_struct(erb_case_node->tag_closing);
   VALUE erb_case_node_children = rb_nodes_array_from_c_array(erb_case_node->children);
+  VALUE erb_case_node_prism_node;
+  if (erb_case_node->prism_node.node != NULL && erb_case_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_case_node->prism_node.parser, erb_case_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_case_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_case_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_case_node_prism_node);
+    } else {
+      erb_case_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_case_node_prism_node = Qnil;
+  }
   VALUE erb_case_node_conditions = rb_nodes_array_from_c_array(erb_case_node->conditions);
   VALUE erb_case_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_case_node->else_clause);
   VALUE erb_case_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_case_node->end_node);
 
-  VALUE args[10] = {
+  VALUE args[11] = {
     type,
     location,
     errors,
@@ -688,12 +905,13 @@ static VALUE rb_erb_case_node_from_c_struct(AST_ERB_CASE_NODE_T* erb_case_node)
     erb_case_node_content,
     erb_case_node_tag_closing,
     erb_case_node_children,
+    erb_case_node_prism_node,
     erb_case_node_conditions,
     erb_case_node_else_clause,
     erb_case_node_end_node
   };
 
-  return rb_class_new_instance(10, args, ERBCaseNode);
+  return rb_class_new_instance(11, args, cERBCaseNode);
 };
 
 static VALUE rb_erb_case_match_node_from_c_struct(AST_ERB_CASE_MATCH_NODE_T* erb_case_match_node) {
@@ -701,13 +919,7 @@ static VALUE rb_erb_case_match_node_from_c_struct(AST_ERB_CASE_MATCH_NODE_T* erb
 
   AST_NODE_T* node = &erb_case_match_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBCaseMatchNode = rb_define_class_under(AST, "ERBCaseMatchNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -715,11 +927,27 @@ static VALUE rb_erb_case_match_node_from_c_struct(AST_ERB_CASE_MATCH_NODE_T* erb
   VALUE erb_case_match_node_content = rb_token_from_c_struct(erb_case_match_node->content);
   VALUE erb_case_match_node_tag_closing = rb_token_from_c_struct(erb_case_match_node->tag_closing);
   VALUE erb_case_match_node_children = rb_nodes_array_from_c_array(erb_case_match_node->children);
+  VALUE erb_case_match_node_prism_node;
+  if (erb_case_match_node->prism_node.node != NULL && erb_case_match_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_case_match_node->prism_node.parser, erb_case_match_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_case_match_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_case_match_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_case_match_node_prism_node);
+    } else {
+      erb_case_match_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_case_match_node_prism_node = Qnil;
+  }
   VALUE erb_case_match_node_conditions = rb_nodes_array_from_c_array(erb_case_match_node->conditions);
   VALUE erb_case_match_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_case_match_node->else_clause);
   VALUE erb_case_match_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_case_match_node->end_node);
 
-  VALUE args[10] = {
+  VALUE args[11] = {
     type,
     location,
     errors,
@@ -727,12 +955,13 @@ static VALUE rb_erb_case_match_node_from_c_struct(AST_ERB_CASE_MATCH_NODE_T* erb
     erb_case_match_node_content,
     erb_case_match_node_tag_closing,
     erb_case_match_node_children,
+    erb_case_match_node_prism_node,
     erb_case_match_node_conditions,
     erb_case_match_node_else_clause,
     erb_case_match_node_end_node
   };
 
-  return rb_class_new_instance(10, args, ERBCaseMatchNode);
+  return rb_class_new_instance(11, args, cERBCaseMatchNode);
 };
 
 static VALUE rb_erb_while_node_from_c_struct(AST_ERB_WHILE_NODE_T* erb_while_node) {
@@ -740,34 +969,45 @@ static VALUE rb_erb_while_node_from_c_struct(AST_ERB_WHILE_NODE_T* erb_while_nod
 
   AST_NODE_T* node = &erb_while_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBWhileNode = rb_define_class_under(AST, "ERBWhileNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 erb_while_node_tag_opening = rb_token_from_c_struct(erb_while_node->tag_opening);
   VALUE erb_while_node_content = rb_token_from_c_struct(erb_while_node->content);
   VALUE erb_while_node_tag_closing = rb_token_from_c_struct(erb_while_node->tag_closing);
+  VALUE erb_while_node_prism_node;
+  if (erb_while_node->prism_node.node != NULL && erb_while_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_while_node->prism_node.parser, erb_while_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_while_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_while_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_while_node_prism_node);
+    } else {
+      erb_while_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_while_node_prism_node = Qnil;
+  }
   VALUE erb_while_node_statements = rb_nodes_array_from_c_array(erb_while_node->statements);
   VALUE erb_while_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_while_node->end_node);
 
-  VALUE args[8] = {
+  VALUE args[9] = {
     type,
     location,
     errors,
     erb_while_node_tag_opening,
     erb_while_node_content,
     erb_while_node_tag_closing,
+    erb_while_node_prism_node,
     erb_while_node_statements,
     erb_while_node_end_node
   };
 
-  return rb_class_new_instance(8, args, ERBWhileNode);
+  return rb_class_new_instance(9, args, cERBWhileNode);
 };
 
 static VALUE rb_erb_until_node_from_c_struct(AST_ERB_UNTIL_NODE_T* erb_until_node) {
@@ -775,34 +1015,45 @@ static VALUE rb_erb_until_node_from_c_struct(AST_ERB_UNTIL_NODE_T* erb_until_nod
 
   AST_NODE_T* node = &erb_until_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBUntilNode = rb_define_class_under(AST, "ERBUntilNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 erb_until_node_tag_opening = rb_token_from_c_struct(erb_until_node->tag_opening);
   VALUE erb_until_node_content = rb_token_from_c_struct(erb_until_node->content);
   VALUE erb_until_node_tag_closing = rb_token_from_c_struct(erb_until_node->tag_closing);
+  VALUE erb_until_node_prism_node;
+  if (erb_until_node->prism_node.node != NULL && erb_until_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_until_node->prism_node.parser, erb_until_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_until_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_until_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_until_node_prism_node);
+    } else {
+      erb_until_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_until_node_prism_node = Qnil;
+  }
   VALUE erb_until_node_statements = rb_nodes_array_from_c_array(erb_until_node->statements);
   VALUE erb_until_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_until_node->end_node);
 
-  VALUE args[8] = {
+  VALUE args[9] = {
     type,
     location,
     errors,
     erb_until_node_tag_opening,
     erb_until_node_content,
     erb_until_node_tag_closing,
+    erb_until_node_prism_node,
     erb_until_node_statements,
     erb_until_node_end_node
   };
 
-  return rb_class_new_instance(8, args, ERBUntilNode);
+  return rb_class_new_instance(9, args, cERBUntilNode);
 };
 
 static VALUE rb_erb_for_node_from_c_struct(AST_ERB_FOR_NODE_T* erb_for_node) {
@@ -810,34 +1061,45 @@ static VALUE rb_erb_for_node_from_c_struct(AST_ERB_FOR_NODE_T* erb_for_node) {
 
   AST_NODE_T* node = &erb_for_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBForNode = rb_define_class_under(AST, "ERBForNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 erb_for_node_tag_opening = rb_token_from_c_struct(erb_for_node->tag_opening);
   VALUE erb_for_node_content = rb_token_from_c_struct(erb_for_node->content);
   VALUE erb_for_node_tag_closing = rb_token_from_c_struct(erb_for_node->tag_closing);
+  VALUE erb_for_node_prism_node;
+  if (erb_for_node->prism_node.node != NULL && erb_for_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_for_node->prism_node.parser, erb_for_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_for_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_for_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_for_node_prism_node);
+    } else {
+      erb_for_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_for_node_prism_node = Qnil;
+  }
   VALUE erb_for_node_statements = rb_nodes_array_from_c_array(erb_for_node->statements);
   VALUE erb_for_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_for_node->end_node);
 
-  VALUE args[8] = {
+  VALUE args[9] = {
     type,
     location,
     errors,
     erb_for_node_tag_opening,
     erb_for_node_content,
     erb_for_node_tag_closing,
+    erb_for_node_prism_node,
     erb_for_node_statements,
     erb_for_node_end_node
   };
 
-  return rb_class_new_instance(8, args, ERBForNode);
+  return rb_class_new_instance(9, args, cERBForNode);
 };
 
 static VALUE rb_erb_rescue_node_from_c_struct(AST_ERB_RESCUE_NODE_T* erb_rescue_node) {
@@ -845,13 +1107,7 @@ static VALUE rb_erb_rescue_node_from_c_struct(AST_ERB_RESCUE_NODE_T* erb_rescue_
 
   AST_NODE_T* node = &erb_rescue_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBRescueNode = rb_define_class_under(AST, "ERBRescueNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -872,7 +1128,7 @@ static VALUE rb_erb_rescue_node_from_c_struct(AST_ERB_RESCUE_NODE_T* erb_rescue_
     erb_rescue_node_subsequent
   };
 
-  return rb_class_new_instance(8, args, ERBRescueNode);
+  return rb_class_new_instance(8, args, cERBRescueNode);
 };
 
 static VALUE rb_erb_ensure_node_from_c_struct(AST_ERB_ENSURE_NODE_T* erb_ensure_node) {
@@ -880,13 +1136,7 @@ static VALUE rb_erb_ensure_node_from_c_struct(AST_ERB_ENSURE_NODE_T* erb_ensure_
 
   AST_NODE_T* node = &erb_ensure_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBEnsureNode = rb_define_class_under(AST, "ERBEnsureNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -905,7 +1155,7 @@ static VALUE rb_erb_ensure_node_from_c_struct(AST_ERB_ENSURE_NODE_T* erb_ensure_
     erb_ensure_node_statements
   };
 
-  return rb_class_new_instance(7, args, ERBEnsureNode);
+  return rb_class_new_instance(7, args, cERBEnsureNode);
 };
 
 static VALUE rb_erb_begin_node_from_c_struct(AST_ERB_BEGIN_NODE_T* erb_begin_node) {
@@ -913,32 +1163,43 @@ static VALUE rb_erb_begin_node_from_c_struct(AST_ERB_BEGIN_NODE_T* erb_begin_nod
 
   AST_NODE_T* node = &erb_begin_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBBeginNode = rb_define_class_under(AST, "ERBBeginNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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 erb_begin_node_tag_opening = rb_token_from_c_struct(erb_begin_node->tag_opening);
   VALUE erb_begin_node_content = rb_token_from_c_struct(erb_begin_node->content);
   VALUE erb_begin_node_tag_closing = rb_token_from_c_struct(erb_begin_node->tag_closing);
+  VALUE erb_begin_node_prism_node;
+  if (erb_begin_node->prism_node.node != NULL && erb_begin_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_begin_node->prism_node.parser, erb_begin_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_begin_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_begin_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_begin_node_prism_node);
+    } else {
+      erb_begin_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_begin_node_prism_node = Qnil;
+  }
   VALUE erb_begin_node_statements = rb_nodes_array_from_c_array(erb_begin_node->statements);
   VALUE erb_begin_node_rescue_clause = rb_node_from_c_struct((AST_NODE_T*) erb_begin_node->rescue_clause);
   VALUE erb_begin_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_begin_node->else_clause);
   VALUE erb_begin_node_ensure_clause = rb_node_from_c_struct((AST_NODE_T*) erb_begin_node->ensure_clause);
   VALUE erb_begin_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_begin_node->end_node);
 
-  VALUE args[11] = {
+  VALUE args[12] = {
     type,
     location,
     errors,
     erb_begin_node_tag_opening,
     erb_begin_node_content,
     erb_begin_node_tag_closing,
+    erb_begin_node_prism_node,
     erb_begin_node_statements,
     erb_begin_node_rescue_clause,
     erb_begin_node_else_clause,
@@ -946,7 +1207,7 @@ static VALUE rb_erb_begin_node_from_c_struct(AST_ERB_BEGIN_NODE_T* erb_begin_nod
     erb_begin_node_end_node
   };
 
-  return rb_class_new_instance(11, args, ERBBeginNode);
+  return rb_class_new_instance(12, args, cERBBeginNode);
 };
 
 static VALUE rb_erb_unless_node_from_c_struct(AST_ERB_UNLESS_NODE_T* erb_unless_node) {
@@ -954,13 +1215,7 @@ static VALUE rb_erb_unless_node_from_c_struct(AST_ERB_UNLESS_NODE_T* erb_unless_
 
   AST_NODE_T* node = &erb_unless_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBUnlessNode = rb_define_class_under(AST, "ERBUnlessNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -968,11 +1223,27 @@ static VALUE rb_erb_unless_node_from_c_struct(AST_ERB_UNLESS_NODE_T* erb_unless_
   VALUE erb_unless_node_content = rb_token_from_c_struct(erb_unless_node->content);
   VALUE erb_unless_node_tag_closing = rb_token_from_c_struct(erb_unless_node->tag_closing);
   VALUE erb_unless_node_then_keyword = (erb_unless_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_unless_node->then_keyword) : Qnil;
+  VALUE erb_unless_node_prism_node;
+  if (erb_unless_node->prism_node.node != NULL && erb_unless_node->prism_node.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(erb_unless_node->prism_node.parser, erb_unless_node->prism_node.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      erb_unless_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(erb_unless_node_prism_node, rb_ascii8bit_encoding());
+      OBJ_FREEZE(erb_unless_node_prism_node);
+    } else {
+      erb_unless_node_prism_node = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    erb_unless_node_prism_node = Qnil;
+  }
   VALUE erb_unless_node_statements = rb_nodes_array_from_c_array(erb_unless_node->statements);
   VALUE erb_unless_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_unless_node->else_clause);
   VALUE erb_unless_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_unless_node->end_node);
 
-  VALUE args[10] = {
+  VALUE args[11] = {
     type,
     location,
     errors,
@@ -980,12 +1251,13 @@ static VALUE rb_erb_unless_node_from_c_struct(AST_ERB_UNLESS_NODE_T* erb_unless_
     erb_unless_node_content,
     erb_unless_node_tag_closing,
     erb_unless_node_then_keyword,
+    erb_unless_node_prism_node,
     erb_unless_node_statements,
     erb_unless_node_else_clause,
     erb_unless_node_end_node
   };
 
-  return rb_class_new_instance(10, args, ERBUnlessNode);
+  return rb_class_new_instance(11, args, cERBUnlessNode);
 };
 
 static VALUE rb_erb_yield_node_from_c_struct(AST_ERB_YIELD_NODE_T* erb_yield_node) {
@@ -993,13 +1265,7 @@ static VALUE rb_erb_yield_node_from_c_struct(AST_ERB_YIELD_NODE_T* erb_yield_nod
 
   AST_NODE_T* node = &erb_yield_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBYieldNode = rb_define_class_under(AST, "ERBYieldNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -1016,7 +1282,7 @@ static VALUE rb_erb_yield_node_from_c_struct(AST_ERB_YIELD_NODE_T* erb_yield_nod
     erb_yield_node_tag_closing
   };
 
-  return rb_class_new_instance(6, args, ERBYieldNode);
+  return rb_class_new_instance(6, args, cERBYieldNode);
 };
 
 static VALUE rb_erb_in_node_from_c_struct(AST_ERB_IN_NODE_T* erb_in_node) {
@@ -1024,13 +1290,7 @@ static VALUE rb_erb_in_node_from_c_struct(AST_ERB_IN_NODE_T* erb_in_node) {
 
   AST_NODE_T* node = &erb_in_node->base;
 
-  VALUE Herb = rb_define_module("Herb");
-  VALUE AST = rb_define_module_under(Herb, "AST");
-  VALUE Node = rb_define_class_under(AST, "Node", rb_cObject);
-  VALUE ERBInNode = rb_define_class_under(AST, "ERBInNode", Node);
-
-  hb_string_T node_type = ast_node_type_to_string(node);
-  VALUE type = rb_utf8_str_new(node_type.data, node_type.length);
+  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);
 
@@ -1051,7 +1311,7 @@ static VALUE rb_erb_in_node_from_c_struct(AST_ERB_IN_NODE_T* erb_in_node) {
     erb_in_node_statements
   };
 
-  return rb_class_new_instance(8, args, ERBInNode);
+  return rb_class_new_instance(8, args, cERBInNode);
 };
 
 
@@ -1062,11 +1322,18 @@ VALUE rb_node_from_c_struct(AST_NODE_T* node) {
     case AST_DOCUMENT_NODE: return rb_document_node_from_c_struct((AST_DOCUMENT_NODE_T*) node); break;
     case AST_LITERAL_NODE: return rb_literal_node_from_c_struct((AST_LITERAL_NODE_T*) node); break;
     case AST_HTML_OPEN_TAG_NODE: return rb_html_open_tag_node_from_c_struct((AST_HTML_OPEN_TAG_NODE_T*) node); break;
+    case AST_HTML_CONDITIONAL_OPEN_TAG_NODE: return rb_html_conditional_open_tag_node_from_c_struct((AST_HTML_CONDITIONAL_OPEN_TAG_NODE_T*) node); break;
     case AST_HTML_CLOSE_TAG_NODE: return rb_html_close_tag_node_from_c_struct((AST_HTML_CLOSE_TAG_NODE_T*) node); break;
+    case AST_HTML_OMITTED_CLOSE_TAG_NODE: return rb_html_omitted_close_tag_node_from_c_struct((AST_HTML_OMITTED_CLOSE_TAG_NODE_T*) node); break;
+    case AST_HTML_VIRTUAL_CLOSE_TAG_NODE: return rb_html_virtual_close_tag_node_from_c_struct((AST_HTML_VIRTUAL_CLOSE_TAG_NODE_T*) node); break;
     case AST_HTML_ELEMENT_NODE: return rb_html_element_node_from_c_struct((AST_HTML_ELEMENT_NODE_T*) node); break;
+    case AST_HTML_CONDITIONAL_ELEMENT_NODE: return rb_html_conditional_element_node_from_c_struct((AST_HTML_CONDITIONAL_ELEMENT_NODE_T*) node); break;
     case AST_HTML_ATTRIBUTE_VALUE_NODE: return rb_html_attribute_value_node_from_c_struct((AST_HTML_ATTRIBUTE_VALUE_NODE_T*) node); break;
     case AST_HTML_ATTRIBUTE_NAME_NODE: return rb_html_attribute_name_node_from_c_struct((AST_HTML_ATTRIBUTE_NAME_NODE_T*) node); break;
     case AST_HTML_ATTRIBUTE_NODE: return rb_html_attribute_node_from_c_struct((AST_HTML_ATTRIBUTE_NODE_T*) node); break;
+    case AST_RUBY_LITERAL_NODE: return rb_ruby_literal_node_from_c_struct((AST_RUBY_LITERAL_NODE_T*) node); break;
+    case AST_RUBY_HTML_ATTRIBUTES_SPLAT_NODE: return rb_ruby_html_attributes_splat_node_from_c_struct((AST_RUBY_HTML_ATTRIBUTES_SPLAT_NODE_T*) node); break;
+    case AST_ERB_OPEN_TAG_NODE: return rb_erb_open_tag_node_from_c_struct((AST_ERB_OPEN_TAG_NODE_T*) node); break;
     case AST_HTML_TEXT_NODE: return rb_html_text_node_from_c_struct((AST_HTML_TEXT_NODE_T*) node); break;
     case AST_HTML_COMMENT_NODE: return rb_html_comment_node_from_c_struct((AST_HTML_COMMENT_NODE_T*) node); break;
     case AST_HTML_DOCTYPE_NODE: return rb_html_doctype_node_from_c_struct((AST_HTML_DOCTYPE_NODE_T*) node); break;