diff options
author | Martin Odersky <odersky@gmail.com> | 2005-12-14 15:53:49 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2005-12-14 15:53:49 +0000 |
commit | 0a27645cd58bde3b7df320338727ecf8b21f5964 (patch) | |
tree | bc15cea75d9eedce2bb85cb9555574ed785fabd8 /sources/scala/tools/nsc/transform/UnCurry.scala | |
parent | bf6dcc4e923a6e10598679108ae635d739419519 (diff) | |
download | scala-0a27645cd58bde3b7df320338727ecf8b21f5964.tar.gz scala-0a27645cd58bde3b7df320338727ecf8b21f5964.tar.bz2 scala-0a27645cd58bde3b7df320338727ecf8b21f5964.zip |
Diffstat (limited to 'sources/scala/tools/nsc/transform/UnCurry.scala')
-rwxr-xr-x | sources/scala/tools/nsc/transform/UnCurry.scala | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sources/scala/tools/nsc/transform/UnCurry.scala b/sources/scala/tools/nsc/transform/UnCurry.scala index 941b5df414..dfa8252a73 100755 --- a/sources/scala/tools/nsc/transform/UnCurry.scala +++ b/sources/scala/tools/nsc/transform/UnCurry.scala @@ -253,9 +253,16 @@ abstract class UnCurry extends InfoTransform { } case Apply(fn, args) => - withNeedLift(true) { - val formals = fn.tpe.paramTypes; - copy.Apply(tree, transform(fn), transformTrees(transformArgs(tree.pos, args, formals))) + if (settings.noassertions.value && + fn.symbol != null && + (fn.symbol.name == nme.assert_ || fn.symbol.name == nme.assume_) && + fn.symbol.owner == PredefModule.moduleClass) { + Literal(()).setPos(tree.pos).setType(UnitClass.tpe) + } else { + withNeedLift(true) { + val formals = fn.tpe.paramTypes; + copy.Apply(tree, transform(fn), transformTrees(transformArgs(tree.pos, args, formals))) + } } case Assign(Select(_, _), _) => |