diff options
author | Li Haoyi <haoyi@dropbox.com> | 2014-11-14 15:44:54 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-14 15:44:54 -0800 |
commit | 64b283eb61f2c20e39e4c55e8696522569420028 (patch) | |
tree | 875fdb95af7991717c63cb45be3f00eb70d7408d /book/src/main | |
parent | ac06ede92a8be7a064e30364161d2610e547e988 (diff) | |
download | hands-on-scala-js-64b283eb61f2c20e39e4c55e8696522569420028.tar.gz hands-on-scala-js-64b283eb61f2c20e39e4c55e8696522569420028.tar.bz2 hands-on-scala-js-64b283eb61f2c20e39e4c55e8696522569420028.zip |
lots of cleanip
Diffstat (limited to 'book/src/main')
-rw-r--r-- | book/src/main/scala/book/Main.scala | 4 | ||||
-rw-r--r-- | book/src/main/scala/book/Utils.scala | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/book/src/main/scala/book/Main.scala b/book/src/main/scala/book/Main.scala index 91360d5..da9bace 100644 --- a/book/src/main/scala/book/Main.scala +++ b/book/src/main/scala/book/Main.scala @@ -27,8 +27,8 @@ object Main { } val allNames = { - def rec(n: Node): Seq[String] = { - n.name +: n.children.flatMap(rec) + def rec(n: Tree[String]): Seq[String] = { + n.value +: n.children.flatMap(rec) } rec(sect.structure).toSet } diff --git a/book/src/main/scala/book/Utils.scala b/book/src/main/scala/book/Utils.scala index 07f462c..ad41d18 100644 --- a/book/src/main/scala/book/Utils.scala +++ b/book/src/main/scala/book/Utils.scala @@ -34,7 +34,7 @@ object sect{ (h6(_, _, _), None) ) - var structure = Node("root", mutable.Buffer.empty) + var structure = Tree[String]("root", mutable.Buffer.empty) val usedRefs = mutable.Set.empty[String] @@ -49,7 +49,7 @@ object sect{ } case class sect(name: String, subname: String = ""){ sect.indent += 1 - val newNode = Node(name, mutable.Buffer.empty) + val newNode = Tree[String](name, mutable.Buffer.empty) val (headerWrap, contentWrap) = sect.headers(sect.indent-1) sect.structure.children.append(newNode) val prev = sect.structure @@ -75,7 +75,7 @@ case class sect(name: String, subname: String = ""){ res } } -case class Node(name: String, children: mutable.Buffer[Node]) +case class Tree[T](value: T, children: mutable.Buffer[Tree[T]]) object lnk{ val usedLinks = mutable.Set.empty[String] def apply(name: String, url: String) = { |