diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-01-28 14:14:20 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-01-28 14:14:20 +0000 |
| commit | 6964699e92e00315ebb874339168eb98c1b3ef31 (patch) | |
| tree | 0a6a0b5cd0b2ba47025199a25f2d076c1c606e1c /test | |
| parent | 5b64d91b2086f67193328fad7331981f30113968 (diff) | |
| download | scala-6964699e92e00315ebb874339168eb98c1b3ef31.tar.gz scala-6964699e92e00315ebb874339168eb98c1b3ef31.tar.bz2 scala-6964699e92e00315ebb874339168eb98c1b3ef31.zip | |
Removing defaultGetter field from TermSymbols.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/names-defaults.check | 1 | ||||
| -rw-r--r-- | test/files/run/names-defaults.scala | 3 | ||||
| -rw-r--r-- | test/files/scalap/caseClass/result.test | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check index ac4fb84423..60c7637e3d 100644 --- a/test/files/run/names-defaults.check +++ b/test/files/run/names-defaults.check @@ -120,3 +120,4 @@ klfj1 blublu1 my text List(1, 2) +3 diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala index d751b50148..54a09c14f9 100644 --- a/test/files/run/names-defaults.scala +++ b/test/files/run/names-defaults.scala @@ -256,6 +256,9 @@ object Test extends Application { def test11[T[P]](x: T[T[List[T[X forSome { type X }]]]] = List(1,2)) = x // (cannot call f using the default, List(1,2) doesn't match the param type) + def multinest = { def bar(x: Int = 1) = { def bar(x: Int = 2) = x; bar() + x }; bar() } + println(multinest) + // #2290 def spawn(a: Int, b: => Unit) = { () } diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test index cabf321a07..a1d0ebe167 100644 --- a/test/files/scalap/caseClass/result.test +++ b/test/files/scalap/caseClass/result.test @@ -2,7 +2,7 @@ case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]](i : A, s : scal val i : A = { /* compiled code */ } val s : scala.Predef.String = { /* compiled code */ } def foo : scala.Int = { /* compiled code */ } - def copy[A >: scala.Nothing <: scala.Seq[scala.Int]]() : CaseClass[A] = { /* compiled code */ } + def copy[A >: scala.Nothing <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) : CaseClass[A] = { /* compiled code */ } def copy$default$1[A >: scala.Nothing <: scala.Seq[scala.Int]] : A = { /* compiled code */ } def copy$default$2[A >: scala.Nothing <: scala.Seq[scala.Int]] : scala.Predef.String = { /* compiled code */ } override def hashCode() : scala.Int = { /* compiled code */ } @@ -12,4 +12,4 @@ case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]](i : A, s : scal override def productArity : scala.Int = { /* compiled code */ } override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } override def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } -}
\ No newline at end of file +} |