[Truffle] Tidy up FlipFlopNode.

jruby · Feb 23, 2016 · e498859 · eregon · Feb 24, 2016 · chrisseaton
1 parent cc14e9a
commit e498859
Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/language/locals/FlipFlopNode.java b/truffle/src/main/java/org/jruby/truffle/language/locals/FlipFlopNode.java
@@ -18,20 +18,19 @@
 
 public class FlipFlopNode extends RubyNode {
 
+    private final boolean exclusive;
+
     @Child private BooleanCastNode begin;
     @Child private BooleanCastNode end;
     @Child private FlipFlopStateNode stateNode;
 
-    private final boolean exclusive;
-
-    public FlipFlopNode(RubyContext context, SourceSection sourceSection,
-                        RubyNode begin, RubyNode end, FlipFlopStateNode stateNode,
-                        boolean exclusive) {
+    public FlipFlopNode(boolean exclusive, SourceSection sourceSection, RubyNode begin, RubyNode end,
+                        FlipFlopStateNode stateNode, RubyContext context) {
         super(context, sourceSection);
+        this.exclusive = exclusive;
         this.begin = BooleanCastNodeGen.create(context, sourceSection, begin);
         this.end = BooleanCastNodeGen.create(context, sourceSection, end);
         this.stateNode = stateNode;
-        this.exclusive = exclusive;
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java
@@ -1397,7 +1397,7 @@ public RubyNode visitFlipNode(org.jruby.ast.FlipNode node) {
 
         final FlipFlopStateNode stateNode = createFlipFlopState(sourceSection, 0);
 
-        final RubyNode ret = new FlipFlopNode(context, sourceSection, begin, end, stateNode, node.isExclusive());
+        final RubyNode ret = new FlipFlopNode(node.isExclusive(), sourceSection, begin, end, stateNode, context);
         return addNewlineIfNeeded(node, ret);
     }