Skip to content

Commit 1d1604f

Browse files
committed
Switch node ID flag to a positive condition
1 parent 937be34 commit 1d1604f

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/java-wasm-bindings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
bundler-cache: true
2929

3030
- name: rake templates
31-
run: PRISM_EXCLUDE_PRETTYPRINT=1 PRISM_OMIT_NODE_ID=1 bundle exec rake templates
31+
run: PRISM_EXCLUDE_PRETTYPRINT=1 PRISM_INCLUDE_NODE_ID=false bundle exec rake templates
3232

3333
- name: Set up WASI-SDK
3434
run: |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,12 @@ public class Loader {
324324
}
325325

326326
<%-
327-
base_params = [*("nodeId" unless Prism::Template::OMIT_NODE_ID), "startOffset", "length"]
327+
base_params = [*("nodeId" if Prism::Template::INCLUDE_NODE_ID), "startOffset", "length"]
328328
base_params_sig = base_params.map { "int #{_1}" }.join(", ")
329329
-%>
330330
private Nodes.Node loadNode() {
331331
int type = buffer.get() & 0xFF;
332-
<%- unless Prism::Template::OMIT_NODE_ID -%>
332+
<%- if Prism::Template::INCLUDE_NODE_ID -%>
333333
int nodeId = loadVarUInt();
334334
<%- end -%>
335335
int startOffset = loadVarUInt();
@@ -341,7 +341,7 @@ public class Loader {
341341
case <%= index + 1 %>:
342342
<%-
343343
params = []
344-
params << "nodeId" unless Prism::Template::OMIT_NODE_ID
344+
params << "nodeId" if Prism::Template::INCLUDE_NODE_ID
345345
params << "startOffset" << "length"
346346
params << "buffer.getInt()" << "null" if node.needs_serialized_length?
347347
params << "loadFlags()" if node.flags

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ public abstract class Nodes {
8888

8989
public static final Node[] EMPTY_ARRAY = {};
9090

91-
<%- unless Prism::Template::OMIT_NODE_ID -%>
91+
<%- if Prism::Template::INCLUDE_NODE_ID -%>
9292
public final int nodeId;
9393
<%- end -%>
9494
public final int startOffset;
9595
public final int length;
9696
private boolean newLineFlag = false;
9797

98-
<%- unless Prism::Template::OMIT_NODE_ID -%>
98+
<%- if Prism::Template::INCLUDE_NODE_ID -%>
9999
public Node(int nodeId, int startOffset, int length) {
100100
this.nodeId = nodeId;
101101
<%- else -%>
@@ -245,7 +245,7 @@ public abstract class Nodes {
245245

246246
<%-
247247
params = []
248-
params << "int nodeId" unless Prism::Template::OMIT_NODE_ID
248+
params << "int nodeId" if Prism::Template::INCLUDE_NODE_ID
249249
params << "int startOffset" << "int length"
250250
if node.needs_serialized_length?
251251
params << "int serializedLength"
@@ -255,7 +255,7 @@ public abstract class Nodes {
255255
params.concat(node.semantic_fields.map { |field| "#{field.java_type} #{field.name}" })
256256
-%>
257257
public <%= node.name -%>(<%= params.join(", ") %>) {
258-
<%- unless Prism::Template::OMIT_NODE_ID -%>
258+
<%- if Prism::Template::INCLUDE_NODE_ID -%>
259259
super(nodeId, startOffset, length);
260260
<%- else -%>
261261
super(startOffset, length);
@@ -280,7 +280,7 @@ public abstract class Nodes {
280280
281281
public <%= node.name -%> getNonLazy() {
282282
if (isLazy()) {
283-
return loader.createDefNodeFromSavedPosition(<%= "nodeId, " unless Prism::Template::OMIT_NODE_ID %>startOffset, length, -serializedLength);
283+
return loader.createDefNodeFromSavedPosition(<%= "nodeId, " if Prism::Template::INCLUDE_NODE_ID %>startOffset, length, -serializedLength);
284284
} else {
285285
return this;
286286
}

templates/src/serialize.c.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static void
7373
pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
7474
pm_buffer_append_byte(buffer, (uint8_t) PM_NODE_TYPE(node));
7575

76-
<%- unless Prism::Template::OMIT_NODE_ID -%>
76+
<%- if Prism::Template::INCLUDE_NODE_ID -%>
7777
pm_buffer_append_varuint(buffer, node->node_id);
7878
<%- end -%>
7979
pm_serialize_location(&node->location, buffer);

templates/template.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Template # :nodoc: all
1111

1212
JAVA_BACKEND = ENV["PRISM_JAVA_BACKEND"] || "default"
1313
JAVA_IDENTIFIER_TYPE = JAVA_BACKEND == "truffleruby" ? "String" : "byte[]"
14-
OMIT_NODE_ID = ENV.fetch("PRISM_OMIT_NODE_ID", false)
14+
INCLUDE_NODE_ID = ENV.fetch("PRISM_INCLUDE_NODE_ID", "true") != "false"
1515

1616
COMMON_FLAGS_COUNT = 2
1717

0 commit comments

Comments
 (0)