diff options
author | schinz <schinz@epfl.ch> | 2005-04-20 06:39:49 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2005-04-20 06:39:49 +0000 |
commit | b0876f8e3527ad574471c94ef0978c1b76227434 (patch) | |
tree | 60e1f1ca8c63e904aad5429dc8af7b8a1e0e8df6 /sources/scalac/symtab | |
parent | 956b9aa3fc0d0d76602def9e016824c55e885cb4 (diff) | |
download | scala-b0876f8e3527ad574471c94ef0978c1b76227434.tar.gz scala-b0876f8e3527ad574471c94ef0978c1b76227434.tar.bz2 scala-b0876f8e3527ad574471c94ef0978c1b76227434.zip |
- renamed weak* methods in ScalaClassType to is...
- renamed weak* methods in ScalaClassType to isNonTrivial*, which better
reflects what they do, - moved these methods to ClassType, - made
getScalaType return a ClassType, to enable the forthcoming optimisation
making strongly trivial classes return a JavaClassType instead of a
ScalaClassType
Diffstat (limited to 'sources/scalac/symtab')
-rw-r--r-- | sources/scalac/symtab/Definitions.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java index cedd8703cd..32c472e90b 100644 --- a/sources/scalac/symtab/Definitions.java +++ b/sources/scalac/symtab/Definitions.java @@ -680,12 +680,12 @@ public class Definitions { return TYPECONSTRUCTOR_FUNCTIONOUTER; } - private Symbol SCALACLASSTYPE_WEAKISINSTANCE; - public Symbol SCALACLASSTYPE_WEAKISINSTANCE() { - if (SCALACLASSTYPE_WEAKISINSTANCE == null) - SCALACLASSTYPE_WEAKISINSTANCE = - loadTerm(SCALACLASSTYPE_CLASS, Names.weakIsInstance); - return SCALACLASSTYPE_WEAKISINSTANCE; + private Symbol CLASSTYPE_ISNONTRIVIALINSTANCE; + public Symbol CLASSTYPE_ISNONTRIVIALINSTANCE() { + if (CLASSTYPE_ISNONTRIVIALINSTANCE == null) + CLASSTYPE_ISNONTRIVIALINSTANCE = + loadTerm(CLASSTYPE_CLASS, Names.isNonTrivialInstance); + return CLASSTYPE_ISNONTRIVIALINSTANCE; } private Symbol SCALACLASSTYPE_SETPARENTS; |