Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actually move to Kiama 1.6.0-SNAPSHOT #329

Open
wants to merge 2 commits into
base: kiama-1.6.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ object dependencies {
"org.apache.avro" % "avro" % "1.7.4",
"com.thoughtworks.xstream" % "xstream" % "1.4.4" intransitive(),
"javassist" % "javassist" % "3.12.1.GA",
"com.googlecode.kiama" %% "kiama" % "1.5.2",
"com.googlecode.kiama" %% "kiama" % "1.6.0-SNAPSHOT",
"com.chuusai" % "shapeless_2.10.3" % "2.0.0-M1",
"org.apache.commons" % "commons-math" % "2.2" % "test",
"org.apache.commons" % "commons-compress" % "1.0" % "test")
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/com/nicta/scoobi/impl/plan/comp/Optimiser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ trait Optimiser extends CompNodes with MemoRewriter {
*/
def parDoFuse = traverseSomebu(parDoFuseRule)

def parDoFuseRule = rule[Any] {
def parDoFuseRule = rule[ParallelDo] {
case p2 @ ParallelDo((p1: ParallelDo) +: rest,_,_,_,_,_,_) if
rest.isEmpty &&
uses(p1).filterNot(_ == p2).isEmpty &&
Expand Down Expand Up @@ -101,8 +101,8 @@ trait Optimiser extends CompNodes with MemoRewriter {
/**
* add a map to output values to non-filled sink nodes if there are some
*/
def addParallelDoForNonFilledSinks = oncebu(rule[Any] {
case p: ProcessNode if p.sinks.exists(!hasBeenFilled) && p.sinks.exists(hasBeenFilled) =>
def addParallelDoForNonFilledSinks = oncebu(rule[ProcessNode] {
case p if p.sinks.exists(!hasBeenFilled) && p.sinks.exists(hasBeenFilled) =>
logger.debug("add a parallelDo node to output non-filled sinks of "+p)
ParallelDo.create(p)(p.wf).copy(nodeSinks = p.sinks.filterNot(hasBeenFilled))
})
Expand All @@ -124,7 +124,7 @@ trait Optimiser extends CompNodes with MemoRewriter {
}

/** duplicate the whole graph by copying all nodes */
lazy val duplicate = (node: CompNode) => rewrite(everywhere(rule[Any] {
lazy val duplicate = (node: CompNode) => rewrite(everywhere(rule[CompNode] {
case n: Op => n.copy()
case n: Materialise => n.copy()
case n: GroupByKey => n.copy()
Expand Down Expand Up @@ -163,7 +163,7 @@ trait Optimiser extends CompNodes with MemoRewriter {
}
}

val truncateRule = rule[Any] { case n: Any =>
val truncateRule = rule[Any] { case n =>
if (condition(n)) truncateNode(n)
else n
}
Expand Down
8 changes: 4 additions & 4 deletions src/test/scala/com/nicta/scoobi/guide/Deployment.scala
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ However, we do need some of Scoobi's dependencies -- so we have to add them in m
"org.apache.avro" % "avro" % "1.7.4", // Note: you only need this if you use it
"com.thoughtworks.xstream" % "xstream" % "1.4.4" intransitive(),
"javassist" % "javassist" % "3.12.1.GA",
"com.googlecode.kiama" %% "kiama" % "1.5.2",
"com.googlecode.kiama" %% "kiama" % "1.6.0-SNAPSHOT",
"com.chuusai" % "shapeless_2.10.2" % "2.0.0-M1",
```

Expand Down Expand Up @@ -123,7 +123,7 @@ libraryDependencies ++= Seq(
"org.scalaz" %% "scalaz-core" % "7.0.2",
"com.thoughtworks.xstream" % "xstream" % "1.4.4" intransitive(),
"javassist" % "javassist" % "3.12.1.GA",
"com.googlecode.kiama" %% "kiama" % "1.5.2",
"com.googlecode.kiama" %% "kiama" % "1.6.0-SNAPSHOT",
"com.chuusai" % "shapeless_2.10.2" % "2.0.0-M1",
)

Expand All @@ -144,7 +144,7 @@ libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % "2.10.3",
"com.thoughtworks.xstream" % "xstream" % "1.4.4" intransitive(),
"javassist" % "javassist" % "3.12.1.GA",
"com.googlecode.kiama" %% "kiama" % "1.5.2",
"com.googlecode.kiama" %% "kiama" % "1.6.0-SNAPSHOT",
"com.chuusai" % "shapeless_2.10.2" % "2.0.0-M1",
)

Expand All @@ -157,7 +157,7 @@ libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % "2.10.3",
"com.thoughtworks.xstream" % "xstream" % "1.4.4" intransitive(),
"javassist" % "javassist" % "3.12.1.GA",
"com.googlecode.kiama" %% "kiama" % "1.5.2",
"com.googlecode.kiama" %% "kiama" % "1.6.0-SNAPSHOT",
"com.chuusai" % "shapeless_2.10.2" % "2.0.0-M1"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ object CompNodeData { outer =>
* a different order
*/
def normalise(result: Any) = rewrite {
everywherebu(rule[Any] {
case iterable: Iterable[_] => Vector(iterable.iterator.toSeq.sortBy(_.toString):_*)
case other => other
everywherebu(rule[Iterable[_]] {
case iterable => Vector(iterable.iterator.toSeq.sortBy(_.toString):_*)
})
}(result).toString

Expand Down