summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3246 from xeno-by/topic/compile-time-onlyJason Zaugg2013-12-103-48/+85
|\ | | | | streamlines refchecking undesired symbol properties
| * streamlines refchecking undesired symbol propertiesEugene Burmako2013-12-093-48/+85
| | | | | | | | | | | | Unifies `checkDeprecated`, `checkMigration` and `checkCompileTimeOnly` into a single centralized point of reference that is now consistently called from `checkTypeRef`, `transformIdent` and `transformSelect`.
* | Merge pull request #3237 from xeno-by/topic/macrodef-returntype-inferenceJason Zaugg2013-12-10102-235/+245
|\ \ | |/ |/| deprecates macro def return type inference
| * deprecates macro def return type inferenceEugene Burmako2013-12-10102-235/+245
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new focus on quasiquotes in macro implementations, we now have to change the way how inference of macro def return types works. Previously, if the return type of a macro def wasn’t specified, we looked into the signature of its macro impl, took its return type (which could only be c.Expr[T]) and then assigned T to be the return type of the macro def. We also had a convenient special case which inferred Any in case when the body of the macro impl wasn’t an expr. That avoided reporting spurious errors if the macro impl had its body typed incorrectly (because in that case we would report a def/impl signature mismatch anyway) and also provided a convenience by letting macro impls end with `???`. However now we also allow macro impls to return c.Tree, which means that we are no longer able to do any meaningful type inference, because c.Tree could correspond to tree of any type. Unfortunately, when coupled with the type inference special case described above, this means that the users who migrate from exprs to quasiquotes are going to face an unpleasant surprise. If they haven’t provided explicit return types for their macro defs, those types are going to be silently inferred as `Any`! This commit plugs this loophole by prohibiting type inference from non-expr return types of macro impls (not counting Nothing). Moreover, it also deprecates c.Expr[T] => T inference in order to avoid confusion when switching between exprs and quasiquotes.
* Merge pull request #3226 from ziggystar/patch-1Adriaan Moors2013-12-082-0/+35
|\ | | | | add method dequeueOption to immutable.Queue
| * add method dequeueOption to immutable.QueueThomas Geier2013-12-052-0/+35
| | | | | | | | | | | | This allows immutable.Queue to be used conveniently in functional code. Method is in the spirit of `headOption` on seqs or `get` on maps. Also adds a unit test for immutable.Queue.
* | Merge pull request #3225 from som-snytt/issue/8013-interp-nowarnAdriaan Moors2013-12-084-6/+60
|\ \ | | | | | | SI-8013 Nowarn on macro str interpolation
| * | SI-8013 Nowarn on macro str interpolationSom Snytt2013-12-044-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When warning about stray "foo $bar" under `-Xlint`, which may be missing an interpolator id, suppress the warning if we're in the middle of a macro expansion, since we have no useful heuristic to apply to the expanded tree. The test for whether the string is part of an expanded tree is to check all open macros for an expanded tree that contains the literal tree under scrutiny. (This is deemed more paranoid than looking for a macro application that is an enclosing position.)
* | | Merge pull request #3231 from xeno-by/topic/undeprecate-parseEugene Burmako2013-12-061-3/+0
|\ \ \ | | | | | | | | undeprecates c.parse
| * | | undeprecates c.parseEugene Burmako2013-12-061-3/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | We never thought that c.parse is going to be completely subsumed by quasiquotes, but hoped that the use cases that are going to be lost aren’t going to be noticed by anyone. Unfortunately, this isn’t the case, so I’m undeprecating c.parse until we get a better story for those for whom quasiquotes are not enough.
* | | Merge pull request #3228 from retronym/merge/2.10.x-and-pr-3209-to-masterJason Zaugg2013-12-0617-29/+137
|\ \ \ | | | | | | | | Merge #3209 and 2.10.x to master
| * \ \ Merge commit '7d41094' into merge/2.10.x-and-pr-3209-to-masterJason Zaugg2013-12-068-15/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/interactive/scala/tools/nsc/interactive/CompilerControl.scala
| | * | | SI-7982 Changed contract of askLoadedType to unload units by defaultFrançois Garillot2013-12-068-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale for not keeping units loaded by default is that the more units are loaded, the slower is background compilation. For instance, in the Scala IDE for Eclipse (which uses the presentation compiler), typechecking occurs every time the reconciler kicks-in (~500millis after you stop typing), hence it is important that units are not kept loaded unless strictly necessary (for some extra information about this, see https://www.assembla.com/spaces/scala-ide/tickets/1001388) While I agree that using a boolean argument (`keepLoaded`) for deciding if a unit should be loaded isn't a great design, other methods in `CompilerControl` also have a keepLoaded parameter, so at least we have some consistency. For the future, I'm thinking we should be able to remove the `keepLoaded` flag altogether, and change the implementation of `askLoadedType` to preserve the same units loaded in the presentation compiler before and after its execution. Basically, if you want a unit to be kept loaded, you should call `askReload` first, and then `askLoadedType`. However, to reduce impact, I think the changes carried by this commit will help us estimate if the solution I just outlined is viable (because `askLoadeType` won't be keeping units loaded by default, which wasn't the case with the former implementation). (While the patch was mostly contributed by @huitseeker, @dotta has edited the commit message to preserve the comments in the PR https://github.com/scala/scala/pull/3209)
| * | | | Merge commit '7d74884' into merge-2.10.x-to-masterJason Zaugg2013-12-063-5/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/files/jvm/scala-concurrent-tck.scala
| | * \ \ \ Merge pull request #3181 from heathermiller/issue/6913James Iry2013-12-053-5/+8
| | |\ \ \ \ | | | | | | | | | | | | | | SI-6913 Reapplies a lost fix by @viktorklang
| | | * | | | SI-6913 Fixing semantics of Future fallbackTo to be according to docsHeather Miller2013-12-053-5/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | Origin: viktorklang@1bbe854
| * | | | | Merge commit '7c1d114' into merge-2.10.x-to-masterJason Zaugg2013-12-067-9/+71
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/interactive/Global.scala
| | * | | | Merge pull request #3208 from dotta/si-7548-on-2.10Jason Zaugg2013-12-027-9/+71
| | |\ \ \ \ | | | |/ / / | | |/| | | askTypeAt returns the same type for full/ targeted typecheck (2.10.x)
| | | * | | SI-7458 Pres. compiler must not observe trees in silent modeJason Zaugg2013-12-022-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we can think that `+` in `1 + BigInt(2)` refers to a method in `Int`. In general, this protects the IDE from observing results from "exploratory" typing which is discarded as the compiler backtracks to another possibility. This protection subsumes the condition that checked for overloaded types: presentation/t7458 now passes without this.
| | | * | | SI-7548 Test to demonstrate residual exploratory typing bugJason Zaugg2013-12-023-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't observe tree types under silent mode. The enclosed test is a standalone version of `1 + BigInt(2)`, a standard example of exploratory typing in Scala. Once we determine that none of the `+` methods in `Int` accepts (possibly implicitly coerced `BigInt`), we have to backtrack and look for a view from `Int => { +(_: BigInt): ? }`. The next commit will correct the problem.
| | | * | | SI-7548 askTypeAt returns the same type whether the source was fully or ↵Mirco Dotta2013-12-024-9/+39
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targeted type-checked When asking for targeted typecheck, the located tree may have overloaded types is the source isn't yet fully typechecked (e.g., a select tree for an overloaded method). This is problematic as it can lead to unknown 'hovers', broken hyperlinking that suddenly starts working, unresolved ScalaDoc comments, and similar, in the Scala IDE. With this commit we are hardening the contract of `askTypeAt` to return the same type whether the file was fully type-checked or targeted type-checked. This is done by preventing the typechecker to stop too early if the `located` tree has an overloaded type. Furthermore, I'm assuming that if `located.tpe` is of type `OverloadedType`, by letting the compiler carry-on the typechecking, the `located.tpe` will eventually be resolved to a non-overloaded type. Said otherwise, I expect the targeted typechecking will always terminate (if my reasoning isn't sound, please say so). The test provided with this commit demonstrates the new behavior (the position used to execute the test is resolved to the `foo` method's call). In fact, before this commit, executing the test returned the following: (x: Int, y: String)Unit <and> (x: String)Unit <and> (x: Int)Unit Showing that the tree's type is an overloaded type. The ambiguity is fixed by this commit, and in fact the test's output is now: (x: Int)Unit
| * | | | Merge commit 'da73950' into merge-2.10.x-to-masterJason Zaugg2013-12-060-0/+0
| |\| | |
| | * | | Merge pull request #3180 from xeno-by/topic/toolbox-rangeposJason Zaugg2013-11-263-2/+16
| | |\ \ \ | | | | | | | | | | | | teaches toolbox about -Yrangepos
| | | * | | [nomaster] teaches toolbox about -YrangeposEugene Burmako2013-11-223-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike in master, in 2.10.x enabling -Yrangepos requires instantiating Global with mixed in RangePositions trait. Same story for toolboxes. Just setting Yrangepos is not enough - one needs to mix in RangePositions into ToolboxGlobal. I didn’t know that back then, so now I’m fixing the oversight. The commit is marked as [nomaster], because -Yrangepos doesn’t need special treatment in master.
| | * | | | Merge pull request #3196 from retronym/topic/3190-fixupJason Zaugg2013-11-2610-8/+178
| | |\ \ \ \ | | | |/ / / | | |/| | | Corrects positions for Dynamic calls
* | | | | | Merge pull request #3191 from retronym/ticket/deprecate-par-viewJason Zaugg2013-12-0621-968/+286
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove parallel collection views and, with them, Gen*View
| * | | | | Removes Gen*View and Par*ViewJason Zaugg2013-11-2621-980/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - code that used to be inherited in *View is now inlined - the `view` methods on `ParIteratoa` and `ParSeq` now convert to sequential collections, and are deprecated asking the user to do this explicitly in the future. Should be largely source compatible with 2.10.x, on the assumption that the removed classes, while being public, were internal implementation details. A few tests used now-removed classes to demonstrate compiler crashes. I managed to confirm that after my decoupling, t4365 still exercises the bug: % qbin/scalac test/files/pos/t4365/*.scala warning: there were 2 deprecation warning(s); re-run with -deprecation for details one warning found % scalac-hash 7b4e450 test/files/pos/t4365/*.scala warning: there were 2 deprecation warning(s); re-run with -deprecation for details one warning found % scalac-hash 7b4e450~1 test/files/pos/t4365/*.scala 2<&1 | grep -i wrong error: something is wrong: cannot make sense of type application something is wrong: cannot make sense of type application something is wrong: cannot make sense of type application I didn't manage to do the same for specializes-sym-crash.scala, and instead just made it compile.
| * | | | | Deprecates Par*View and Gen*ViewJason Zaugg2013-11-2412-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 2.12, this gives us the option to move the code from Gen*View down into *View. If we don't do something more drastic with views, which inertia and history suggests is a real possibility, we can at least shed a little of the implementation. These abstractions are *only* used to share implementation; there is no `view` method available on, for instance, `GenSeq` that lets one abstract over parallel/sequential collections while spawning views. scala> (List(1): collection.GenSeq[Int]).view <console>:8: error: value view is not a member of scala.collection.GenSeq[Int] (List(1): collection.GenSeq[Int]).view ^ Let's keep it that way. I suspect that views over parallel collections exist not because they were the most sought after feature, but rather because the initial incarnatin of parallel collections used to live undernead TraversableOnce, and hence were obligated to implement `def view`. This change will give us deprecation warnings in the non deprecated places that extend `Gen*View` (three, by my count) in the interim. There are ways to avoid this, but they aren't particularly appealing.
* | | | | | Merge pull request #3198 from adriaanm/update-versionsAdriaan Moors2013-12-041-0/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use -Dupdate.versions to update versions.properties
| * | | | | | Use -Dupdate.versions to update versions.propertiesAdriaan Moors2013-11-261-0/+21
| | | | | | |
* | | | | | | Merge pull request #3216 from xeno-by/topic/macro-error-messagesAdriaan Moors2013-12-0315-76/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | better error messages for various macro definition errors
| * | | | | | | better error messages for various macro definition errorsEugene Burmako2013-12-0315-76/+84
| | | | | | | |
* | | | | | | | Merge pull request #3213 from Ichoran/issue/8014Adriaan Moors2013-12-032-1/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes SI-8014, regression in Vector ++ TraversableOnce.
| * | | | | | | | Fixes SI-8014, regression in Vector ++ TraversableOnce.Rex Kerr2013-12-022-1/+52
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now uses the cached copy instead of the exhausted iterator. Adds a JUnit test for ++.
* | | | | | | | Merge pull request #3202 from retronym/topic/function1-tuplenAdriaan Moors2013-12-0310-8/+119
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Diminished Tuple Confusion
| * | | | | | | | Better error messages for common Function/Tuple mistakesJason Zaugg2013-12-0110-8/+119
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, for `((a, b) => c): (Tuple2[A, B] => C)`, we currently just offer "missing parameter type." Is something of a rite of passage to know that you need `{ case (...)}` This commit stops short DWIM, but does offer a diagnostic to guide the user towards the supported way of destructuring a `Tuple` in the sole argument of a `Function1`. Secondly, another (less common?) way one might try to write a function to destructure a single tuple argument is: (((a, b)) => c) The parser now matches offers a specific error message for this, and points out the alternatives. In both cases, we avoid offering syntactically invalid alternatives, by detecting names that aren't valid as variable-patterns, and falling back to generic "paramN" in the error message. A handly utility function to sequence a list of options is liberated from the pattern matcher for broader use.
* | | | | | | | Merge pull request #3215 from retronym/ticket/7373Adriaan Moors2013-12-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-7373 Make the constructor of Vector non-public
| * | | | | | | | SI-7373 Make the constructor of Vector non-publicJason Zaugg2013-12-031-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The danger of: new Vector(1, 2, 3).toString java.lang.NullPointerException and the "should have been private all along" argument call for a break in the source compatibility policy here.
* | | | | | | | Merge pull request #3212 from retronym/ticket/8023Adriaan Moors2013-12-034-12/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | SI-8023 Fix symbol-completion-order bug of type var patterns
| * | | | | | | SI-8023 Address review comments around typedHigherKindedTypeJason Zaugg2013-12-033-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make `WildCardType` kind polymorphic - Factory methods for expected kinds. They are still just `Type`-s, though. - Check if the type parameter is initialized, rather than its owner. - Take advantage of these to cleanup `typedAppliedTypeTree` TODO: is this comment totally accurate? If so, should we refactor `Kind.FromParams(tparams)` to `Kind.Arity(tparams.length)`? // @M: kind-arity checking is done here and in adapt, // full kind-checking is in checkKindBounds (in Infer)
| * | | | | | | SI-8023 Fix symbol-completion-order type var pattern bugJason Zaugg2013-12-022-7/+37
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the `isComplete` check altogether leads to cycles in, for instatnce, F-bound type parameters: trait LSO[+A, +Repr <: LSO[A, Repr]] // error: illegal cyclic reference involving type Repr But, I believe that we can (and must) eagerly initialize the type parameter symbols if we are typechecking a pattern. While this appeared to regress in 2.11.x, but the problem was in fact dormant and was merely uncovered in the fix for SI-7756, 3df1d77fc.
* | | | | | | Merge pull request #3207 from retronym/ticket/8022Adriaan Moors2013-12-022-6/+36
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | SI-8022 Backwards compatibility for Regex#unapplySeq
| * | | | | | SI-8022 Backwards compatibility for Regex#unapplySeqJason Zaugg2013-12-012-6/+36
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in ce1bbfe / SI-6406 introduced overloads of `unapplySeq` with wider static and dynmaic result types than the now-deprecated alternative that accepted `Any`. This is subtly source incompatible and the change was noticed in Specs2. This commit uses `List` as the static and runtime type for the new overloads. For consistency, the same is done for the new method added in SI-7737 / 93e9623.
* | | | | | Merge pull request #3201 from adriaanm/test-rm-androidJason Zaugg2013-11-282-27/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused android tests.
| * | | | | | Remove unused android tests.Adriaan Moors2013-11-282-27/+0
|/ / / / / /
* | | | | | Merge pull request #3193 from adriaanm/releastarrAdriaan Moors2013-11-279-741/+605
|\ \ \ \ \ \ | |/ / / / / |/| | | | | No longer support unreleased STARR.
| * | | | | Rename build-support.xml to build-ant-macros.xml.Adriaan Moors2013-11-262-1/+1
| | | | | |
| * | | | | No longer support unreleased STARR.Adriaan Moors2013-11-257-205/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The STARR ("stable reference") compiler is used to bootstrap the compiler. It is now always resolved from maven, based on the `starr.version` property (stored in `versions.properties`). Before, we used the `.desired.sha1` mechanism to pull a set of jars that define the compiler used to build locker ("local reference"), which then builds quick. From now on, we only support officially released versions of STARR. Milestones are allowed of course, which means that, instead of breaking change, STARR evolution must support old and new behavior for at least one milestone cycle. For local development, use the `replacestarr` target as before. It builds quick (core only) and publishes it to your local maven repo with a generated version number, which is saved as `starr.version` in `build.properties` for convenience (overriding `versions.properties`), so that your next build will use this version of the compiler for STARR. You may now think of STARR as STAble Reference Release -- if you will.
| * | | | | Move all macros in build.xml to build-support.xml.Adriaan Moors2013-11-253-538/+550
| | | | | | | | | | | | | | | | | | | | | | | | No functional changes -- in an effort to separate state from behavior.
* | | | | | Merge pull request #3197 from retronym/merge/2.10.x-positions-to-masterJason Zaugg2013-11-2610-8/+178
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge 2.10.x, and PR #3196, to master