diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-28 12:57:34 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-28 14:02:54 -0700 |
| commit | 97f03245d9646b9ade43418dee7dc0d2a6203ce7 (patch) | |
| tree | 2408e5ac41c3a6391606dd08daef5391c365babe | |
| parent | 3e40fb5d94a4d185c93861b9caf86ac92a04ef2a (diff) | |
| download | scala-97f03245d9646b9ade43418dee7dc0d2a6203ce7.tar.gz scala-97f03245d9646b9ade43418dee7dc0d2a6203ce7.tar.bz2 scala-97f03245d9646b9ade43418dee7dc0d2a6203ce7.zip | |
Revived the lisp test.
All hail the lisp test!
Closes SI-4579.
| -rw-r--r-- | test/files/run/lisp.check (renamed from test/disabled/run/lisp.check) | 1 | ||||
| -rw-r--r-- | test/files/run/lisp.scala (renamed from test/disabled/run/lisp.scala) | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/disabled/run/lisp.check b/test/files/run/lisp.check index 64053f26d0..38ca7b655d 100644 --- a/test/disabled/run/lisp.check +++ b/test/files/run/lisp.check @@ -23,4 +23,3 @@ List('lambda, List('x), List('+, List('*, 'x, 'x), 1)) faculty(10) = 3628800 faculty(10) = 3628800 foobar = ("a" "bc" "def" "z") - diff --git a/test/disabled/run/lisp.scala b/test/files/run/lisp.scala index 06e68f508a..07f44e1151 100644 --- a/test/disabled/run/lisp.scala +++ b/test/files/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 => |