diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2014-04-21 01:30:54 +0200 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2014-04-21 01:32:30 +0200 |
| commit | 33a914a2ba4018eb6e8bc85577cb0f1290c28c02 (patch) | |
| tree | c5f6d42e6c707a3a2553bfc8eff80cea96d584f9 /src/compiler/scala/tools/nsc/transform/patmat/Logic.scala | |
| parent | cac6383e6658dc5956540b76b9b46c3b664774ac (diff) | |
| download | scala-33a914a2ba4018eb6e8bc85577cb0f1290c28c02.tar.gz scala-33a914a2ba4018eb6e8bc85577cb0f1290c28c02.tar.bz2 scala-33a914a2ba4018eb6e8bc85577cb0f1290c28c02.zip | |
SI-8520 Fix -Dscalac.patmat.analysisBudget=off
Correctly parse "off" instead of throwing java.lang.NumberFormatException
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/patmat/Logic.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/patmat/Logic.scala | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala index e0bc478fad..d2ae963ea8 100644 --- a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala +++ b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala @@ -162,11 +162,18 @@ trait Logic extends Debugging { // to govern how much time we spend analyzing matches for unreachability/exhaustivity object AnalysisBudget { - private val budgetProp = scala.sys.Prop[Int]("scalac.patmat.analysisBudget") + private val budgetProp = scala.sys.Prop[String]("scalac.patmat.analysisBudget") private val budgetOff = "off" val max: Int = { val DefaultBudget = 256 - budgetProp.option.getOrElse(if (budgetProp.get.equalsIgnoreCase("off")) Integer.MAX_VALUE else DefaultBudget) + budgetProp.option match { + case Some(`budgetOff`) => + Integer.MAX_VALUE + case Some(x) => + x.toInt + case None => + DefaultBudget + } } abstract class Exception(val advice: String) extends RuntimeException("CNF budget exceeded") |