Fixed examples for new Stream-based results

djspiewak · Mar 31, 2010 · 0cd76da · 0cd76da
1 parent 2418779
commit 0cd76da
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/examples/src/Example.scala b/examples/src/Example.scala
@@ -15,7 +15,7 @@ trait Example[A] extends Parsers {
       if (results exists { _.isInstanceOf[Success[A]] }) {
         handleSuccesses(for (Success(tree, _) <- results) yield tree)
       } else {
-        val sorted = results sort { _.tail.length < _.tail.length }
+        val sorted = results.toList sort { _.tail.length < _.tail.length }
         val length = sorted.head.tail.length
 
         for (Failure(msg, tail) <- sorted takeWhile { _.tail.length == length }) {
@@ -30,5 +30,5 @@ trait Example[A] extends Parsers {
 
   def parser: Parser[A]
 
-  def handleSuccesses(forest: List[A])
+  def handleSuccesses(forest: Stream[A])
 }
diff --git a/examples/src/arithmetic/ArithmeticParser.scala b/examples/src/arithmetic/ArithmeticParser.scala
@@ -29,7 +29,7 @@ object ArithmeticParser extends common.Example[Expr] with RegexParsers {
 
   def parser = expr
 
-  def handleSuccesses(forest: List[Expr]) {
+  def handleSuccesses(forest: Stream[Expr]) {
     forest foreach println
   }
 }
diff --git a/examples/src/config/ConfigParser.scala b/examples/src/config/ConfigParser.scala
@@ -33,7 +33,7 @@ object ConfigParser extends common.Example[Map[String, String]] with RegexParser
 
       back
     } else {
-      val sorted = results sort { _.tail.length < _.tail.length }
+      val sorted = results.toList sort { _.tail.length < _.tail.length }
       val length = sorted.head.tail.length
 
       throw new ConfigException(sorted takeWhile { _.tail.length == length } flatMap {
@@ -43,7 +43,7 @@ object ConfigParser extends common.Example[Map[String, String]] with RegexParser
     }
   }
 
-  def handleSuccesses(forest: List[Map[String, String]]) {
+  def handleSuccesses(forest: Stream[Map[String, String]]) {
     for ((key, value) <- forest.foldLeft(Map[String, String]()) { _ ++ _ }) {
       println("  " + key + " -> " + value)
     }

diff --git a/examples/src/lambdacalc/LambdaCalcParser.scala b/examples/src/lambdacalc/LambdaCalcParser.scala
@@ -35,7 +35,7 @@ object LambdaCalcParser extends common.Example[(List[Alias], Expr)] with RegexPa
 
   def parser = aliases
 
-  def handleSuccesses(forest: List[(List[Alias], Expr)]) {
+  def handleSuccesses(forest: Stream[(List[Alias], Expr)]) {
     val errors = mutable.Set[String]()
 
     val status = for ((tree, expr) <- forest) yield {

diff --git a/examples/src/miniml/MiniMLParser.scala b/examples/src/miniml/MiniMLParser.scala
@@ -77,7 +77,7 @@ object MiniMLParser extends common.Example[Any] with RegexParsers {
 
   def parser = decs
 
-  def handleSuccesses(v: List[Any]) {
+  def handleSuccesses(v: Stream[Any]) {
     if (!v.isEmpty)
       println("  Successfully recognized!")
   }

diff --git a/examples/src/paren/ParenParser.scala b/examples/src/paren/ParenParser.scala
@@ -13,7 +13,7 @@ object ParenParser extends common.Example[Int] {
 
   def parser = expr
 
-  def handleSuccesses(forest: List[Int]) {
+  def handleSuccesses(forest: Stream[Int]) {
     for (depth <- forest) {
       println("  " + depth)
     }