diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-09 10:10:06 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-09 10:10:06 -0700 |
commit | fc65423d8d6a7548393d212e17c8563cf40bcfc0 (patch) | |
tree | 32dc5e8d37cb0d0c28423bc42eb87f77240fde51 /test/files/run | |
parent | c05d2a41dc9b044370abf9ba1ceaafbb2cde5652 (diff) | |
parent | 2885eb0b2d49c33c707cecd2ee7b9588fe3f76ab (diff) | |
download | scala-fc65423d8d6a7548393d212e17c8563cf40bcfc0.tar.gz scala-fc65423d8d6a7548393d212e17c8563cf40bcfc0.tar.bz2 scala-fc65423d8d6a7548393d212e17c8563cf40bcfc0.zip |
Merge pull request #2367 from vigdorchik/si-6387-revert
Revert "SI-6387 Clones accessor before name expansion"
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/t6387.check | 1 | ||||
-rw-r--r-- | test/files/run/t6387.scala | 16 | ||||
-rw-r--r-- | test/files/run/t7341.check | 0 | ||||
-rwxr-xr-x | test/files/run/t7341.flags | 1 | ||||
-rwxr-xr-x | test/files/run/t7341.scala | 15 |
5 files changed, 16 insertions, 17 deletions
diff --git a/test/files/run/t6387.check b/test/files/run/t6387.check deleted file mode 100644 index 83b33d238d..0000000000 --- a/test/files/run/t6387.check +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/test/files/run/t6387.scala b/test/files/run/t6387.scala deleted file mode 100644 index bbebb5f511..0000000000 --- a/test/files/run/t6387.scala +++ /dev/null @@ -1,16 +0,0 @@ -trait A { - def foo: Long -} - -object Test { - def a(): A = new A { - var foo: Long = 1000L - - val test = () => { - foo = 28 - } - } - def main(args: Array[String]) { - println(a().foo) - } -} diff --git a/test/files/run/t7341.check b/test/files/run/t7341.check new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/files/run/t7341.check diff --git a/test/files/run/t7341.flags b/test/files/run/t7341.flags new file mode 100755 index 0000000000..ae08446055 --- /dev/null +++ b/test/files/run/t7341.flags @@ -0,0 +1 @@ +-Xcheckinit
\ No newline at end of file diff --git a/test/files/run/t7341.scala b/test/files/run/t7341.scala new file mode 100755 index 0000000000..dc526c6c19 --- /dev/null +++ b/test/files/run/t7341.scala @@ -0,0 +1,15 @@ +object Obj { + private var cache: Any = () + def returning(f: () => Unit) = () + def foo { + returning(() => cache = ()) + } + + def apply(): Any = { + cache + } +} + +object Test extends App { + Obj() +} |