Skip to content

Commit

Permalink
fixing error
Browse files Browse the repository at this point in the history
  • Loading branch information
amaurremi committed Jun 2, 2015
1 parent ebcd547 commit 4e0f9a3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ EclipseKeys.createSrc := EclipseCreateSrc.Default + EclipseCreateSrc.Resource
libraryDependencies ++= Seq(
"junit" % "junit" % "4.+",
"com.typesafe" % "config" % "0.5.+",
"com.ibm.wala" % "com.ibm.wala.shrike" % "1.3.4-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.util" % "1.3.4-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.core" % "1.3.4-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.core.tests" % "1.3.4-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.shrike" % "1.3.8-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.util" % "1.3.8-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.core" % "1.3.8-SNAPSHOT",
"com.ibm.wala" % "com.ibm.wala.core.tests" % "1.3.8-SNAPSHOT",
"org.scalatest" % "scalatest_2.11" % "2.2.1" % "test",
"org.scalamock" %% "scalamock-scalatest-support" % "3.2" % "test",
"org.mockito" % "mockito-core" % "1.9.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import ca.uwaterloo.ide.conversion.IdeFromIfdsBuilder
import ca.uwaterloo.ide.solver.IdeSolver
import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil
import com.ibm.wala.core.tests.util.TestConstants
import com.ibm.wala.dataflow.IFDS.PartiallyBalancedTabulationProblem
import com.ibm.wala.dataflow.IFDS.TabulationProblem
import com.ibm.wala.examples.analysis.dataflow.DataflowTest
import com.ibm.wala.ipa.callgraph._
import com.ibm.wala.ipa.callgraph.impl.Util
import com.ibm.wala.ipa.cfg.BasicBlockInContext
import com.ibm.wala.ipa.cha.ClassHierarchy
import com.ibm.wala.ssa.analysis.IExplodedBasicBlock
import com.ibm.wala.util.collections.Pair
import com.ibm.wala.util.config.AnalysisScopeReader

object ReachingDefsIdeSpec {
Expand All @@ -31,9 +32,11 @@ class ReachingDefsIdeProblem extends IdeFromIfdsBuilder with IdeSolver {
private[this] val builder: CallGraphBuilder = Util.makeZeroOneCFABuilder(options, new AnalysisCache, cha, scope)
private[this] val cg: CallGraph = builder.makeCallGraph(options, null)

override type F = (CGNode, Integer)
override val walaIfdsProblem: PartiallyBalancedTabulationProblem[BasicBlockInContext[IExplodedBasicBlock], CGNode, (CGNode, Integer)] = new ReachingDefsProblem(cg, new AnalysisCache)
override type F = Pair[CGNode, Integer]
override type Node = BasicBlockInContext[IExplodedBasicBlock]
override type Procedure = CGNode
override val walaIfdsProblem
: TabulationProblem[Node, Procedure, F]
= new ReachingDefsProblem(cg, new AnalysisCache)
}

0 comments on commit 4e0f9a3

Please sign in to comment.