Skip to content

Commit ea530e2

Browse files
committed
Move directed graph into external project
1 parent 369470c commit ea530e2

16 files changed

+14
-599
lines changed

core/pom.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
jar 'org.jruby.joni:joni:2.1.5'
4545
jar 'org.jruby.extras:bytelist:1.0.12'
4646
jar 'org.jruby.jcodings:jcodings:1.0.12'
47+
jar 'org.jruby:dirgra:0.1'
4748

4849
jar 'com.headius:invokebinder:1.5'
4950
jar 'com.headius:options:1.1'

core/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@
109109
<artifactId>jcodings</artifactId>
110110
<version>1.0.12</version>
111111
</dependency>
112+
<dependency>
113+
<groupId>org.jruby</groupId>
114+
<artifactId>dirgra</artifactId>
115+
<version>0.1</version>
116+
</dependency>
112117
<dependency>
113118
<groupId>com.headius</groupId>
114119
<artifactId>invokebinder</artifactId>

core/src/main/java/org/jruby/ir/dataflow/FlowGraphNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.jruby.ir.dataflow;
22

3+
import org.jruby.dirgra.Edge;
34
import org.jruby.ir.instructions.Instr;
45
import org.jruby.ir.representations.BasicBlock;
56
import org.jruby.ir.representations.CFG;
6-
import org.jruby.ir.util.Edge;
77

88
import java.util.BitSet;
99
import java.util.List;

core/src/main/java/org/jruby/ir/dataflow/analyses/LiveVariableNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jruby.ir.dataflow.analyses;
22

3+
import org.jruby.dirgra.Edge;
34
import org.jruby.ir.IRClosure;
45
import org.jruby.ir.IRFlags;
56
import org.jruby.ir.IRScope;
@@ -13,7 +14,6 @@
1314
import org.jruby.ir.operands.Variable;
1415
import org.jruby.ir.operands.WrappedIRClosure;
1516
import org.jruby.ir.representations.BasicBlock;
16-
import org.jruby.ir.util.Edge;
1717

1818
import java.util.*;
1919

core/src/main/java/org/jruby/ir/dataflow/analyses/LoadLocalVarPlacementNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jruby.ir.dataflow.analyses;
22

3+
import org.jruby.dirgra.Edge;
34
import org.jruby.ir.IRClosure;
45
import org.jruby.ir.IREvalScript;
56
import org.jruby.ir.IRScope;
@@ -8,7 +9,6 @@
89
import org.jruby.ir.instructions.*;
910
import org.jruby.ir.operands.*;
1011
import org.jruby.ir.representations.BasicBlock;
11-
import org.jruby.ir.util.Edge;
1212

1313
import java.util.*;
1414

core/src/main/java/org/jruby/ir/dataflow/analyses/StoreLocalVarPlacementNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jruby.ir.dataflow.analyses;
22

3+
import org.jruby.dirgra.Edge;
34
import org.jruby.ir.IRClosure;
45
import org.jruby.ir.IRScope;
56
import org.jruby.ir.Operation;
@@ -8,7 +9,6 @@
89
import org.jruby.ir.instructions.*;
910
import org.jruby.ir.operands.*;
1011
import org.jruby.ir.representations.BasicBlock;
11-
import org.jruby.ir.util.Edge;
1212

1313
import java.util.HashSet;
1414
import java.util.ListIterator;

core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jruby.ir.dataflow.analyses;
22

3+
import org.jruby.dirgra.Edge;
34
import org.jruby.ir.IRClosure;
45
import org.jruby.ir.Operation;
56
import org.jruby.ir.dataflow.DataFlowConstants;
@@ -11,7 +12,6 @@
1112
import org.jruby.ir.operands.Float;
1213
import org.jruby.ir.representations.BasicBlock;
1314
import org.jruby.ir.representations.CFG;
14-
import org.jruby.ir.util.Edge;
1515

1616
import java.util.*;
1717

core/src/main/java/org/jruby/ir/representations/CFG.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.jruby.ir.representations;
22

3+
import org.jruby.dirgra.DirectedGraph;
4+
import org.jruby.dirgra.Edge;
35
import org.jruby.ir.IRClosure;
46
import org.jruby.ir.IRScope;
57
import org.jruby.ir.Operation;
@@ -9,8 +11,6 @@
911
import org.jruby.ir.operands.Variable;
1012
import org.jruby.ir.operands.WrappedIRClosure;
1113
import org.jruby.ir.transformations.inlining.CloneInfo;
12-
import org.jruby.ir.util.DirectedGraph;
13-
import org.jruby.ir.util.Edge;
1414
import org.jruby.util.log.Logger;
1515
import org.jruby.util.log.LoggerFactory;
1616

core/src/main/java/org/jruby/ir/transformations/inlining/CFGInliner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jruby.ir.transformations.inlining;
22

3+
import org.jruby.dirgra.Edge;
34
import org.jruby.RubyModule;
45
import org.jruby.ir.IRClosure;
56
import org.jruby.ir.IRScope;
@@ -9,7 +10,6 @@
910
import org.jruby.ir.representations.BasicBlock;
1011
import org.jruby.ir.representations.CFG;
1112
import org.jruby.ir.representations.CFG.EdgeType;
12-
import org.jruby.ir.util.Edge;
1313

1414
import java.util.ArrayList;
1515
import java.util.List;

core/src/main/java/org/jruby/ir/util/DataIterable.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

core/src/main/java/org/jruby/ir/util/DataIterator.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

core/src/main/java/org/jruby/ir/util/DirectedGraph.java

Lines changed: 0 additions & 104 deletions
This file was deleted.

core/src/main/java/org/jruby/ir/util/Edge.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

core/src/main/java/org/jruby/ir/util/EdgeTypeIterable.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)