diff options
| author | odersky <odersky@gmail.com> | 2016-08-21 13:15:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-21 13:15:55 +0300 |
| commit | ac423a31548cfd0901559513e020331facf66a89 (patch) | |
| tree | 66e3eb8a6284d426a74b1369ef63f992896b607a /src/dotty/tools/dotc/core | |
| parent | f19b6dd8371b6dd7cf45279d97e0fa6702e7365a (diff) | |
| parent | 3360130593e3949b455b179f244ad76d7aedfe0e (diff) | |
| download | dotty-ac423a31548cfd0901559513e020331facf66a89.tar.gz dotty-ac423a31548cfd0901559513e020331facf66a89.tar.bz2 dotty-ac423a31548cfd0901559513e020331facf66a89.zip | |
Merge pull request #1459 from dotty-staging/tests3
Refinements to auto-tupling
Diffstat (limited to 'src/dotty/tools/dotc/core')
| -rw-r--r-- | src/dotty/tools/dotc/core/TypeOps.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala index 93b1b1f02..b69ce2536 100644 --- a/src/dotty/tools/dotc/core/TypeOps.scala +++ b/src/dotty/tools/dotc/core/TypeOps.scala @@ -493,7 +493,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. */ def featureEnabled(owner: ClassSymbol, feature: TermName): Boolean = { def toPrefix(sym: Symbol): String = - if (!sym.exists || (sym eq defn.LanguageModuleClass) || (sym eq defn.Scala2LanguageModuleRef)) "" + if (!sym.exists || (sym eq defn.LanguageModuleClass) || (sym eq defn.Scala2LanguageModuleClass)) "" else toPrefix(sym.owner) + sym.name + "." def featureName = toPrefix(owner) + feature def hasImport(implicit ctx: Context): Boolean = { @@ -512,7 +512,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. /** Is auto-tupling enabled? */ def canAutoTuple = - !featureEnabled(defn.LanguageModuleClass, nme.noAutoTupling) + !featureEnabled(defn.Scala2LanguageModuleClass, nme.noAutoTupling) def scala2Mode = featureEnabled(defn.LanguageModuleClass, nme.Scala2) |