aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adopt scala's scheme for root import hidingMartin Odersky2017-01-154-14/+23
| | | | | | | | | | scalac hides a root import from Predef if there is an eplicit Predef import. We now do the same (previously we did this only if the overriding import undefined something, using a `x => _` syntax). To avoid cycles and races one had to be very careful not to force import symbols too early, so we now compare the name before the symbol proper. All this is likely temporary - the comment of ImportInfo#unimported points to a different, more systematic solution.
* Merge pull request #1883 from dotty-staging/fix-1877Dmitry Petrashko2017-01-1114-6/+195
|\ | | | | Fix #1877: Add forwarders for primitive/generic mixins.
| * Add PrimitiveForwarders and fix forwarding on value classes.Nicolas Stucki2017-01-118-15/+102
| |
| * Fix #1877: Add forwarders for primitive/generic mixins.Nicolas Stucki2017-01-068-6/+108
| |
* | Merge pull request #1690 from dotty-staging/benchDmitry Petrashko2017-01-1111-3/+211
|\ \ | | | | | | Fix benchmarks and add multiple mini benchmark tests
| * | restore curve name for backward data compatibilityliu fengyun2016-11-241-6/+4
| | |
| * | add mini tests to benchmarksliu fengyun2016-11-2410-3/+213
| | |
| * | fix benchmark testliu fengyun2016-11-241-1/+1
| | |
* | | Merge pull request #1894 from dotty-staging/fix/inner-class-emissionGuillaume Martres2017-01-113-1/+21
|\ \ \ | | | | | | | | Partially fix Java interop for emitted inner classes
| * | | Partially fix Java interop for emitted inner classesGuillaume Martres2017-01-113-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backend uses `rawname` to define the "inner name" of an InnerClass entry in a classfile, this should be the simple name of the class before any mangling takes place. Fixing this allows Java code to reference dotty inner classes, except if they're defined in objects which is still broken until https://github.com/DarkDimius/scala/pull/4 is merged and a new backend is published.
* | | | Merge pull request #1893 from dotty-staging/fix-#1891odersky2017-01-113-2/+25
|\ \ \ \ | | | | | | | | | | Fix #1891: Don't add redundant constraint
| * | | | Add more explanation.Martin Odersky2017-01-111-0/+3
| | | | |
| * | | | Fix #1891: Don't add redundant constraintMartin Odersky2017-01-103-2/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before adding a constraint, make sure there is no way the two types are already in a subtype relation. Adding redundant constraints is problematic because we might introduce cycles. See i1891.scala for a test.
* | | | Merge pull request #1890 from dotty-staging/remove-inlined-fieldsodersky2017-01-102-21/+29
|\ \ \ \ | |/ / / |/| | | Stop emitting fields for inlined fields.
| * | | Fix #1878: Use Inline on final vals.Nicolas Stucki2017-01-104-20/+51
| | | |
| * | | Stop emitting fields for inlined fields.Nicolas Stucki2017-01-101-1/+2
| | | |
| * | | Revert "Fix #1878: Generate fields for final vars."Nicolas Stucki2017-01-103-25/+1
|/ / / | | | | | | | | | This reverts commit 63d68bf4d3cbac82f6d9faf19acd5589603a17ee.
* | | Merge pull request #1889 from dotty-staging/fix/dummies-for-sbtFelix Mulder2017-01-091-1/+28
|\ \ \ | | | | | | | | Add dummy scala{-compiler,-reflect,p}
| * | | Add dummy scala{-compiler,-reflect,p}Guillaume Martres2017-01-081-1/+28
|/ / / | | | | | | | | | | | | This is needed to make dotty-compiled projects work with sbt 0.13.13, the other needed fix is https://github.com/sbt/sbt/pull/2897
* | | Merge pull request #1888 from dotty-staging/bump-version-011Guillaume Martres2017-01-0887-180/+174
|\ \ \ | | | | | | | | Bump version from 0.1-SNAPSHOT to 0.1.1-SNAPSHOT
| * | | Bump version from 0.1-SNAPSHOT to 0.1.1-SNAPSHOTGuillaume Martres2017-01-0887-180/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for two reasons: - All published Scala versions are of the form a.b.c and some tooling expect that, like sbt CrossVersion API. - Using 0.1.1 instead of 0.1.0 means that we match the version number of dotty-sbt-bridge, this is simpler and means that in the future sbt could automatically choose the correct version of dotty-sbt-bridge so that the user does not need to specify scalaCompilerBridgeSource in his build.sbt Note: it's awful that we have hardcoded paths to jars and that I had to change them, but I won't fix that now.
* | | | Improve error position and drop second error since it is prunedJonathan Brachthäuser2017-01-082-2/+2
| | | |
* | | | Give context for code examples to ease understandingJonathan Brachthäuser2017-01-081-9/+18
| | | |
* | | | Replace all occurrences of Id, ident or Ident with idJonathan Brachthäuser2017-01-081-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To match the specs in https://github.com/lampepfl/dotty/blob/master/docs/syntax-summary.txt all occurences of Id, ident or Ident in comments have been replaced with the terminal `id`.
* | | | Add error message for dangling this in path selectionsJonathan Brachthäuser2017-01-082-1/+28
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following examples trigger the error message: val x: Foo.this = ??? // Also triggers the error: import foo.this // Additionally, also slays the compiler type X = Foo.this.type
* | | Merge pull request #1887 from dotty-staging/fix-#1867Guillaume Martres2017-01-072-1/+4
|\ \ \ | | | | | | | | Fix #1867: Set position of empty refined types
| * | | Fix #1867: Set position of empty refined typesMartin Odersky2017-01-042-1/+4
| | | |
* | | | Merge pull request #1885 from dotty-staging/add/dummy-libsGuillaume Martres2017-01-061-5/+9
|\ \ \ \ | |_|_|/ |/| | | Fix dummy scala-library
| * | | Fix dummy scala-libraryGuillaume Martres2017-01-061-5/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | To be useful, the dummy scala-library: - needs to be published with crossPaths off (the "_2.11" path of the artefact name), like the real scala-library - should depend on dotty-library and not just scala-library, since this is what is needed to compile dotty programs
* | | Merge pull request #1873 from dotty-staging/fix-#1865odersky2017-01-052-1/+26
|\ \ \ | | | | | | | | Fix #1865: Compute outer path at right phase
| * | | Address reviewer commentsMartin Odersky2017-01-042-1/+1
| | | |
| * | | Fix #1865: Compute outer path at right phaseMartin Odersky2017-01-032-1/+26
| |/ / | | | | | | | | | | | | When computing the outer path, we need to be careful to dealias before erasure, even if the outer path is demanded during erasure. Otherwise we lose prefixes.
* | | Merge pull request #1879 from dotty-staging/fix-final-varsodersky2017-01-053-1/+25
|\ \ \ | | | | | | | | Fix #1878: Generate fields for final vars.
| * | | Fix #1878: Generate fields for final vars.Nicolas Stucki2017-01-053-1/+25
|/ / /
* | | Merge pull request #1876 from dotty-staging/lower-max-inlinesodersky2017-01-041-1/+1
|\ \ \ | | | | | | | | Fix #1875: Decrease -Xmax-inlines default to 32.
| * | | Fix #1875: Decrease -Xmax-inlines default to 32.Nicolas Stucki2017-01-041-1/+1
|/ / /
* | | Merge pull request #1869 from dotty-staging/fix-#1868odersky2017-01-042-1/+8
|\ \ \ | | | | | | | | Fix #1868: Fix a logic error in a match
| * | | Fix #1868 - Fix logic bug in matchMartin Odersky2017-01-022-1/+8
| | | |
* | | | Merge pull request #1864 from dotty-staging/fix-#1732odersky2017-01-042-1/+17
|\ \ \ \ | | | | | | | | | | Fix #1732: Special treatment for bottom type by-name args
| * | | | Add test caseMartin Odersky2017-01-031-0/+15
| |/ / /
| * / / Fix #1732: Special treatment for bottom type by-name argsMartin Odersky2016-12-311-1/+2
| |/ / | | | | | | | | | | | | | | | If a by-name arg has a bottom type, we need to create a closure with the result type of the formal parameter, or else specialization with FunctionalInterfaces will fail.
* | | Merge pull request #1872 from dotty-staging/fix-compileStdLib-testliu fengyun2017-01-033-6/+24
|\ \ \ | | | | | | | | Fix compileStdLib test
| * | | Fix test pos/compileStdLibNicolas Stucki2017-01-033-6/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | The issue was that all the files stdlib files where copied in partest-generated/pos/compileStdLib direclty (i.e. directories flattend). This implies that files with the same names would overwrite eachother (like `package.scala` and `Set.scala`).
* | | Merge pull request #1871 from jarrodj/masterFelix Mulder2017-01-032-1/+44
|\ \ \ | |/ / |/| | Add error message for unbound wildcard type. Parsers.scala:664
| * | Add error message for unbound wildcard type.Jarrod Janssen2017-01-022-1/+44
|/ /
* | Merge pull request #1850 from dotty-staging/fix-#1845odersky2016-12-282-1/+6
|\ \ | | | | | | Fix #1845: Survive illegal this-type prefixes
| * | Annotate other error line in testMartin Odersky2016-12-261-1/+1
| | |
| * | Add // error to neg testMartin Odersky2016-12-221-1/+1
| | |
| * | Fix #1845: Survive illegal this-type prefixesMartin Odersky2016-12-222-1/+6
| | |
* | | Update links and source (#1862)senia-psm2016-12-271-11/+20
| | |