jruby · Apr 30, 2015 · Apr 30, 2015 · Apr 30, 2015 · Apr 30, 2015
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -169,6 +169,7 @@ def help
     puts 'jt findbugs                                    run findbugs'
     puts 'jt findbugs report                             run findbugs and generate an HTML report'
     puts 'jt install ..../graal/mx/suite.py              install a JRuby distribution into an mx suite'
+    puts 'jt poms                                        rebuild Maven POM XML files from Ruby files'
     puts
     puts 'you can also put build or rebuild in front of any command'
     puts
@@ -383,6 +384,10 @@ def install(arg)
       raise ArgumentError, kind
     end
   end
+
+  def poms
+    sh 'rake', 'maven:dump_poms'
+  end
 end
 
 class JT

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
@@ -17,9 +17,9 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.nodes.cast.ProcOrNullNode;
-import org.jruby.truffle.nodes.cast.ProcOrNullNodeFactory;
+import org.jruby.truffle.nodes.cast.ProcOrNullNodeGen;
 import org.jruby.truffle.nodes.dispatch.*;
 import org.jruby.truffle.nodes.literal.HashLiteralNode;
 import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
@@ -84,7 +84,7 @@ public RubyCallNode(RubyContext context, SourceSection section, String methodNam
         if (block == null) {
             this.block = null;
         } else {
-            this.block = ProcOrNullNodeFactory.create(context, section, block);
+            this.block = ProcOrNullNodeGen.create(context, section, block);
         }
 
         this.arguments = arguments;
@@ -93,7 +93,7 @@ public RubyCallNode(RubyContext context, SourceSection section, String methodNam
 
         dispatchHead = DispatchHeadNodeFactory.createMethodCall(context, ignoreVisibility, false, MissingBehavior.CALL_METHOD_MISSING);
         respondToMissing = DispatchHeadNodeFactory.createMethodCall(context, true, MissingBehavior.RETURN_MISSING);
-        respondToMissingCast = BooleanCastNodeFactory.create(context, section, null);
+        respondToMissingCast = BooleanCastNodeGen.create(context, section, null);
 
         this.ignoreVisibility = ignoreVisibility;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -37,7 +37,6 @@
  * @see YieldDispatchNode
  */
 @TypeSystemReference(RubyTypes.class)
-@GenerateNodeFactory
 public abstract class RubyNode extends Node {
 
     private final RubyContext context;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadDenormalizedNode.java
@@ -37,7 +37,7 @@ public ArrayReadDenormalizedNode(RubyContext context, SourceSection sourceSectio
     public Object read(VirtualFrame frame, RubyArray array, int index) {
         if (readNode == null) {
             CompilerDirectives.transferToInterpreter();
-            readNode = insert(ArrayReadNormalizedNodeFactory.create(getContext(), getSourceSection(), null, null));
+            readNode = insert(ArrayReadNormalizedNodeGen.create(getContext(), getSourceSection(), null, null));
         }
 
         final int normalizedIndex = array.normalizeIndex(index);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadSliceDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadSliceDenormalizedNode.java
@@ -38,7 +38,7 @@ public ArrayReadSliceDenormalizedNode(RubyContext context, SourceSection sourceS
     public Object read(VirtualFrame frame, RubyArray array, int index, int length) {
         if (readNode == null) {
             CompilerDirectives.transferToInterpreter();
-            readNode = insert(ArrayReadSliceNormalizedNodeFactory.create(getContext(), getSourceSection(), null, null, null));
+            readNode = insert(ArrayReadSliceNormalizedNodeGen.create(getContext(), getSourceSection(), null, null, null));
         }
 
         final int normalizedIndex = array.normalizeIndex(index);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayWriteDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayWriteDenormalizedNode.java
@@ -38,7 +38,7 @@ public ArrayWriteDenormalizedNode(RubyContext context, SourceSection sourceSecti
     public Object write(VirtualFrame frame, RubyArray array, int index, Object value) {
         if (writeNode == null) {
             CompilerDirectives.transferToInterpreter();
-            writeNode = insert(ArrayWriteNormalizedNodeFactory.create(getContext(), getSourceSection(), null, null, null));
+            writeNode = insert(ArrayWriteNormalizedNodeGen.create(getContext(), getSourceSection(), null, null, null));
         }
 
         final int normalizedIndex = array.normalizeIndex(index);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayWriteNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayWriteNormalizedNode.java
@@ -37,8 +37,8 @@ public ArrayWriteNormalizedNode(RubyContext context, SourceSection sourceSection
         super(context, sourceSection);
 
         // TODO CS 9-Feb-15 make this lazy later on
-        ensureCapacityNode = EnsureCapacityArrayNodeFactory.create(context, sourceSection, null, null);
-        generalizeNode = GeneralizeArrayNodeFactory.create(context, sourceSection, null, null);
+        ensureCapacityNode = EnsureCapacityArrayNodeGen.create(context, sourceSection, null, null);
+        generalizeNode = GeneralizeArrayNodeGen.create(context, sourceSection, null, null);
     }
 
     public abstract Object executeWrite(VirtualFrame frame, RubyArray array, int index, Object value);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/PrimitiveArrayNodeFactory.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/PrimitiveArrayNodeFactory.java
@@ -23,9 +23,9 @@ public static RubyNode read(RubyContext context, SourceSection sourceSection, Ru
         final RubyNode literalIndex = new FixnumLiteralNode.IntegerFixnumLiteralNode(context, sourceSection, index);
 
         if (index >= 0) {
-            return ArrayReadNormalizedNodeFactory.create(context, sourceSection, array, literalIndex);
+            return ArrayReadNormalizedNodeGen.create(context, sourceSection, array, literalIndex);
         } else {
-            return ArrayReadDenormalizedNodeFactory.create(context, sourceSection, array, literalIndex);
+            return ArrayReadDenormalizedNodeGen.create(context, sourceSection, array, literalIndex);
         }
     }
 
@@ -37,9 +37,9 @@ public static RubyNode readSlice(RubyContext context, SourceSection sourceSectio
         final RubyNode literalExclusiveEnd = new FixnumLiteralNode.IntegerFixnumLiteralNode(context, sourceSection, exclusiveEnd);
 
         if (start >= 0 && exclusiveEnd >= 0) {
-            return ArrayReadSliceNormalizedNodeFactory.create(context, sourceSection, array, literalStart, literalExclusiveEnd);
+            return ArrayReadSliceNormalizedNodeGen.create(context, sourceSection, array, literalStart, literalExclusiveEnd);
         } else {
-            return ArrayReadSliceDenormalizedNodeFactory.create(context, sourceSection, array, literalStart, literalExclusiveEnd);
+            return ArrayReadSliceDenormalizedNodeGen.create(context, sourceSection, array, literalStart, literalExclusiveEnd);
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.core.ArrayDupNode;
-import org.jruby.truffle.nodes.core.ArrayDupNodeFactory;
+import org.jruby.truffle.nodes.core.ArrayDupNodeGen;
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.nodes.dispatch.DispatchNode;
@@ -50,9 +50,9 @@ public SplatCastNode(RubyContext context, SourceSection sourceSection, NilBehavi
         super(context, sourceSection);
         this.nilBehavior = nilBehavior;
         // Calling private #to_a is allowed for the *splat operator.
-        dup = ArrayDupNodeFactory.create(context, sourceSection, null);
+        dup = ArrayDupNodeGen.create(context, sourceSection, null);
         respondToToA = DispatchHeadNodeFactory.createMethodCall(context, true, MissingBehavior.RETURN_MISSING);
-        respondToCast = BooleanCastNodeFactory.create(context, sourceSection, null);
+        respondToCast = BooleanCastNodeGen.create(context, sourceSection, null);
         toA = DispatchHeadNodeFactory.createMethodCall(context, true, MissingBehavior.RETURN_MISSING);
         this.useToAry = useToAry;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
@@ -18,9 +18,9 @@
 import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.objects.IsTaintedNode;
-import org.jruby.truffle.nodes.objects.IsTaintedNodeFactory;
+import org.jruby.truffle.nodes.objects.IsTaintedNodeGen;
 import org.jruby.truffle.nodes.objects.TaintNode;
-import org.jruby.truffle.nodes.objects.TaintNodeFactory;
+import org.jruby.truffle.nodes.objects.TaintNodeGen;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
@@ -40,21 +40,21 @@ public TaintResultNode(boolean taintFromSelf, int taintFromParameter, RubyNode m
         this.taintFromSelf = taintFromSelf;
         this.taintFromParameter = taintFromParameter;
         this.method = method;
-        this.isTaintedNode = IsTaintedNodeFactory.create(getContext(), getSourceSection(), null);
+        this.isTaintedNode = IsTaintedNodeGen.create(getContext(), getSourceSection(), null);
     }
 
     public TaintResultNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
         this.taintFromSelf = false;
         this.taintFromParameter = -1;
-        this.isTaintedNode = IsTaintedNodeFactory.create(getContext(), getSourceSection(), null);
+        this.isTaintedNode = IsTaintedNodeGen.create(getContext(), getSourceSection(), null);
     }
 
     public Object maybeTaint(RubyBasicObject source, RubyBasicObject result) {
         if (taintProfile.profile(isTaintedNode.isTainted(source))) {
             if (taintNode == null) {
                 CompilerDirectives.transferToInterpreter();
-                taintNode = insert(TaintNodeFactory.create(getContext(), getSourceSection(), null));
+                taintNode = insert(TaintNodeGen.create(getContext(), getSourceSection(), null));
             }
 
             taintNode.taint(result);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/AndNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/AndNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**
@@ -30,7 +30,7 @@ public class AndNode extends RubyNode {
     public AndNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {
         super(context, sourceSection);
         this.left = left;
-        leftCast = BooleanCastNodeFactory.create(context, sourceSection, null);
+        leftCast = BooleanCastNodeGen.create(context, sourceSection, null);
         this.right = right;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/FlipFlopNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/FlipFlopNode.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.nodes.methods.locals.FlipFlopStateNode;
 import org.jruby.truffle.runtime.RubyContext;
 
@@ -27,8 +27,8 @@ public class FlipFlopNode extends RubyNode {
 
     public FlipFlopNode(RubyContext context, SourceSection sourceSection, RubyNode begin, RubyNode end, FlipFlopStateNode stateNode, boolean exclusive) {
         super(context, sourceSection);
-        this.begin = BooleanCastNodeFactory.create(context, sourceSection, begin);
-        this.end = BooleanCastNodeFactory.create(context, sourceSection, end);
+        this.begin = BooleanCastNodeGen.create(context, sourceSection, begin);
+        this.end = BooleanCastNodeGen.create(context, sourceSection, end);
         this.stateNode = stateNode;
         this.exclusive = exclusive;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/IfNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/IfNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**
@@ -39,7 +39,7 @@ public IfNode(RubyContext context, SourceSection sourceSection, RubyNode conditi
         assert thenBody != null;
         assert elseBody != null;
 
-        this.condition = BooleanCastNodeFactory.create(context, sourceSection, condition);
+        this.condition = BooleanCastNodeGen.create(context, sourceSection, condition);
         this.thenBody = thenBody;
         this.elseBody = elseBody;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/NotNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/NotNode.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**
@@ -25,7 +25,7 @@ public class NotNode extends RubyNode {
 
     public NotNode(RubyContext context, SourceSection sourceSection, RubyNode child) {
         super(context, sourceSection);
-        this.child = BooleanCastNodeFactory.create(context, sourceSection, child);
+        this.child = BooleanCastNodeGen.create(context, sourceSection, child);
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/OrNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**
@@ -30,7 +30,7 @@ public class OrNode extends RubyNode {
     public OrNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {
         super(context, sourceSection);
         this.left = left;
-        leftCast = BooleanCastNodeFactory.create(context, sourceSection, null);
+        leftCast = BooleanCastNodeGen.create(context, sourceSection, null);
         this.right = right;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
@@ -18,7 +18,7 @@
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
-import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.NextException;
 import org.jruby.truffle.runtime.control.RedoException;
@@ -60,7 +60,7 @@ private static abstract class WhileRepeatingBaseNode extends Node implements Rep
 
         public WhileRepeatingBaseNode(RubyContext context, RubyNode condition, RubyNode body) {
             this.context = context;
-            this.condition = BooleanCastNodeFactory.create(context, condition.getSourceSection(), condition);
+            this.condition = BooleanCastNodeGen.create(context, condition.getSourceSection(), condition);
             this.body = body;
         }
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayCoreMethodNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayCoreMethodNode.java
@@ -14,7 +14,7 @@
 import org.jruby.truffle.runtime.RubyContext;
 
 @ImportStatic(ArrayGuards.class)
-public abstract class ArrayCoreMethodNode extends CoreMethodNode {
+public abstract class ArrayCoreMethodNode extends CoreMethodArrayArgumentsNode {
 
     public ArrayCoreMethodNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);