Move directed graph into external project

jruby · Dec 15, 2014 · ea530e2 · ea530e2
1 parent 369470c
commit ea530e2
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 599 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -44,6 +44,7 @@
   jar 'org.jruby.joni:joni:2.1.5'
   jar 'org.jruby.extras:bytelist:1.0.12'
   jar 'org.jruby.jcodings:jcodings:1.0.12'
+  jar 'org.jruby:dirgra:0.1'
 
   jar 'com.headius:invokebinder:1.5'
   jar 'com.headius:options:1.1'

diff --git a/core/pom.xml b/core/pom.xml
@@ -109,6 +109,11 @@
       <artifactId>jcodings</artifactId>
       <version>1.0.12</version>
     </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>dirgra</artifactId>
+      <version>0.1</version>
+    </dependency>
     <dependency>
       <groupId>com.headius</groupId>
       <artifactId>invokebinder</artifactId>

diff --git a/core/src/main/java/org/jruby/ir/dataflow/FlowGraphNode.java b/core/src/main/java/org/jruby/ir/dataflow/FlowGraphNode.java
@@ -1,9 +1,9 @@
 package org.jruby.ir.dataflow;
 
+import org.jruby.dirgra.Edge;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.representations.BasicBlock;
 import org.jruby.ir.representations.CFG;
-import org.jruby.ir.util.Edge;
 
 import java.util.BitSet;
 import java.util.List;

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/LiveVariableNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/LiveVariableNode.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.dataflow.analyses;
 
+import org.jruby.dirgra.Edge;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRFlags;
 import org.jruby.ir.IRScope;
@@ -13,7 +14,6 @@
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.operands.WrappedIRClosure;
 import org.jruby.ir.representations.BasicBlock;
-import org.jruby.ir.util.Edge;
 
 import java.util.*;
 

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/LoadLocalVarPlacementNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/LoadLocalVarPlacementNode.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.dataflow.analyses;
 
+import org.jruby.dirgra.Edge;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IREvalScript;
 import org.jruby.ir.IRScope;
@@ -8,7 +9,6 @@
 import org.jruby.ir.instructions.*;
 import org.jruby.ir.operands.*;
 import org.jruby.ir.representations.BasicBlock;
-import org.jruby.ir.util.Edge;
 
 import java.util.*;
 

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/StoreLocalVarPlacementNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/StoreLocalVarPlacementNode.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.dataflow.analyses;
 
+import org.jruby.dirgra.Edge;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.Operation;
@@ -8,7 +9,6 @@
 import org.jruby.ir.instructions.*;
 import org.jruby.ir.operands.*;
 import org.jruby.ir.representations.BasicBlock;
-import org.jruby.ir.util.Edge;
 
 import java.util.HashSet;
 import java.util.ListIterator;

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.dataflow.analyses;
 
+import org.jruby.dirgra.Edge;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.Operation;
 import org.jruby.ir.dataflow.DataFlowConstants;
@@ -11,7 +12,6 @@
 import org.jruby.ir.operands.Float;
 import org.jruby.ir.representations.BasicBlock;
 import org.jruby.ir.representations.CFG;
-import org.jruby.ir.util.Edge;
 
 import java.util.*;
 

diff --git a/core/src/main/java/org/jruby/ir/representations/CFG.java b/core/src/main/java/org/jruby/ir/representations/CFG.java
@@ -1,5 +1,7 @@
 package org.jruby.ir.representations;
 
+import org.jruby.dirgra.DirectedGraph;
+import org.jruby.dirgra.Edge;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.Operation;
@@ -9,8 +11,6 @@
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.operands.WrappedIRClosure;
 import org.jruby.ir.transformations.inlining.CloneInfo;
-import org.jruby.ir.util.DirectedGraph;
-import org.jruby.ir.util.Edge;
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
 

diff --git a/core/src/main/java/org/jruby/ir/transformations/inlining/CFGInliner.java b/core/src/main/java/org/jruby/ir/transformations/inlining/CFGInliner.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.transformations.inlining;
 
+import org.jruby.dirgra.Edge;
 import org.jruby.RubyModule;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRScope;
@@ -9,7 +10,6 @@
 import org.jruby.ir.representations.BasicBlock;
 import org.jruby.ir.representations.CFG;
 import org.jruby.ir.representations.CFG.EdgeType;
-import org.jruby.ir.util.Edge;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/core/src/main/java/org/jruby/ir/util/DataIterable.java b/core/src/main/java/org/jruby/ir/util/DataIterable.java
diff --git a/core/src/main/java/org/jruby/ir/util/DataIterator.java b/core/src/main/java/org/jruby/ir/util/DataIterator.java
diff --git a/core/src/main/java/org/jruby/ir/util/DirectedGraph.java b/core/src/main/java/org/jruby/ir/util/DirectedGraph.java
diff --git a/core/src/main/java/org/jruby/ir/util/Edge.java b/core/src/main/java/org/jruby/ir/util/Edge.java
diff --git a/core/src/main/java/org/jruby/ir/util/EdgeTypeIterable.java b/core/src/main/java/org/jruby/ir/util/EdgeTypeIterable.java