diff options
author | Paul Phillips <paulp@improving.org> | 2012-12-05 12:49:21 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-12-05 17:55:55 -0800 |
commit | 96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (patch) | |
tree | 1b6a876f276988886b41e47f8f41b3f83e5764b8 /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | |
parent | 9547753a80fab450c842cb4a9a8296aa41875ff3 (diff) | |
download | scala-96fa31d0a3cf7ff401f9197cd0e12acd296e55b1.tar.gz scala-96fa31d0a3cf7ff401f9197cd0e12acd296e55b1.tar.bz2 scala-96fa31d0a3cf7ff401f9197cd0e12acd296e55b1.zip |
Expunged the .net backend.
It lives on in a branch born from this commit's parent.
It's abrupt; no attempt is made to offer a "smooth transition"
for the serious msil userbase, population zero. If anyone feels
very strongly that such a transition is necessary, I will be
happy to talk you into feeling differently.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 0ae225ccee..16680c3f13 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -1116,8 +1116,7 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans def isUnit(s: Symbol) = unboxedValueClass(s) == UnitClass def isNumeric(s: Symbol) = isNumericValueClass(unboxedValueClass(s)) || isAnyNumber(s) def isScalaNumber(s: Symbol) = s isSubClass ScalaNumberClass - // test is behind a platform guard - def isJavaNumber(s: Symbol) = !forMSIL && (s isSubClass JavaNumberClass) + def isJavaNumber(s: Symbol) = s isSubClass JavaNumberClass // includes java.lang.Number if appropriate [SI-5779] def isAnyNumber(s: Symbol) = isScalaNumber(s) || isJavaNumber(s) def isMaybeAnyValue(s: Symbol) = isPrimitiveValueClass(unboxedValueClass(s)) || isMaybeValue(s) @@ -1160,7 +1159,7 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans nonSensiblyNeq() } else if (isNumeric(receiver)) { - if (!isNumeric(actual) && !forMSIL) + if (!isNumeric(actual)) if (isUnit(actual) || isBoolean(actual) || !isMaybeValue(actual)) // 5 == "abc" nonSensiblyNeq() } |