Skip to content

Commit 9ec05ad

Browse files
eregoneregon
committed
Remove @NodeChildren
* This was only needed on Java 7. Java 8 has @repeatable annotations.
1 parent 28b350a commit 9ec05ad

File tree

89 files changed

+246
-611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+246
-611
lines changed

‎src/main/java/org/truffleruby/cext/CExtNodes.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.oracle.truffle.api.dsl.Fallback;
1818
import com.oracle.truffle.api.dsl.ImportStatic;
1919
import com.oracle.truffle.api.dsl.NodeChild;
20-
import com.oracle.truffle.api.dsl.NodeChildren;
2120
import com.oracle.truffle.api.dsl.Specialization;
2221
import com.oracle.truffle.api.frame.Frame;
2322
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
@@ -631,11 +630,9 @@ public boolean rb_check_frozen(Object object) {
631630

632631
}
633632

634-
@NodeChildren({
635-
@NodeChild(type = RubyNode.class, value = "module"),
636-
@NodeChild(type = RubyNode.class, value = "name")
637-
})
638633
@CoreMethod(names = "rb_const_get", onSingleton = true, required = 2)
634+
@NodeChild(value = "module", type = RubyNode.class)
635+
@NodeChild(value = "name", type = RubyNode.class)
639636
public abstract static class RbConstGetNode extends CoreMethodNode {
640637

641638
@Child private LookupConstantNode lookupConstantNode = LookupConstantNode.create(true, false, true);
@@ -653,11 +650,9 @@ public Object rbConstGet(DynamicObject module, String name) {
653650

654651
}
655652

656-
@NodeChildren({
657-
@NodeChild(type = RubyNode.class, value = "module"),
658-
@NodeChild(type = RubyNode.class, value = "name")
659-
})
660653
@CoreMethod(names = "rb_const_get_from", onSingleton = true, required = 2)
654+
@NodeChild(value = "module", type = RubyNode.class)
655+
@NodeChild(value = "name", type = RubyNode.class)
661656
public abstract static class RbConstGetFromNode extends CoreMethodNode {
662657

663658
@Child private LookupConstantNode lookupConstantNode = LookupConstantNode.create(true, false, false);
@@ -675,12 +670,10 @@ public Object rbConstGetFrom(DynamicObject module, String name) {
675670

676671
}
677672

678-
@NodeChildren({
679-
@NodeChild(type = RubyNode.class, value = "module"),
680-
@NodeChild(type = RubyNode.class, value = "name"),
681-
@NodeChild(type = RubyNode.class, value = "value")
682-
})
683673
@CoreMethod(names = "rb_const_set", onSingleton = true, required = 3)
674+
@NodeChild(value = "module", type = RubyNode.class)
675+
@NodeChild(value = "name", type = RubyNode.class)
676+
@NodeChild(value = "value", type = RubyNode.class)
684677
public abstract static class RbConstSetNode extends CoreMethodNode {
685678

686679
@CreateCast("name")

‎src/main/java/org/truffleruby/core/array/ArrayAppendOneNode.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.ImportStatic;
1414
import com.oracle.truffle.api.dsl.NodeChild;
15-
import com.oracle.truffle.api.dsl.NodeChildren;
1615
import com.oracle.truffle.api.dsl.Specialization;
1716
import com.oracle.truffle.api.object.DynamicObject;
1817
import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -21,10 +20,8 @@
2120

2221
import static org.truffleruby.core.array.ArrayHelpers.setSize;
2322

24-
@NodeChildren({
25-
@NodeChild("array"),
26-
@NodeChild("value"),
27-
})
23+
@NodeChild("array")
24+
@NodeChild("value")
2825
@ImportStatic(ArrayGuards.class)
2926
public abstract class ArrayAppendOneNode extends RubyNode {
3027

‎src/main/java/org/truffleruby/core/array/ArrayDropTailNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.ImportStatic;
1414
import com.oracle.truffle.api.dsl.NodeChild;
15-
import com.oracle.truffle.api.dsl.NodeChildren;
1615
import com.oracle.truffle.api.dsl.Specialization;
1716
import com.oracle.truffle.api.object.DynamicObject;
1817
import com.oracle.truffle.api.profiles.ConditionProfile;
1918
import org.truffleruby.language.RubyNode;
2019

21-
@NodeChildren({ @NodeChild(value = "array", type = RubyNode.class) })
20+
@NodeChild("array")
2221
@ImportStatic(ArrayGuards.class)
2322
public abstract class ArrayDropTailNode extends RubyNode {
2423

‎src/main/java/org/truffleruby/core/array/ArrayGetTailNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.ImportStatic;
1414
import com.oracle.truffle.api.dsl.NodeChild;
15-
import com.oracle.truffle.api.dsl.NodeChildren;
1615
import com.oracle.truffle.api.dsl.Specialization;
1716
import com.oracle.truffle.api.object.DynamicObject;
1817
import com.oracle.truffle.api.profiles.ConditionProfile;
1918
import org.truffleruby.language.RubyNode;
2019

21-
@NodeChildren({@NodeChild(value = "array", type = RubyNode.class)})
20+
@NodeChild("array")
2221
@ImportStatic(ArrayGuards.class)
2322
public abstract class ArrayGetTailNode extends RubyNode {
2423

‎src/main/java/org/truffleruby/core/array/ArrayNodes.java

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.oracle.truffle.api.dsl.CreateCast;
1717
import com.oracle.truffle.api.dsl.ImportStatic;
1818
import com.oracle.truffle.api.dsl.NodeChild;
19-
import com.oracle.truffle.api.dsl.NodeChildren;
2019
import com.oracle.truffle.api.dsl.ReportPolymorphism;
2120
import com.oracle.truffle.api.dsl.Specialization;
2221
import com.oracle.truffle.api.frame.VirtualFrame;
@@ -96,10 +95,8 @@ public DynamicObject allocate(DynamicObject rubyClass) {
9695
}
9796

9897
@CoreMethod(names = "+", required = 1)
99-
@NodeChildren({
100-
@NodeChild(type = RubyNode.class, value = "a"),
101-
@NodeChild(type = RubyNode.class, value = "b")
102-
})
98+
@NodeChild(value = "a", type = RubyNode.class)
99+
@NodeChild(value = "b", type = RubyNode.class)
103100
@ImportStatic(ArrayGuards.class)
104101
@ReportPolymorphism
105102
public abstract static class AddNode extends CoreMethodNode {
@@ -534,10 +531,8 @@ private DynamicObject readSlice(DynamicObject array, int start, int length) {
534531
}
535532

536533
@CoreMethod(names = "at", required = 1, lowerFixnum = 1)
537-
@NodeChildren({
538-
@NodeChild(type = RubyNode.class, value = "array"),
539-
@NodeChild(type = RubyNode.class, value = "index")
540-
})
534+
@NodeChild(value = "array", type = RubyNode.class)
535+
@NodeChild(value = "index", type = RubyNode.class)
541536
public abstract static class AtNode extends CoreMethodNode {
542537

543538
@Child private ArrayReadDenormalizedNode readNode;
@@ -658,10 +653,8 @@ public Object compactObjectsNonMutable(DynamicObject array,
658653
}
659654

660655
@CoreMethod(names = "concat", required = 1, raiseIfFrozenSelf = true)
661-
@NodeChildren({
662-
@NodeChild(type = RubyNode.class, value = "array"),
663-
@NodeChild(type = RubyNode.class, value = "other")
664-
})
656+
@NodeChild(value = "array", type = RubyNode.class)
657+
@NodeChild(value = "other", type = RubyNode.class)
665658
@ImportStatic(ArrayGuards.class)
666659
public abstract static class ConcatNode extends CoreMethodNode {
667660

@@ -781,10 +774,8 @@ public void checkFrozen(Object object) {
781774
}
782775

783776
@CoreMethod(names = "delete_at", required = 1, raiseIfFrozenSelf = true, lowerFixnum = 1)
784-
@NodeChildren({
785-
@NodeChild(type = RubyNode.class, value = "array"),
786-
@NodeChild(type = RubyNode.class, value = "index")
787-
})
777+
@NodeChild(value = "array", type = RubyNode.class)
778+
@NodeChild(value = "index", type = RubyNode.class)
788779
@ImportStatic(ArrayGuards.class)
789780
@ReportPolymorphism
790781
public abstract static class DeleteAtNode extends CoreMethodNode {
@@ -1258,10 +1249,8 @@ protected ReplaceNode createReplaceNode() {
12581249
}
12591250

12601251
@CoreMethod(names = "initialize_copy", required = 1, raiseIfFrozenSelf = true)
1261-
@NodeChildren({
1262-
@NodeChild(type = RubyNode.class, value = "self"),
1263-
@NodeChild(type = RubyNode.class, value = "from")
1264-
})
1252+
@NodeChild(value = "self", type = RubyNode.class)
1253+
@NodeChild(value = "from", type = RubyNode.class)
12651254
@ImportStatic(ArrayGuards.class)
12661255
public abstract static class InitializeCopyNode extends CoreMethodNode {
12671256

@@ -1782,10 +1771,8 @@ private Object rejectInPlaceInternal(DynamicObject array, DynamicObject block, A
17821771
}
17831772

17841773
@CoreMethod(names = "replace", required = 1, raiseIfFrozenSelf = true)
1785-
@NodeChildren({
1786-
@NodeChild(type = RubyNode.class, value = "array"),
1787-
@NodeChild(type = RubyNode.class, value = "other")
1788-
})
1774+
@NodeChild(value = "array", type = RubyNode.class)
1775+
@NodeChild(value = "other", type = RubyNode.class)
17891776
@ImportStatic(ArrayGuards.class)
17901777
@ReportPolymorphism
17911778
public abstract static class ReplaceNode extends CoreMethodNode {
@@ -1965,10 +1952,8 @@ public Object selectOther(DynamicObject array, DynamicObject block,
19651952
}
19661953

19671954
@CoreMethod(names = "shift", raiseIfFrozenSelf = true, optional = 1, lowerFixnum = 1)
1968-
@NodeChildren({
1969-
@NodeChild(type = RubyNode.class, value = "array"),
1970-
@NodeChild(type = RubyNode.class, value = "n")
1971-
})
1955+
@NodeChild(value = "array", type = RubyNode.class)
1956+
@NodeChild(value = "n", type = RubyNode.class)
19721957
@ImportStatic(ArrayGuards.class)
19731958
@ReportPolymorphism
19741959
public abstract static class ShiftNode extends CoreMethodNode {

‎src/main/java/org/truffleruby/core/array/ArrayReadDenormalizedNode.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@
1111

1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.NodeChild;
14-
import com.oracle.truffle.api.dsl.NodeChildren;
1514
import com.oracle.truffle.api.dsl.Specialization;
1615
import com.oracle.truffle.api.object.DynamicObject;
1716
import com.oracle.truffle.api.profiles.ConditionProfile;
1817
import org.truffleruby.Layouts;
1918
import org.truffleruby.language.RubyNode;
2019

21-
@NodeChildren({
22-
@NodeChild(value = "array", type = RubyNode.class),
23-
@NodeChild(value = "index", type = RubyNode.class)
24-
})
20+
@NodeChild("array")
21+
@NodeChild("index")
2522
public abstract class ArrayReadDenormalizedNode extends RubyNode {
2623

2724
@Child private ArrayReadNormalizedNode readNode = ArrayReadNormalizedNodeGen.create(null, null);

‎src/main/java/org/truffleruby/core/array/ArrayReadNormalizedNode.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@
1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.ImportStatic;
1414
import com.oracle.truffle.api.dsl.NodeChild;
15-
import com.oracle.truffle.api.dsl.NodeChildren;
1615
import com.oracle.truffle.api.dsl.ReportPolymorphism;
1716
import com.oracle.truffle.api.dsl.Specialization;
1817
import com.oracle.truffle.api.object.DynamicObject;
1918

2019
import org.truffleruby.Layouts;
2120
import org.truffleruby.language.RubyNode;
2221

23-
@NodeChildren({
24-
@NodeChild(value = "array", type = RubyNode.class),
25-
@NodeChild(value = "index", type = RubyNode.class)
26-
})
22+
@NodeChild("array")
23+
@NodeChild("index")
2724
@ImportStatic(ArrayGuards.class)
2825
@ReportPolymorphism
2926
public abstract class ArrayReadNormalizedNode extends RubyNode {

‎src/main/java/org/truffleruby/core/array/ArraySliceNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.ImportStatic;
1414
import com.oracle.truffle.api.dsl.NodeChild;
15-
import com.oracle.truffle.api.dsl.NodeChildren;
1615
import com.oracle.truffle.api.dsl.Specialization;
1716
import com.oracle.truffle.api.object.DynamicObject;
1817
import com.oracle.truffle.api.profiles.ConditionProfile;
1918

2019
import org.truffleruby.language.RubyNode;
2120

22-
@NodeChildren({@NodeChild(value = "array", type = RubyNode.class)})
21+
@NodeChild("array")
2322
@ImportStatic(ArrayGuards.class)
2423
public abstract class ArraySliceNode extends RubyNode {
2524

‎src/main/java/org/truffleruby/core/binding/BindingNodes.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.oracle.truffle.api.dsl.CreateCast;
4545
import com.oracle.truffle.api.dsl.ImportStatic;
4646
import com.oracle.truffle.api.dsl.NodeChild;
47-
import com.oracle.truffle.api.dsl.NodeChildren;
4847
import com.oracle.truffle.api.dsl.Specialization;
4948
import com.oracle.truffle.api.frame.Frame;
5049
import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -180,10 +179,8 @@ public DynamicObject dup(DynamicObject binding) {
180179

181180
@ImportStatic(BindingNodes.class)
182181
@CoreMethod(names = "local_variable_defined?", required = 1)
183-
@NodeChildren({
184-
@NodeChild(type = RubyNode.class, value = "binding"),
185-
@NodeChild(type = RubyNode.class, value = "name")
186-
})
182+
@NodeChild(value = "binding", type = RubyNode.class)
183+
@NodeChild(value = "name", type = RubyNode.class)
187184
public abstract static class LocalVariableDefinedNode extends CoreMethodNode {
188185

189186
@CreateCast("name")
@@ -223,10 +220,8 @@ protected int getCacheLimit() {
223220

224221
@ImportStatic(BindingNodes.class)
225222
@CoreMethod(names = "local_variable_get", required = 1)
226-
@NodeChildren({
227-
@NodeChild(type = RubyNode.class, value = "binding"),
228-
@NodeChild(type = RubyNode.class, value = "name")
229-
})
223+
@NodeChild(value = "binding", type = RubyNode.class)
224+
@NodeChild(value = "name", type = RubyNode.class)
230225
public abstract static class LocalVariableGetNode extends CoreMethodNode {
231226

232227
@CreateCast("name")
@@ -283,11 +278,9 @@ protected int getCacheLimit() {
283278

284279
@ImportStatic(BindingNodes.class)
285280
@CoreMethod(names = "local_variable_set", required = 2)
286-
@NodeChildren({
287-
@NodeChild(type = RubyNode.class, value = "binding"),
288-
@NodeChild(type = RubyNode.class, value = "name"),
289-
@NodeChild(type = RubyNode.class, value = "value")
290-
})
281+
@NodeChild(value = "binding", type = RubyNode.class)
282+
@NodeChild(value = "name", type = RubyNode.class)
283+
@NodeChild(value = "value", type = RubyNode.class)
291284
public abstract static class LocalVariableSetNode extends CoreMethodNode {
292285

293286
@CreateCast("name")

‎src/main/java/org/truffleruby/core/cast/ToSNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.oracle.truffle.api.frame.VirtualFrame;
2222
import com.oracle.truffle.api.object.DynamicObject;
2323

24-
@NodeChild(type = RubyNode.class)
24+
@NodeChild(value = "value", type = RubyNode.class)
2525
public abstract class ToSNode extends RubyNode {
2626

2727
@Child private KernelNodes.ToSNode kernelToSNode;

‎src/main/java/org/truffleruby/core/encoding/EncodingConverterNodes.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.oracle.truffle.api.dsl.Cached;
1616
import com.oracle.truffle.api.dsl.CreateCast;
1717
import com.oracle.truffle.api.dsl.NodeChild;
18-
import com.oracle.truffle.api.dsl.NodeChildren;
1918
import com.oracle.truffle.api.dsl.Specialization;
2019
import com.oracle.truffle.api.object.DynamicObject;
2120
import com.oracle.truffle.api.profiles.BranchProfile;
@@ -435,10 +434,8 @@ public DynamicObject getReplacement(DynamicObject encodingConverter) {
435434
}
436435

437436
@CoreMethod(names = "replacement=", required = 1)
438-
@NodeChildren({
439-
@NodeChild(value = "encodingConverter", type = RubyNode.class),
440-
@NodeChild(value = "replacement", type = RubyNode.class)
441-
})
437+
@NodeChild(value = "encodingConverter", type = RubyNode.class)
438+
@NodeChild(value = "replacement", type = RubyNode.class)
442439
public abstract static class EncodingConverterSetReplacementNode extends CoreMethodNode {
443440

444441
@CreateCast("replacement")

‎src/main/java/org/truffleruby/core/format/convert/BytesToInteger16BigNode.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
package org.truffleruby.core.format.convert;
1111

1212
import com.oracle.truffle.api.dsl.NodeChild;
13-
import com.oracle.truffle.api.dsl.NodeChildren;
1413
import com.oracle.truffle.api.dsl.Specialization;
1514
import com.oracle.truffle.api.object.DynamicObject;
1615
import org.truffleruby.core.format.FormatNode;
1716
import org.truffleruby.core.format.MissingValue;
1817

19-
@NodeChildren({
20-
@NodeChild(value = "bytes", type = FormatNode.class),
21-
})
18+
@NodeChild("bytes")
2219
public abstract class BytesToInteger16BigNode extends FormatNode {
2320

2421
@Specialization

‎src/main/java/org/truffleruby/core/format/convert/BytesToInteger16LittleNode.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
package org.truffleruby.core.format.convert;
1111

1212
import com.oracle.truffle.api.dsl.NodeChild;
13-
import com.oracle.truffle.api.dsl.NodeChildren;
1413
import com.oracle.truffle.api.dsl.Specialization;
1514
import com.oracle.truffle.api.object.DynamicObject;
1615
import org.truffleruby.core.format.FormatNode;
1716
import org.truffleruby.core.format.MissingValue;
1817

19-
@NodeChildren({
20-
@NodeChild(value = "bytes", type = FormatNode.class),
21-
})
18+
@NodeChild("bytes")
2219
public abstract class BytesToInteger16LittleNode extends FormatNode {
2320

2421
@Specialization

‎src/main/java/org/truffleruby/core/format/convert/BytesToInteger32BigNode.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
package org.truffleruby.core.format.convert;
1111

1212
import com.oracle.truffle.api.dsl.NodeChild;
13-
import com.oracle.truffle.api.dsl.NodeChildren;
1413
import com.oracle.truffle.api.dsl.Specialization;
1514
import com.oracle.truffle.api.object.DynamicObject;
1615
import org.truffleruby.core.format.FormatNode;
1716
import org.truffleruby.core.format.MissingValue;
1817

19-
@NodeChildren({
20-
@NodeChild(value = "bytes", type = FormatNode.class),
21-
})
18+
@NodeChild("bytes")
2219
public abstract class BytesToInteger32BigNode extends FormatNode {
2320

2421
@Specialization

0 commit comments

Comments
 (0)