diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-09-10 13:12:27 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-09-10 13:12:27 +0000 |
| commit | b907c8eb599b53d83b2494e63a928182ec97f2eb (patch) | |
| tree | 525ad28a003906f9c493595f84e5ec4a977cfc88 /test | |
| parent | c9e92bfc89083227aa18f88b07688afd625970af (diff) | |
| download | scala-b907c8eb599b53d83b2494e63a928182ec97f2eb.tar.gz scala-b907c8eb599b53d83b2494e63a928182ec97f2eb.tar.bz2 scala-b907c8eb599b53d83b2494e63a928182ec97f2eb.zip | |
1. added var pattern = expr syntax
2. better error messages in two situations
3. fixed tickets 5, 33, 42
4. changed check files of 3 failing tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/bug565.check | 2 | ||||
| -rw-r--r-- | test/files/neg/bug800.check | 4 | ||||
| -rw-r--r-- | test/files/neg/bug997.check | 4 | ||||
| -rw-r--r-- | test/files/run/t0042.check | 1 | ||||
| -rwxr-xr-x | test/files/run/t0042.scala | 9 |
5 files changed, 15 insertions, 5 deletions
diff --git a/test/files/neg/bug565.check b/test/files/neg/bug565.check index 563cff1585..47a1ebd169 100644 --- a/test/files/neg/bug565.check +++ b/test/files/neg/bug565.check @@ -1,5 +1,5 @@ bug565.scala:2: error: only classes can have declared but undefined members (Note that variables need to be initialized to be defined) var s0: String - ^ + ^ one error found diff --git a/test/files/neg/bug800.check b/test/files/neg/bug800.check index b62a3bdde9..00ca02070e 100644 --- a/test/files/neg/bug800.check +++ b/test/files/neg/bug800.check @@ -6,8 +6,8 @@ bug800.scala:8: error: method qualification is defined twice ^ bug800.scala:12: error: value qualification is defined twice var qualification = false; - ^ + ^ bug800.scala:16: error: method qualification is defined twice var qualification = false; - ^ + ^ four errors found diff --git a/test/files/neg/bug997.check b/test/files/neg/bug997.check index 90a1123738..44e383228d 100644 --- a/test/files/neg/bug997.check +++ b/test/files/neg/bug997.check @@ -1,10 +1,10 @@ -bug997.scala:7: error: wrong number of arguments for object Foo of type object Foo +bug997.scala:7: error: wrong number of arguments for object Foo "x" match { case Foo(a) => Console.println(a) } ^ bug997.scala:7: error: not found: value a "x" match { case Foo(a) => Console.println(a) } ^ -bug997.scala:13: error: wrong number of arguments for object Foo of type object Foo +bug997.scala:13: error: wrong number of arguments for object Foo "x" match { case Foo(a, b, c) => Console.println((a,b,c)) } ^ bug997.scala:13: error: not found: value a diff --git a/test/files/run/t0042.check b/test/files/run/t0042.check new file mode 100644 index 0000000000..aeb2d5e239 --- /dev/null +++ b/test/files/run/t0042.check @@ -0,0 +1 @@ +Some(1) diff --git a/test/files/run/t0042.scala b/test/files/run/t0042.scala new file mode 100755 index 0000000000..53314f2885 --- /dev/null +++ b/test/files/run/t0042.scala @@ -0,0 +1,9 @@ +object Test extends Application { + def getClause[T](clauses: List[T]): Option[T] = { + for (c <- clauses) { + return Some(c) + } + return None + } + println(getClause(List(1, 2, 3))) +} |