Skip to content

Don't pursue SAM translation after an arity mismatch. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/compiler/scala/tools/nsc/typechecker/Typers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2871,8 +2871,9 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
*
* Note that the arity of the sam must correspond to the arity of the function.
*/
val samViable = sam.exists && sameLength(sam.info.params, fun.vparams)
val (argpts, respt) =
if (sam.exists && sameLength(sam.info.params, fun.vparams)) {
if (samViable) {
val samInfo = pt memberInfo sam
(samInfo.paramTypes, samInfo.resultType)
} else {
Expand Down Expand Up @@ -2926,7 +2927,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper

// Use synthesizeSAMFunction to expand `(p1: T1, ..., pN: TN) => body`
// to an instance of the corresponding anonymous subclass of `pt`.
case _ if sam.exists =>
case _ if samViable =>
newTyper(context.outer).synthesizeSAMFunction(sam, fun, respt, pt, mode)

// regular Function
Expand Down
52 changes: 52 additions & 0 deletions test/files/neg/sammy_wrong_arity.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
sammy_wrong_arity.scala:6: error: type mismatch;
found : () => Int
required: T1
(() => 0): T1
^
sammy_wrong_arity.scala:7: error: type mismatch;
found : Any => Int
required: T2
((x: Any) => 0): T2
^
sammy_wrong_arity.scala:9: error: type mismatch;
found : Any => Int
required: T0
((x: Any) => 0): T0
^
sammy_wrong_arity.scala:10: error: type mismatch;
found : Any => Int
required: T2
((x: Any) => 0): T2
^
sammy_wrong_arity.scala:12: error: type mismatch;
found : (Any, Any) => Int
required: T0
((x: Any, y: Any) => 0): T0
^
sammy_wrong_arity.scala:13: error: type mismatch;
found : (Any, Any) => Int
required: T1
((x: Any, y: Any) => 0): T1
^
sammy_wrong_arity.scala:15: error: missing parameter type
((x) => 0): T2
^
sammy_wrong_arity.scala:17: error: missing parameter type
((x) => 0): T0
^
sammy_wrong_arity.scala:18: error: missing parameter type
((x) => 0): T2
^
sammy_wrong_arity.scala:20: error: missing parameter type
((x, y) => 0): T0
^
sammy_wrong_arity.scala:20: error: missing parameter type
((x, y) => 0): T0
^
sammy_wrong_arity.scala:21: error: missing parameter type
((x, y) => 0): T1
^
sammy_wrong_arity.scala:21: error: missing parameter type
((x, y) => 0): T1
^
13 errors found
1 change: 1 addition & 0 deletions test/files/neg/sammy_wrong_arity.flags
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Xexperimental
22 changes: 22 additions & 0 deletions test/files/neg/sammy_wrong_arity.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
trait T0 { def ap(): Int }
trait T1 { def ap(a: Any): Int }
trait T2 { def ap(a: Any, b: Any): Int }

class Test {
(() => 0): T1
((x: Any) => 0): T2

((x: Any) => 0): T0
((x: Any) => 0): T2

((x: Any, y: Any) => 0): T0
((x: Any, y: Any) => 0): T1

((x) => 0): T2

((x) => 0): T0
((x) => 0): T2

((x, y) => 0): T0
((x, y) => 0): T1
}