diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-03-07 11:05:02 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-03-20 13:02:40 +0100 |
| commit | 7a04b119c9744262bd46c1795b811f56df9516a6 (patch) | |
| tree | fb98dc39eff900b0dd1af4106ae84910c75fc417 /src/dotty/tools/dotc/core | |
| parent | 574a148fd561a793ee522c2be18ee02214236d80 (diff) | |
| download | dotty-7a04b119c9744262bd46c1795b811f56df9516a6.tar.gz dotty-7a04b119c9744262bd46c1795b811f56df9516a6.tar.bz2 dotty-7a04b119c9744262bd46c1795b811f56df9516a6.zip | |
Removed explicit tuplings from dotc codebase.
Eliminated all "Dotty deviations" which were due to lack of auto-tupling.
Diffstat (limited to 'src/dotty/tools/dotc/core')
| -rw-r--r-- | src/dotty/tools/dotc/core/Contexts.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/PickleBuffer.scala | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/src/dotty/tools/dotc/core/Contexts.scala index 68daea440..8780b0bf6 100644 --- a/src/dotty/tools/dotc/core/Contexts.scala +++ b/src/dotty/tools/dotc/core/Contexts.scala @@ -273,7 +273,7 @@ object Contexts { newctx.implicitsCache = null newctx.setCreationTrace() // Dotty deviation: Scala2x allows access to private members implicitCache and setCreationTrace - // even from a subclass prefix. Dotty (and Java) do not. I think that's a bug in Scala2x. + // even from a subclass prefix. Dotty (and Java) do not. It's confirmed as a bug in Scala2x. newctx.asInstanceOf[FreshContext] } diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index bcf2bb74c..22e308062 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -292,7 +292,7 @@ class Definitions { lazy val targs = ft.argInfos if ((FunctionClasses contains tsym) && (targs.length - 1 <= MaxFunctionArity) && - (FunctionClass(targs.length - 1) == tsym)) Some((targs.init, targs.last)) // Dotty deviation: no auto-tupling + (FunctionClass(targs.length - 1) == tsym)) Some(targs.init, targs.last) else None } } diff --git a/src/dotty/tools/dotc/core/pickling/PickleBuffer.scala b/src/dotty/tools/dotc/core/pickling/PickleBuffer.scala index 2bedcab92..ef2b4acb2 100644 --- a/src/dotty/tools/dotc/core/pickling/PickleBuffer.scala +++ b/src/dotty/tools/dotc/core/pickling/PickleBuffer.scala @@ -229,8 +229,8 @@ object PickleBuffer { PARAM -> Param, PACKAGE -> Package, MACRO -> Macro, - BYNAMEPARAM -> ((Method, Covariant)), // Dotty deviation: no auto-tupling - LABEL -> ((Label, Contravariant)), // Dotty deviation: no auto-tupling + BYNAMEPARAM -> (Method, Covariant), + LABEL -> (Label, Contravariant), ABSOVERRIDE -> AbsOverride, LOCAL -> Local, JAVA -> JavaDefined, @@ -238,16 +238,16 @@ object PickleBuffer { STABLE -> Stable, STATIC -> Static, CASEACCESSOR -> CaseAccessor, - DEFAULTPARAM -> ((DefaultParameterized, Trait)), // Dotty deviation: no auto-tupling + DEFAULTPARAM -> (DefaultParameterized, Trait), BRIDGE -> Bridge, ACCESSOR -> Accessor, SUPERACCESSOR -> SuperAccessor, PARAMACCESSOR -> ParamAccessor, MODULEVAR -> Scala2ModuleVar, LAZY -> Lazy, - MIXEDIN -> ((MixedIn, Scala2Existential)), // Dotty deviation: no auto-tupling + MIXEDIN -> (MixedIn, Scala2Existential), EXPANDEDNAME -> ExpandedName, - IMPLCLASS -> ((Scala2PreSuper, ImplClass)), // Dotty deviation: no auto-tupling + IMPLCLASS -> (Scala2PreSuper, ImplClass), SPECIALIZED -> Specialized, DEFAULTINIT -> DefaultInit, VBRIDGE -> VBridge, |