diff options
author | Paul Phillips <paulp@improving.org> | 2012-04-12 20:35:05 +0100 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-04-12 21:56:20 +0100 |
commit | f1c6714e22e70ecba2aa595bf592b916be82deb4 (patch) | |
tree | 9c59c245a90cade2c9747ee82a4bba62d3aafe32 | |
parent | cfc4757a580c537425857ff849f3dc106d924092 (diff) | |
download | scala-f1c6714e22e70ecba2aa595bf592b916be82deb4.tar.gz scala-f1c6714e22e70ecba2aa595bf592b916be82deb4.tar.bz2 scala-f1c6714e22e70ecba2aa595bf592b916be82deb4.zip |
Fix for SI-5535.
-rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala | 2 | ||||
-rw-r--r-- | test/files/run/t5535.check | 20 | ||||
-rw-r--r-- | test/files/run/t5535.scala | 10 |
3 files changed, 31 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala index 68bfeafbc6..099034fe97 100644 --- a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala +++ b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala @@ -120,7 +120,7 @@ trait MemberHandlers { private def vparamss = member.vparamss private def isMacro = member.mods.hasFlag(scala.reflect.internal.Flags.MACRO) // true if not a macro and 0-arity - override def definesValue = !isMacro && (vparamss.isEmpty || vparamss.head.isEmpty) + override def definesValue = !isMacro && (vparamss.isEmpty || vparamss.head.isEmpty && vparamss.tail.isEmpty) override def resultExtractionCode(req: Request) = if (mods.isPublic) codegenln(name, ": ", req.typeOf(name)) else "" } diff --git a/test/files/run/t5535.check b/test/files/run/t5535.check new file mode 100644 index 0000000000..8da9829b78 --- /dev/null +++ b/test/files/run/t5535.check @@ -0,0 +1,20 @@ +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> def h()(i: Int) = 1 + i +h: ()(i: Int)Int + +scala> println(h()(5)) +6 + +scala> val f = h() _ +f: Int => Int = <function1> + +scala> println(f(10)) +11 + +scala> + +scala> diff --git a/test/files/run/t5535.scala b/test/files/run/t5535.scala new file mode 100644 index 0000000000..7bc12f3470 --- /dev/null +++ b/test/files/run/t5535.scala @@ -0,0 +1,10 @@ +import scala.tools.partest.ReplTest + +object Test extends ReplTest { + def code = """ +def h()(i: Int) = 1 + i +println(h()(5)) +val f = h() _ +println(f(10)) + """ +} |