diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-21 15:01:46 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-21 15:01:46 +0100 |
| commit | d79fc2cae4e550bf0a3276a3961ed007bdd428e7 (patch) | |
| tree | 8dd84da7c1648b7586f239ee3b66c5e515e9980c /src/reflect | |
| parent | e72f77be2e2c47e1f3905089e16c2ba4826de089 (diff) | |
| parent | 4223bc2ddc497457c7dccd1b9b65e98244a9b4d1 (diff) | |
| download | scala-d79fc2cae4e550bf0a3276a3961ed007bdd428e7.tar.gz scala-d79fc2cae4e550bf0a3276a3961ed007bdd428e7.tar.bz2 scala-d79fc2cae4e550bf0a3276a3961ed007bdd428e7.zip | |
Merge pull request #3555 from adriaanm/rebase-3553
Small Predef cleanup
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala | 3 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/StdNames.scala | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 2567abe51d..e1d760a87a 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -1432,7 +1432,8 @@ trait Definitions extends api.StandardDefinitions { TypeTagClass -> materializeTypeTag ) lazy val TagSymbols = TagMaterializers.keySet - lazy val Predef_conforms = getMemberMethod(PredefModule, nme.conforms) + lazy val Predef_conforms = (getMemberIfDefined(PredefModule, nme.conforms) + orElse getMemberMethod(PredefModule, "conforms": TermName)) // TODO: predicate on -Xsource:2.10 (for now, needed for transition from M8 -> RC1) lazy val Predef_classOf = getMemberMethod(PredefModule, nme.classOf) lazy val Predef_implicitly = getMemberMethod(PredefModule, nme.implicitly) lazy val Predef_wrapRefArray = getMemberMethod(PredefModule, nme.wrapRefArray) diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index 0c28c4fba4..f3467ff9f4 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -671,7 +671,7 @@ trait StdNames { val classOf: NameType = "classOf" val clone_ : NameType = "clone" val collection: NameType = "collection" - val conforms: NameType = "conforms" + val conforms: NameType = "$conforms" // dollar prefix to avoid accidental shadowing val copy: NameType = "copy" val create: NameType = "create" val currentMirror: NameType = "currentMirror" |