diff options
author | schinz <schinz@epfl.ch> | 2005-04-19 18:04:25 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2005-04-19 18:04:25 +0000 |
commit | 956b9aa3fc0d0d76602def9e016824c55e885cb4 (patch) | |
tree | aa8ff335e3643334c2a50d89ede249ab489d8a24 /sources/scalac | |
parent | 8d4cadf3d956a9779bc3148f6670888e6f6d4340 (diff) | |
download | scala-956b9aa3fc0d0d76602def9e016824c55e885cb4.tar.gz scala-956b9aa3fc0d0d76602def9e016824c55e885cb4.tar.bz2 scala-956b9aa3fc0d0d76602def9e016824c55e885cb4.zip |
- renamed getType to getScalaType
Diffstat (limited to 'sources/scalac')
-rw-r--r-- | sources/scalac/symtab/Definitions.java | 2 | ||||
-rw-r--r-- | sources/scalac/transformer/TypesAsValuesPhase.java | 2 | ||||
-rw-r--r-- | sources/scalac/util/Names.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java index cb647954ec..cedd8703cd 100644 --- a/sources/scalac/symtab/Definitions.java +++ b/sources/scalac/symtab/Definitions.java @@ -379,7 +379,7 @@ public class Definitions { public Symbol SCALAOBJECT_GETTYPE() { if (SCALAOBJECT_GETTYPE == null) - SCALAOBJECT_GETTYPE = loadTerm(SCALAOBJECT_CLASS, Names.getType); + SCALAOBJECT_GETTYPE = loadTerm(SCALAOBJECT_CLASS, Names.getScalaType); return SCALAOBJECT_GETTYPE; } diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java index c56e577df1..b18afe9525 100644 --- a/sources/scalac/transformer/TypesAsValuesPhase.java +++ b/sources/scalac/transformer/TypesAsValuesPhase.java @@ -374,7 +374,7 @@ public class TypesAsValuesPhase extends Phase { case DefDef(_, _, _, _, _, Tree rhs): Symbol symbol = getSymbolFor(tree); - if (symbol.name == Names.getType && symbol.isSynthetic()) { + if (symbol.name == Names.getScalaType && symbol.isSynthetic()) { // Correct the body of the getType method which, // until now, was a placeholder (introduced by // RefCheck). diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java index 16557bbaab..9875857bdd 100644 --- a/sources/scalac/util/Names.java +++ b/sources/scalac/util/Names.java @@ -180,7 +180,7 @@ public class Names { public static final Name get = Name.fromString("get"); public static final Name getClass = Name.fromString("getClass"); public static final Name getInstantiation = Name.fromString("getInstantiation"); - public static final Name getType = Name.fromString("getType"); + public static final Name getScalaType = Name.fromString("getScalaType"); public static final Name isInstance = Name.fromString("isInstance"); public static final Name hashCode = Name.fromString("hashCode"); public static final Name hasNext = Name.fromString("hasNext"); |