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

data/templates/ext/herb/nodes.c.erb

@@ -1,4 +1,5 @@
 #include <ruby.h>
+#include <ruby/encoding.h>
 
 #include "error_helpers.h"
 #include "extension_helpers.h"
@@ -11,27 +12,35 @@
 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;
+<%- nodes.each do |node| -%>
+static VALUE c<%= node.name %>;
+<%- end -%>
+
+void rb_init_node_classes(void) {
+  mAST = rb_define_module_under(mHerb, "AST");
+  cNode = rb_define_class_under(mAST, "Node", rb_cObject);
+  <%- nodes.each do |node| -%>
+  c<%= node.name %> = rb_define_class_under(mAST, "<%= node.name %>", cNode);
+  <%- end -%>
+}
+
 <%- nodes.each do |node| -%>
 static VALUE rb_<%= node.human %>_from_c_struct(<%= node.struct_type %>* <%= node.human %>) {
   if (<%= node.human %> == NULL) { return Qnil; }
 
   AST_NODE_T* node = &<%= node.human %>->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 <%= node.name %> = rb_define_class_under(AST, "<%= node.name %>", 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);
 
   <%- node.fields.each do |field| -%>
   <%- case field -%>
   <%- when Herb::Template::StringField -%>
-  VALUE <%= node.human %>_<%= field.name %> = rb_utf8_str_new_cstr(<%= node.human %>-><%= field.name %>);
-  <%- when Herb::Template::NodeField -%>
+  VALUE <%= node.human %>_<%= field.name %> = rb_string_from_hb_string(<%= node.human %>-><%= field.name %>);
+  <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
   VALUE <%= node.human %>_<%= field.name %> = rb_node_from_c_struct((AST_NODE_T*) <%= node.human %>-><%= field.name %>);
   <%- when Herb::Template::TokenField -%>
   VALUE <%= node.human %>_<%= field.name %> = rb_token_from_c_struct(<%= node.human %>-><%= field.name %>);
@@ -40,15 +49,40 @@ static VALUE rb_<%= node.human %>_from_c_struct(<%= node.struct_type %>* <%= nod
   <%- when Herb::Template::ArrayField -%>
   VALUE <%= node.human %>_<%= field.name %> = rb_nodes_array_from_c_array(<%= node.human %>-><%= field.name %>);
   <%- when Herb::Template::ElementSourceField -%>
-  VALUE <%= node.human %>_<%= field.name %>;
-  {
-    hb_string_T element_source_string = element_source_to_string(<%= node.human %>-><%= field.name %>);
-    <%= node.human %>_<%= field.name %> = rb_utf8_str_new(element_source_string.data, element_source_string.length);
-  }
+  VALUE <%= node.human %>_<%= field.name %> = rb_string_from_hb_string(<%= node.human %>-><%= field.name %>);
   <%- when Herb::Template::LocationField -%>
   VALUE <%= node.human %>_<%= field.name %> = (<%= node.human %>-><%= field.name %> != NULL) ? rb_location_from_c_struct(*<%= node.human %>-><%= field.name %>) : Qnil;
+  <%- when Herb::Template::PrismSerializedField -%>
+  VALUE <%= node.human %>_<%= field.name %>;
+  if (<%= node.human %>-><%= field.name %>.data != NULL && <%= node.human %>-><%= field.name %>.length > 0) {
+    <%= node.human %>_<%= field.name %> = rb_str_new((const char*)<%= node.human %>-><%= field.name %>.data, <%= node.human %>-><%= field.name %>.length);
+    rb_enc_associate(<%= node.human %>_<%= field.name %>, rb_ascii8bit_encoding());
+    OBJ_FREEZE(<%= node.human %>_<%= field.name %>);
+  } else {
+    <%= node.human %>_<%= field.name %> = Qnil;
+  }
+  <%- when Herb::Template::PrismNodeField -%>
+  VALUE <%= node.human %>_<%= field.name %>;
+  if (<%= node.human %>-><%= field.name %>.node != NULL && <%= node.human %>-><%= field.name %>.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(<%= node.human %>-><%= field.name %>.parser, <%= node.human %>-><%= field.name %>.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      <%= node.human %>_<%= field.name %> = rb_str_new(pm_buffer.value, pm_buffer.length);
+      rb_enc_associate(<%= node.human %>_<%= field.name %>, rb_ascii8bit_encoding());
+      OBJ_FREEZE(<%= node.human %>_<%= field.name %>);
+    } else {
+      <%= node.human %>_<%= field.name %> = Qnil;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    <%= node.human %>_<%= field.name %> = Qnil;
+  }
+  <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField, Herb::Template::VoidPointerField -%>
+  /* <%= field.name %> is internal parser state, not exposed to Ruby */
+  VALUE <%= node.human %>_<%= field.name %> = Qnil;
   <%- else -%>
-  /* <%= field.inspect %> */
+  /* Unhandled field type: <%= field.class.name %> */
   VALUE <%= node.human %>_<%= field.name %> = Qnil;
   <%- end -%>
   <%- end -%>
@@ -62,7 +96,7 @@ static VALUE rb_<%= node.human %>_from_c_struct(<%= node.struct_type %>* <%= nod
     <%- end -%>
   };
 
-  return rb_class_new_instance(<%= 3 + node.fields.count %>, args, <%= node.name %>);
+  return rb_class_new_instance(<%= 3 + node.fields.count %>, args, c<%= node.name %>);
 };
 
 <%- end -%>

data/templates/ext/herb/nodes.h.erb

@@ -4,6 +4,7 @@
 #include "../../src/include/herb.h"
 #include <ruby.h>
 
+void rb_init_node_classes(void);
 VALUE rb_node_from_c_struct(AST_NODE_T* node);
 
 #endif

data/templates/java/error_helpers.c.erb

@@ -18,7 +18,7 @@ jobject <%= error.name %>FromCStruct(JNIEnv* env, <%= error.struct_type %>* <%=
 
   jstring jtype = (*env)->NewStringUTF(env, "<%= error.name %>");
   jobject location = CreateLocation(env, <%= error.human %>->base.location);
-  jstring jmessage = (*env)->NewStringUTF(env, <%= error.human %>->base.message);
+  jstring jmessage = CreateStringFromHbString(env, <%= error.human %>->base.message);
 
   return (*env)->NewObject(env, errorClass, constructor, jtype, location, jmessage);
 }

data/templates/java/nodes.c.erb

@@ -25,30 +25,52 @@ jobject <%= node.name %>FromCStruct(JNIEnv* env, <%= node.struct_type %>* <%= no
 
   <%- node.fields.each do |field| -%>
   <%- if field.is_a?(Herb::Template::StringField) -%>
-  jstring <%= field.name %> = (*env)->NewStringUTF(env, <%= node.human %>-><%= field.name %>);
+  jstring <%= field.name %> = CreateStringFromHbString(env, <%= node.human %>-><%= field.name %>);
   <%- elsif field.is_a?(Herb::Template::TokenField) -%>
   jobject <%= field.name %> = <%= node.human %>-><%= field.name %> ? CreateToken(env, <%= node.human %>-><%= field.name %>) : NULL;
   <%- elsif field.is_a?(Herb::Template::BooleanField) -%>
   jboolean <%= field.name %> = <%= node.human %>-><%= field.name %> ? JNI_TRUE : JNI_FALSE;
   <%- elsif field.is_a?(Herb::Template::ArrayField) -%>
   jobject <%= field.name %> = NodesArrayFromCArray(env, <%= node.human %>-><%= field.name %>);
-  <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+  <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
   jobject <%= field.name %> = <%= node.human %>-><%= field.name %> ? NodeFromCStruct(env, (AST_NODE_T*) <%= node.human %>-><%= field.name %>) : NULL;
   <%- elsif field.is_a?(Herb::Template::ElementSourceField) -%>
-  // TODO: Convert element_source to string
-  jstring <%= field.name %> = (*env)->NewStringUTF(env, "");
+  jstring <%= field.name %> = <%= node.human %>-><%= field.name %>.data ? (*env)->NewStringUTF(env, <%= node.human %>-><%= field.name %>.data) : NULL;
   <%- elsif field.is_a?(Herb::Template::LocationField) -%>
   jobject <%= field.name %> = <%= node.human %>-><%= field.name %> ? CreateLocation(env, *<%= node.human %>-><%= field.name %>) : NULL;
-  <%- elsif field.is_a?(Herb::Template::AnalyzedRubyField) || field.is_a?(Herb::Template::PrismNodeField) -%>
-  // Skip <%= field.name %> (<%= field.class.name.split('::').last %>) - not supported in Java yet
+  <%- elsif field.is_a?(Herb::Template::PrismSerializedField) -%>
+  jbyteArray <%= field.name %>;
+  if (<%= node.human %>-><%= field.name %>.data != NULL && <%= node.human %>-><%= field.name %>.length > 0) {
+    <%= field.name %> = (*env)->NewByteArray(env, (jsize)<%= node.human %>-><%= field.name %>.length);
+    (*env)->SetByteArrayRegion(env, <%= field.name %>, 0, (jsize)<%= node.human %>-><%= field.name %>.length, (const jbyte*)<%= node.human %>-><%= field.name %>.data);
+  } else {
+    <%= field.name %> = NULL;
+  }
+  <%- elsif field.is_a?(Herb::Template::PrismNodeField) -%>
+  jbyteArray <%= field.name %>;
+  if (<%= node.human %>-><%= field.name %>.node != NULL && <%= node.human %>-><%= field.name %>.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(<%= node.human %>-><%= field.name %>.parser, <%= node.human %>-><%= field.name %>.node, &pm_buffer);
+    if (pm_buffer.length > 0) {
+      <%= field.name %> = (*env)->NewByteArray(env, (jsize)pm_buffer.length);
+      (*env)->SetByteArrayRegion(env, <%= field.name %>, 0, (jsize)pm_buffer.length, (const jbyte*)pm_buffer.value);
+    } else {
+      <%= field.name %> = NULL;
+    }
+    pm_buffer_free(&pm_buffer);
+  } else {
+    <%= field.name %> = NULL;
+  }
+  <%- elsif field.is_a?(Herb::Template::AnalyzedRubyField) || field.is_a?(Herb::Template::PrismContextField) -%>
+  // Skip <%= field.name %> (<%= field.class.name.split('::').last %>) - internal parser state
   <%- end -%>
   <%- end -%>
 
-  const char* signature = "(Ljava/lang/String;Lorg/herb/Location;Ljava/util/List;<%- node.fields.each do |f| -%><%- unless f.is_a?(Herb::Template::AnalyzedRubyField) || f.is_a?(Herb::Template::PrismNodeField) -%><%- if f.is_a?(Herb::Template::StringField) -%>Ljava/lang/String;<%- elsif f.is_a?(Herb::Template::TokenField) -%>Lorg/herb/Token;<%- elsif f.is_a?(Herb::Template::BooleanField) -%>Z<%- elsif f.is_a?(Herb::Template::ArrayField) -%>Ljava/util/List;<%- elsif f.is_a?(Herb::Template::NodeField) -%>Lorg/herb/ast/<%= f.specific_kind || 'Node' %>;<%- elsif f.is_a?(Herb::Template::ElementSourceField) -%>Ljava/lang/String;<%- elsif f.is_a?(Herb::Template::LocationField) -%>Lorg/herb/Location;<%- end -%><%- end -%><%- end -%>)V";
+  const char* signature = "(Ljava/lang/String;Lorg/herb/Location;Ljava/util/List;<%- node.fields.each do |f| -%><%- unless f.is_a?(Herb::Template::AnalyzedRubyField) || f.is_a?(Herb::Template::PrismContextField) -%><%- if f.is_a?(Herb::Template::StringField) -%>Ljava/lang/String;<%- elsif f.is_a?(Herb::Template::TokenField) -%>Lorg/herb/Token;<%- elsif f.is_a?(Herb::Template::BooleanField) -%>Z<%- elsif f.is_a?(Herb::Template::ArrayField) -%>Ljava/util/List;<%- elsif f.is_a?(Herb::Template::NodeField) -%>Lorg/herb/ast/<%= f.specific_kind || 'Node' %>;<%- elsif f.is_a?(Herb::Template::ElementSourceField) -%>Ljava/lang/String;<%- elsif f.is_a?(Herb::Template::LocationField) -%>Lorg/herb/Location;<%- elsif f.is_a?(Herb::Template::PrismSerializedField) || f.is_a?(Herb::Template::PrismNodeField) -%>[B<%- end -%><%- end -%><%- end -%>)V";
   jmethodID constructor = (*env)->GetMethodID(env, nodeClass, "<init>", signature);
   if (!constructor) { return NULL; }
 
-  jobject result = (*env)->NewObject(env, nodeClass, constructor, type, location, errors<%- node.fields.each do |field| -%><%- unless field.is_a?(Herb::Template::AnalyzedRubyField) || field.is_a?(Herb::Template::PrismNodeField) -%>, <%= field.name %><%- end -%><%- end -%>);
+  jobject result = (*env)->NewObject(env, nodeClass, constructor, type, location, errors<%- node.fields.each do |field| -%><%- unless field.is_a?(Herb::Template::AnalyzedRubyField) || field.is_a?(Herb::Template::PrismContextField) -%>, <%= field.name %><%- end -%><%- end -%>);
 
   return result;
 }

data/templates/java/org/herb/ast/Errors.java.erb

@@ -1,6 +1,7 @@
 package org.herb.ast;
 
 import org.herb.Location;
+import org.herb.Position;
 import org.herb.Token;
 
 /**
@@ -58,12 +59,16 @@ class <%= error.name %> extends HerbError {
   private final Token <%= field.name %>;
   <%- when Herb::Template::TokenTypeField -%>
   private final String <%= field.name %>;
+  <%- when Herb::Template::PositionField -%>
+  private final Position <%= field.name %>;
+  <%- when Herb::Template::SizeTField -%>
+  private final long <%= field.name %>;
   <%- else -%>
   // Unsupported field type: <%= field.class %>
   <%- end -%>
   <%- end -%>
 
-  public <%= error.name %>(String type, String message, Location location<%- error.fields.each do |field| -%><%- case field -%><%- when Herb::Template::StringField -%>, String <%= field.name %><%- when Herb::Template::TokenField -%>, Token <%= field.name %><%- when Herb::Template::TokenTypeField -%>, String <%= field.name %><%- end -%><%- end -%>) {
+  public <%= error.name %>(String type, String message, Location location<%- error.fields.each do |field| -%><%- case field -%><%- when Herb::Template::StringField -%>, String <%= field.name %><%- when Herb::Template::TokenField -%>, Token <%= field.name %><%- when Herb::Template::TokenTypeField -%>, String <%= field.name %><%- when Herb::Template::PositionField -%>, Position <%= field.name %><%- when Herb::Template::SizeTField -%>, long <%= field.name %><%- end -%><%- end -%>) {
     super(type, message, location);
     <%- error.fields.each do |field| -%>
     this.<%= field.name %> = <%= field.name %>;
@@ -87,6 +92,16 @@ class <%= error.name %> extends HerbError {
     return <%= field.name %>;
   }
 
+  <%- when Herb::Template::PositionField -%>
+  public Position get<%= field.name.capitalize %>() {
+    return <%= field.name %>;
+  }
+
+  <%- when Herb::Template::SizeTField -%>
+  public long get<%= field.name.capitalize %>() {
+    return <%= field.name %>;
+  }
+
   <%- end -%>
   <%- end -%>
   @Override
@@ -111,6 +126,14 @@ class <%= error.name %> extends HerbError {
     output.append("<%= symbol %> <%= field.name %>: ");
     output.append(<%= field.name %> != null ? <%= field.name %>.inspect() : "∅");
     output.append("\n");
+    <%- when Herb::Template::PositionField -%>
+    output.append("<%= symbol %> <%= field.name %>: ");
+    output.append(<%= field.name %> != null ? <%= field.name %>.toString() : "∅");
+    output.append("\n");
+    <%- when Herb::Template::SizeTField -%>
+    output.append("<%= symbol %> <%= field.name %>: ");
+    output.append(<%= field.name %>);
+    output.append("\n");
     <%- end -%>
     <%- end -%>
 

data/templates/java/org/herb/ast/Nodes.java.erb

@@ -18,7 +18,7 @@ class <%= node.name %> extends BaseNode {
   private final boolean <%= field.name %>;
   <%- elsif field.is_a?(Herb::Template::ArrayField) -%>
   private final List<Node> <%= field.name %>;
-  <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+  <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
   <%- if field.specific_kind -%>
   private final <%= field.specific_kind %> <%= field.name %>;
   <%- else -%>
@@ -28,6 +28,8 @@ class <%= node.name %> extends BaseNode {
   private final String <%= field.name %>;
   <%- elsif field.is_a?(Herb::Template::LocationField) -%>
   private final Location <%= field.name %>;
+  <%- elsif field.is_a?(Herb::Template::PrismSerializedField) || field.is_a?(Herb::Template::PrismNodeField) -%>
+  private final byte[] <%= field.name %>;
   <%- else -%>
   // private final Object <%= field.name %>;
   <%- end -%>
@@ -48,12 +50,14 @@ class <%= node.name %> extends BaseNode {
     boolean <%= field.name %><%- if node.fields.last != field %>,<% end %>
     <%- elsif field.is_a?(Herb::Template::ArrayField) -%>
     List<Node> <%= field.name %><%- if node.fields.last != field %>,<% end %>
-    <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+    <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
     <%= field.specific_kind || 'Node' %> <%= field.name %><%- if node.fields.last != field %>,<% end %>
     <%- elsif field.is_a?(Herb::Template::ElementSourceField) -%>
     String <%= field.name %><%- if node.fields.last != field %>,<% end %>
     <%- elsif field.is_a?(Herb::Template::LocationField) -%>
     Location <%= field.name %><%- if node.fields.last != field %>,<% end %>
+    <%- elsif field.is_a?(Herb::Template::PrismSerializedField) || field.is_a?(Herb::Template::PrismNodeField) -%>
+    byte[] <%= field.name %><%- if node.fields.last != field %>,<% end %>
     <%- else -%>
     // <%= field.c_type %> <%= field.name %>
     <%- end -%>
@@ -64,7 +68,7 @@ class <%= node.name %> extends BaseNode {
 
     <%- if node.fields.any? -%>
     <%- node.fields.each do |field| -%>
-    <%- unless field.is_a?(Herb::Template::AnalyzedRubyField) || field.is_a?(Herb::Template::PrismNodeField) -%>
+    <%- unless field.is_a?(Herb::Template::AnalyzedRubyField) || field.is_a?(Herb::Template::PrismContextField) -%>
     this.<%= field.name %> = <%= field.name %>;
     <%- else -%>
     // this.<%= field.name %> = <%= field.name %>;
@@ -95,7 +99,7 @@ class <%= node.name %> extends BaseNode {
     return <%= field.name %>;
   }
 
-  <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+  <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
   public <%= field.specific_kind || 'Node' %> get<%= field.name.split('_').map(&:capitalize).join %>() {
     return <%= field.name %>;
   }
@@ -110,6 +114,11 @@ class <%= node.name %> extends BaseNode {
     return <%= field.name %>;
   }
 
+  <%- elsif field.is_a?(Herb::Template::PrismSerializedField) || field.is_a?(Herb::Template::PrismNodeField) -%>
+  public byte[] get<%= field.name.split('_').map(&:capitalize).join %>() {
+    return <%= field.name %>;
+  }
+
   <%- else -%>
   /*
   public Object get<%= field.name.split('_').map(&:capitalize).join %>() {
@@ -135,7 +144,7 @@ class <%= node.name %> extends BaseNode {
       }
     }
 
-    <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+    <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
     if (<%= field.name %> != null) <%= field.name %>.accept(visitor, context);
 
     <%- end -%>
@@ -147,6 +156,10 @@ class <%= node.name %> extends BaseNode {
 
   @Override
   public String inspect() {
+    return inspect(null);
+  }
+
+  public String inspect(String source) {
     StringBuilder output = new StringBuilder();
 
     output.append("@ <%= node.name %> ").append(location != null ? "(location: " + location.toString() + ")" : "no-location").append("\n");
@@ -156,32 +169,78 @@ class <%= node.name %> extends BaseNode {
     output.append(inspectErrors("    "));
     <%- end -%>
     <%- if node.fields.any? -%>
-    <%- node.fields.each_with_index do |field, index| -%>
-    <%- is_last = index == node.fields.length - 1 -%>
-    <%- symbol = is_last ? "└── " : "├── " -%>
-    <%- prefix = is_last ? "    " : "│   " -%>
+    <%- node.field_visibilities.each do |visibility| -%>
+    <%- field = visibility.field -%>
+    <%- next if field.always_invisible? -%>
+    <%- if field.conditionally_invisible? -%>
+    if (<%= field.name %> != null) {
+      output.append("└── <%= field.name %>: ").append("(").append(<%= field.name %>.length).append(" bytes)").append("\n");
+    }
+    <%- else -%>
+    <%- if visibility.dynamic_last? -%>
+    {
+      boolean isLast = <%= visibility.prism_field_name %> == null;
+      String symbol = isLast ? "└── " : "├── ";
+    <%- end -%>
     <%- if field.is_a?(Herb::Template::StringField) || field.is_a?(Herb::Template::ElementSourceField) -%>
-    output.append("<%= symbol %><%= field.name %>: ").append(<%= field.name %> != null ? "\"" + <%= field.name %>.replace("\\", "\\\\").replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t").replace("\"", "\\\"") + "\"" : "∅").append("\n");
+    <%- if visibility.dynamic_last? -%>
+      output.append(symbol).append("<%= field.name %>: ").append(<%= field.name %> != null ? "\"" + <%= field.name %>.replace("\\", "\\\\").replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t").replace("\"", "\\\"") + "\"" : "∅").append("\n");
+    <%- else -%>
+    output.append("<%= visibility.symbol %><%= field.name %>: ").append(<%= field.name %> != null ? "\"" + <%= field.name %>.replace("\\", "\\\\").replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t").replace("\"", "\\\"") + "\"" : "∅").append("\n");
+    <%- end -%>
     <%- elsif field.is_a?(Herb::Template::TokenField) -%>
-    output.append("<%= symbol %><%= field.name %>: ").append(<%= field.name %> != null ? <%= field.name %>.treeInspect() : "∅").append("\n");
+    <%- if visibility.dynamic_last? -%>
+      output.append(symbol).append("<%= field.name %>: ").append(<%= field.name %> != null ? <%= field.name %>.treeInspect() : "∅").append("\n");
+    <%- else -%>
+    output.append("<%= visibility.symbol %><%= field.name %>: ").append(<%= field.name %> != null ? <%= field.name %>.treeInspect() : "∅").append("\n");
+    <%- end -%>
     <%- elsif field.is_a?(Herb::Template::BooleanField) -%>
-    output.append("<%= symbol %><%= field.name %>: ").append(<%= field.name %>).append("\n");
+    <%- if visibility.dynamic_last? -%>
+      output.append(symbol).append("<%= field.name %>: ").append(<%= field.name %>).append("\n");
+    <%- else -%>
+    output.append("<%= visibility.symbol %><%= field.name %>: ").append(<%= field.name %>).append("\n");
+    <%- end -%>
     <%- elsif field.is_a?(Herb::Template::LocationField) -%>
-    output.append("<%= symbol %><%= field.name %>: ").append(<%= field.name %> != null ? "(location: " + <%= field.name %>.treeInspect() + ")" : "∅").append("\n");
+    <%- if visibility.dynamic_last? -%>
+      output.append(symbol).append("<%= field.name %>: ").append(<%= field.name %> != null ? "(location: " + <%= field.name %>.treeInspect() + ")" : "∅").append("\n");
+    <%- else -%>
+    output.append("<%= visibility.symbol %><%= field.name %>: ").append(<%= field.name %> != null ? "(location: " + <%= field.name %>.treeInspect() + ")" : "∅").append("\n");
+    <%- end -%>
     <%- elsif field.is_a?(Herb::Template::ArrayField) -%>
-    output.append("<%= symbol %><%= field.name %>: ").append(inspectArray(<%= field.name %>, "<%= prefix %>"));
-    <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+    <%- if visibility.dynamic_last? -%>
+      String childPrefix = isLast ? "    " : "│   ";
+      output.append(symbol).append("<%= field.name %>: ").append(inspectArray(<%= field.name %>, childPrefix, source));
+    <%- else -%>
+    output.append("<%= visibility.symbol %><%= field.name %>: ").append(inspectArray(<%= field.name %>, "<%= visibility.prefix %>", source));
+    <%- end -%>
+    <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
+    <%- if visibility.dynamic_last? -%>
+      String childPrefix = isLast ? "    " : "│   ";
+      if (<%= field.name %> != null) {
+        output.append(symbol).append("<%= field.name %>:\n");
+        output.append(childPrefix).append(inspectNode(<%= field.name %>, childPrefix, source));
+      } else {
+        output.append(symbol).append("<%= field.name %>: ∅\n");
+      }
+    <%- else -%>
     if (<%= field.name %> != null) {
-      output.append("<%= symbol %><%= field.name %>:\n");
-      output.append("<%= prefix %>").append(inspectNode(<%= field.name %>, "<%= prefix %>"));
-      <%- unless is_last -%>
-      output.append("<%= prefix %>").append("\n");
+      output.append("<%= visibility.symbol %><%= field.name %>:\n");
+      output.append("<%= visibility.prefix %>").append(inspectNode(<%= field.name %>, "<%= visibility.prefix %>", source));
+      <%- unless visibility.static_last? -%>
+      output.append("<%= visibility.prefix %>").append("\n");
       <%- end -%>
     } else {
-      output.append("<%= symbol %><%= field.name %>: ∅\n");
+      output.append("<%= visibility.symbol %><%= field.name %>: ∅\n");
+    }
+    <%- end -%>
+    <%- else -%>
+    <% raise "Unhandled class #{field.class}" %>
+    <%- end -%>
+    <%- if visibility.dynamic_last? -%>
     }
     <%- end -%>
     <%- end -%>
+    <%- end -%>
     <%- else -%>
     output.append("└── (no fields)\n");
     <%- end -%>
@@ -209,7 +268,7 @@ class <%= node.name %> extends BaseNode {
       }
     }
 
-    <%- elsif field.is_a?(Herb::Template::NodeField) -%>
+    <%- elsif field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField) -%>
     if (<%= field.name %> != null) {
       result.addAll(<%= field.name %>.recursiveErrors());
     }

data/templates/javascript/packages/core/src/errors.ts.erb

@@ -1,4 +1,5 @@
 import { Location, SerializedLocation } from "./location.js"
+import { Position, SerializedPosition } from "./position.js"
 import { Token, SerializedToken } from "./token.js"
 import { Diagnostic, MonacoDiagnostic } from "./diagnostic.js"
 
@@ -64,6 +65,8 @@ export interface Serialized<%= error.name %> {
   <%= field.name %>: SerializedToken | null;
   <%- when Herb::Template::TokenTypeField -%>
   <%= field.name %>: string | null;
+  <%- when Herb::Template::PositionField -%>
+  <%= field.name %>: SerializedPosition;
   <%- else -%>
   <%= field.name %>: any; // <%= field.inspect %>
   <%- end -%>
@@ -82,6 +85,8 @@ export interface <%= error.name %>Props {
   <%= field.name %>: Token | null;
   <%- when Herb::Template::TokenTypeField -%>
   <%= field.name %>: string | null;
+  <%- when Herb::Template::PositionField -%>
+  <%= field.name %>: Position;
   <%- else -%>
   <%= field.name %>: any; // <%= field.inspect %>
   <%- end -%>
@@ -97,6 +102,8 @@ export class <%= error.name %> extends HerbError {
   readonly <%= field.name %>: Token | null;
   <%- when Herb::Template::TokenTypeField -%>
   readonly <%= field.name %>: string | null;
+  <%- when Herb::Template::PositionField -%>
+  readonly <%= field.name %>: Position;
   <%- else -%>
   readonly <%= field.name %>: any;
   <%- end -%>
@@ -113,8 +120,10 @@ export class <%= error.name %> extends HerbError {
       <%= field.name %>: data.<%= field.name %>,
       <%- when Herb::Template::TokenField -%>
       <%= field.name %>: data.<%= field.name %> ? Token.from(data.<%= field.name %>) : null,
+      <%- when Herb::Template::PositionField -%>
+      <%= field.name %>: Position.from(data.<%= field.name %>),
       <%- else -%>
-      <% raise "Unexpetected type: #{field.class}" %>
+      <% raise "Unexpected type: #{field.class}" %>
       <%- end -%>
       <%- end -%>
     })
@@ -138,8 +147,10 @@ export class <%= error.name %> extends HerbError {
       <%= field.name %>: this.<%= field.name %>,
       <%- when Herb::Template::TokenField -%>
       <%= field.name %>: this.<%= field.name %> ? this.<%= field.name %>.toJSON() : null,
+      <%- when Herb::Template::PositionField -%>
+      <%= field.name %>: this.<%= field.name %>.toJSON(),
       <%- else -%>
-      <% raise "Unexpetected type: #{field.class}" %>
+      <% raise "Unexpected type: #{field.class}" %>
       <%- end -%>
       <%- end -%>
     };
@@ -170,8 +181,10 @@ export class <%= error.name %> extends HerbError {
     output += `<%= name %>${JSON.stringify(this.<%= field.name %>)}\n`;
     <%- when Herb::Template::TokenField -%>
     output += `<%= name %>${this.<%= field.name %> ? this.<%= field.name %>.treeInspect() : "∅"}\n`;
+    <%- when Herb::Template::PositionField -%>
+    output += `<%= name %>(${this.<%= field.name %>.line}:${this.<%= field.name %>.column})\n`;
     <%- else -%>
-    <% raise "Unexpetected type: #{field.class}" %>
+    <% raise "Unexpected type: #{field.class}" %>
     <%- end -%>
     <%- end -%>
 

data/templates/javascript/packages/core/src/node-type-guards.ts.erb

@@ -20,7 +20,9 @@ import {
 /**
  * Checks if a node is a <%= node.name %>
  */
-export function is<%= node.name %>(node: Node): node is <%= node.name %> {
+export function is<%= node.name %>(node: Node | null | undefined): node is <%= node.name %> {
+  if (!node) return false
+
   return node instanceof <%= node.name %> || node.type === "<%= node.type %>" || (node.constructor as any).type === "<%= node.type %>"
 }