Switch node ID flag to a positive condition

Author: headius

templates/java/api/src/main/java-templates/org/ruby_lang/prism/Loader.java.erb

@@ -326,12 +326,12 @@ public class Loader {
     }
 
     <%-
-    base_params = [*("nodeId" unless Prism::Template::OMIT_NODE_ID), "startOffset", "length"]
+    base_params = [*("nodeId" if Prism::Template::INCLUDE_NODE_ID), "startOffset", "length"]
     base_params_sig = base_params.map { "int #{_1}" }.join(", ")
     -%>
     private Nodes.Node loadNode() {
         int type = buffer.get() & 0xFF;
-        <%- unless Prism::Template::OMIT_NODE_ID -%>
+        <%- if Prism::Template::INCLUDE_NODE_ID -%>
         int nodeId = loadVarUInt();
         <%- end -%>
         int startOffset = loadVarUInt();
@@ -343,7 +343,7 @@ public class Loader {
             case <%= index + 1 %>:
             <%-
             params = []
-            params << "nodeId" unless Prism::Template::OMIT_NODE_ID
+            params << "nodeId" if Prism::Template::INCLUDE_NODE_ID
             params << "startOffset" << "length"
             params << "buffer.getInt()" << "null" if node.needs_serialized_length?
             params << "loadFlags()" if node.flags

templates/java/api/src/main/java-templates/org/ruby_lang/prism/Nodes.java.erb

@@ -89,14 +89,14 @@ public abstract class Nodes {
 
         public static final Node[] EMPTY_ARRAY = {};
 
-        <%- unless Prism::Template::OMIT_NODE_ID -%>
+        <%- if Prism::Template::INCLUDE_NODE_ID -%>
         public final int nodeId;
         <%- end -%>
         public final int startOffset;
         public final int length;
         private boolean newLineFlag = false;
 
-        <%- unless Prism::Template::OMIT_NODE_ID -%>
+        <%- if Prism::Template::INCLUDE_NODE_ID -%>
         public Node(int nodeId, int startOffset, int length) {
             this.nodeId = nodeId;
         <%- else -%>
@@ -246,7 +246,7 @@ public abstract class Nodes {
 
         <%-
           params = []
-          params << "int nodeId" unless Prism::Template::OMIT_NODE_ID
+          params << "int nodeId" if Prism::Template::INCLUDE_NODE_ID
           params << "int startOffset" << "int length"
           if node.needs_serialized_length?
             params << "int serializedLength"
@@ -256,7 +256,7 @@ public abstract class Nodes {
           params.concat(node.semantic_fields.map { |field| "#{field.java_type} #{field.name}" })
         -%>
         public <%= node.name -%>(<%= params.join(", ") %>) {
-        <%- unless Prism::Template::OMIT_NODE_ID -%>
+        <%- if Prism::Template::INCLUDE_NODE_ID -%>
             super(nodeId, startOffset, length);
         <%- else -%>
             super(startOffset, length);
@@ -281,7 +281,7 @@ public abstract class Nodes {
 
         public <%= node.name -%> getNonLazy() {
             if (isLazy()) {
-                return loader.createDefNodeFromSavedPosition(<%= "nodeId, " unless Prism::Template::OMIT_NODE_ID %>startOffset, length, -serializedLength);
+                return loader.createDefNodeFromSavedPosition(<%= "nodeId, " if Prism::Template::INCLUDE_NODE_ID %>startOffset, length, -serializedLength);
             } else {
                 return this;
             }

templates/src/serialize.c.erb

@@ -73,7 +73,7 @@ static void
 pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
     pm_buffer_append_byte(buffer, (uint8_t) PM_NODE_TYPE(node));
 
-    <%- unless Prism::Template::OMIT_NODE_ID -%>
+    <%- if Prism::Template::INCLUDE_NODE_ID -%>
     pm_buffer_append_varuint(buffer, node->node_id);
     <%- end -%>
     pm_serialize_location(&node->location, buffer);

templates/template.rb

@@ -11,7 +11,7 @@ module Template # :nodoc: all
 
     JAVA_BACKEND = ENV["PRISM_JAVA_BACKEND"] || "default"
     JAVA_IDENTIFIER_TYPE = JAVA_BACKEND == "truffleruby" ? "String" : "byte[]"
-    OMIT_NODE_ID = ENV.fetch("PRISM_OMIT_NODE_ID", false)
+    INCLUDE_NODE_ID = ENV.fetch("PRISM_INCLUDE_NODE_ID", "true") != "false"
 
     COMMON_FLAGS_COUNT = 2