diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-28 17:54:19 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-28 17:54:19 -0700 |
| commit | 622cc9967376d6cef57c7478587e20d6afe9503f (patch) | |
| tree | e9acba6b2b21f0951b9d40dedc418950b9f76d9d | |
| parent | 399bd6240f775583ee9709311bd0b02e8359c15c (diff) | |
| download | scala-622cc9967376d6cef57c7478587e20d6afe9503f.tar.gz scala-622cc9967376d6cef57c7478587e20d6afe9503f.tar.bz2 scala-622cc9967376d6cef57c7478587e20d6afe9503f.zip | |
Revert the lisp test.
The lisp test enjoys the suffering of others.
| -rw-r--r-- | test/disabled/run/lisp.check (renamed from test/files/run/lisp.check) | 1 | ||||
| -rw-r--r-- | test/disabled/run/lisp.scala (renamed from test/files/run/lisp.scala) | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/files/run/lisp.check b/test/disabled/run/lisp.check index 38ca7b655d..64053f26d0 100644 --- a/test/files/run/lisp.check +++ b/test/disabled/run/lisp.check @@ -23,3 +23,4 @@ List('lambda, List('x), List('+, List('*, 'x, 'x), 1)) faculty(10) = 3628800 faculty(10) = 3628800 foobar = ("a" "bc" "def" "z") + diff --git a/test/files/run/lisp.scala b/test/disabled/run/lisp.scala index 07f44e1151..06e68f508a 100644 --- a/test/files/run/lisp.scala +++ b/test/disabled/run/lisp.scala @@ -12,11 +12,11 @@ class LispTokenizer(s: String) extends Iterator[String] { while (i < s.length() && s.charAt(i) <= ' ') i += 1 i < s.length() } - def next: String = + def next: String = if (hasNext) { val start = i if (isDelimiter(s charAt i)) i += 1 - else + else do i = i + 1 while (!isDelimiter(s charAt i)) s.substring(start, i) @@ -312,7 +312,7 @@ object LispAny extends Lisp { case 'cond :: ('else :: expr :: Nil) :: rest => normalize(expr); case 'cond :: (test :: expr :: Nil) :: rest => - normalize('if :: test :: expr :: ('cond :: rest) :: Nil) + normalize('if :: test :: expr :: ('cond :: rest) :: Nil) case 'cond :: 'else :: expr :: Nil => normalize(expr) case h :: t => |