Skip to content

Commit

Permalink
Move directed graph into external project
Browse files Browse the repository at this point in the history
  • Loading branch information
enebo committed Dec 15, 2014
1 parent 369470c commit ea530e2
Show file tree
Hide file tree
Showing 16 changed files with 14 additions and 599 deletions.
1 change: 1 addition & 0 deletions core/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 5 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.*;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/ir/representations/CFG.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
31 changes: 0 additions & 31 deletions core/src/main/java/org/jruby/ir/util/DataIterable.java

This file was deleted.

69 changes: 0 additions & 69 deletions core/src/main/java/org/jruby/ir/util/DataIterator.java

This file was deleted.

104 changes: 0 additions & 104 deletions core/src/main/java/org/jruby/ir/util/DirectedGraph.java

This file was deleted.

34 changes: 0 additions & 34 deletions core/src/main/java/org/jruby/ir/util/Edge.java

This file was deleted.

28 changes: 0 additions & 28 deletions core/src/main/java/org/jruby/ir/util/EdgeTypeIterable.java

This file was deleted.

0 comments on commit ea530e2

Please sign in to comment.