aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refine "&" for denotations.Martin Odersky2015-06-021-9/+45
| | | | | | | | | The policy is now made clear in a doc comment. The new part is that we will prefer a symbol defined in a subclass over a symbol defined in a superclass. With the previous commit 0a0d3dd1 on "More precise and uniform modelling of isCurrent" we got runtime test failures for Course-2002-03.scala because the new definition isCurrent assumed a behavior of `member` which was not assured: Namely that the merged denotation would prefer symbols in subclasses over symbols in superclasses.
* More precise and uniform modelling of "isCurrent"Martin Odersky2015-06-012-8/+5
| | | | | | | | For implemented getters and forwarded methods we need a notion of "isCurrent", which means: would the getter or method before the implementation is added be a member of the implementing class? Only in this case do we need to do anything. The method formulation was previously weaker than the getter formulation, which led to an error when compiling core (duplicate methods: andThen and size).
* Add test case.Martin Odersky2015-06-012-0/+58
| | | | We are still lacking the setup to do this right for mixed Scala 2/Dotty runtime tests. So I checked into `pos` for now.
* Avoid generating trait setters for constants.Martin Odersky2015-06-011-1/+2
| | | | Scalac does not generate them either.
* Uncomment important test for Scala trait forwardingMartin Odersky2015-06-011-1/+1
| | | | Scala 2 doe snot generate default methods, so we always need forwarders.
* Fix missing implementation class forwardMartin Odersky2015-06-011-9/+1
| | | | | A transformFollowingDeep was missing, so LinkScala2ImplClasses never got to see the call.
* Elim ElimWildcardIdentsMartin Odersky2015-06-016-46/+12
| | | | | | Instead of cleaning up, generate sensical code in the first place. This is shorter and (I would argue) clearer, and also has the advantage that some initializing assignments are not generated at all.
* Make elimWildcardIdents apply to AssignmentsMartin Odersky2015-06-012-1/+4
| | | | | | | | Fixes junit failure in dotty where a lazy val was initialized with a "...$lazy = _" assignment. Moved ElimWiildcard to one group before. It does not really matter where it goes so it might as well go someshere in the middle of the pack.
* Improve commentsMartin Odersky2015-06-012-2/+14
|
* New phase: LinkScala2ImplClassesMartin Odersky2015-06-012-1/+59
| | | | This phase rewrites supercalls to calls to static implementation class methods.
* Make memberSignature work after erasure.Martin Odersky2015-06-011-3/+9
| | | | Erasure uncurries arguments, need to track that in memberSignature.
* New phase: AugmentScala2TraitsMartin Odersky2015-06-014-4/+103
|
* Avoid referring to initial$x methods when implementing Scala2 traitsMartin Odersky2015-06-011-6/+11
| | | | | They don't exist for Scala2 traits. Instead we let the initializer be `_' and rely on trait setters (to be implemented) to initialize the field.
* New utility method tpd.UnderscoreMartin Odersky2015-06-015-5/+7
| | | | A typed `_'. This is needed in a few places.
* Make ensureMethodic work after erasure.Martin Odersky2015-06-012-2/+2
| | | | | Previously it didn't, because it created an ExprType, which is illegal after erasure.
* Use $init$ as the name of trait constructorsMartin Odersky2015-06-011-1/+1
| | | | This brings it in line with Scala2 conventions.
* Move needsForwarder logic from ResolveSuper to MixinOps.Martin Odersky2015-06-012-8/+13
| | | | We'd like to make it reusable for a phase that treats Scala2 traits.
* New NameOps methods for Scala2 traitsMartin Odersky2015-06-013-4/+12
| | | | Also: generalize expandedName so that it can cater for trait setters.
* Make Mutable a ModifierFlag.Martin Odersky2015-06-012-2/+8
| | | | | | It definitely does appear in trees, so should be included in the set. Affects how things are printed. Before, typed var's would still show up as vals.
* Merge postConditions of memoize and constructorsMartin Odersky2015-06-012-11/+9
| | | | | | | If memoize and constructors are run in different groups, memoize's previous postcondition "all concerete methods are implemented" is wrong, because constructors are not implemengted yet. Solved by moving the postcondition to phase Constructors.
* Merge pull request #626 from smarter/fix/ast-tostringodersky2015-05-311-2/+2
|\ | | | | Add missing string interpolator prefix in some AST nodes' toString
| * Add missing string interpolator prefix in some AST nodes' toStringGuillaume Martres2015-05-311-2/+2
|/
* Merge pull request #625 from smarter/add/ast-toStringodersky2015-05-311-2/+7
|\ | | | | Trees: Add toString for AST nodes which are not case classes
| * Trees: Add toString for AST nodes which are not case classesGuillaume Martres2015-05-301-2/+7
| | | | | | | | This makes debugging trees easier.
* | Merge pull request #623 from dotty-staging/make-tests-passodersky2015-05-3118-62/+116
|\ \ | |/ |/| Make tests pass
| * Fix ElimStaticThis#transformIdentGuillaume Martres2015-05-302-4/+9
| | | | | | | | | | | | | | | | | | - Only transform static methods which are inside module classes. - Make sure that the prefix of the underlying type of the Ident is a ThisType of the current module class. For example in "scala.Int.box(42)", "box" is an Ident whose underlying type is "TermRef(ThisType(TypeRef(ThisType(TypeRef(NoPrefix,scala)),Int$)),box)", but we should not trigger an assertion in this case.
| * Update t6260-delambdafy.check to account for change in lambda generationGuillaume Martres2015-05-301-1/+0
| |
| * Avoid static initialization deadlock in run tests.Guillaume Martres2015-05-305-23/+34
| | | | | | | | | | See https://github.com/lampepfl/dotty/pull/624#issuecomment-107064519 for a lengthy explanation.
| * New phase: ElimStaticThisDmitry Petrashko2015-05-292-0/+39
| |
| * Bring back disabled test.Martin Odersky2015-05-292-0/+0
| |
| * Eliminate `_' from rhs of ValDefsMartin Odersky2015-05-295-36/+23
| | | | | | | | Previously was only done for DefDefs. Caused backend failure.
| * Stop running scala/scala tests instead of our junit tests.Martin Odersky2015-05-291-0/+1
| |
| * Move test that fails again to disabled.Martin Odersky2015-05-292-0/+26
| |
| * Revert "Fix #580: use isContainedIn to support cases where the enclosing ↵Martin Odersky2015-05-293-27/+1
| | | | | | | | | | | | class is also the top-level class" This reverts commit 6898d2c296326779d373ef0e0b84e4451550120a.
| * Fix compilation failure by refining adaptation of constantsMartin Odersky2015-05-291-1/+13
|/ | | | | | | | | Constants that are adapted to a different supertype need to do this explicitly (not just by changing the type). Otherwise tree checkers will compute the original type and fail. This caused a test failure in pos/harmonize. The mystery is why this was not caught in the checkin tests.
* Merge pull request #611 from dotty-staging/supercalls-traits-testDmitry Petrashko2015-05-286-8/+70
|\ | | | | Add a test for supercalls in traits.
| * Refine definition of isCurrentMartin Odersky2015-05-281-2/+3
| | | | | | | | Fixes problem with run/t261.scala.
| * Extended test case.Martin Odersky2015-05-272-2/+12
| | | | | | | | Also added non-unit fields and a class that directly implements two traits with the same fields.
| * Mixin: generate a getter in implementing class only if currentMartin Odersky2015-05-272-4/+9
| | | | | | | | | | | | A class might implement several fields in inherited traits with the same and type. In that case only one getter should be produced, but all initializing expressions have to be executed.
| * Fix bug in typer erasure's transformInfoMartin Odersky2015-05-271-1/+1
| | | | | | | | ()Unit translates to ()BoxedUnit not BoxedUnit.
| * workaround https://issues.scala-lang.org/browse/SI-7666Dmitry Petrashko2015-05-271-5/+11
| |
| * Add super calls to trait initialization test)Dmitry Petrashko2015-05-271-3/+3
| |
| * Add a test for trait initialization.Dmitry Petrashko2015-05-271-0/+25
| |
| * Add a test that tests supercalls in traits.Dmitry Petrashko2015-05-271-0/+15
| |
* | Merge pull request #616 from dotty-staging/partest-packageDmitry Petrashko2015-05-281-6/+6
|\ \ | | | | | | Package dotty before running partest.
| * | Package dotty before running partest.Dmitry Petrashko2015-05-281-6/+6
| | | | | | | | | | | | To make sure that artifact is the same.
* | | Merge pull request #617 from smarter/fix/param-forwardingDmitry Petrashko2015-05-283-2/+107
|\ \ \ | |/ / |/| | ParamForwarding: do not require param accessors to be private[this]
| * | ParamForwarding: do not require param accessors to be private[this]Guillaume Martres2015-05-283-2/+107
|/ / | | | | | | | | | | | | | | | | | | Also mark the forwarder as Stable otherwise we get a RefChecks error. This fixes #608. Note that we do less parameter forwarding than scalac. See for example D and Y in tests/run/paramForwarding.scala which don't get their own local fields in scalac but do in dotty.
* | Merge pull request #612 from vsalvis/vsalvis-fix-showdiffDmitry Petrashko2015-05-271-1/+20
|\ \ | | | | | | Fix --show-diff for partest issue #609
| * | Fix --show-diff for partestvsalvis2015-05-271-1/+20
| | |