Add node_id to Java serialization

Author: kddnewton

templates/java/org/prism/Loader.java.erb

@@ -358,6 +358,7 @@ public class Loader {
 
     private Nodes.Node loadNode() {
         int type = buffer.get() & 0xFF;
+        int nodeId = loadVarUInt();
         int startOffset = loadVarUInt();
         int length = loadVarUInt();
 
@@ -366,7 +367,7 @@ public class Loader {
             <%- nodes.each_with_index do |node, index| -%>
             case <%= index + 1 %>:
             <%-
-            params = ["startOffset", "length"]
+            params = ["nodeId", "startOffset", "length"]
             params << "buffer.getInt()" if node.needs_serialized_length?
             params << "loadFlags()" if node.flags
             params.concat node.semantic_fields.map { |field|

templates/java/org/prism/Nodes.java.erb

@@ -92,11 +92,13 @@ public abstract class Nodes {
 
         public static final Node[] EMPTY_ARRAY = {};
 
+        public final int nodeId;
         public final int startOffset;
         public final int length;
         private boolean newLineFlag = false;
 
-        public Node(int startOffset, int length) {
+        public Node(int nodeId, int startOffset, int length) {
+            this.nodeId = nodeId;
             this.startOffset = startOffset;
             this.length = length;
         }
@@ -223,13 +225,13 @@ public abstract class Nodes {
         <%- end -%>
 
         <%-
-          params = ["int startOffset", "int length"]
+          params = ["int nodeId", "int startOffset", "int length"]
           params << "int serializedLength" if node.needs_serialized_length?
           params << "short flags" if node.flags
           params.concat(node.semantic_fields.map { |field| "#{field.java_type} #{field.name}" })
         -%>
         public <%= node.name -%>(<%= params.join(", ") %>) {
-            super(startOffset, length);
+            super(nodeId, startOffset, length);
         <%- if node.needs_serialized_length? -%>
             this.serializedLength = serializedLength;
         <%- end -%>

templates/src/serialize.c.erb

@@ -74,9 +74,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
 
     size_t offset = buffer->length;
 
-    <%- unless Prism::Template::SERIALIZE_ONLY_SEMANTICS_FIELDS -%>
     pm_buffer_append_varuint(buffer, node->node_id);
-    <%- end -%>
     pm_serialize_location(parser, &node->location, buffer);
 
     switch (PM_NODE_TYPE(node)) {