aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2098 from dotty-staging/fix-i1960Guillaume Martres2017-03-141-0/+8
|\ | | | | Fix #1960: add test
| * add test for #1960liu fengyun2017-03-141-0/+8
| |
* | Merge pull request #2097 from dotty-staging/fix-i1706Guillaume Martres2017-03-141-0/+3
|\ \ | | | | | | Fix #1706: add test
| * | add test for #1706liu fengyun2017-03-141-0/+3
| |/ | | | | | | The bug is already fixed in PR #1724 while fixing another issue
* | Merge pull request #2100 from dotty-staging/fix/sbt-reporterGuillaume Martres2017-03-141-9/+27
|\ \ | | | | | | Various fixes to the sbt reporter
| * | sbt-bridge: Fix lineContent, pointer, pointerSpaceGuillaume Martres2017-03-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were done to imitate how these fields are set in https://github.com/sbt/sbt/blob/0.13/compile/interface/src/main/scala/xsbt/DelegatingReporter.scala The main issue this fixes is sbt displaying the ^ pointer way too far, because the number of spaces was set from the beginning of the file instead of the beginning of the line.
| * | sbt-bridge: Reduce verbosity by using intermediate variableGuillaume Martres2017-03-141-6/+7
| | |
| * | sbt-bridge: simpler way to get file pathGuillaume Martres2017-03-141-4/+5
| | |
| * | sbt-bridge: Don't crash when a Message does not have a PositionGuillaume Martres2017-03-141-9/+23
|/ /
* | Merge pull request #2091 from dotty-staging/fix-#2077Guillaume Martres2017-03-144-11/+21
|\ \ | | | | | | Fix #2077: Optimization of constant conditionals
| * | Fix #2077: Optimization of constant conditionalsMartin Odersky2017-03-134-11/+21
| |/ | | | | | | | | Move fixed logic to FirstTransform, where the other constant folding operations are also done.
* | Merge pull request #2090 from dotty-staging/fix/ParSetLikeodersky2017-03-142-0/+11
|\ \ | | | | | | Fix #2089: Error when compiling ParSetLike, ParSet, SetLike, in this order
| * | Fix #2089: Error when compiling ParSetLike, ParSet, SetLike, in this orderGuillaume Martres2017-03-132-0/+11
| | | | | | | | | | | | | | | This fix is inspired by 6c91684, but I couldn't tell you why it works exactly, it's just something I tried.
* | | Merge pull request #2093 from dotty-staging/fix/sourceFileodersky2017-03-141-4/+7
|\ \ \ | | | | | | | | Fix Symbol#sourceFile not working after Flatten
| * | | Fix Symbol#sourceFile not working after FlattenGuillaume Martres2017-03-141-4/+7
| | | | | | | | | | | | | | | | | | | | The SourceFile annotation is only present on the non-flattened top-level class.
* | | | Merge pull request #2094 from dotty-staging/fix-i2071odersky2017-03-142-0/+9
|\ \ \ \ | | | | | | | | | | Fix #2071: handle HKApply in SAMType
| * | | | fix #2071: handle HKApply in SAMTypeliu fengyun2017-03-142-0/+9
| | |_|/ | |/| |
* | | | Merge pull request #2095 from dotty-staging/posfixodersky2017-03-141-1/+1
|\ \ \ \ | |/ / / |/| | | Fix #1488: position fix for lazy vals
| * | | fix #1488: unfriendly jumping in evaluating lazy val blockliu fengyun2017-03-141-1/+1
|/ / /
* | | Merge pull request #2087 from dotty-staging/fix/ParSetLikeodersky2017-03-132-3/+4
|\ \ \ | |/ / |/| / | |/ Fix compilation of ParSetLike by itself
| * Fix compilation of ParSetLike by itselfGuillaume Martres2017-03-132-3/+4
|/ | | | | | | Before this commit, ParSetLike compiled fine as part of compileStdLib but crashed when compiled by itself because we tried to force a LazyRef while forcing the same LazyRef. This commit fixes this by being slightly more lazy where it matters.
* Merge pull request #2080 from dotty-staging/fix#-2066odersky2017-03-127-16/+72
|\ | | | | Fix #2066: Don't qualify private members in SelectionProto's...
| * Alternative fix of #2066.Martin Odersky2017-03-124-16/+51
| | | | | | | | | | Now we never match `? { name: T }` with types that have only a private `name` member. This is what scalac does, too.
| * Fix #2066: Don't qualify private members in SelectionProto's...Martin Odersky2017-03-124-3/+24
| | | | | | | | ... unless they would be accessible in the given context.
* | Merge pull request #2083 from dotty-staging/fix/plainprinter-posGuillaume Martres2017-03-121-1/+1
|\ \ | | | | | | -Yplain-printer: do not print positions by default
| * | -Yplain-printer: do not print positions by defaultGuillaume Martres2017-03-121-1/+1
|/ / | | | | | | You can still have positions printed by explictly passing -Yprintpos
* | Merge pull request #2078 from dotty-staging/fix-#1569-v2Guillaume Martres2017-03-125-26/+41
|\ \ | | | | | | Fix #360: Improve avoidance algorithm
| * | Comment ApproximatingTypeMapMartin Odersky2017-03-121-0/+7
| | |
| * | Improve definition and doc comment for ensureNoLeaksMartin Odersky2017-03-122-23/+22
| | | | | | | | | | | | No more try-again business necessary.
| * | Add original test case of #360Martin Odersky2017-03-121-0/+6
| | |
| * | Fix #1569: Improve avoidance algorithmMartin Odersky2017-03-123-13/+16
| |/ | | | | | | | | | | The essential change is that we do not throw away more precise info of the avoided type if the expected type is fully defined.
* | Merge pull request #2076 from dotty-staging/fix/override-java-varargsodersky2017-03-125-6/+30
|\ \ | | | | | | Fix overriding a Java method with varargs
| * | ElimRepeated: Do not use installAfterGuillaume Martres2017-03-121-6/+14
| | | | | | | | | | | | | | | | | | | | | This was a mistake introduced in the previous commit, installAfter is only safe to use in `IdentityDenotTransformer` phases, otherwise it means that the phase denotation transformer is not run at all for this particular denotation, this caused Ycheck to fail.
| * | Fix overriding a Java method with varargsGuillaume Martres2017-03-125-4/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If A method like: override def foo(x: Object*) overrides a Java method, it needs to be rewritten as: def foo(x: Seq[Object]) override def foo(x: Array[Object]): Object = foo(Predef.wrapRefArray(x)) This should be handled by ElimRepeated but there were two bugs: - `addVarArgsBridge` was called at phase `thisTransformer.next`, this is too late to create the bridge since `T*` has already been rewritten as `Seq[T]` - The original method symbol needs to have the `override` flag dropped, since it doesn't override anything. Furthermore, RefChecks had to be moved after ElimRepeated, otherwise the testcase would fail the overriding checks.
* | Merge pull request #2075 from dotty-staging/fix/tasty-testsodersky2017-03-123-1/+0
|\ \ | |/ |/| Move tests/tasty/* to tests/pickling/*
| * Move tests/tasty/* to tests/pickling/*Guillaume Martres2017-03-113-1/+0
| | | | | | | | | | These two directories were tested using the same flags, but tests/tasty compiled all of its files at once which is usually not what is intended.
* | Merge pull request #1884 from MasseGuillaume/restore-delegating-reporterFelix Mulder2017-03-112-8/+14
|\ \ | |/ |/| restore position offset in DelegatingReporter
| * restore position offset in DelegatingReporterGuillaume Massé2017-01-062-8/+14
| |
* | Merge pull request #2070 from dotty-staging/fix/erasedLubodersky2017-03-092-4/+23
|\ \ | | | | | | Fix bug in erasedLub leading to incorrect signatures
| * | Fix bug in erasedLub leading to incorrect signaturesGuillaume Martres2017-03-082-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, the added testcase failed in a strange way: 14 | def bla(foo: Foo) = orElse2(identity).apply(foo) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |value of type <nonsensical><notype></nonsensical> does not take parameters This happened because the TermRef for the apply method had an incorrect signature, therefore its underlying type was NoType. According to the documentation of `erasedLub`, the erasure should be: "a common superclass or trait S of the argument classes, with the following two properties: S is minimal: no other common superclass or trait derives from S] S is last : in the linearization of the first argument type `tp1` there are no minimal common superclasses or traits that come after S. (the reason to pick last is that we prefer classes over traits that way)." I'm not convinced that the implementation satisfies either of these two properties, but this commit at least makes S closer to being minimal by making sure that the last best candidate never derives from it.
* | | Merge pull request #2068 from dotty-staging/fix-#2064odersky2017-03-092-8/+22
|\ \ \ | | | | | | | | Fix #2064: Avoid illegal types in OrDominator
| * | | Fix commentMartin Odersky2017-03-081-2/+3
| | | |
| * | | Better fixMartin Odersky2017-03-082-7/+5
| | | | | | | | | | | | | | | | | | | | `superType` should never return a `TypeBounds` in the first place. This commit makes sure it doesn't.
| * | | Fix #2064: Avoid illegal types in OrDominatorMartin Odersky2017-03-082-1/+16
| | | | | | | | | | | | | | | | | | | | Need to skip type bounds in `underlying` chain, since TypeBounds is not a legal operand type for OrType.
* | | | Merge pull request #2045 from dotty-staging/fix-hlist-hmapodersky2017-03-0923-64/+430
|\ \ \ \ | | | | | | | | | | Fix type inference for HLists and HMaps
| * | | | Adress reviewers commentsMartin Odersky2017-03-032-2/+8
| | | | |
| * | | | More testsMartin Odersky2017-03-023-1/+43
| | | | | | | | | | | | | | | | | | | | and a typo fixed
| * | | | New test: covariant hmapsMartin Odersky2017-03-021-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type inference tends to take quite different paths for non-variant and variant data structures. Since, non-variant hmap has already exposed quite a few problems, it's good to test it also in the covariant case.
| * | | | Move depmeth tests back to pendingMartin Odersky2017-03-012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe this worked only accidentally because we matched more things with wildcards which turned out to be flawed. The test errors show some funky _#_ types, so not sure whether the tests are still valid or not. Moved back to pending awaiting further resolution.
| * | | | Make alignArgsInAnd safe and turn it on by defaultMartin Odersky2017-03-015-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turned out hmaps.scala requires the arg alignment to compile. So we have our first counterexample that we cannot drop this hack. Now it is made safe in the sense that no constraints get lost anymore.